New upstream version 1.4.0.3

1 files changed, 22 insertions, 24 deletions

diff --git a/InternetUpdater.cpp b/InternetUpdater.cpp
index de23424..a3dbded 100644
--- a/InternetUpdater.cpp
+++ b/InternetUpdater.cpp
@@ -1,6 +1,7 @@
 #include "InternetUpdater.h"
 #include "EventDispatcher.h"
 #include "OptionEngine.h"
+#include "cpp11addition.h"
 
 #ifdef ULTRACOPIER_INTERNET_SUPPORT
 
@@ -21,39 +22,36 @@ InternetUpdater::InternetUpdater(QObject *parent) :
 
 void InternetUpdater::downloadFile()
 {
-    if(!OptionEngine::optionEngine->getOptionValue(QStringLiteral("Ultracopier"),QStringLiteral("checkTheUpdate")).toBool())
+    if(!stringtobool(OptionEngine::optionEngine->getOptionValue("Ultracopier","checkTheUpdate")))
         return;
     #ifdef ULTRACOPIER_MODE_SUPERCOPIER
-        QString name=QStringLiteral("Supercopier");
-    #else
-        QString name=QStringLiteral("Ultracopier");
-    #endif
-    QString ultracopierVersion;
+         std::string name="Supercopier";
+     #else
+         std::string name="Ultracopier";
+     #endif
+    std::string ultracopierVersion;
     #ifdef ULTRACOPIER_VERSION_ULTIMATE
-    ultracopierVersion=QStringLiteral("%1 Ultimate/%2").arg(name).arg(ULTRACOPIER_VERSION);
+    ultracopierVersion=name+" Ultimate/"+ULTRACOPIER_VERSION;
     #else
-    ultracopierVersion=QStringLiteral("%1/%2").arg(name).arg(ULTRACOPIER_VERSION);
+    ultracopierVersion=name+"/"+ULTRACOPIER_VERSION;
     #endif
     #ifdef ULTRACOPIER_VERSION_PORTABLE
         #ifdef ULTRACOPIER_PLUGIN_ALL_IN_ONE
-             ultracopierVersion+=QStringLiteral(" portable/all-in-one");
+             ultracopierVersion+=" portable/all-in-one";
         #else
-             ultracopierVersion+=QStringLiteral(" portable");
+             ultracopierVersion+=" portable";
         #endif
     #else
         #ifdef ULTRACOPIER_PLUGIN_ALL_IN_ONE
-            ultracopierVersion+=QStringLiteral(" all-in-one");
+            ultracopierVersion+=" all-in-one";
         #endif
     #endif
-    #ifdef ULTRACOPIER_CGMINER
-            ultracopierVersion+=QStringLiteral(" miner");
-    #endif
     #if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
-    ultracopierVersion+=QStringLiteral(" (OS: %1)").arg(EventDispatcher::GetOSDisplayString());
+    ultracopierVersion+=" (OS: "+EventDispatcher::GetOSDisplayString()+")";
     #endif
-    ultracopierVersion+=QStringLiteral(" ")+ULTRACOPIER_PLATFORM_CODE;
+    ultracopierVersion+=" "+std::string(ULTRACOPIER_PLATFORM_CODE);
     QNetworkRequest networkRequest(QStringLiteral(ULTRACOPIER_UPDATER_URL));
-    networkRequest.setHeader(QNetworkRequest::UserAgentHeader,ultracopierVersion);
+    networkRequest.setHeader(QNetworkRequest::UserAgentHeader,QString::fromStdString(ultracopierVersion));
     networkRequest.setRawHeader("Connection", "Close");
     reply = qnam.get(networkRequest);
     connect(reply, &QNetworkReply::finished, this, &InternetUpdater::httpFinished);
@@ -64,7 +62,7 @@ void InternetUpdater::httpFinished()
     QVariant redirectionTarget = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
     if (!reply->isFinished())
     {
-        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("get the new update failed: not finished"));
+        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"get the new update failed: not finished");
         reply->deleteLater();
         return;
     }
@@ -72,25 +70,25 @@ void InternetUpdater::httpFinished()
     {
         newUpdateTimer.stop();
         newUpdateTimer.start(1000*3600*24);
-        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("get the new update failed: %1").arg(reply->errorString()));
+        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"get the new update failed: "+reply->errorString().toStdString());
         reply->deleteLater();
         return;
     } else if (!redirectionTarget.isNull()) {
-        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("redirection denied to: %1").arg(redirectionTarget.toUrl().toString()));
+        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"redirection denied to: "+redirectionTarget.toUrl().toString().toStdString());
         reply->deleteLater();
         return;
     }
     QString newVersion=QString::fromUtf8(reply->readAll());
     if(newVersion.isEmpty())
     {
-        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("version string is empty"));
+        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"version string is empty");
         reply->deleteLater();
         return;
     }
     newVersion.remove("\n");
     if(!newVersion.contains(QRegularExpression(QLatin1Literal("^[0-9]+(\\.[0-9]+)+$"))))
     {
-        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("version string don't match: %1").arg(newVersion));
+        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"version string don't match: "+newVersion.toStdString());
         reply->deleteLater();
         return;
     }
@@ -99,13 +97,13 @@ void InternetUpdater::httpFinished()
         reply->deleteLater();
         return;
     }
-    if(PluginsManager::compareVersion(newVersion,QStringLiteral("<="),ULTRACOPIER_VERSION))
+    if(PluginsManager::compareVersion(newVersion.toStdString(),"<=",ULTRACOPIER_VERSION))
     {
         reply->deleteLater();
         return;
     }
     newUpdateTimer.stop();
-    emit newUpdate(newVersion);
+    emit newUpdate(newVersion.toStdString());
     reply->deleteLater();
 }