Conflict

[speedfreak] / Client / mainwindow.h

diff --git a/Client/mainwindow.h b/Client/mainwindow.h
index 23a6c17..87c603d 100644 (file)
--- a/Client/mainwindow.h
+++ b/Client/mainwindow.h
@@ -1,7 +1,8 @@
 /*
  * Mainwindow for speedFreak project
  *
- * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
+ * @author      Rikhard Kuutti  <rikhard.kuutti@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
  */
@@ -14,7 +15,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QMessageBox>
-#include "creditsdialog.h"
+//#include "creditsdialog.h"
 #include "routesavedialog.h"
 #include "routedialog.h"
 #include "welcomedialog.h"
@@ -24,6 +25,7 @@
 #include "httpclient.h"
 #include "routedialog.h"
 #include "resultdialog.h"
+#include "helpdialog.h"
 
 
 namespace Ui {
@@ -36,7 +38,7 @@ public:
     MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
-    CreditsDialog *creditsDialog;
+    //CreditsDialog *creditsDialog;
     RouteSaveDialog *routeSaveDialog;
     RouteDialog *routeDialog;
     WelcomeDialog *welcomeDialog;
@@ -44,7 +46,7 @@ public:
     accelerationstart* accstart;
     TopResultDialog *topResultDialog;
     HttpClient *httpClient;
-    ResultDialog *resultDialog;
+    HelpDialog *helpDialog;
 
 protected:
     void changeEvent(QEvent *e);
@@ -65,7 +67,7 @@ private slots:
     void clientSendRoute();
     void clientRegUserToServer();
     void clientUserLogin();
-    void clientSendResult();
+    void clientSendResult(QString category, double result);
     void setCategoryCompoBox();
     void showTop10();