X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=Client%2Fcarmainwindow.cpp;h=5b1e1f4274ae724ffba4ed53a6a3b4c7fa632e26;hb=02000dfe5ae73748692027765c501313d1945dc1;hp=e5f35f89338865e7e923311ea087cd808ac2f3e9;hpb=f1f29ebb9027770de638a1cc95269ea03b625d8c;p=speedfreak

diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp
index e5f35f8..5b1e1f4 100644
--- a/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@ -33,7 +33,7 @@ CarMainWindow::CarMainWindow(QWidget *parent):QMainWindow(parent), ui(new Ui::Ca
     myHttpClient = new HttpClient(this);
     myRegistration = new Registration(this);
     connect(myRegistration,SIGNAL(sendregistration()),this,SLOT(regUserToServer()));
-
+    connect(myLogin,SIGNAL(userNameChanged()),this,SLOT(userLogin()));
     myRoute = new RouteDialog( this);
 
     time = 0;
@@ -424,7 +424,15 @@ void CarMainWindow::regUserToServer()
     myHttpClient->requestRegistration();
 }
 
+<<<<<<< HEAD:Client/carmainwindow.cpp
 void CarMainWindow::on_drawRoutePushButton_clicked()
 {
     myRoute->show();
 }
+
+=======
+>>>>>>> Added fuction for checking username registration on the server.:Client/carmainwindow.cpp
+void CarMainWindow::userLogin()
+{
+    myHttpClient->checkLogin();
+}