diff options
| author | Arno <am@disconnect.de> | 2013-03-03 12:05:21 +0100 |
|---|---|---|
| committer | Arno <am@disconnect.de> | 2013-03-03 12:05:21 +0100 |
| commit | a0fe997bbe54b98a6338aa28d8b008266e423081 (patch) | |
| tree | a949fcccf3485359684344a2a64e0b67a3962073 /smglobals.cpp | |
| parent | 1ddfe1550f718f268c8fd6f333f83898907c9ba9 (diff) | |
| download | SheMov-a0fe997bbe54b98a6338aa28d8b008266e423081.tar.gz SheMov-a0fe997bbe54b98a6338aa28d8b008266e423081.tar.bz2 SheMov-a0fe997bbe54b98a6338aa28d8b008266e423081.zip | |
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 :)
Diffstat (limited to 'smglobals.cpp')
| -rw-r--r-- | smglobals.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |