Merge branch 'update/httpClient'

diff --combined Client/httpclient.cpp
index fe73799,e59a0ae..ce3f2d8
--- 1/Client/httpclient.cpp
--- 2/Client/httpclient.cpp
+++ b/Client/httpclient.cpp
@@@ -50,7 -50,7 +50,7 @@@ void HttpClient::requestRegistration(
      qDebug() <<  myMainw->settingsDialog->getRegUserName() << "+" <<  myMainw->settingsDialog->getRegPassword() << "+" <<  myMainw->settingsDialog->getRegEmail();
  
      QBuffer *regbuffer = new QBuffer();
-     QUrl qurl("http://api.speedfreak-app.com/api/register");
+     QUrl qurl("http://www.speedfreak-app.com/users/register");
      QNetworkRequest request(qurl);
      qDebug() << qurl.toString();
      QNetworkReply *currentDownload;
@@@ -59,7 -59,8 +59,8 @@@
      myXmlwriter->writeRegistering(regbuffer,
                         myMainw->settingsDialog->getRegUserName(),
                         myMainw->settingsDialog->getRegPassword(),
-                        myMainw->settingsDialog->getRegEmail());
+                        myMainw->settingsDialog->getRegEmail(),
+                        "My car is cool");
      qDebug() << "carmainwindow: regbuffer->data(): " << regbuffer->data();
  
      currentDownload = netManager->post(request, ("xml=" + regbuffer->data()));
@@@ -80,10 -81,12 +81,12 @@@
  void HttpClient::sendResultXml(QString category, double result)
  {
      qDebug() << "_sendResultXml";
+     qDebug() << category;
  
      QBuffer *xmlbuffer = new QBuffer();
  
-     QUrl qurl("http://api.speedfreak-app.com/api/update/" + category);
+     QUrl qurl("http://www.speedfreak-app.com/results/update/" + category);
+ 
      qDebug() << qurl.toString();
      QNetworkRequest request(qurl);
      QNetworkReply *currentDownload;
@@@ -114,20 -117,18 +117,20 @@@
    * @param int 1(send to server) or 0(no send)
    * @todo Check destination URL.
    */
 -void HttpClient::sendRouteXml(QString s, int i)
 +void HttpClient::sendRouteXml(QString oldName, QString newName, int i)
  {
      qDebug() << "_sendRouteXml";
  
 -    QString filename = ".//speedfreak_route/route.xml";
 +    //QString filename = "/home/user/MyDocs/speedfreak/route/route.xml";
 +    qDebug() << "__old:" + oldName;
 +    QString filename = newName; //+ ".xml";
  
 -    if(s != "")
 +    if(newName != "")
      {
          qDebug() << "_rename xml";
 -        filename = s + ".xml";
          QDir dir(filename);
 -        qDebug() << dir.rename(".//speedfreak_route/route.xml", filename);
 +        qDebug() << "__new:" + filename;
 +        qDebug() << dir.rename(oldName, filename);
      }
  
      if(i == 1)
@@@ -140,7 -141,7 +143,7 @@@
              return;
          }
  
-         QUrl qurl("http://api.speedfreak-app.com/api/update/route");
+         QUrl qurl("http://speedfreak-app.com/update/route");
          qDebug() << qurl.toString();
          QNetworkRequest request(qurl);
          QNetworkReply *currentDownload;
@@@ -172,7 -173,7 +175,7 @@@ void HttpClient::requestTopList(QStrin
      qDebug() << "_requestTopList";
      qDebug() << category;
  
-     QString urlBase = "http://api.speedfreak-app.com/api/results/";
+     QString urlBase = "http://www.speedfreak-app.com/results/list/";
      QUrl qurl(urlBase + category + "/" + limit);
      qDebug() << qurl.toString();
      QNetworkRequest request(qurl);
@@@ -198,8 -199,8 +201,8 @@@
  void HttpClient::requestCategories()
  {
      qDebug() << "_requestCategories" ;
+     QUrl qurl("www.speedfreak-app.com/results/categories");
  
-     QUrl qurl("http://api.speedfreak-app.com/api/categories/");
      qDebug() << qurl.toString();
      QNetworkRequest request(qurl);
      QNetworkReply *currentDownload;
@@@ -225,8 -226,9 +228,9 @@@ void HttpClient::checkLogin(
  {
      qDebug() << "_checkLogin";
  
-     QUrl qurl("http://api.speedfreak-app.com/api/login/");
+     QUrl qurl("http://www.speedfreak-app.com/users/login");
      qDebug() << qurl.toString();
+ 
      QNetworkRequest request(qurl);
      QNetworkReply *currentDownload;
  
@@@ -483,7 -485,7 +487,7 @@@ void HttpClient::sendProfileXml(
          myMainw->settingsDialog->profileDialog->setLabelInfoToUser("Profile saved to phone");
  
      // Send xml to server
-     /*QUrl qurl("http://api.speedfreak-app.com/api/profile");
+     /*QUrl qurl("http://speedfreak-app.com/api/profile");
      QNetworkRequest request(qurl);
      qDebug() << qurl.toString();
      QNetworkReply *currentDownload;