Merged branches

diff --git a/Client/accelerometer.cpp b/Client/accelerometer.cpp
index 1a36361..5c16c98 100644 (file)
--- a/Client/accelerometer.cpp
+++ b/Client/accelerometer.cpp
@@ -1,3 +1,12 @@
+/*
+ * Accelerometer class to access the device accelerometer
+ *
+ * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
+ * @author      Kai Rasilainen 
+ * @copyright   (c) 2010 Speed Freak team
+ * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
 #include "accelerometer.h"
 #include "math.h"
 

diff --git a/Client/accelerometer.h b/Client/accelerometer.h
index 52990df..2ee3ec9 100644 (file)
--- a/Client/accelerometer.h
+++ b/Client/accelerometer.h
@@ -1,3 +1,12 @@
+/*
+ * Accelerometer class to access the device accelerometer
+ *
+ * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
+ * @author      Kai Rasilainen 
+ * @copyright   (c) 2010 Speed Freak team
+ * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
 #ifndef ACCELEROMETER_H
 #define ACCELEROMETER_H
 

diff --git a/Client/calculate.cpp b/Client/calculate.cpp
index ad535b1..85afca3 100644 (file)
--- a/Client/calculate.cpp
+++ b/Client/calculate.cpp
@@ -1,3 +1,12 @@
+/*
+ * Calculate class to process accelerometer data
+ *
+ * @author      Kai Rasilainen 
+ * @copyright   (c) 2010 Speed Freak team
+ * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
+
 #include "calculate.h"
 #include <math.h>
 

diff --git a/Client/calculate.h b/Client/calculate.h
index 421990f..ef000ba 100644 (file)
--- a/Client/calculate.h
+++ b/Client/calculate.h
@@ -1,3 +1,11 @@
+/*
+ * Calculate class to process accelerometer data
+ *
+ * @author      Kai Rasilainen 
+ * @copyright   (c) 2010 Speed Freak team
+ * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
 #ifndef CALCULATE_H
 #define CALCULATE_H
 

diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index 1dd6cd6..89868c6 100644 (file)
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -64,6 +64,7 @@ private:
     QStringList categories; //Top-tab view
 
 private slots:
+    void on_setUserPushButton_clicked();
     void on_registratePushButton_clicked();
     void on_loginLogoutButton_clicked();
     void on_comboBoxTopCategory_activated(QString );