mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-13 17:20:55 +00:00
cmake: fix merged build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31923 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
1116e15a4b
commit
765362f7a2
@ -671,13 +671,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';
|
||||
}
|
||||
|
||||
|
@ -1164,8 +1164,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);
|
||||
|
@ -23,6 +23,9 @@
|
||||
#include <QPushButton>
|
||||
#include <QAbstractListModel>
|
||||
|
||||
#ifdef KeyPress
|
||||
#undef KeyPress
|
||||
#endif
|
||||
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
Loading…
Reference in New Issue
Block a user