fixup: QStringList

Author: illwieckz

currentversionfetcher.cpp

@@ -53,7 +53,7 @@ void CurrentVersionFetcher::fetchCurrentVersion()
     }
 }
 
-void ComponentVersionFetcher(QJsonObject components, QString name, QString system, QString *version, std::vector<QString> *urls)
+void ComponentVersionFetcher(QJsonObject components, QString name, QString system, QString *version, QStringList *urls)
 {
     QString path;
     QJsonArray mirrors;
@@ -104,19 +104,19 @@ void ComponentVersionFetcher(QJsonObject components, QString name, QString syste
         qDebug() << "ComponentVersionFetcher: fetched mirror =" << mirror;
         QString url = mirror + path;
         qDebug() << "ComponentVersionFetcher: fetched url =" << url;
-        urls->push_back(url);
+        urls->append(url);
     }
 }
 
 void CurrentVersionFetcher::reply(QNetworkReply* reply)
 {
     QString formatVersion;
     QString updaterVersion;
-    std::vector<QString> updaterUrls;
+    QStringList updaterUrls;
     QString gameVersion;
-    std::vector<QString> gameUrls;
+    QStringList gameUrls;
     QString newsVersion;
-    std::vector<QString> newsUrls;
+    QStringList newsUrls;
 
     if (reply->error() != QNetworkReply::NoError) {
         qDebug() << "CurrentVersionFetcher: network error";

currentversionfetcher.h

@@ -31,7 +31,7 @@ class CurrentVersionFetcher : public QObject
     void fetchCurrentVersion();
 
 signals:
-    void onCurrentVersions(QString updaterVersion, std::vector<QString> updaterUrls, QString gameVersion, std::vector<QString> gameUrls, QString newsUrl);
+    void onCurrentVersions(QString updaterVersion, QStringList updaterUrls, QString gameVersion, QStringList gameUrls, QString newsUrl);
 
 private slots:
     void reply(QNetworkReply* reply);

splashcontroller.cpp

@@ -45,38 +45,34 @@ void SplashController::checkForUpdate()
             return;
     }
 
-    connect(&fetcher_, SIGNAL(onCurrentVersions(QString, std::vector<QString>, QString, std::vector<QString>, QString)),
-            this, SLOT(onCurrentVersions(QString, std::vector<QString>, QString, std::vector<QString>, QString)));
+    connect(&fetcher_, SIGNAL(onCurrentVersions(QString, QStringList, QString, QStringList, QString)),
+            this, SLOT(onCurrentVersions(QString, QStringList, QString, QStringList, QString)));
 
     fetcher_.fetchCurrentVersion();
 }
 
 QString SplashController::updaterUrl() {
-    if (latestUpdaterUrls_.empty()) {
+    if (latestUpdaterUrls_.isEmpty()) {
         return "";
     }
 
-    QString url = latestUpdaterUrls_.at(0);
-    latestUpdaterUrls_.erase(latestUpdaterUrls_.begin());
-    return url;
+    return latestUpdaterUrls_.takeFirst();
 }
 
 QString SplashController::gameUrl() {
-    if (latestGameUrls_.empty()) {
+    if (latestGameUrls_.isEmpty()) {
         return "";
     }
 
-    QString url = latestGameUrls_.at(0);
-    latestGameUrls_.erase(latestGameUrls_.begin());
-    return url;
+    return latestGameUrls_.takeFirst();
 }
 
 QString SplashController::newsUrl() const {
     return latestNewsUrl_;
 }
 
 // Receives the results of the checkForUpdate request.
-void SplashController::onCurrentVersions(QString updaterVersion, std::vector<QString> updaterUrls, QString gameVersion, std::vector<QString> gameUrls, QString newsUrl)
+void SplashController::onCurrentVersions(QString updaterVersion, QStringList updaterUrls, QString gameVersion, QStringList gameUrls, QString newsUrl)
 {
     latestUpdaterVersion_ = updaterVersion;
     latestUpdaterUrls_ = updaterUrls;

splashcontroller.h

@@ -56,9 +56,9 @@ class SplashController : public QObject
     // Latest versions fetching
     CurrentVersionFetcher fetcher_;
     QString latestUpdaterVersion_;
-    std::vector<QString> latestUpdaterUrls_;
+    QStringList latestUpdaterUrls_;
     QString latestGameVersion_;
-    std::vector<QString> latestGameUrls_;
+    QStringList latestGameUrls_;
     QString latestNewsUrl_;
 
 public:
@@ -79,7 +79,7 @@ class SplashController : public QObject
     void newsUrlFetched(QString newsUrl);
 
 private slots:
-    void onCurrentVersions(QString updaterVersion, std::vector<QString> updaterUrls, QString gameVersion, std::vector<QString> gameUrls, QString newsUrl);
+    void onCurrentVersions(QString updaterVersion, QStringList updaterUrls, QString gameVersion, QStringList gameUrls, QString newsUrl);
 
 private:
     void launchGameIfInstalled();