diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-03-15 14:27:00 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-01 10:29:26 +0200 |
commit | 70beac08afaec0ef0c4ef2e72ebfc007acba7d56 (patch) | |
tree | bdb53e3693e023ceae2658190b03162412bf66f8 /src/widgets/widgets | |
parent | 66f06a930da0114f62a5470e778182c50117ad27 (diff) |
Remove all QRegExp dependencies from widgets
QRegExp is deprecated in Qt6 and will get moved to the Qt 5 compat
library. As such we need to remove all API and usages of QRegExp
in Qt.
Change-Id: I33fb56701d3d7c577f98a304c1d4e6f626fcb397
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qplaintextedit.cpp | 21 | ||||
-rw-r--r-- | src/widgets/widgets/qplaintextedit.h | 3 | ||||
-rw-r--r-- | src/widgets/widgets/qtextedit.cpp | 21 | ||||
-rw-r--r-- | src/widgets/widgets/qtextedit.h | 3 | ||||
-rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 13 | ||||
-rw-r--r-- | src/widgets/widgets/qwidgettextcontrol_p.h | 3 |
6 files changed, 0 insertions, 64 deletions
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index d19e7e9ff9..d62d9ac229 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -2922,27 +2922,6 @@ bool QPlainTextEdit::find(const QString &exp, QTextDocument::FindFlags options) } /*! - \fn bool QPlainTextEdit::find(const QRegExp &exp, QTextDocument::FindFlags options) - - \since 5.3 - \overload - - Finds the next occurrence, matching the regular expression, \a exp, using the given - \a options. The QTextDocument::FindCaseSensitively option is ignored for this overload, - use QRegExp::caseSensitivity instead. - - Returns \c true if a match was found and changes the cursor to select the match; - otherwise returns \c false. -*/ -#ifndef QT_NO_REGEXP -bool QPlainTextEdit::find(const QRegExp &exp, QTextDocument::FindFlags options) -{ - Q_D(QPlainTextEdit); - return d->control->find(exp, options); -} -#endif - -/*! \fn bool QPlainTextEdit::find(const QRegularExpression &exp, QTextDocument::FindFlags options) \since 5.13 diff --git a/src/widgets/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h index a5945d649a..881bdf7c24 100644 --- a/src/widgets/widgets/qplaintextedit.h +++ b/src/widgets/widgets/qplaintextedit.h @@ -147,9 +147,6 @@ public: bool centerOnScroll() const; bool find(const QString &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); -#ifndef QT_NO_REGEXP - bool find(const QRegExp &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); -#endif #if QT_CONFIG(regularexpression) bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); #endif diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 8ddda78f7d..b8dec4273d 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -2610,27 +2610,6 @@ bool QTextEdit::find(const QString &exp, QTextDocument::FindFlags options) } /*! - \fn bool QTextEdit::find(const QRegExp &exp, QTextDocument::FindFlags options) - - \since 5.3 - \overload - - Finds the next occurrence, matching the regular expression, \a exp, using the given - \a options. The QTextDocument::FindCaseSensitively option is ignored for this overload, - use QRegExp::caseSensitivity instead. - - Returns \c true if a match was found and changes the cursor to select the match; - otherwise returns \c false. -*/ -#ifndef QT_NO_REGEXP -bool QTextEdit::find(const QRegExp &exp, QTextDocument::FindFlags options) -{ - Q_D(QTextEdit); - return d->control->find(exp, options); -} -#endif - -/*! \fn bool QTextEdit::find(const QRegularExpression &exp, QTextDocument::FindFlags options) \since 5.13 diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index 5c8a3c7793..5a50995dd3 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -166,9 +166,6 @@ public: void setWordWrapMode(QTextOption::WrapMode policy); bool find(const QString &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); -#ifndef QT_NO_REGEXP - bool find(const QRegExp &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); -#endif #if QT_CONFIG(regularexpression) bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); #endif diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index b68a216af5..3b9ec618bb 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -3145,19 +3145,6 @@ bool QWidgetTextControl::find(const QString &exp, QTextDocument::FindFlags optio return true; } -#ifndef QT_NO_REGEXP -bool QWidgetTextControl::find(const QRegExp &exp, QTextDocument::FindFlags options) -{ - Q_D(QWidgetTextControl); - QTextCursor search = d->doc->find(exp, d->cursor, options); - if (search.isNull()) - return false; - - setTextCursor(search); - return true; -} -#endif - #if QT_CONFIG(regularexpression) bool QWidgetTextControl::find(const QRegularExpression &exp, QTextDocument::FindFlags options) { diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h index c445ecaf80..89acd1e50c 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p.h @@ -117,9 +117,6 @@ public: QTextCharFormat currentCharFormat() const; bool find(const QString &exp, QTextDocument::FindFlags options = { }); -#ifndef QT_NO_REGEXP - bool find(const QRegExp &exp, QTextDocument::FindFlags options = { }); -#endif #if QT_CONFIG(regularexpression) bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = { }); #endif |