Conflict solved: mainwindow.cpp and calculate.cpp

[speedfreak] / Client / routesavedialog.h

diff --git a/Client/routesavedialog.h b/Client/routesavedialog.h
index 924b4d6..50ddaff 100644 (file)
--- a/Client/routesavedialog.h
+++ b/Client/routesavedialog.h
@@ -31,6 +31,7 @@ public:
     ~RouteSaveDialog();
     RouteDialog *routeDialog;
     HelpRoutingDialog *helpRoutingDialog;
+    CalibrateDialog *calibrateDialog;
     double getAverageSpeed();
     QString getDistanceTraveled();
 
@@ -44,7 +45,6 @@ private:
     QTimer *timerRoutePicture;
     GPSData *gpsData;
     Maemo5Location *location;
-    CalibrateDialog *calibrateDialog;
     QString gpsSpeed;
     QString distanceString;
     QPixmap *pixmapRouteStop;
@@ -57,18 +57,25 @@ private:
     double allSpeeds;
     int speedCount;
     double direction;
+    int progressbarIteration;
+    int progressbarPoints;
+    void openRouteDialog();
+    QString fileName;
 
 private slots:
+    void on_buttonLoadRoute_clicked();
     void on_pushButtonInfo_clicked();
     void on_buttonRouteStartStop_clicked();
     void timerSatellitePictureTimeout();
     void timerRoutePictureTimeout();
     void gpsStatus();
-    void sendRoute();
+    void sendRoute(QString,int);
     void killHelpDialog();
+    void killRouteDialog();
+    void setProgressbar(int i);
 
 signals:
-    void sendroute();
+    void sendroute(QString,QString,int);
 
 };