projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Conflict
[speedfreak]
/
Client
/
resultdialog.h
diff --git
a/Client/resultdialog.h
b/Client/resultdialog.h
index
e8828c7
..
09c4174
100644
(file)
--- a/
Client/resultdialog.h
+++ b/
Client/resultdialog.h
@@
-1,7
+1,8
@@
/*
* CarMainWindow main class
*
/*
* CarMainWindow main class
*
- * @author Janne Änäkkälä <janne.anakkala@fudeco.com>
+ * @author Janne Änäkkälä <janne.anakkala@fudeco.com>
+ * @author Toni Jussila <toni.jussila@fudeco.com>
* @copyright (c) 2010 Speed Freak team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*/
* @copyright (c) 2010 Speed Freak team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*/
@@
-10,7
+11,7
@@
#define RESULTDIALOG_H
#include <QDialog>
#define RESULTDIALOG_H
#include <QDialog>
-//#include "measures.h"
+
namespace Ui {
class ResultDialog;
namespace Ui {
class ResultDialog;
@@
-25,6
+26,7
@@
public:
void setEnd(int pValue);
void setValue(int pSpeed, double pTime);
void setLabelInfoToUser(QString infoText);
void setEnd(int pValue);
void setValue(int pSpeed, double pTime);
void setLabelInfoToUser(QString infoText);
+ double getResult();
signals:
void sendresult(double);
signals:
void sendresult(double);