Conflict fixed: mainwindow.cpp and httpclient.cpp

[speedfreak] / Client / resultdialog.h

diff --git a/Client/resultdialog.h b/Client/resultdialog.h
index 09c4174..252e7ff 100644 (file)
--- a/Client/resultdialog.h
+++ b/Client/resultdialog.h
@@ -27,6 +27,7 @@ public:
     void setValue(int pSpeed, double pTime);
     void setLabelInfoToUser(QString infoText);
     double getResult();
     void setValue(int pSpeed, double pTime);
     void setLabelInfoToUser(QString infoText);
     double getResult();

+    void setSendServerButtonEnabled();

 
 signals:
     void sendresult(double);
 
 signals:
     void sendresult(double);