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.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/client/toolbar/toolbar.h b/src/client/toolbar/toolbar.h
index 8887ca7..be42aa2 100644
--- a/src/client/toolbar/toolbar.h
+++ b/src/client/toolbar/toolbar.h
@@ -15,18 +15,23 @@
 #define PVSCLIENTGUI_H_
 
 #include <QtGui>
-#include "ui_toolbar.h"
 
 class ServerConnection;
 class VncWindow;
 class ConnectWindow;
 class BlankScreen;
 
-class Toolbar : public QWidget, private Ui_ToolbarClass
+namespace Ui{
+class Toolbar;
+}
+
+class Toolbar : public QWidget
 {
-Q_OBJECT
+	Q_OBJECT
 
 private:
+	Ui::Toolbar *_ui;
+
 	int _location;
 	int _hideTimer;
 	int _hideDelay;
@@ -48,7 +53,7 @@ private:
 	void timerEvent(QTimerEvent* event);
 
 public:
-	Toolbar(QWidget *parent = NULL);
+	explicit Toolbar(QWidget *parent = 0);
 	virtual ~Toolbar();
 
 	int const static POSITION_TOP_LEFT = 0;