Refactoring and minor changes

Author: spectralcode

src/authenticationwidget.h

@@ -42,11 +42,8 @@ class AuthenticationWidget : public QueryWidget
 public:
 	AuthenticationWidget(QString keyFilePath, QWidget* parent = 0, QString name = "");
 	~AuthenticationWidget();
-	QString getName() { return this->name; }
-
 
 private:
-	QString name;
 	QString key;
 	bool keyAvailable;
 

src/buttonquerywidget.cpp

@@ -24,8 +24,6 @@
 **                      at                                                **
 **                      iqo.uni-hannover.de                               **
 **                                                                        **
-**          Date:       12 June 2019                                      **
-**          Version:    1.0.0                                             **
 ****************************************************************************/
 
 #include "buttonquerywidget.h"

src/buttonquerywidget.h

@@ -24,8 +24,6 @@
 **                      at                                                **
 **                      iqo.uni-hannover.de                               **
 **                                                                        **
-**          Date:       12 June 2019                                      **
-**          Version:    1.0.0                                             **
 ****************************************************************************/
 
 #pragma once
@@ -47,10 +45,8 @@ class ButtonQueryWidget : public QueryWidget
 private:
 	QPushButton* button;
 	QHBoxLayout* layout;
-	QString name;
 	QString command;
 
-
 public slots:
 	void handleResponse(QString initialQuery, QString response) override;
 	void sendQuery();

src/comboboxquerywidget.cpp

@@ -24,8 +24,6 @@
 **                      at                                                **
 **                      iqo.uni-hannover.de                               **
 **                                                                        **
-**          Date:       12 June 2019                                      **
-**          Version:    1.0.0                                             **
 ****************************************************************************/
 
 #include "comboboxquerywidget.h"

src/comboboxquerywidget.h

@@ -24,8 +24,6 @@
 **                      at                                                **
 **                      iqo.uni-hannover.de                               **
 **                                                                        **
-**          Date:       12 June 2019                                      **
-**          Version:    1.0.0                                             **
 ****************************************************************************/
 
 #pragma once
@@ -43,18 +41,15 @@ class ComboBoxQueryWidget : public QueryWidget
 public:
 	ComboBoxQueryWidget(QWidget *parent = nullptr);
 	ComboBoxQueryWidget(QString name, QStringList options, bool expert, QString infoText, QWidget *parent = nullptr);
-	~ComboBoxQueryWidget();
-	QString getName() { return this->name; }
+	~ComboBoxQueryWidget();	
 
 private:
 	QComboBox* comboBox;
 	QLabel* label;
 	QHBoxLayout* layout;
-	QString name;
 	QStringList options;
 	bool enableDisableComboBox;
 
-
 public slots:
 	void handleResponse(QString initialQuery, QString response) override;
 	void changeValue(int value);

src/intvaluewidget.h

@@ -46,11 +46,9 @@ class IntValueWidget : public QueryWidget
 	void setMin(int minValue);
 	void setMax(int maxValue);
 	void setStepSize(int stepSize);
-	QString getName() { return this->name; }
 
 private:
 	int value;
-	QString name;
 	QSpinBox* spinBox;
 	QLabel* label;
 	QHBoxLayout* layout;

src/querywidget.cpp

@@ -24,8 +24,6 @@
 **                      at                                                **
 **                      iqo.uni-hannover.de                               **
 **                                                                        **
-**          Date:       12 June 2019                                      **
-**          Version:    1.0.0                                             **
 ****************************************************************************/
 
 #include "querywidget.h"
@@ -34,6 +32,7 @@ QueryWidget::QueryWidget(QWidget *parent)
 	: QWidget(parent)
 {
 	this->expert = false;
+    this->name = "";
 }
 
 QueryWidget::~QueryWidget()

src/querywidget.h

@@ -24,8 +24,6 @@
 **                      at                                                **
 **                      iqo.uni-hannover.de                               **
 **                                                                        **
-**          Date:       12 June 2019                                      **
-**          Version:    1.0.0                                             **
 ****************************************************************************/
 
 //Abstract class that defines the necessary signals, slots and methods for communication with QueryManager
@@ -44,9 +42,11 @@ class QueryWidget : public QWidget
 	~QueryWidget();
 	void setExpert(bool expertMode) { this->expert = expertMode; }
 	bool isExpert() { return this->expert; }
+    QString getName() { return this->name; }
 
 protected:
 	bool expert;
+    QString name;
 
 public slots:
 	virtual void handleResponse(QString initialQuery, QString response) = 0;