diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/client/connectwindow/connectwindow.h | 2 | ||||
-rw-r--r-- | src/client/toolbar/toolbar.h | 2 | ||||
-rw-r--r-- | src/client/util/platform/blankscreen.cpp (renamed from src/client/util/platform/blankscreen_X11.cpp) | 0 | ||||
-rw-r--r-- | src/client/util/platform/blankscreen_Win32.cpp | 41 | ||||
-rw-r--r-- | src/client/vnc/vncwindow.h | 2 | ||||
-rw-r--r-- | src/server/clicklabel/clicklabel.h | 2 | ||||
-rw-r--r-- | src/server/connectionframe/connectionframe.h | 2 | ||||
-rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 2 | ||||
-rw-r--r-- | src/server/mainwindow/mainwindow.h | 2 | ||||
-rw-r--r-- | src/server/sessionnamewindow/sessionnamewindow.cpp | 2 | ||||
-rw-r--r-- | src/server/sessionnamewindow/sessionnamewindow.h | 2 | ||||
-rw-r--r-- | src/server/util/platform/screensaver.cpp (renamed from src/server/util/platform/screensaver_X11.cpp) | 0 |
12 files changed, 9 insertions, 50 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; diff --git a/src/server/clicklabel/clicklabel.h b/src/server/clicklabel/clicklabel.h index 4d730a9..4c5a898 100644 --- a/src/server/clicklabel/clicklabel.h +++ b/src/server/clicklabel/clicklabel.h @@ -1,7 +1,7 @@ #ifndef _CLICKLABEL_H_ #define _CLICKLABEL_H_ -#include <QtGui> +#include <QtWidgets> #include <QLabel> /** diff --git a/src/server/connectionframe/connectionframe.h b/src/server/connectionframe/connectionframe.h index 7f338a8..72f57f3 100644 --- a/src/server/connectionframe/connectionframe.h +++ b/src/server/connectionframe/connectionframe.h @@ -1,6 +1,6 @@ #ifndef _CONNECTIONFRAME_H_ #define _CONNECTIONFRAME_H_ -#include <QtGui> +#include <QtWidgets> #include "../net/client.h" class MainWindow; diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index 2eab581..d4819cf 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -16,7 +16,7 @@ // Self #include "mainwindow.h" // QT stuff -#include <QtGui> +#include <QtWidgets> #include <QFileDialog> #include <QSvgRenderer> #include <QPainter> diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 27bf264..ac59481 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -1,7 +1,7 @@ #ifndef _MAINWINDOW_H_ #define _MAINWINDOW_H_ -#include <QtGui> +#include <QtWidgets> #include <QMainWindow> #include "../net/client.h" diff --git a/src/server/sessionnamewindow/sessionnamewindow.cpp b/src/server/sessionnamewindow/sessionnamewindow.cpp index cc4d751..c171f53 100644 --- a/src/server/sessionnamewindow/sessionnamewindow.cpp +++ b/src/server/sessionnamewindow/sessionnamewindow.cpp @@ -14,7 +14,7 @@ # ----------------------------------------------------------------------------- */ -#include <QtGui> +#include <QtWidgets> #include "sessionnamewindow.h" #include "../serverapp/serverapp.h" #include "../numerickeyboard/numerickeyboard.h" diff --git a/src/server/sessionnamewindow/sessionnamewindow.h b/src/server/sessionnamewindow/sessionnamewindow.h index 2338def..e46b895 100644 --- a/src/server/sessionnamewindow/sessionnamewindow.h +++ b/src/server/sessionnamewindow/sessionnamewindow.h @@ -1,7 +1,7 @@ #ifndef _SESSIONNAMEWINDOW_H_ #define _SESSIONNAMEWINDOW_H_ -#include <QtGui> +#include <QtWidgets> namespace Ui diff --git a/src/server/util/platform/screensaver_X11.cpp b/src/server/util/platform/screensaver.cpp index efffba9..efffba9 100644 --- a/src/server/util/platform/screensaver_X11.cpp +++ b/src/server/util/platform/screensaver.cpp |