diff options
| author | Björn Hagemeister | 2014-05-06 15:42:33 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-05-06 15:42:33 +0200 |
| commit | 8e774982be169f33fe4f4c687885d96f1c4e5ab4 (patch) | |
| tree | f4d8042b531ef15024cd9e56a9569f3939950e96 /src/client/toolbar/toolbar.h | |
| parent | New Feature: Showing client toolbar while vnc server is running. (diff) | |
| parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
| download | pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.tar.gz pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.tar.xz pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Conflicts:
src/client/connectwindow/connectwindow.h
Diffstat (limited to 'src/client/toolbar/toolbar.h')
| -rw-r--r-- | src/client/toolbar/toolbar.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/client/toolbar/toolbar.h b/src/client/toolbar/toolbar.h index 8a9da6f..aabb596 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; |