anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the NoNewLineValidator to Validator.cpp where it fits better.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39743 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Julien Rioux 2011-09-24 16:39:17 +00:00
parent 5c17ce4195
commit 566d1f1b00
3 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/frontends/qt4/GuiPrefs.cpp
View File

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

12
src/frontends/qt4/Validator.cpp
View File

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

12
src/frontends/qt4/Validator.h
View File

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