Merge remote branch 'openslx/mcastft' into input

Conflicts:
	CMakeLists.txt
	i18n/pvs_ar_JO.ts
	i18n/pvs_de_DE.ts
	i18n/pvs_es_MX.ts
	i18n/pvs_fr_FR.ts
	i18n/pvs_pl_PL.ts
	i18n/pvsmgr_ar_JO.ts
	i18n/pvsmgr_de_DE.ts
	i18n/pvsmgr_es_MX.ts
	i18n/pvsmgr_fr_FR.ts
	i18n/pvsmgr_pl_PL.ts
	icons/README
	pvsmgr.qrc
	src/gui/mainWindow.cpp
	src/pvs.cpp
	src/pvs.h
	src/pvsDaemon.cpp
	src/util/clientGUIUtils.h

1 files changed, 10 insertions, 17 deletions

diff --git a/src/util/clientGUIUtils.h b/src/util/clientGUIUtils.h
index 4da0a99..7f7ea47 100644..100755
--- a/src/util/clientGUIUtils.h
+++ b/src/util/clientGUIUtils.h
@@ -1,21 +1,20 @@
+#ifndef _BLANKSCREEN_H_
+#define _BLANKSCREEN_H_
+
 #include "src/util/consoleLogger.h"
-#include <X11/Xlib.h> // Every Xlib program must include this
-#include <X11/cursorfont.h>
 #include <assert.h>
 #include <unistd.h>
 #include <stdio.h>
 
 
-
 #define REFRESH_RATE 0.15
-
-#ifndef _BLANKSCREEN_H_
-#define _BLANKSCREEN_H_
+class BlankScreen_Sysdep;
 
 class BlankScreen
 {
 public:
     BlankScreen();
+    virtual ~BlankScreen();
     void draw(bool force = false);
     bool lock();
     bool unlock();
@@ -23,23 +22,17 @@ public:
     bool lock_inputs();
 
 private:
-    Display *dpy;
-    Window win;
-    XEvent ev;
-    int scr;
-
-    bool locked;
-
-
-    QString lockMsg;
-    int blackColor, whiteColor;
-    int offX, offY;
+    BlankScreen_Sysdep* _sysdep;
 };
 
+#ifndef __WIN32__
+# include <X11/Xlib.h>
+
 class X11Info
 {
 public:
 	static Display* display();
 };
+#endif /* !__WIN32__ */
 
 #endif