From: Peter Kümmel <syntheticpp@gmx.net>
Date: Fri, 25 May 2007 15:05:46 +0000 (+0000)
Subject: fix merge build src/frontends/qt4/QDocument.cpp
X-Git-Tag: 1.6.10~9627
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=af6a9552ed2cb30cc4d66b44927ebffbd17aee88;p=features.git

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
---

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