Cleanup private part of Layout Box on destructor (probably not really an

[lyx.git] / src / frontends / qt4 / GuiPrefs.cpp

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index be8957889949bf1c630b6487667c39c977d554a8..d56d3b068104371d5f95c21578f10f3ee3fbf795 100644 (file)
--- 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
@@ -1903,7 +1877,7 @@ PrefFileformats::PrefFileformats(GuiPreferences * form)
 
        formatED->setValidator(new FormatNameValidator(formatsCB, form_->formats()));
        formatsCB->setValidator(new FormatPrettynameValidator(formatsCB, form_->formats()));
-       extensionED->setValidator(new NoNewLineValidator(extensionED));
+       extensionsED->setValidator(new NoNewLineValidator(extensionsED));
        shortcutED->setValidator(new NoNewLineValidator(shortcutED));
        editorED->setValidator(new NoNewLineValidator(editorED));
        viewerED->setValidator(new NoNewLineValidator(viewerED));
@@ -2010,7 +1984,7 @@ void PrefFileformats::on_formatsCB_currentIndexChanged(int i)
 
        formatED->setText(toqstr(f.name()));
        copierED->setText(toqstr(form_->movers().command(f.name())));
-       extensionED->setText(toqstr(f.extension()));
+       extensionsED->setText(toqstr(f.extensions()));
        shortcutED->setText(
                toqstr(l10n_shortcut(f.prettyname(), f.shortcut())));
        documentCB->setChecked((f.documentFormat()));
@@ -2045,12 +2019,13 @@ void PrefFileformats::on_copierED_textEdited(const QString & s)
 }
 
 
-void PrefFileformats::on_extensionED_textEdited(const QString & s)
+void PrefFileformats::on_extensionsED_textEdited(const QString & s)
 {
-       currentFormat().setExtension(fromqstr(s));
+       currentFormat().setExtensions(fromqstr(s));
        changed();
 }
 
+
 void PrefFileformats::on_viewerED_textEdited(const QString & s)
 {
        currentFormat().setViewer(fromqstr(s));