diff options
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qvalidator.cpp | 115 | ||||
| -rw-r--r-- | src/gui/util/qvalidator.h | 24 |
2 files changed, 0 insertions, 139 deletions
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp index 43251a8829..4420163866 100644 --- a/src/gui/util/qvalidator.cpp +++ b/src/gui/util/qvalidator.cpp @@ -215,20 +215,6 @@ QValidator::QValidator(QObject * parent) { } -#ifdef QT3_SUPPORT -/*! - \obsolete - Sets up the validator. The \a parent and \a name parameters are - passed on to the QObject constructor. -*/ - -QValidator::QValidator(QObject * parent, const char *name) - : QObject(*new QValidatorPrivate, parent) -{ - setObjectName(QString::fromAscii(name)); -} -#endif - /*! Destroys the validator, freeing any storage and other resources used. @@ -360,40 +346,6 @@ QIntValidator::QIntValidator(int minimum, int maximum, } -#ifdef QT3_SUPPORT -/*! - \obsolete - - Constructs a validator with a \a parent object and a \a name that - accepts all integers. -*/ - -QIntValidator::QIntValidator(QObject * parent, const char *name) - : QValidator(parent) -{ - setObjectName(QString::fromAscii(name)); - b = INT_MIN; - t = INT_MAX; -} - - -/*! - \obsolete - - Constructs a validator called \a name with a \a parent, that - accepts integers from \a minimum to \a maximum inclusive. -*/ - -QIntValidator::QIntValidator(int minimum, int maximum, - QObject * parent, const char* name) - : QValidator(parent) -{ - setObjectName(QString::fromAscii(name)); - b = minimum; - t = maximum; -} -#endif - /*! Destroys the validator. */ @@ -640,42 +592,6 @@ QDoubleValidator::QDoubleValidator(double bottom, double top, int decimals, dec = decimals; } -#ifdef QT3_SUPPORT -/*! - \obsolete - - Constructs a validator object with a \a parent object and a \a name - that accepts any double. -*/ - -QDoubleValidator::QDoubleValidator(QObject * parent, const char *name) - : QValidator(*new QDoubleValidatorPrivate , parent) -{ - setObjectName(QString::fromAscii(name)); - b = -HUGE_VAL; - t = HUGE_VAL; - dec = 1000; -} - - -/*! - \obsolete - - Constructs a validator object with a \a parent object, called \a - name. This validator will accept doubles from \a bottom to \a top - inclusive, with up to \a decimals digits after the decimal point. -*/ - -QDoubleValidator::QDoubleValidator(double bottom, double top, int decimals, - QObject * parent, const char* name) - : QValidator(*new QDoubleValidatorPrivate, parent) -{ - setObjectName(QString::fromAscii(name)); - b = bottom; - t = top; - dec = decimals; -} -#endif /*! Destroys the validator. @@ -920,37 +836,6 @@ QRegExpValidator::QRegExpValidator(const QRegExp& rx, QObject *parent) { } -#ifdef QT3_SUPPORT -/*! - \obsolete - - Constructs a validator with a \a parent object and \a name that accepts - any string (including an empty one) as valid. -*/ - -QRegExpValidator::QRegExpValidator(QObject *parent, const char *name) - : QValidator(parent), r(QString::fromLatin1(".*")) -{ - setObjectName(QString::fromAscii(name)); -} - -/*! - \obsolete - - Constructs a validator with a \a parent object and a \a name that - accepts all strings that match the regular expression \a rx. - - The match is made against the entire string; e.g. if the regexp is - \bold{[A-Fa-f0-9]+} it will be treated as \bold{^[A-Fa-f0-9]+$}. -*/ - -QRegExpValidator::QRegExpValidator(const QRegExp& rx, QObject *parent, - const char *name) - : QValidator(parent), r(rx) -{ - setObjectName(QString::fromAscii(name)); -} -#endif /*! Destroys the validator. 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) |