Fixed merge conflict

[easylist] / mainform.cpp

diff --git a/mainform.cpp b/mainform.cpp
index c271bed..a598a18 100755 (executable)
--- a/mainform.cpp
+++ b/mainform.cpp
@@ -230,13 +230,14 @@ void MainForm::on_actionSync_triggered()
     url.append("?username=" + username);\r
     url.append("&password=" + password);\r
     qDebug() << url;\r
-    requestWebpage->fetch(url);\r
+    requestWebpage->post(url,settings->value(LIST_TEXT,"").toString().toUtf8());\r
+    //requestWebpage->fetch(url);\r
 }\r
 \r
 void MainForm::slotSyncList(QNetworkReply* pReply)\r
 {\r
     QByteArray data=pReply->readAll();\r
-    QString list(data);\r
+    QString list = QString::fromUtf8(data);\r
     settings->setValue(LIST_TEXT, list);\r
     settings->setValue(SELECTED_LIST_NAME, SYNC_LIST_NAME);\r
     settings->setValue(SYNC_LIST_NAME, settings->value(LIST_TEXT, ""));\r