From 35c3facc81cf10a2070cc5091e4e447ecc7416e3 Mon Sep 17 00:00:00 2001 From: Manuel Schneider Date: Tue, 6 May 2014 14:37:44 +0200 Subject: Changes the approach of Qt Gui initialization to the member pointer approach. This means multiple inheritance is avoided and the form is now a member pointer of the class. Immlicitely renamed some ui elements for clearification. Again changed unnecessary use of QDialog to QWidget. --- src/client/connectwindow/connectwindow.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/client/connectwindow/connectwindow.h') diff --git a/src/client/connectwindow/connectwindow.h b/src/client/connectwindow/connectwindow.h index 2bc2f86..191121c 100644 --- a/src/client/connectwindow/connectwindow.h +++ b/src/client/connectwindow/connectwindow.h @@ -19,13 +19,14 @@ #include #include #include -#include "ui_connect.h" - #include "../../shared/networkmessage.h" +namespace Ui{ +class ConnectWindow; +} class ServerConnection; -class ConnectWindow : public QDialog, private Ui_Dialog +class ConnectWindow : public QWidget { Q_OBJECT @@ -46,6 +47,8 @@ public: }; private: + Ui::ConnectWindow *_ui; + bool _connected; int _timerDiscover, _timerHide; ServerConnection *_connection; @@ -62,7 +65,7 @@ private: void updateState(); public: - ConnectWindow(QWidget *parent = NULL); + explicit ConnectWindow(QWidget *parent = NULL); virtual ~ConnectWindow(); void setConnected(const bool connected); -- cgit v1.2.3-55-g7522