Merge branch 'master' of git.openslx.org:pvs2

Conflicts:
	src/client/connectwindow/connectwindow.h

1 files changed, 7 insertions, 4 deletions

diff --git a/src/client/connectwindow/connectwindow.h b/src/client/connectwindow/connectwindow.h
index 13983fa..8d4a436 100644
--- a/src/client/connectwindow/connectwindow.h
+++ b/src/client/connectwindow/connectwindow.h
@@ -19,10 +19,11 @@
 #include <QtGui>
 #include <QUdpSocket>
 #include <QSslSocket>
-#include "ui_connect.h"
-
 #include "../../shared/networkmessage.h"
 
+namespace Ui{
+class ConnectWindow;
+}
 class ServerConnection;
 
 /**
@@ -32,7 +33,7 @@ class ServerConnection;
  * For connecting with manager, user is able to set sessionName. If connection works
  * correctly flashy green checkmark is shown.
  */
-class ConnectWindow : public QDialog, private Ui_Dialog
+class ConnectWindow : public QWidget
 {
 Q_OBJECT
 
@@ -53,6 +54,8 @@ public:
 	};
 
 private:
+	Ui::ConnectWindow *_ui;
+
 	bool _connected;
 	int _timerDiscover, _timerHide;
 	ServerConnection *_connection;
@@ -69,7 +72,7 @@ private:
 	void updateState();
 
 public:
-	ConnectWindow(QWidget *parent = NULL);
+	explicit ConnectWindow(QWidget *parent = NULL);
 	virtual ~ConnectWindow();
 
 	void setConnected(const bool connected);