diff options
author | Dirk von Suchodoletz | 2011-03-25 02:29:55 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2011-03-25 02:29:55 +0100 |
commit | 2da95e2716a5e912089562f0c43aa7bdae07a70e (patch) | |
tree | 9f2e1df13f7c7a1d98faf6df687586b3ff82f958 /src/pvs.h | |
parent | ... (diff) | |
parent | revert username generator (diff) | |
download | pvs-2da95e2716a5e912089562f0c43aa7bdae07a70e.tar.gz pvs-2da95e2716a5e912089562f0c43aa7bdae07a70e.tar.xz pvs-2da95e2716a5e912089562f0c43aa7bdae07a70e.zip |
Merge branch 'master' of openslx.org:pvs
Diffstat (limited to 'src/pvs.h')
-rw-r--r--[-rwxr-xr-x] | src/pvs.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/pvs.h b/src/pvs.h index 49c2b4c..b2a84cf 100755..100644 --- a/src/pvs.h +++ b/src/pvs.h @@ -13,10 +13,8 @@ #define PVSCLIENT_H_ #include <QtCore> -#ifndef __WIN32__ - #include <X11/Xlib.h> - #include <X11/cursorfont.h> -#endif +#include <X11/Xlib.h> +#include <X11/cursorfont.h> #include <signal.h> #include "setup.h" @@ -141,9 +139,7 @@ private: bool _locked; ///< are we locked? QString _lockMsg; ///< message to display while we're locked bool _vncAllowed; ///< whether vncConnections to this client are allowed (dup?) - /*#ifndef __WIN32__*/ - BlankScreen *_blankScreen;///< object to blank the screen - /*#endif*/ + BlankScreen *_blankScreen;///< object to blank the screen QFileSystemWatcher* _notify; ///< used to get notifies about file changes //vnc-server |