From 3fd9398052d2b483d2830c3661ceed26e551fa49 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 28 Sep 2011 22:20:06 +0200 Subject: Remove the remaining traces of QT3_SUPPORT The only place that now still knows about it is moc, so it can still parse old headers. Change-Id: Iafec080f99c67560974e9ebc0cbfb27d9a4b2d6f Reviewed-on: http://codereview.qt-project.org/5755 Reviewed-by: Qt Sanity Bot Reviewed-by: Friedemann Kleint --- src/gui/util/qvalidator.h | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'src/gui/util/qvalidator.h') diff --git a/src/gui/util/qvalidator.h b/src/gui/util/qvalidator.h index cb0436cc3e..5ea7fef4fc 100644 --- a/src/gui/util/qvalidator.h +++ b/src/gui/util/qvalidator.h @@ -68,10 +68,6 @@ public: Invalid, Intermediate, Acceptable - -#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN) - , Valid = Intermediate -#endif }; void setLocale(const QLocale &locale); @@ -80,10 +76,6 @@ public: virtual State validate(QString &, int &) const = 0; virtual void fixup(QString &) const; -#ifdef QT3_SUPPORT -public: - QT3_SUPPORT_CONSTRUCTOR QValidator(QObject * parent, const char *name); -#endif protected: QValidator(QObjectPrivate &d, QObject *parent); QValidator(QValidatorPrivate &d, QObject *parent); @@ -116,11 +108,6 @@ public: Q_SIGNALS: void bottomChanged(int bottom); void topChanged(int top); -#ifdef QT3_SUPPORT -public: - QT3_SUPPORT_CONSTRUCTOR QIntValidator(QObject * parent, const char *name); - QT3_SUPPORT_CONSTRUCTOR QIntValidator(int bottom, int top, QObject * parent, const char *name); -#endif private: Q_DISABLE_COPY(QIntValidator) @@ -170,12 +157,6 @@ Q_SIGNALS: void decimalsChanged(int decimals); void notationChanged(QDoubleValidator::Notation notation); -#ifdef QT3_SUPPORT -public: - QT3_SUPPORT_CONSTRUCTOR QDoubleValidator(QObject * parent, const char *name); - QT3_SUPPORT_CONSTRUCTOR QDoubleValidator(double bottom, double top, int decimals, - QObject * parent, const char *name); -#endif private: Q_DECLARE_PRIVATE(QDoubleValidator) Q_DISABLE_COPY(QDoubleValidator) @@ -203,11 +184,6 @@ public: Q_SIGNALS: void regExpChanged(const QRegExp& regExp); -#ifdef QT3_SUPPORT -public: - QT3_SUPPORT_CONSTRUCTOR QRegExpValidator(QObject *parent, const char *name); - QT3_SUPPORT_CONSTRUCTOR QRegExpValidator(const QRegExp& rx, QObject *parent, const char *name); -#endif private: Q_DISABLE_COPY(QRegExpValidator) -- cgit v1.2.3