get rid of QT3_SUPPORT and some cleanup

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14771 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/validators.C b/src/frontends/qt4/validators.C
index 2de6e5df000b80c72d764194b88df757f11f02b7..34a2e4fa033bd2df29f1bfba464dac115bcd0f7f 100644 (file)
--- a/src/frontends/qt4/validators.C
+++ b/src/frontends/qt4/validators.C
@@ -24,8 +24,8 @@
 #include "support/lstrings.h"
 #include "support/std_ostream.h"
 
-#include <qlineedit.h>
-#include <qwidget.h>
+#include <QLineEdit>
+#include <QWidget>
 
 #include <sstream>
 
@@ -33,8 +33,8 @@ using lyx::support::isStrDbl;
 using std::string;
 
 
-LengthValidator::LengthValidator(QWidget * parent, const char * name)
-       : QValidator(parent, name),
+LengthValidator::LengthValidator(QWidget * parent)
+       : QValidator(parent),
          no_bottom_(true), glue_length_(false)
 {}
 
@@ -88,8 +88,8 @@ LengthValidator * unsignedLengthValidator(QLineEdit * ed)
 
 
 PathValidator::PathValidator(bool acceptable_if_empty,
-                            QWidget * parent, const char * name)
-       : QValidator(parent, name),
+                            QWidget * parent)
+       : QValidator(parent),
          acceptable_if_empty_(acceptable_if_empty),
          latex_doc_(false),
          tex_allows_spaces_(false)

diff --git a/src/frontends/qt4/validators.h b/src/frontends/qt4/validators.h
index 56bcc77a5104fa31d2290c27e2b964f9f035cd4a..21784beb1d4ca1d5350b0f397b5879c4fa79462b 100644 (file)
--- a/src/frontends/qt4/validators.h
+++ b/src/frontends/qt4/validators.h
@@ -26,7 +26,8 @@
 
 #include "lyxlength.h"
 #include "lyxgluelength.h"
-#include <qvalidator.h>
+
+#include <QValidator>
 
 class QWidget;
 class QLineEdit;
@@ -40,7 +41,7 @@ class LengthValidator : public QValidator
        Q_OBJECT
 public:
        /// Define a validator for widget @c parent.
-       LengthValidator(QWidget * parent, const char *name = 0);
+       LengthValidator(QWidget * parent);
 
        /** @returns QValidator::Acceptable if @c data is a LyXGlueLength.
         *  If not, returns QValidator::Intermediate.
@@ -98,8 +99,7 @@ public:
         *  If @c acceptable_if_empty is @c true then an empty path
         *  is regarded as acceptable.
         */
-       PathValidator(bool acceptable_if_empty,
-                     QWidget * parent, const char *name = 0);
+       PathValidator(bool acceptable_if_empty, QWidget * parent);
 
        /** @returns QValidator::Acceptable if @c data is a valid path.
         *  If not, returns QValidator::Intermediate.