diff options
Diffstat (limited to 'src/corelib/tools/qregexp.h')
-rw-r--r-- | src/corelib/tools/qregexp.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index 12e42a95b7..4ce2f6e0be 100644 --- a/src/corelib/tools/qregexp.h +++ b/src/corelib/tools/qregexp.h @@ -45,9 +45,6 @@ #ifndef QT_NO_REGEXP #include <QtCore/qstring.h> -#ifdef QT3_SUPPORT -#include <new> -#endif QT_BEGIN_HEADER @@ -91,37 +88,16 @@ public: void setPattern(const QString &pattern); Qt::CaseSensitivity caseSensitivity() const; void setCaseSensitivity(Qt::CaseSensitivity cs); -#ifdef QT3_SUPPORT - inline QT3_SUPPORT bool caseSensitive() const { return caseSensitivity() == Qt::CaseSensitive; } - inline QT3_SUPPORT void setCaseSensitive(bool sensitive) - { setCaseSensitivity(sensitive ? Qt::CaseSensitive : Qt::CaseInsensitive); } -#endif PatternSyntax patternSyntax() const; void setPatternSyntax(PatternSyntax syntax); -#ifdef QT3_SUPPORT - inline QT3_SUPPORT bool wildcard() const { return patternSyntax() == Wildcard; } - inline QT3_SUPPORT void setWildcard(bool aWildcard) - { setPatternSyntax(aWildcard ? Wildcard : RegExp); } -#endif bool isMinimal() const; void setMinimal(bool minimal); -#ifdef QT3_SUPPORT - inline QT3_SUPPORT bool minimal() const { return isMinimal(); } -#endif bool exactMatch(const QString &str) const; int indexIn(const QString &str, int offset = 0, CaretMode caretMode = CaretAtZero) const; int lastIndexIn(const QString &str, int offset = -1, CaretMode caretMode = CaretAtZero) const; -#ifdef QT3_SUPPORT - inline QT3_SUPPORT int search(const QString &str, int from = 0, - CaretMode caretMode = CaretAtZero) const - { return indexIn(str, from, caretMode); } - inline QT3_SUPPORT int searchRev(const QString &str, int from = -1, - CaretMode caretMode = CaretAtZero) const - { return lastIndexIn(str, from, caretMode); } -#endif int matchedLength() const; #ifndef QT_NO_REGEXP_CAPTURE #ifdef QT_DEPRECATED @@ -140,15 +116,6 @@ public: static QString escape(const QString &str); -#ifdef QT3_SUPPORT - inline QT3_SUPPORT_CONSTRUCTOR QRegExp(const QString &aPattern, bool cs, bool aWildcard = false) - { - new (this) - QRegExp(aPattern, cs ? Qt::CaseSensitive : Qt::CaseInsensitive, - aWildcard ? Wildcard : RegExp); - } -#endif - private: QRegExpPrivate *priv; }; |