port to qt5

* got rid of the Win32/X11 differentiation
* due to QT5, additional packages are needed to compile
** libqt5x11extras5-dev
** libqt5svg5-dev

5 files changed, 3 insertions, 44 deletions

diff --git a/src/client/connectwindow/connectwindow.h b/src/client/connectwindow/connectwindow.h
index 53af662..51b1bf2 100644
--- a/src/client/connectwindow/connectwindow.h
+++ b/src/client/connectwindow/connectwindow.h
@@ -16,7 +16,7 @@
 #ifndef PVSCONNECTWINDOW_H_
 #define PVSCONNECTWINDOW_H_
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QMap>
 #include <QUdpSocket>
 #include <QSslSocket>
diff --git a/src/client/toolbar/toolbar.h b/src/client/toolbar/toolbar.h
index 47f385c..347871f 100644
--- a/src/client/toolbar/toolbar.h
+++ b/src/client/toolbar/toolbar.h
@@ -14,7 +14,7 @@
 #ifndef PVSCLIENTGUI_H_
 #define PVSCLIENTGUI_H_
 
-#include <QtGui>
+#include <QtWidgets>
 #include "../util/room.h"
 
 class ServerConnection;
diff --git a/src/client/util/platform/blankscreen_X11.cpp b/src/client/util/platform/blankscreen.cpp
index ee644ca..ee644ca 100644
--- a/src/client/util/platform/blankscreen_X11.cpp
+++ b/src/client/util/platform/blankscreen.cpp
diff --git a/src/client/util/platform/blankscreen_Win32.cpp b/src/client/util/platform/blankscreen_Win32.cpp
deleted file mode 100644
index 1d1dd12..0000000
--- a/src/client/util/platform/blankscreen_Win32.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#include "blankscreen.h"
-#include <qwidget.h>
-
-struct BlankScreen_Sysdep {
-
-	bool locked;
-	QWidget* blankwin;
-
-	QString lockMsg;
-	int blackColor, whiteColor;
-	int offX, offY;
-};
-
-BlankScreen::BlankScreen()
-{
-	_sysdep = new BlankScreen_Sysdep;
-	_sysdep->blankwin = new QWidget(0, Qt::X11BypassWindowManagerHint | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
-	_sysdep->blankwin->setWindowState(Qt::WindowFullScreen);
-	_sysdep->blankwin->show();
-}
-
-BlankScreen::~BlankScreen()
-{
-	delete _sysdep;
-}
-
-void BlankScreen::draw(bool force)
-{
-
-}
-
-bool BlankScreen::lock(const QString& message)
-{
-	return true;
-}
-
-bool BlankScreen::unlock()
-{
-	return true;
-}
diff --git a/src/client/vnc/vncwindow.h b/src/client/vnc/vncwindow.h
index 29f2e98..3247b12 100644
--- a/src/client/vnc/vncwindow.h
+++ b/src/client/vnc/vncwindow.h
@@ -14,7 +14,7 @@
 #ifndef CLIENTVNCVIEWER_H_
 #define CLIENTVNCVIEWER_H_
 
-#include <QtGui>
+#include <QtWidgets>
 
 class VncThread;
 class QPainter;