cmake: fix merge build

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31891 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index c5548af832caff6aa641cf2f6892589d04f40bb8..2b9911ea8930e0805dfe181b9ac0f169005685d4 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -670,13 +670,13 @@ string citationStyleToString(const CitationStyle & s)
        string cite = citeCommands[s.style];
        if (s.full) {
                CiteStyle const * last = citeStylesFull + nCiteStylesFull;
-               if (find(citeStylesFull, last, s.style) != last)
+               if (std::find(citeStylesFull, last, s.style) != last)
                        cite += '*';
        }
 
        if (s.forceUpperCase) {
                CiteStyle const * last = citeStylesUCase + nCiteStylesUCase;
-               if (find(citeStylesUCase, last, s.style) != last)
+               if (std::find(citeStylesUCase, last, s.style) != last)
                        cite[0] = 'C';
        }
 

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index bc532de05898a6dd0dab88c03b1fc6059d88e1c3..4b60132690cbb20d92592b79cbceb066b3e3d54e 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -1492,8 +1492,8 @@ QAbstractItemModel * GuiApplication::languageModel()
        QStandardItemModel * lang_model = new QStandardItemModel(this);
        lang_model->insertColumns(0, 1);
        int current_row;
-       Languages::const_iterator it = languages.begin();
-       Languages::const_iterator end = languages.end();
+       Languages::const_iterator it = lyx::languages.begin();
+       Languages::const_iterator end = lyx::languages.end();
        for (; it != end; ++it) {
                current_row = lang_model->rowCount();
                lang_model->insertRows(current_row, 1);

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 6b3acb422c7569593475a86a00f07a62a09cf558..b866cc3acf586b2602737447659120d36f5a3303 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1869,7 +1869,7 @@ void GuiDocument::applyView()
 
        QString const lang = langModule->languageCO->itemData(
                langModule->languageCO->currentIndex()).toString();
-       bp_.language = languages.getLanguage(fromqstr(lang));
+       bp_.language = lyx::languages.getLanguage(fromqstr(lang));
 
        // numbering
        if (bp_.documentClass().hasTocLevels()) {

diff --git a/src/frontends/qt4/GuiSelectionManager.cpp b/src/frontends/qt4/GuiSelectionManager.cpp
index c1d33b41788f89685eaf844fc19a6d1f44570730..4d172bc35d890cb52de14e27d6ec9f50f9edcfaf 100644 (file)
--- a/src/frontends/qt4/GuiSelectionManager.cpp
+++ b/src/frontends/qt4/GuiSelectionManager.cpp
@@ -23,6 +23,14 @@
 #include <QPushButton>
 #include <QAbstractListModel>
 
+#ifdef KeyPress
+#undef KeyPress
+#endif
+
+#ifdef ControlModifier
+#undef ControlModifier
+#endif
+
 
 namespace lyx {
 namespace frontend {