Conflict solved: mainwindow.cpp and calculate.cpp

[speedfreak] / Client / calibratedialog.cpp

diff --git a/Client/calibratedialog.cpp b/Client/calibratedialog.cpp
index 146e85c..39c93ab 100644 (file)
--- a/Client/calibratedialog.cpp
+++ b/Client/calibratedialog.cpp
@@ -1,14 +1,19 @@
 /*
  * Calibrate dialog
  *
 /*
  * Calibrate dialog
  *

- * @author     Kai Rasilainen <kai.rasilainen@fudeco.com>
- * @copyright  (c) 2010 Speed Freak team
- * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @author      Kai Rasilainen <kai.rasilainen@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

  */
 
 #include "calibratedialog.h"
 #include "ui_calibratedialog.h"
 
  */
 
 #include "calibratedialog.h"
 #include "ui_calibratedialog.h"
 

+/**
+  * Default constructor for Calibrate dialog class.
+  *
+  */

 CalibrateDialog::CalibrateDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::CalibrateDialog)
 CalibrateDialog::CalibrateDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::CalibrateDialog)

@@ -17,11 +22,18 @@ CalibrateDialog::CalibrateDialog(QWidget *parent) :
     this->setWindowTitle("Calibrating...");
 }
 
     this->setWindowTitle("Calibrating...");
 }
 

+/**
+  * Default destructor for Calibrate dialog class.
+  * Deletes all dynamic objects and sets them to NULL.
+  */

 CalibrateDialog::~CalibrateDialog()
 {
     delete ui;
 }
 
 CalibrateDialog::~CalibrateDialog()
 {
     delete ui;
 }
 

+/**
+  *
+  */

 void CalibrateDialog::changeEvent(QEvent *e)
 {
     QDialog::changeEvent(e);
 void CalibrateDialog::changeEvent(QEvent *e)
 {
     QDialog::changeEvent(e);

@@ -34,21 +46,39 @@ void CalibrateDialog::changeEvent(QEvent *e)
     }
 }
 
     }
 }
 

+/**
+  * Set progressbar value.
+  *
+  * @param int progressbar value.
+  */

 void CalibrateDialog::setProgressValue(int value)
 {
     ui->progressBar->setValue(value);
 }
 
 void CalibrateDialog::setProgressValue(int value)
 {
     ui->progressBar->setValue(value);
 }
 

+/**
+  * Reset progressbar value.
+  */

 void CalibrateDialog::resetProgressValue()
 {
     ui->progressBar->reset();
 }
 
 void CalibrateDialog::resetProgressValue()
 {
     ui->progressBar->reset();
 }
 

+/**
+  * Set max value.
+  *
+  * @param int max
+  */

 void CalibrateDialog::setMaxValue(int max)
 {
     ui->progressBar->setMaximum( max );
 }
 
 void CalibrateDialog::setMaxValue(int max)
 {
     ui->progressBar->setMaximum( max );
 }
 

+/**
+  * Set title.
+  *
+  * @param QString title
+  */

 void CalibrateDialog::setTitle(QString title)
 {
     this->setWindowTitle(title);
 void CalibrateDialog::setTitle(QString title)
 {
     this->setWindowTitle(title);