Merge pull request #50 from zrax/qt515

Fix Qt 5.15 deprecation warnings
H-uru · Jun 4, 2020 · cc0d7f5 · cc0d7f5
2 parents 087cda1 + 8a3ca9a
commit cc0d7f5
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 33 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 
 find_package(HSPlasma REQUIRED)
 find_package(string_theory 2.0 REQUIRED)
-find_package(Qt5 5.5 REQUIRED COMPONENTS Core Gui Widgets)
+find_package(Qt5 5.8 REQUIRED COMPONENTS Core Gui Widgets)
 find_package(KF5SyntaxHighlighting REQUIRED)
 find_package(PythonInterp REQUIRED)
 

diff --git a/src/PlasmaShop/GameBrowser.cpp b/src/PlasmaShop/GameBrowser.cpp
@@ -24,7 +24,7 @@
 #include <QSettings>
 #include <QMessageBox>
 #include <QCompleter>
-#include <QDirModel>
+#include <QFileSystemModel>
 #include <QDialogButtonBox>
 #include <QFileDialog>
 
@@ -200,10 +200,10 @@ void GameListDialog::onEditGame(QTreeWidgetItem* item, int)
 GameConfigDialog::GameConfigDialog(const GameInfo& info, QWidget* parent)
     : QDialog(parent)
 {
-    QDirModel* dirModel = new QDirModel(QStringList("*"),
-                                        QDir::Dirs | QDir::NoDotAndDotDot,
-                                        QDir::Name | QDir::IgnoreCase,
-                                        this);
+    auto dirModel = new QFileSystemModel(this);
+    dirModel->setRootPath(QStringLiteral(""));
+    dirModel->setNameFilters(QStringList("*"));
+    dirModel->setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
 
     fGameTitle = new QLineEdit(info.fGameTitle, this);
     fGameType = new QComboBox(this);

diff --git a/src/PlasmaShop/OptionsDialog.cpp b/src/PlasmaShop/OptionsDialog.cpp
@@ -16,7 +16,7 @@
 
 #include "OptionsDialog.h"
 #include <QCompleter>
-#include <QDirModel>
+#include <QFileSystemModel>
 #include <QGridLayout>
 #include <QSpacerItem>
 #include <QTabWidget>
@@ -43,10 +43,10 @@ OptionsDialog::OptionsDialog(QWidget* parent)
     : QDialog(parent)
 {
     QTabWidget* tabs = new QTabWidget(this);
-    QDirModel* dirModel = new QDirModel(QStringList("*"),
-                                        QDir::AllEntries | QDir::NoDotAndDotDot | QDir::Executable,
-                                        QDir::Name | QDir::DirsLast | QDir::IgnoreCase,
-                                        this);
+    auto dirModel = new QFileSystemModel(this);
+    dirModel->setRootPath(QStringLiteral(""));
+    dirModel->setNameFilters(QStringList("*"));
+    dirModel->setFilter(QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot);
 
     // "General" (programs) tab
     QWidget* tabProgs = new QWidget(tabs);

diff --git a/src/PlasmaShop/QPlasmaSumFile.cpp b/src/PlasmaShop/QPlasmaSumFile.cpp
@@ -189,12 +189,13 @@ bool QPlasmaSumFile::loadSumData(hsStream* S)
     }
 
     TreeSignalBlocker block(fFileList);
+    auto locale = QLocale::system();
     for (const hsSumFile::FileInfo& file : fSumData.getFiles()) {
         QTreeWidgetItem* ent = new QTreeWidgetItem(fFileList);
         QString qpath = st2qstr(file.fPath);
         ent->setText(0, qpath);
-        ent->setText(1, QDateTime::fromTime_t(file.fTimestamp)
-                                  .toString(Qt::SystemLocaleShortDate));
+        QDateTime dateTime(QDateTime::fromSecsSinceEpoch(file.fTimestamp));
+        ent->setText(1, locale.toString(dateTime, QLocale::ShortFormat));
         ent->setText(2, st2qstr(file.fHash.toHex()));
         ent->setIcon(0, QPlasmaDocument::GetDocIcon(qpath));
         ent->setFlags(ent->flags() | Qt::ItemIsEditable);
@@ -248,13 +249,14 @@ void QPlasmaSumFile::onItemChanged(QTreeWidgetItem* item, int column)
         break;
     case 1:
         {
-            QDateTime ts = QDateTime::fromString(item->text(1), Qt::SystemLocaleShortDate);
+            QLocale locale = QLocale::system();
+            QDateTime ts = locale.toDateTime(item->text(1), QLocale::ShortFormat);
             if (!ts.isValid()) {
                 QMessageBox::critical(this, tr("Error"),
                                       tr("Invalid date/time: %1").arg(item->text(1)),
                                       QMessageBox::Ok);
-                item->setText(1, QDateTime::fromTime_t(file.fTimestamp)
-                                           .toString(Qt::SystemLocaleShortDate));
+                QDateTime dateTime(QDateTime::fromSecsSinceEpoch(file.fTimestamp));
+                item->setText(1, locale.toString(dateTime, QLocale::ShortFormat));
                 break;
             }
             file.fTimestamp = ts.toTime_t();

diff --git a/src/PlasmaShop/QPlasmaTextDoc.cpp b/src/PlasmaShop/QPlasmaTextDoc.cpp
@@ -398,7 +398,7 @@ void QPlasmaTextDoc::textReplace()
 bool QPlasmaTextDoc::onFind(const QString& text, bool regex, bool cs,
                             bool wo, bool reverse)
 {
-    QTextDocument::FindFlags options = 0;
+    QTextDocument::FindFlags options;
     if (cs)
         options |= QTextDocument::FindCaseSensitively;
     if (wo)

diff --git a/src/PrpShop/PRP/Surface/QLayer.cpp b/src/PrpShop/PRP/Surface/QLayer.cpp
@@ -59,7 +59,7 @@ QLayer::QLayer(plCreatable* pCre, QWidget* parent)
     fBlendFlags[kBlendAdd] = new QBitmaskCheckBox(hsGMatState::kBlendAdd,
             tr("Add"), blendWidget);
     fBlendFlags[kBlendAddColorTimesAlpha] = new QBitmaskCheckBox(hsGMatState::kBlendAddColorTimesAlpha,
-            tr("Add Color × Alpha"), blendWidget);
+            tr("Add Color \xc3\x97 Alpha"), blendWidget);
     fBlendFlags[kBlendAntiAlias] = new QBitmaskCheckBox(hsGMatState::kBlendAntiAlias,
             tr("Anti-Alias"), blendWidget);
     fBlendFlags[kBlendDetail] = new QBitmaskCheckBox(hsGMatState::kBlendDetail,

diff --git a/src/PrpShop/QPrcEditor.cpp b/src/PrpShop/QPrcEditor.cpp
@@ -77,7 +77,8 @@ QSize QPrcEditor::sizeHint() const
                    settings.value("SciFontItalic", false).toBool());
 
     QFontMetrics fm(textFont);
-    return QSize(fm.width(QChar('_')) * 82, fm.height() * 25 + 50);
+    return QSize(fm.boundingRect(QString(82, QChar('_'))).width(),
+                 fm.height() * 25 + 50);
 }
 
 void QPrcEditor::loadPrcData()

diff --git a/src/QHexWidget.cpp b/src/QHexWidget.cpp
@@ -242,12 +242,12 @@ void QHexWidget::getRenderMetrics(const QFontMetrics& fm, int maxAddress,
                                   int& rightMargin) const
 {
     if (maxAddress >= 0x10000)
-        byteOffset = fm.width("0000 0000") + (HEX_PADDING * 2);
+        byteOffset = fm.boundingRect("0000 0000").width() + (HEX_PADDING * 2);
     else
-        byteOffset = fm.width("0000") + (HEX_PADDING * 2);
+        byteOffset = fm.boundingRect("0000").width() + (HEX_PADDING * 2);
 
-    const int bwidth = fm.width("00_");
-    const int swidth = fm.width(QChar('_'));
+    const int bwidth = fm.boundingRect("00_").width();
+    const int swidth = fm.boundingRect(QChar('_')).width();
     charOffset = byteOffset + HEX_PADDING + (bwidth * BYTES_PER_LINE)
                             + (swidth * ((BYTES_PER_LINE / 4) + 1));
     rightMargin = charOffset + (swidth * (BYTES_PER_LINE + 1));
@@ -301,8 +301,8 @@ void QHexWidget::render(QPainter* painter)
     int maxAddress = fData.size();
     int byteOffset, charOffset, rightMargin;
     getRenderMetrics(fm, maxAddress, byteOffset, charOffset, rightMargin);
-    const int bwidth = fm.width("00_");
-    const int swidth = fm.width(QChar('_'));
+    const int bwidth = fm.boundingRect("00_").width();
+    const int swidth = fm.boundingRect(QChar('_')).width();
 
     painter->fillRect(0, 0, byteOffset, viewport()->height(),
                       pal.color(QPalette::Window));
@@ -413,8 +413,8 @@ void QHexWidget::render(QPainter* painter)
 int QHexWidget::addressAt(int x, int y) const
 {
     QFontMetrics fm(font());
-    const int bwidth = fm.width("00_");
-    const int cwidth = fm.width(QChar('0'));
+    const int bwidth = fm.boundingRect("00_").width();
+    const int cwidth = fm.boundingRect(QChar('0')).width();
 
     int byteOffset, charOffset, rightMargin;
     getRenderMetrics(fm, fData.size(), byteOffset, charOffset, rightMargin);

diff --git a/src/QNumerics.cpp b/src/QNumerics.cpp
@@ -33,13 +33,15 @@ QFloatEdit::QFloatEdit(QWidget* parent)
 QSize QFloatEdit::sizeHint() const
 {
     QFontMetrics metrics(fontMetrics());
-    return QSize(metrics.width("-1234567890") + 2, QLineEdit::sizeHint().height());
+    return QSize(metrics.boundingRect("-1234567890").width() + 2,
+                 QLineEdit::sizeHint().height());
 }
 
 QSize QFloatEdit::minimumSizeHint() const
 {
     QFontMetrics metrics(fontMetrics());
-    return QSize(metrics.width("-1234") + 2, QLineEdit::sizeHint().height());
+    return QSize(metrics.boundingRect("-1234").width() + 2,
+                 QLineEdit::sizeHint().height());
 }
 
 void QFloatEdit::setRange(double minimum, double maximum, int decimals)
@@ -60,13 +62,15 @@ QIntEdit::QIntEdit(QWidget* parent)
 QSize QIntEdit::sizeHint() const
 {
     QFontMetrics metrics(fontMetrics());
-    return QSize(metrics.width("-1234567890") + 2, QLineEdit::sizeHint().height());
+    return QSize(metrics.boundingRect("-1234567890").width() + 2,
+                 QLineEdit::sizeHint().height());
 }
 
 QSize QIntEdit::minimumSizeHint() const
 {
     QFontMetrics metrics(fontMetrics());
-    return QSize(metrics.width("-1234") + 2, QLineEdit::sizeHint().height());
+    return QSize(metrics.boundingRect("-1234").width() + 2,
+                 QLineEdit::sizeHint().height());
 }
 
 void QIntEdit::setRange(int minimum, int maximum)

diff --git a/src/VaultShop/QVaultSDLNode.cpp b/src/VaultShop/QVaultSDLNode.cpp
@@ -168,9 +168,10 @@ QString QSDLEditor::GetVarDisplay(plStateVariable* var)
         case plVarDescriptor::kAgeTimeOfDay:
             {
                 QDateTime dt;
+                QLocale locale = QLocale::system();
                 if (!((plSimpleStateVariable*)var)->getTimeStamp().atEpoch()) {
                     dt.setTime_t(((plSimpleStateVariable*)var)->getTimeStamp().getSecs());
-                    result += dt.toString(Qt::SystemLocaleShortDate);
+                    result += locale.toString(dt, QLocale::ShortFormat);
                 } else {
                     result += "N/A";
                 }
@@ -179,9 +180,10 @@ QString QSDLEditor::GetVarDisplay(plStateVariable* var)
         case plVarDescriptor::kTime:
             {
                 QDateTime dt;
+                QLocale locale = QLocale::system();
                 if (!((plSimpleStateVariable*)var)->Time(i).atEpoch()) {
                     dt.setTime_t(((plSimpleStateVariable*)var)->Time(i).getSecs());
-                    result += dt.toString(Qt::SystemLocaleShortDate);
+                    result += locale.toString(dt, QLocale::ShortFormat);
                 } else {
                     result += "N/A";
                 }