Merge branch 'changes/UI'

[speedfreak] / Client / carmainwindow.h

diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index dcf047e..a7c7857 100644 (file)
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -82,7 +82,7 @@ private:
 
 signals:
 void speedAchieved();
-void sendresult();
+void userNameChanged();
 
 private slots:
     void on_pushButtonSendResult_clicked();
@@ -90,9 +90,8 @@ private slots:
     void on_manualStartButton_clicked();
     void on_setUserPushButton_clicked();
     void on_registratePushButton_clicked();
-    void on_loginLogoutButton_clicked();
     void on_comboBoxTopCategory_activated(QString );
-    void on_pushButton_clicked();
+    //void on_pushButton_clicked();
     void networkResponse(QNetworkReply*);
     void on_comboBoxTopCategory_currentIndexChanged(QString category); //Top-tab view
     void on_listViewStartTabAccelerationCategories_clicked(QModelIndex index); //Start-tab view
@@ -108,6 +107,7 @@ private slots:
     void errorFromServer(QNetworkReply* reply);
 
     void after_timeout();
+    void updateUserName();
 };
 
 #endif // CARMAINWINDOW_H