diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2022-06-09 13:57:57 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2022-06-09 13:57:57 -0500 |
| commit | 35d1546110647b2a7044d373bdf2da0ced419794 (patch) | |
| tree | bb224fdd4ad98d0c9b5e48c0d78f5835b2d09cb0 | |
| parent | c4bebbf17383ee1465cf132b092f620d58919f27 (diff) | |
| parent | 7b729fc885d9bf042903e7e20e05407d59a49816 (diff) | |
| download | monzero-gui-35d1546110647b2a7044d373bdf2da0ced419794.tar.gz monzero-gui-35d1546110647b2a7044d373bdf2da0ced419794.tar.xz monzero-gui-35d1546110647b2a7044d373bdf2da0ced419794.zip | |
Merge pull request #3915
7b729fc qt: replace QRegExp with QRegularExpression (selsta)
| -rw-r--r-- | src/main/main.cpp | 1 | ||||
| -rw-r--r-- | src/qt/TailsOS.cpp | 1 | ||||
| -rw-r--r-- | src/qt/utils.h | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/main/main.cpp b/src/main/main.cpp index 1e375843..8be5071a 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -36,7 +36,6 @@ #include <QObject> #include <QDesktopWidget> #include <QScreen> -#include <QRegExp> #include <QThread> #include <version.h> diff --git a/src/qt/TailsOS.cpp b/src/qt/TailsOS.cpp index df2fa92b..a307d857 100644 --- a/src/qt/TailsOS.cpp +++ b/src/qt/TailsOS.cpp @@ -1,4 +1,3 @@ -#include <QRegExp> #include <QMessageBox> #include <QPixmap> #include <QTranslator> diff --git a/src/qt/utils.h b/src/qt/utils.h index 9eb58e22..31477190 100644 --- a/src/qt/utils.h +++ b/src/qt/utils.h @@ -30,7 +30,7 @@ #define UTILS_H #include <QtCore> -#include <QRegExp> +#include <QRegularExpression> #include <QApplication> bool fileExists(QString path); @@ -42,7 +42,7 @@ QString getAccountName(); QString xdgMime(); void registerXdgMime(); #endif -const static QRegExp reURI = QRegExp("^\\w+:\\/\\/([\\w+\\-?\\-_\\-=\\-&]+)"); +const static QRegularExpression reURI = QRegularExpression("^\\w+:\\/\\/([\\w+\\-?\\-_\\-=\\-&]+)"); QString randomUserAgent(); #endif // UTILS_H |