From af6a9552ed2cb30cc4d66b44927ebffbd17aee88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Fri, 25 May 2007 15:05:46 +0000 Subject: [PATCH] fix merge build src/frontends/qt4/QDocument.cpp git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18509 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/QDocument.cpp | 2 +- src/frontends/qt4/QListings.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/QDocument.cpp b/src/frontends/qt4/QDocument.cpp index 389d395b56..1abbe1b9a8 100644 --- a/src/frontends/qt4/QDocument.cpp +++ b/src/frontends/qt4/QDocument.cpp @@ -891,7 +891,7 @@ void QDocumentDialog::apply(BufferParams & params) params.quotes_language = lga; int const pos = langModule->languageCO->currentIndex(); - params.language = languages.getLanguage(lang_[pos]); + params.language = lyx::languages.getLanguage(lang_[pos]); // numbering if (params.getTextClass().hasTocLevels()) { diff --git a/src/frontends/qt4/QListings.cpp b/src/frontends/qt4/QListings.cpp index 25606e02c7..84e6d0efe3 100644 --- a/src/frontends/qt4/QListings.cpp +++ b/src/frontends/qt4/QListings.cpp @@ -208,7 +208,7 @@ QListingsDialog::QListingsDialog(QListings * form) numberStepLE->setValidator(new QIntValidator(0, 1000000, this)); firstlineLE->setValidator(new QIntValidator(0, 1000000, this)); lastlineLE->setValidator(new QIntValidator(0, 1000000, this)); - placementLE->setValidator(new QRegExpValidator(QRegExp("[\*tbph]*"), this)); + placementLE->setValidator(new QRegExpValidator(QRegExp("[\\*tbph]*"), this)); }