diff options
-rw-r--r-- | src/widgets/dialogs/qcolordialog.cpp | 2 | ||||
-rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 8 | ||||
-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 | ||||
-rw-r--r-- | tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp | 44 | ||||
-rw-r--r-- | tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp | 45 |
10 files changed, 4 insertions, 159 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index aa1ee86f76..f815f17d55 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -59,8 +59,6 @@ #include "qpushbutton.h" #if QT_CONFIG(regularexpression) #include <qregularexpression.h> -#else -#include <qregexp.h> #endif #if QT_CONFIG(settings) #include "qsettings.h" diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 4d15d8ce85..658d7b562b 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -4352,7 +4352,7 @@ QStringList QFSCompleter::splitPath(const QString &path) const return QStringList(completionPrefix()); QString pathCopy = QDir::toNativeSeparators(path); - QString sep = QDir::separator(); + QChar sep = QDir::separator(); #if defined(Q_OS_WIN) if (pathCopy == QLatin1String("\\") || pathCopy == QLatin1String("\\\\")) return QStringList(pathCopy); @@ -4384,14 +4384,14 @@ QStringList QFSCompleter::splitPath(const QString &path) const parts.append(QString()); #else QStringList parts = pathCopy.split(sep); - if (pathCopy[0] == sep[0]) // read the "/" at the beginning as the split removed it - parts[0] = sep[0]; + if (pathCopy[0] == sep) // read the "/" at the beginning as the split removed it + parts[0] = sep; #endif #if defined(Q_OS_WIN) bool startsFromRoot = !parts.isEmpty() && parts[0].endsWith(QLatin1Char(':')); #else - bool startsFromRoot = pathCopy[0] == sep[0]; + bool startsFromRoot = pathCopy[0] == sep; #endif if (parts.count() == 1 || (parts.count() > 1 && !startsFromRoot)) { const QFileSystemModel *dirModel; 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 diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp index a86784f2ec..fa702f8661 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp @@ -135,11 +135,6 @@ private slots: void insertAndScrollToBottom(); void inputMethodQueryImHints_data(); void inputMethodQueryImHints(); -#ifndef QT_NO_REGEXP - void findWithRegExp(); - void findBackwardWithRegExp(); - void findWithRegExpReturnsFalseIfNoMoreResults(); -#endif #if QT_CONFIG(regularexpression) void findWithRegularExpression(); void findBackwardWithRegularExpression(); @@ -1562,45 +1557,6 @@ void tst_QPlainTextEdit::inputMethodQueryImHints() QCOMPARE(static_cast<Qt::InputMethodHints>(value.toInt()), hints); } -#ifndef QT_NO_REGEXP -void tst_QPlainTextEdit::findWithRegExp() -{ - ed->setPlainText(QStringLiteral("arbitrary text")); - QRegExp rx("\\w{2}xt"); - - bool found = ed->find(rx); - - QVERIFY(found); - QCOMPARE(ed->textCursor().selectedText(), QStringLiteral("text")); -} - -void tst_QPlainTextEdit::findBackwardWithRegExp() -{ - ed->setPlainText(QStringLiteral("arbitrary text")); - QTextCursor cursor = ed->textCursor(); - cursor.movePosition(QTextCursor::End); - ed->setTextCursor(cursor); - QRegExp rx("a\\w*t"); - - bool found = ed->find(rx, QTextDocument::FindBackward); - - QVERIFY(found); - QCOMPARE(ed->textCursor().selectedText(), QStringLiteral("arbit")); -} - -void tst_QPlainTextEdit::findWithRegExpReturnsFalseIfNoMoreResults() -{ - ed->setPlainText(QStringLiteral("arbitrary text")); - QRegExp rx("t.xt"); - ed->find(rx); - - bool found = ed->find(rx); - - QVERIFY(!found); - QCOMPARE(ed->textCursor().selectedText(), QStringLiteral("text")); -} -#endif - #if QT_CONFIG(regularexpression) void tst_QPlainTextEdit::findWithRegularExpression() { diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index bd287eb225..716e7da490 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -194,12 +194,6 @@ private slots: void countTextChangedOnRemove(); -#ifndef QT_NO_REGEXP - void findWithRegExp(); - void findBackwardWithRegExp(); - void findWithRegExpReturnsFalseIfNoMoreResults(); -#endif - #if QT_CONFIG(regularexpression) void findWithRegularExpression(); void findBackwardWithRegularExpression(); @@ -2609,45 +2603,6 @@ void tst_QTextEdit::countTextChangedOnRemove() QCOMPARE(spy.count(), 1); } -#ifndef QT_NO_REGEXP -void tst_QTextEdit::findWithRegExp() -{ - ed->setHtml(QStringLiteral("arbitrary te<span style=\"color:#ff0000\">xt</span>")); - QRegExp rx("\\w{2}xt"); - - bool found = ed->find(rx); - - QVERIFY(found); - QCOMPARE(ed->textCursor().selectedText(), QStringLiteral("text")); -} - -void tst_QTextEdit::findBackwardWithRegExp() -{ - ed->setPlainText(QStringLiteral("arbitrary text")); - QTextCursor cursor = ed->textCursor(); - cursor.movePosition(QTextCursor::End); - ed->setTextCursor(cursor); - QRegExp rx("a\\w*t"); - - bool found = ed->find(rx, QTextDocument::FindBackward); - - QVERIFY(found); - QCOMPARE(ed->textCursor().selectedText(), QStringLiteral("arbit")); -} - -void tst_QTextEdit::findWithRegExpReturnsFalseIfNoMoreResults() -{ - ed->setPlainText(QStringLiteral("arbitrary text")); - QRegExp rx("t.xt"); - ed->find(rx); - - bool found = ed->find(rx); - - QVERIFY(!found); - QCOMPARE(ed->textCursor().selectedText(), QStringLiteral("text")); -} -#endif - #if QT_CONFIG(regularexpression) void tst_QTextEdit::findWithRegularExpression() { |