From a903c231f266a87fa6ef5b49600a9e6dc8df62b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=20Morschh=C3=A4user?= Date: Fri, 20 Jun 2014 16:54:46 +0200 Subject: [PATCH] Qt5: QDesktopServices::storageLocation deprecated --- cockatrice/src/main.cpp | 4 ++++ oracle/src/window_main.cpp | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index ef57655a..2de76f9e 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -120,7 +120,11 @@ int main(int argc, char *argv[]) qsrand(QDateTime::currentDateTime().toTime_t()); bool startMainProgram = true; +#if QT_VERSION < 0x050000 const QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation); +#else + const QString dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation)).toString(); +#endif if (!db->getLoadSuccess()) if (db->loadCardDatabase(dataDir + "/cards.xml")) settingsCache->setCardDatabasePath(dataDir + "/cards.xml"); diff --git a/oracle/src/window_main.cpp b/oracle/src/window_main.cpp index 0283bded..6d4a1be9 100644 --- a/oracle/src/window_main.cpp +++ b/oracle/src/window_main.cpp @@ -24,7 +24,11 @@ const QString WindowMain::defaultSetsUrl = QString("http://www.woogerworks.com/f WindowMain::WindowMain(QWidget *parent) : QMainWindow(parent) { +#if QT_VERSION < 0x050000 importer = new OracleImporter(QDesktopServices::storageLocation(QDesktopServices::DataLocation), this); +#else + importer = new OracleImporter(QStandardPaths::standardLocations(QStandardPaths::DataLocation)).toString(), this); +#endif nam = new QNetworkAccessManager(this); checkBoxLayout = new QVBoxLayout; @@ -176,7 +180,11 @@ void WindowMain::updateTotalProgress(int cardsImported, int setIndex, const QStr if (nextSetName.isEmpty()) { QMessageBox::information(this, tr("Oracle importer"), tr("Import finished: %1 cards.").arg(importer->getCardList().size())); bool ok = false; +#if QT_VERSION < 0x050000 const QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation); +#else + const QString dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation)).toString(); +#endif QDir dir(dataDir); if (!dir.exists()) dir.mkpath(dataDir);