Conflict fixed: mainwindow.cpp and httpclient.cpp

[speedfreak] / Client / httpclient.h

diff --git a/Client/httpclient.h b/Client/httpclient.h
index 0ade96c..772d1b8 100644 (file)
--- a/Client/httpclient.h
+++ b/Client/httpclient.h
@@ -1,9 +1,11 @@
 /*
  * Http client Connects application to server.
  *
- * @author     Tiina Kivilinna-Korhola
- * @copyright  (c) 2010 Speed Freak team
- * license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @author      Tiina Kivilinna-Korhola
+ * @author      Olavi Pulkkinen <olavi.pulkkinen@fudeco.com>
+ * @author      Toni Jussila   <toni.jussila@fudeco.com>
+ * @copyright   (c) 2010 Speed Freak team
+ * license      http://opensource.org/licenses/gpl-license.php GNU Public License
  */
 
 #ifndef HTTPCLIENT_H
@@ -12,19 +14,41 @@
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
+#include "xmlwriter.h"
+#include "xmlreader.h"
+class MainWindow;
 
 
-class HttpClient : public QObject
-{
+
+class HttpClient : public QObject {
     Q_OBJECT
 public:
-    HttpClient();
+    HttpClient(MainWindow *myCarw);
     ~HttpClient();
+    XmlWriter *myXmlwriter;
+    XmlReader *myXmlreader;
 
 private:
+    MainWindow *myMainw;
     QNetworkAccessManager *netManager;
 
+signals:
+    void loginOK();
+
 public slots:
+    void requestRegistration();
+    void checkLogin();
+    void sendResultXml(QString category, double result);
+    void sendRouteXml();
+    void requestTopList(QString category, QString limit);
+    void requestCategories();
+    void ackOfResult();
+    void ackOfRoute();
+    void ackOfRegistration();
+    void ackOfCategories();
+    void ackOfToplist();
+    void ackOfLogin();
+    void errorFromServer(QNetworkReply::NetworkError);
 
 };