Conflict solved: mainwindow.cpp and calculate.cpp

[speedfreak] / Client / topresultdialog.cpp

diff --git a/Client/topresultdialog.cpp b/Client/topresultdialog.cpp
index 0c81ced..8d361d8 100644 (file)
--- a/Client/topresultdialog.cpp
+++ b/Client/topresultdialog.cpp
@@ -11,6 +11,9 @@
 #include "topresultdialog.h"
 #include "ui_topresultdialog.h"
 
+/**
+  * Constructor of this class
+  */
 TopResultDialog::TopResultDialog(QWidget *parent) :
     QDialog(parent), ui(new Ui::TopResultDialog)
 {
@@ -34,12 +37,18 @@ TopResultDialog::TopResultDialog(QWidget *parent) :
     ui->labelTopList->setText("");
 }
 
+/**
+  * Destructor of this class
+  */
 TopResultDialog::~TopResultDialog()
 {
     qDebug() << "__~TopResultDialog";
     delete ui;
 }
 
+/**
+  *
+  */
 void TopResultDialog::changeEvent(QEvent *e)
 {
     QDialog::changeEvent(e);
@@ -52,7 +61,9 @@ void TopResultDialog::changeEvent(QEvent *e)
     }
 }
 
-
+/**
+  * This slot function called when ever refresh button clicked.
+  */
 void TopResultDialog::on_buttonTopRefresh_clicked()
 {
     ui->labelTopList->clear();
@@ -60,32 +71,62 @@ void TopResultDialog::on_buttonTopRefresh_clicked()
     emit refreshCategoryList();
 }
 
+/**
+  * Set categories compobox.
+  *
+  * @param QStringList list
+  */
 void TopResultDialog::setCompoBoxCategories(QStringList list)
 {
     ui->comboBoxTopCategory->addItems(list);
 }
 
+/**
+  * Show top list.
+  *
+  * @param QString str
+  */
 void TopResultDialog::showTopList(QString str)
 {
     qDebug() << "__showTopList";
     ui->labelTopList->setText(str);
 }
 
+/**
+  * Get recent category index.
+  *
+  * @return int category index
+  */
 int TopResultDialog::getRecentCategoryIndex()
 {
     return recentCategoryIndex;
 }
 
+/**
+  * Set limit nr.
+  *
+  * @param int number
+  */
 void TopResultDialog::setLimitNr(int number)
 {
     limitNr = number;
 }
 
+/**
+  * Get limit nr.
+  *
+  * @return int limit nr
+  */
 int TopResultDialog::getLimitNr()
 {
     return limitNr;
 }
 
+/**
+  * This slot function called when ever top category combobox current index changed.
+  *
+  * @param int index
+  */
 void TopResultDialog::on_comboBoxTopCategory_currentIndexChanged(int index)
 {
     ui->labelTopList->clear();
@@ -93,6 +134,11 @@ void TopResultDialog::on_comboBoxTopCategory_currentIndexChanged(int index)
     emit refreshTopList(index);
 }
 
+/**
+  * Set label info to user.
+  *
+  * @param QString info text
+  */
 void TopResultDialog::setLabelInfoToUser(QString infoText)
 {
     this->ui->labelInfoToUser->setText(infoText);