# HG changeset patch # User unc0rr # Date 1329061112 -14400 # Node ID 6b7560b37eef01ace0eac4a09ca6d5cbd084c1ab # Parent 21cf35a570a7edf67de4db294930c6c706d85f37 Remove STL dependency (again), fix qmake build diff -r 21cf35a570a7 -r 6b7560b37eef QTfrontend/hwform.cpp --- 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); } diff -r 21cf35a570a7 -r 6b7560b37eef project_files/hedgewars.pro --- 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