From 566d1f1b0007a793ec76e956156502f4cfb97d04 Mon Sep 17 00:00:00 2001
From: Julien Rioux <jrioux@lyx.org>
Date: Sat, 24 Sep 2011 16:39:17 +0000
Subject: [PATCH] Move the NoNewLineValidator to Validator.cpp where it fits
 better.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39743 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiPrefs.cpp  | 28 +---------------------------
 src/frontends/qt4/Validator.cpp | 12 ++++++++++++
 src/frontends/qt4/Validator.h   | 12 ++++++++++++
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 4fe68d45c7..d56d3b0681 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -20,6 +20,7 @@
 #include "GuiFontLoader.h"
 #include "GuiKeySymbol.h"
 #include "qt_helpers.h"
+#include "Validator.h"
 
 #include "Author.h"
 #include "BufferList.h"
@@ -349,33 +350,6 @@ static void setComboxFont(QComboBox * cb, string const & family,
 }
 
 
-/////////////////////////////////////////////////////////////////////
-//
-// NoNewLineValidator
-//
-/////////////////////////////////////////////////////////////////////
-
-class NoNewLineValidator : public QValidator
-{
-public:
-	NoNewLineValidator(QWidget *);
-	QValidator::State validate(QString & input, int & pos) const;
-};
-
-
-NoNewLineValidator::NoNewLineValidator(QWidget * parent)
-	: QValidator(parent)
-{
-}
-
-
-QValidator::State NoNewLineValidator::validate(QString & input, int & /*pos*/) const
-{
-	input.remove(QRegExp("[\\n\\r]"));
-	return QValidator::Acceptable;
-}
-
-
 /////////////////////////////////////////////////////////////////////
 //
 // StrftimeValidator
diff --git a/src/frontends/qt4/Validator.cpp b/src/frontends/qt4/Validator.cpp
index e156dcb099..7f5d5d45e2 100644
--- a/src/frontends/qt4/Validator.cpp
+++ b/src/frontends/qt4/Validator.cpp
@@ -138,6 +138,18 @@ QValidator::State DoubleAutoValidator::validate(QString & input, int & pos) cons
 }
 
 
+NoNewLineValidator::NoNewLineValidator(QWidget * parent)
+	: QValidator(parent)
+{}
+
+
+QValidator::State NoNewLineValidator::validate(QString & qtext, int &) const
+{
+	qtext.remove(QRegExp("[\\n\\r]"));
+	return QValidator::Acceptable;
+}
+
+
 PathValidator::PathValidator(bool acceptable_if_empty,
 			     QWidget * parent)
 	: QValidator(parent),
diff --git a/src/frontends/qt4/Validator.h b/src/frontends/qt4/Validator.h
index 36250bbdca..e824659323 100644
--- a/src/frontends/qt4/Validator.h
+++ b/src/frontends/qt4/Validator.h
@@ -124,6 +124,18 @@ private:
 };
 
 
+// A class to ascertain that no newline characters are passed.
+class NoNewLineValidator : public QValidator
+{
+	Q_OBJECT
+public:
+	// Define a validator.
+	NoNewLineValidator(QWidget *);
+	// Remove newline characters from input.
+	QValidator::State validate(QString &, int &) const;
+};
+
+
 /** A class to ascertain whether the data passed to the @c validate()
  *  member function is a valid file path.
  *  The test is active only when the path is to be stored in a LaTeX
-- 
2.39.2