From a0fe997bbe54b98a6338aa28d8b008266e423081 Mon Sep 17 00:00:00 2001
From: Arno <am@disconnect.de>
Date: Sun, 3 Mar 2013 12:05:21 +0100
Subject: Port to Qt5

* Change #include to qt5
* Fix missing QX11Info
* use explicit constructor for QVariant(QColor)
* use beginResetModel() and endResetModel() instead of reset(). The
latter was removed. Hopefully it still works :)
---
 smglobals.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'smglobals.cpp')

diff --git a/smglobals.cpp b/smglobals.cpp
index 419f15c..6ef4ceb 100644
--- a/smglobals.cpp
+++ b/smglobals.cpp
@@ -8,7 +8,7 @@
 #include <QSqlDatabase>
 #include <QAbstractItemModel>
 #include <QStringList>
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include <QSettings>
 #include <QDir>
 #include <QFile>
@@ -17,7 +17,6 @@
 #include <QTemporaryFile>
 #include <QProcess>
 
-#include <QX11Info>
 #include <X11/Xlib.h>
 #include <X11/extensions/Xfixes.h>
 
@@ -129,7 +128,8 @@ SeriesTreeWidget *SmGlobals::seriesTreeWidget(){
 
 QSize SmGlobals::cursorSize() {
 	if(!mCursorSize.isValid()){
-		XFixesCursorImage *curImage = XFixesGetCursorImage(QX11Info::display());
+        Display *dpy = XOpenDisplay(0);
+        XFixesCursorImage *curImage = XFixesGetCursorImage(dpy);
 		mCursorSize = QSize(curImage->width, curImage->height);
 		XFree(curImage);
 	}
-- 
cgit v1.2.3-70-g09d2