projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Conflict solved: mainwindow.cpp and calculate.cpp
[speedfreak]
/
Client
/
instructionsdialog.cpp
diff --git
a/Client/instructionsdialog.cpp
b/Client/instructionsdialog.cpp
index
8358b57
..
9585605
100644
(file)
--- a/
Client/instructionsdialog.cpp
+++ b/
Client/instructionsdialog.cpp
@@
-2,6
+2,7
@@
* Instructions dialog for speedFreak project
*
* @author Rikhard Kuutti <rikhard.kuutti@fudeco.com>
* Instructions dialog for speedFreak project
*
* @author Rikhard Kuutti <rikhard.kuutti@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
*/
@@
-9,6
+10,9
@@
#include "instructionsdialog.h"
#include "ui_instructionsdialog.h"
#include "instructionsdialog.h"
#include "ui_instructionsdialog.h"
+/**
+ * Default constructor of this class.
+ */
InstructionsDialog::InstructionsDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::InstructionsDialog)
InstructionsDialog::InstructionsDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::InstructionsDialog)
@@
-17,11
+21,17
@@
InstructionsDialog::InstructionsDialog(QWidget *parent) :
this->setWindowTitle("Help");
}
this->setWindowTitle("Help");
}
+/**
+ * Default destructor of this class.
+ */
InstructionsDialog::~InstructionsDialog()
{
delete ui;
}
InstructionsDialog::~InstructionsDialog()
{
delete ui;
}
+/**
+ *
+ */
void InstructionsDialog::changeEvent(QEvent *e)
{
QDialog::changeEvent(e);
void InstructionsDialog::changeEvent(QEvent *e)
{
QDialog::changeEvent(e);