From daba8bda2e60e9e3b4c616117c81c5ad5ada941d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Sat, 7 Nov 2009 12:50:30 +0000 Subject: [PATCH] cmake: fix merge build git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31891 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BiblioInfo.cpp | 4 ++-- src/frontends/qt4/GuiApplication.cpp | 4 ++-- src/frontends/qt4/GuiDocument.cpp | 2 +- src/frontends/qt4/GuiSelectionManager.cpp | 8 ++++++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp index c5548af832..2b9911ea89 100644 --- 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 bc532de058..4b60132690 100644 --- 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 6b3acb422c..b866cc3acf 100644 --- 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 c1d33b4178..4d172bc35d 100644 --- a/src/frontends/qt4/GuiSelectionManager.cpp +++ b/src/frontends/qt4/GuiSelectionManager.cpp @@ -23,6 +23,14 @@ #include #include +#ifdef KeyPress +#undef KeyPress +#endif + +#ifdef ControlModifier +#undef ControlModifier +#endif + namespace lyx { namespace frontend {