Conflict solved: mainwindow.cpp and calculate.cpp

[speedfreak] / Client / routesavedialog.h

diff --git a/Client/routesavedialog.h b/Client/routesavedialog.h
index 7fe157e..50ddaff 100644 (file)
--- a/Client/routesavedialog.h
+++ b/Client/routesavedialog.h
@@ -59,7 +59,8 @@ private:
     double direction;
     int progressbarIteration;
     int progressbarPoints;
-    void openRouteDialog(QString fileName);
+    void openRouteDialog();
+    QString fileName;
 
 private slots:
     void on_buttonLoadRoute_clicked();
@@ -68,13 +69,13 @@ private slots:
     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);
 
 };