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.

2 files changed, 3 insertions, 5 deletions

diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h
index 3ea82ca..c06f8e9 100644
--- a/src/server/mainwindow/mainwindow.h
+++ b/src/server/mainwindow/mainwindow.h
@@ -11,8 +11,7 @@ class ConnectionFrame;
 class ListenServer;
 class DiscoveryListener;
 
-namespace Ui
-{
+namespace Ui{
 	class MainWindow;
 }
 
diff --git a/src/server/sessionnamewindow/sessionnamewindow.h b/src/server/sessionnamewindow/sessionnamewindow.h
index ed944c1..ee93ea2 100644
--- a/src/server/sessionnamewindow/sessionnamewindow.h
+++ b/src/server/sessionnamewindow/sessionnamewindow.h
@@ -4,8 +4,7 @@
 #include <QtGui>
 
 
-namespace Ui
-{
+namespace Ui{
 class SessionName;
 }
 
@@ -14,7 +13,7 @@ class SessionNameWindow : public QDialog
     Q_OBJECT
 
 private:
-    Ui::SessionName *ui;
+		Ui::SessionName *ui;
 
 public:
     SessionNameWindow(QWidget *parent = 0);