less string conversions as long as we stay in the frontend

[lyx.git] / src / frontends / qt4 / GuiDocument.cpp

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 2e21094787bde9a3415b9781a3080f03489534db..99b5fbaaaad9db9e76354ce81e49ad7733346e4a 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -13,7 +13,7 @@
 
 #include "GuiDocument.h"
 
-#include "BaseClassList.h"
+#include "LayoutFile.h"
 #include "BranchList.h"
 #include "buffer_funcs.h"
 #include "Buffer.h"
@@ -49,13 +49,10 @@
 
 #include "frontends/alert.h"
 
-#include <boost/bind.hpp>
-
 #include <QCloseEvent>
 #include <QScrollBar>
 #include <QTextCursor>
 
-#include <algorithm>
 #include <sstream>
 
 using namespace std;
@@ -63,17 +60,6 @@ using namespace lyx::support;
 
 
 namespace {
-///
-template<class Pair>
-vector<typename Pair::second_type> const
-getSecond(vector<Pair> const & pr)
-{
-        vector<typename Pair::second_type> tmp(pr.size());
-        transform(pr.begin(), pr.end(), tmp.begin(),
-                                        boost::bind(&Pair::second, _1));
-        return tmp;
-}
-
 
 char const * const tex_graphics[] =
 {
@@ -152,8 +138,8 @@ public:
                // Ordering criteria:
                //   1. Availability of text class
                //   2. Description (lexicographic)
-               LayoutFile const & tc1 = BaseClassList::get()[lhs];
-               LayoutFile const & tc2 = BaseClassList::get()[rhs];
+               LayoutFile const & tc1 = LayoutFileList::get()[lhs];
+               LayoutFile const & tc2 = LayoutFileList::get()[rhs];
                return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) ||
                        (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() &&
                         _(tc1.description()) < _(tc2.description()));
@@ -519,8 +505,10 @@ GuiDocument::GuiDocument(GuiView & lv)
        : GuiDialog(lv, "document", qt_("Document Settings")), current_id_(0)
 {
        setupUi(this);
-       
-       lang_ = getSecond(getLanguageData(false));
+
+       QList<LanguagePair> langs = languageData(false);        
+       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()));
@@ -797,12 +785,11 @@ GuiDocument::GuiDocument(GuiView & lv)
        connect(langModule->quoteStyleCO, SIGNAL(activated(int)),
                this, SLOT(change_adaptor()));
        // language & quotes
-       vector<LanguagePair> const langs = getLanguageData(false);
-       vector<LanguagePair>::const_iterator lit  = langs.begin();
-       vector<LanguagePair>::const_iterator lend = langs.end();
-       for (; lit != lend; ++lit) {
-               langModule->languageCO->addItem(toqstr(lit->first));
-       }
+
+       QList<LanguagePair>::const_iterator lit  = langs.begin();
+       QList<LanguagePair>::const_iterator lend = langs.end();
+       for (; lit != lend; ++lit)
+               langModule->languageCO->addItem(lit->first);
 
        // Always put the default encoding in the first position.
        // It is special because the displayed text is translated.
@@ -820,7 +807,6 @@ GuiDocument::GuiDocument(GuiView & lv)
        langModule->quoteStyleCO->addItem(qt_(">>text<<"));
 
 
-
        numberingModule = new UiWidget<Ui::NumberingUi>;
        // numbering
        connect(numberingModule->depthSL, SIGNAL(valueChanged(int)),
@@ -902,7 +888,7 @@ GuiDocument::GuiDocument(GuiView & lv)
        }
        // latex classes
        latexModule->classCO->setModel(&classes_model_);
-       BaseClassList const & bcl = BaseClassList::get();
+       LayoutFileList const & bcl = LayoutFileList::get();
        vector<LayoutFileIndex> classList = bcl.classList();
        sort(classList.begin(), classList.end(), less_textclass_avail_desc());
 
@@ -1243,7 +1229,7 @@ void GuiDocument::classChanged()
                return;
        string const classname = classes_model_.getIDString(idx);
        // check if this is a local layout file
-       if (prefixIs(classname, BaseClassList::localPrefix)) {
+       if (prefixIs(classname, LayoutFileList::localPrefix)) {
                int const ret = Alert::prompt(_("Local layout file"),
                                _("The layout file you have selected is a local layout\n"
                                  "file, not one in the system or user directory. Your\n"
@@ -1486,7 +1472,7 @@ void GuiDocument::apply(BufferParams & params)
        params.quotes_language = lga;
 
        int const pos = langModule->languageCO->currentIndex();
-       params.language = lyx::languages.getLanguage(lang_[pos]);
+       params.language = lyx::languages.getLanguage(fromqstr(lang_[pos]));
 
        // numbering
        if (params.documentClass().hasTocLevels()) {
@@ -1659,11 +1645,10 @@ void GuiDocument::apply(BufferParams & params)
                params.orientation = ORIENTATION_PORTRAIT;
 
        // margins
-       params.use_geometry =
-               (!marginsModule->marginCB->isChecked()
-               || geom_papersize);
+       params.use_geometry = !marginsModule->marginCB->isChecked()
+               || geom_papersize;
 
-       Ui::MarginsUi const * m(marginsModule);
+       Ui::MarginsUi const * m = marginsModule;
 
        params.leftmargin = widgetsToLength(m->innerLE, m->innerUnit);
        params.topmargin = widgetsToLength(m->topLE, m->topUnit);
@@ -1707,17 +1692,12 @@ void GuiDocument::apply(BufferParams & params)
 }
 
 
-/** Return the position of val in the vector if found.
-    If not found, return 0.
- */
-template<class A>
-static size_t findPos(vector<A> const & vec, A const & val)
-{
-       typename vector<A>::const_iterator it =
-               find(vec.begin(), vec.end(), val);
-       if (it == vec.end())
-               return 0;
-       return distance(vec.begin(), it);
+static int findPos(QStringList const & vec, QString const & val)
+{
+       for (int i = 0; i != vec.size(); ++i)
+               if (vec[i] == val)
+                       return i;
+       return 0;
 }
 
 
@@ -1773,8 +1753,7 @@ void GuiDocument::updateParams(BufferParams const & params)
                params.use_bibtopic);
 
        // language & quotes
-       int const pos = int(findPos(lang_,
-                                   params.language->lang()));
+       int const pos = findPos(lang_, toqstr(params.language->lang()));
        langModule->languageCO->setCurrentIndex(pos);
 
        langModule->quoteStyleCO->setCurrentIndex(
@@ -2039,7 +2018,7 @@ void GuiDocument::updateAvailableModules()
        modules_av_model_.clear();
        vector<modInfoStruct> const modInfoList = getModuleInfo();
        int const mSize = modInfoList.size();
-       for (int i = 0; i < mSize; ++i) {
+       for (int i = 0; i != mSize; ++i) {
                modInfoStruct const & modInfo = modInfoList[i];
                modules_av_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
        }
@@ -2048,11 +2027,11 @@ void GuiDocument::updateAvailableModules()
 
 void GuiDocument::updateSelectedModules() 
 {
-       //and selected ones, too
+       // and selected ones, too
        modules_sel_model_.clear();
        vector<modInfoStruct> const selModList = getSelectedModules();
        int const sSize = selModList.size();
-       for (int i = 0; i < sSize; ++i) {
+       for (int i = 0; i != sSize; ++i) {
                modInfoStruct const & modInfo = selModList[i];
                modules_sel_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
        }
@@ -2119,9 +2098,9 @@ void GuiDocument::setLayoutComboByIDString(std::string const & idString)
 
 bool GuiDocument::isValid()
 {
-       return (validate_listings_params().empty() &&
-               (textLayoutModule->skipCO->currentIndex() != 3 ||
-                !textLayoutModule->skipLE->text().isEmpty()));
+       return validate_listings_params().empty()
+               && (textLayoutModule->skipCO->currentIndex() != 3
+                       || !textLayoutModule->skipLE->text().isEmpty());
 }