Remove STL dependency (again), fix qmake build
authorunc0rr
Sun, 12 Feb 2012 19:38:32 +0400
changeset 6677 6b7560b37eef
parent 6676 21cf35a570a7
child 6678 beab48f963d5
Remove STL dependency (again), fix qmake build
QTfrontend/hwform.cpp
project_files/hedgewars.pro
--- a/QTfrontend/hwform.cpp	Sun Feb 12 15:59:10 2012 +0100
+++ b/QTfrontend/hwform.cpp	Sun Feb 12 19:38:32 2012 +0400
@@ -1638,9 +1638,9 @@
     connect(nam, SIGNAL(finished(QNetworkReply*)),
             this, SLOT(finishedSlot(QNetworkReply*)));
 
-    QUrl url(string(string("https://www.google.com/accounts/ClientLogin?"
-                           "accountType=GOOGLE&Email=feedback.hedgewars@gmail.com&Passwd=hwfeedback&service=code&source=HedgewarsFoundation-Hedgewars-")
-                    + (cVersionString?(*cVersionString):QString("")).toStdString()).c_str());
+    QUrl url(QString("https://www.google.com/accounts/ClientLogin?"
+                     "accountType=GOOGLE&Email=feedback.hedgewars@gmail.com&Passwd=hwfeedback&service=code&source=HedgewarsFoundation-Hedgewars-")
+                    + (cVersionString?(*cVersionString):QString("")));
     nam->get(QNetworkRequest(url));
 
 }
@@ -1690,12 +1690,11 @@
             return;
         }
 
-        QByteArray body(issueXml.toStdString().c_str());
+        QByteArray body(issueXml.toUtf8());
         QNetworkRequest header(QUrl("https://code.google.com/feeds/issues/p/hedgewars/issues/full"));
         header.setRawHeader("Content-Length", QString::number(issueXml.length()).toAscii());
         header.setRawHeader("Content-Type", "application/atom+xml");
-        header.setRawHeader("Authorization", string(
-                                string("GoogleLogin auth=") + authToken.toStdString()).c_str());
+        header.setRawHeader("Authorization", QString("GoogleLogin auth=%1").arg(authToken).toUtf8());
         nam->post(header, body);
 
     }
--- a/project_files/hedgewars.pro	Sun Feb 12 15:59:10 2012 +0100
+++ b/project_files/hedgewars.pro	Sun Feb 12 19:38:32 2012 +0400
@@ -175,7 +175,6 @@
     ../QTfrontend/ui_hwform.cpp \
     ../QTfrontend/hwconsts.cpp \
     ../QTfrontend/ui/mouseoverfilter.cpp \
-    ../QTfrontend/ui/mouseoverfilter.cpp \
     ../QTfrontend/ui/widget/qpushbuttonwithsound.cpp \
     ../QTfrontend/ui/page/pagefeedback.cpp