Merge 05f46011eb into 032c41f3d5

cockatrice/src/deckstats_interface.cpp

@@ -7,6 +7,10 @@
 #include <QMessageBox>
 #include <QDesktopServices>
 
+#if QT_VERSION >= 0x050000
+#include <QUrlQuery>
+#endif
+
 DeckStatsInterface::DeckStatsInterface(QObject *parent)
     : QObject(parent)
 {
@@ -42,7 +46,13 @@ void DeckStatsInterface::queryFinished(QNetworkReply *reply)
 void DeckStatsInterface::analyzeDeck(DeckList *deck)
 {
     QUrl params;
+#if QT_VERSION < 0x050000
     params.addQueryItem("deck", deck->writeToString_Plain());
+#else
+    QUrlQuery urlQuery;
+    urlQuery.addQueryItem("deck", deck->writeToString_Plain());
+    params.setUrlQuery(urlQuery);
+#endif
     QByteArray data;
     data.append(params.encodedQuery());
     

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");

cockatrice/src/qt-json/json.cpp

@@ -553,7 +553,7 @@ int Json::nextToken(const QString &json, int &index)
 
         QChar c = json[index];
         index++;
-        switch(c.toAscii())
+        switch(c.toLatin1())
         {
                 case '{': return JsonTokenCurlyOpen;
                 case '}': return JsonTokenCurlyClose;

oracle/src/oracleimporter.cpp

@@ -1,5 +1,10 @@
 #include "oracleimporter.h"
+#if QT_VERSION < 0x050000
 #include <QtGui>
+#else
+#include <QtWidgets>
+#endif
+
 #include <QtNetwork>
 #include <QXmlStreamReader>
 #include <QDomDocument>

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);

servatrice/src/passwordhasher.cpp

@@ -16,7 +16,7 @@ QString PasswordHasher::computeHash(const QString &password, const QString &salt
 	const int algo = GCRY_MD_SHA512;
 	const int rounds = 1000;
 
-	QByteArray passwordBuffer = (salt + password).toAscii();
+	QByteArray passwordBuffer = (salt + password).toUtf8();
 	int hashLen = gcry_md_get_algo_dlen(algo);
 	char hash[hashLen], tmp[hashLen];
 	gcry_md_hash_buffer(algo, hash, passwordBuffer.data(), passwordBuffer.size());

servatrice/src/servatrice.cpp

@@ -319,7 +319,7 @@ void Servatrice::updateServerList()
 	query.prepare("select id, ssl_cert, hostname, address, game_port, control_port from " + dbPrefix + "_servers order by id asc");
 	servatriceDatabaseInterface->execSqlQuery(query);
 	while (query.next()) {
-		ServerProperties prop(query.value(0).toInt(), QSslCertificate(query.value(1).toString().toAscii()), query.value(2).toString(), QHostAddress(query.value(3).toString()), query.value(4).toInt(), query.value(5).toInt());
+		ServerProperties prop(query.value(0).toInt(), QSslCertificate(query.value(1).toString().toUtf8()), query.value(2).toString(), QHostAddress(query.value(3).toString()), query.value(4).toInt(), query.value(5).toInt());
 		serverList.append(prop);
 		qDebug() << QString("#%1 CERT=%2 NAME=%3 IP=%4:%5 CPORT=%6").arg(prop.id).arg(QString(prop.cert.digest().toHex())).arg(prop.hostname).arg(prop.address.toString()).arg(prop.gamePort).arg(prop.controlPort);
 	}