From fbb8c063eca15868548ecc98334e5935e6a01e3c Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Wed, 7 May 2008 22:42:44 +0000 Subject: [PATCH] move languageData() out of qt_helpers.cpp git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24670 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiCharacter.cpp | 15 ++++++++- src/frontends/qt4/GuiCharacter.h | 2 +- src/frontends/qt4/GuiDocument.cpp | 14 ++++----- src/frontends/qt4/GuiPrefs.cpp | 20 ++++++------ src/frontends/qt4/qt_helpers.cpp | 49 ------------------------------ src/frontends/qt4/qt_helpers.h | 7 ----- 6 files changed, 31 insertions(+), 76 deletions(-) diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp index a1d7abe03a..1fcacd91f9 100644 --- a/src/frontends/qt4/GuiCharacter.cpp +++ b/src/frontends/qt4/GuiCharacter.cpp @@ -116,10 +116,23 @@ static QList familyData() return families; } + +static QList languageData() +{ + QList list; + Languages::const_iterator it = languages.begin(); + for (; it != languages.end(); ++it) { + list << LanguagePair( + qt_(it->second.display()), toqstr(it->second.lang())); + } + return list; +} + + namespace { template -void fillCombo(QComboBox * combo, QList list) +void fillCombo(QComboBox * combo, QList const & list) { typename QList::const_iterator cit = list.begin(); for (; cit != list.end(); ++cit) diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h index 3be1401f30..307d00380b 100644 --- a/src/frontends/qt4/GuiCharacter.h +++ b/src/frontends/qt4/GuiCharacter.h @@ -16,7 +16,6 @@ #include "GuiDialog.h" #include "ui_CharacterUi.h" -#include "qt_helpers.h" // for LanguagePair #include "Font.h" #include @@ -45,6 +44,7 @@ typedef std::pair ShapePair; typedef std::pair SizePair; typedef std::pair BarPair; typedef std::pair ColorPair; +typedef std::pair LanguagePair; class GuiCharacter : public GuiDialog, public Ui::CharacterUi { diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index 136fa3096c..815912207c 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -510,10 +510,6 @@ GuiDocument::GuiDocument(GuiView & lv) { setupUi(this); - QList langs = languageData(); - for (int i = 0; i != langs.size(); ++i) - lang_.append(langs[i].second); - connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); @@ -790,10 +786,12 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); // language & quotes - QList::const_iterator lit = langs.begin(); - QList::const_iterator lend = langs.end(); - for (; lit != lend; ++lit) - langModule->languageCO->addItem(lit->first); + Languages::const_iterator lit = languages.begin(); + Languages::const_iterator lend = languages.end(); + for (; lit != lend; ++lit) { + lang_.append(toqstr(lit->second.lang())); + langModule->languageCO->addItem(qt_(lit->second.display())); + } // Always put the default encoding in the first position. // It is special because the displayed text is translated. diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index 764b22d72b..27c043a406 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -13,19 +13,20 @@ #include "GuiPrefs.h" -#include "qt_helpers.h" +#include "FileDialog.h" #include "GuiApplication.h" +#include "GuiFontExample.h" #include "GuiFontLoader.h" +#include "GuiKeySymbol.h" +#include "qt_helpers.h" #include "BufferList.h" #include "Color.h" #include "ConverterCache.h" -#include "FileDialog.h" #include "FuncRequest.h" -#include "GuiFontExample.h" -#include "GuiKeySymbol.h" #include "KeyMap.h" #include "KeySequence.h" +#include "Language.h" #include "LyXAction.h" #include "PanelStack.h" #include "paper.h" @@ -1658,12 +1659,11 @@ PrefLanguage::PrefLanguage(QWidget * parent) defaultLanguageCO->clear(); - // store the lang identifiers for later - //foreach (LanguagePair const & lpair, languageData(false)) { - QList l = languageData(); - foreach (LanguagePair const & lpair, l) { - defaultLanguageCO->addItem(lpair.first); - lang_.append(lpair.second); + Languages::const_iterator lit = languages.begin(); + Languages::const_iterator lend = languages.end(); + for (; lit != lend; ++lit) { + lang_.append(toqstr(lit->second.lang())); + defaultLanguageCO->addItem(qt_(lit->second.display())); } } diff --git a/src/frontends/qt4/qt_helpers.cpp b/src/frontends/qt4/qt_helpers.cpp index da5de87dac..05841fd392 100644 --- a/src/frontends/qt4/qt_helpers.cpp +++ b/src/frontends/qt4/qt_helpers.cpp @@ -160,55 +160,6 @@ QString const qt_(string const & str) return toqstr(_(str)); } -namespace { - -class Sorter -{ -public: -#if !defined(USE_WCHAR_T) && defined(__GNUC__) - bool operator()(LanguagePair const & lhs, LanguagePair const & rhs) const - { - return lhs.first < rhs.first; - } -#else - Sorter() : loc_ok(true) - { - try { - loc_ = locale(""); - } catch (...) { - loc_ok = false; - } - } - - bool operator()(LanguagePair const & lhs, LanguagePair const & rhs) const - { - // FIXME: would that be "QString::localeAwareCompare()"? - if (loc_ok) - return loc_(fromqstr(lhs.first), fromqstr(rhs.first)); - else - return lhs.first < rhs.first; - } -private: - locale loc_; - bool loc_ok; -#endif -}; - - -} // namespace anon - - -QList languageData() -{ - QList list; - Languages::const_iterator it = languages.begin(); - for (; it != languages.end(); ++it) { - list << LanguagePair( - qt_(it->second.display()), toqstr(it->second.lang())); - } - return list; -} - void rescanTexStyles() { diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h index ee3aa6d51c..66a9235ef2 100644 --- a/src/frontends/qt4/qt_helpers.h +++ b/src/frontends/qt4/qt_helpers.h @@ -19,8 +19,6 @@ #include -#include - class QComboBox; class QLineEdit; class QCheckBox; @@ -70,11 +68,6 @@ void setValid(QWidget * widget, bool valid); QString const qt_(std::string const & str); /// -typedef std::pair LanguagePair; - -/// -QList languageData(); - support::FileName libFileSearch(QString const & dir, QString const & name, QString const & ext = QString()); -- 2.39.2