Modernize Qt dependency path

src/qt/guiutil.cpp

@@ -48,14 +48,21 @@
 #include <QClipboard>
 #include <QDateTime>
 #include <QDesktopServices>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 #include <QDesktopWidget>
+#endif
+#include <QDir>
 #include <QDoubleValidator>
 #include <QFileDialog>
+#include <QFileInfo>
 #include <QFont>
 #include <QGuiApplication>
 #include <QLineEdit>
+#include <QLocale>
+#include <QRegularExpression>
 #include <QScreen>
 #include <QSettings>
+#include <QStandardPaths>
 #include <QTextDocument> // for Qt::mightBeRichText
 #include <QThread>
 #include <QUrlQuery>
@@ -82,12 +89,12 @@ namespace GUIUtil
 {
 QString dateTimeStr(const QDateTime& date)
 {
-    return date.date().toString(Qt::SystemLocaleShortDate) + QString(" ") + date.toString("hh:mm");
+    return QLocale::system().toString(date.date(), QLocale::ShortFormat) + QString(" ") + date.toString("hh:mm");
 }
 
 QString dateTimeStr(qint64 nTime)
 {
-    return dateTimeStr(QDateTime::fromTime_t((qint32)nTime));
+    return dateTimeStr(QDateTime::fromSecsSinceEpoch((qint32)nTime));
 }
 
 QFont bitcoinAddressFont()
@@ -269,10 +276,11 @@ QString getSaveFileName(QWidget* parent, const QString& caption, const QString&
     QString result = QDir::toNativeSeparators(QFileDialog::getSaveFileName(parent, caption, myDir, filter, &selectedFilter));
 
     /* Extract first suffix from filter pattern "Description (*.foo)" or "Description (*.foo *.bar ...) */
-    QRegExp filter_re(".* \\(\\*\\.(.*)[ \\)]");
+    QRegularExpression filter_re(".* \\(\\*\\.([^\\s\\)]+).*\\)");
     QString selectedSuffix;
-    if (filter_re.exactMatch(selectedFilter)) {
-        selectedSuffix = filter_re.cap(1);
+    QRegularExpressionMatch filter_match = filter_re.match(selectedFilter);
+    if (filter_match.hasMatch()) {
+        selectedSuffix = filter_match.captured(1);
     }
 
     /* Add suffix if needed */
@@ -310,10 +318,11 @@ QString getOpenFileName(QWidget* parent, const QString& caption, const QString&
 
     if (selectedSuffixOut) {
         /* Extract first suffix from filter pattern "Description (*.foo)" or "Description (*.foo *.bar ...) */
-        QRegExp filter_re(".* \\(\\*\\.(.*)[ \\)]");
+        QRegularExpression filter_re(".* \\(\\*\\.([^\\s\\)]+).*\\)");
         QString selectedSuffix;
-        if (filter_re.exactMatch(selectedFilter)) {
-            selectedSuffix = filter_re.cap(1);
+        QRegularExpressionMatch filter_match = filter_re.match(selectedFilter);
+        if (filter_match.hasMatch()) {
+            selectedSuffix = filter_match.captured(1);
         }
         *selectedSuffixOut = selectedSuffix;
     }
@@ -809,7 +818,7 @@ bool isExternal(QString theme)
     if (theme.isEmpty())
         return false;
 
-    return (theme.operator!=("default"));
+    return theme != "default";
 }
 
 // Open CSS when configured