anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: fix merge build

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31891 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2009-11-07 12:50:30 +00:00
parent 131298543b
commit daba8bda2e
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BiblioInfo.cpp
View File

@ -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';
}

4
src/frontends/qt4/GuiApplication.cpp
View File

@ -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);

2
src/frontends/qt4/GuiDocument.cpp
View File

@ -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()) {

8
src/frontends/qt4/GuiSelectionManager.cpp
View File

@ -23,6 +23,14 @@
#include <QPushButton>
#include <QAbstractListModel>
#ifdef KeyPress
#undef KeyPress
#endif
#ifdef ControlModifier
#undef ControlModifier
#endif
namespace lyx {
namespace frontend {