From eac971d44321c1cc2bce31366a054b69c34c5b1a Mon Sep 17 00:00:00 2001 From: Jeremy Rimpo Date: Sun, 5 Dec 2021 03:42:43 -0600 Subject: [PATCH] Changes to compile with Qt6 + Boost 1.77 --- src/gamemorrowind.cpp | 2 +- src/morrowindsavegame.cpp | 3 ++- src/morrowindsavegameinfowidget.cpp | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gamemorrowind.cpp b/src/gamemorrowind.cpp index dacb1d0..62bf8a8 100644 --- a/src/gamemorrowind.cpp +++ b/src/gamemorrowind.cpp @@ -85,7 +85,7 @@ QList GameMorrowind::executables() const << ExecutableInfo("Morrowind", findInGameFolder(binaryName())) << ExecutableInfo("Morrowind Launcher", findInGameFolder(getLauncherName())) << ExecutableInfo("MGE XE", findInGameFolder("MGEXEgui.exe")) - << ExecutableInfo("LOOT", getLootPath()).withArgument("--game=\"Morrowind\"") + << ExecutableInfo("LOOT", QFileInfo(getLootPath())).withArgument("--game=\"Morrowind\"") ; } diff --git a/src/morrowindsavegame.cpp b/src/morrowindsavegame.cpp index f73d696..79ea868 100644 --- a/src/morrowindsavegame.cpp +++ b/src/morrowindsavegame.cpp @@ -2,6 +2,7 @@ #include #include +#include #include MorrowindSaveGame::MorrowindSaveGame(QString const &fileName, GameMorrowind const *game) : @@ -9,7 +10,7 @@ MorrowindSaveGame::MorrowindSaveGame(QString const &fileName, GameMorrowind cons { std::filesystem::path realFile(fileName.toStdWString()); QString realFileName = QString::fromStdWString(realFile.filename().wstring()); - m_SaveNumber = realFileName.mid(4, 5).remove(QRegExp("0+$")).toInt(); + m_SaveNumber = realFileName.mid(4, 5).remove(QRegularExpression("0+$")).toInt(); FileWrapper file(fileName, "TES3"); QStringList dummyPlugins; diff --git a/src/morrowindsavegameinfowidget.cpp b/src/morrowindsavegameinfowidget.cpp index 567096c..e61ef39 100644 --- a/src/morrowindsavegameinfowidget.cpp +++ b/src/morrowindsavegameinfowidget.cpp @@ -34,7 +34,7 @@ MorrowindSaveGameInfoWidget::MorrowindSaveGameInfoWidget(MorrowindSaveGameInfo c ui->gameFrame->setStyleSheet("background-color: transparent;"); QVBoxLayout *gameLayout = new QVBoxLayout(); - gameLayout->setMargin(0); + gameLayout->setContentsMargins(0, 0, 0, 0); gameLayout->setSpacing(2); ui->gameFrame->setLayout(gameLayout); } @@ -56,8 +56,8 @@ void MorrowindSaveGameInfoWidget::setSave(MOBase::ISaveGame const& save) { //This somewhat contorted code is because on my system at least, the //old way of doing this appears to give short date and long time. QDateTime t = morrowindSave.getCreationTime(); - ui->dateLabel->setText(t.date().toString(Qt::DefaultLocaleShortDate) + " " + - t.time().toString(Qt::DefaultLocaleLongDate)); + ui->dateLabel->setText(QLocale::system().toString(t.date(), QLocale::FormatType::ShortFormat) + " " + + QLocale::system().toString(t.time(), QLocale::FormatType::ShortFormat)); ui->screenshotLabel->setPixmap(QPixmap::fromImage(morrowindSave.getScreenshot())); if (ui->gameFrame->layout() != nullptr) { QLayoutItem *item = nullptr;