Conflict

[speedfreak] / Client / routesavedialog.h

diff --git a/Client/routesavedialog.h b/Client/routesavedialog.h
index 5112c4b..8a0d539 100644 (file)
--- a/Client/routesavedialog.h
+++ b/Client/routesavedialog.h
@@ -40,9 +40,9 @@ private:
     RouteDialog *routeDialog;
     QString gpsSpeed;
     QPixmap *pixmapRouteStop;
-    QPixmap *pixmapRoutePlay;
+    QPixmap *pixmapRouteStart;
     QIcon *iconRouteStop;
-    QIcon *iconRoutePlay;
+    QIcon *iconRouteStart;
     bool buttonStatus;
 
 private slots:
@@ -50,6 +50,11 @@ private slots:
     void timerSatellitePictureTimeout();
     void timerRoutePictureTimeout();
     void gpsStatus();
+    void sendRoute();
+
+signals:
+    void sendroute();
+
 };
 
 #endif // ROUTESAVEDIALOG_H