Mercurial > octave

diff libgui/qterminal/libqterminal/unix/Filter.h @ 31998:4d01a2860f3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace deprecated QRegExp by QRegularExpression in libgui/qterminal/libqterminal/unix. * libgui/qterminal/libqterminal/unix/Filter.cpp (RegExpFilter::setRegExp, RegExpFilter::regExp, RegExpFilter::process, UrlFilter::process, UrlFilter::HotSpot::UrlType, UrlFilter::HotSpot::activate, UrlFilter::FullUrlRegExp, UrlFilter::EmailAddressRegExp, UrlFilter::CompleteUrlRegExp, UrlFilter::ErrorLinkRegExp, UrlFilter::ParseErrorLinkRegExp, UrlFilter::CompleteErrorLinkRegExp, UrlFilter::HotSpot::actions), libgui/qterminal/libqterminal/unix/Filter.h, libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp (KeyboardTranslatorReader::tokenize): Replace deprecated QRegExp by QRegularExpression. Cleanup Qt header includes. * libgui/qterminal/libqterminal/unix/Emulation.cpp, libgui/qterminal/libqterminal/unix/TerminalMode.cpp: Cleanup Qt header includes.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 12 Apr 2023 15:23:05 +0200
parents 0b429d1a4974
children 7f18c537e101
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/Filter.h	Wed Apr 12 13:22:50 2023 +0200
+++ b/libgui/qterminal/libqterminal/unix/Filter.h	Wed Apr 12 15:23:05 2023 +0200
@@ -25,11 +25,11 @@
 
 // Qt
 #include <QAction>
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QHash>
-#include <QtCore/QRegExp>
+#include <QHash>
+#include <QList>
+#include <QObject>
+#include <QRegularExpression>
+#include <QStringList>
 
 // Local
 #include "unix/Character.h"
@@ -230,9 +230,9 @@
      * Regular expressions which match the empty string are treated as not matching
      * anything.
      */
-    void setRegExp(const QRegExp& text);
+    void setRegExp(const QRegularExpression& text);
     /** Returns the regular expression which the filter searches for in blocks of text */
-    QRegExp regExp() const;
+    QRegularExpression regExp() const;
 
     /**
      * Reimplemented to search the filter's text buffer for text matching regExp()
@@ -256,7 +256,7 @@
                                     int endLine,int endColumn, Type);
     Type _type;
 
-    QRegExp _searchText;
+    QRegularExpression _searchText;
 };
 
 class FilterObject;
@@ -316,14 +316,14 @@
 
 private:
 
-    static const QRegExp FullUrlRegExp;
-    static const QRegExp EmailAddressRegExp;
-    static const QRegExp ErrorLinkRegExp;
-    static const QRegExp ParseErrorLinkRegExp;
-    static const QRegExp CompleteErrorLinkRegExp;
+    static const QRegularExpression FullUrlRegExp;
+    static const QRegularExpression EmailAddressRegExp;
+    static const QRegularExpression ErrorLinkRegExp;
+    static const QRegularExpression ParseErrorLinkRegExp;
+    static const QRegularExpression CompleteErrorLinkRegExp;
 
     // combined OR of FullUrlRegExp and EmailAddressRegExp
-    static const QRegExp CompleteUrlRegExp;
+    static const QRegularExpression CompleteUrlRegExp;
 };
 
 class FilterObject : public QObject