diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-02 09:54:30 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-09 10:30:23 +0200 |
commit | 0110ca6ffb12d610b88fc117d924cf9b09c2c0fc (patch) | |
tree | d3d2aaec104ae63edf4d81b0d94f74b15bf475dd | |
parent | 444b66a440890986094b0499f5b299fae9f8d646 (diff) | |
download | qtx11extras-0110ca6ffb12d610b88fc117d924cf9b09c2c0fc.tar.gz |
Update signatures for Qt6
Changed to match the types of xcb_window_t and xcb_timestamp_t.
Change-Id: I002b354078d5291442f2d588f9ce05657e17dfba
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r-- | src/x11extras/qx11info_x11.cpp | 15 | ||||
-rw-r--r-- | src/x11extras/qx11info_x11.h | 14 |
2 files changed, 10 insertions, 19 deletions
diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp index 7b6b2a0..ff972ac 100644 --- a/src/x11extras/qx11info_x11.cpp +++ b/src/x11extras/qx11info_x11.cpp @@ -154,8 +154,6 @@ int QX11Info::appDpiY(int screen) return scr->logicalDotsPerInchY(); } -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -// ### Qt 6: remove /*! Returns a handle for the applications root window on the given \a screen. @@ -166,10 +164,7 @@ int QX11Info::appDpiY(int screen) \sa QApplication::desktop() */ -unsigned long QX11Info::appRootWindow(int screen) -#else quint32 QX11Info::appRootWindow(int screen) -#endif { if (!qApp) return 0; @@ -214,7 +209,7 @@ int QX11Info::appScreen() \sa setAppTime(), appUserTime() */ -unsigned long QX11Info::appTime() +quint32 QX11Info::appTime() { if (!qApp) return 0; @@ -230,7 +225,7 @@ unsigned long QX11Info::appTime() \sa setAppUserTime(), appTime() */ -unsigned long QX11Info::appUserTime() +quint32 QX11Info::appUserTime() { if (!qApp) return 0; @@ -246,7 +241,7 @@ unsigned long QX11Info::appUserTime() \sa appTime(), setAppUserTime() */ -void QX11Info::setAppTime(unsigned long time) +void QX11Info::setAppTime(quint32 time) { if (!qApp) return; @@ -267,7 +262,7 @@ void QX11Info::setAppTime(unsigned long time) \sa appUserTime(), setAppTime() */ -void QX11Info::setAppUserTime(unsigned long time) +void QX11Info::setAppUserTime(quint32 time) { if (!qApp) return; @@ -291,7 +286,7 @@ void QX11Info::setAppUserTime(unsigned long time) \since 5.2 */ -unsigned long QX11Info::getTimestamp() +quint32 QX11Info::getTimestamp() { if (!qApp) return 0; diff --git a/src/x11extras/qx11info_x11.h b/src/x11extras/qx11info_x11.h index 20f048a..988c4a5 100644 --- a/src/x11extras/qx11info_x11.h +++ b/src/x11extras/qx11info_x11.h @@ -63,20 +63,16 @@ public: static int appDpiX(int screen=-1); static int appDpiY(int screen=-1); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - static unsigned long appRootWindow(int screen=-1); -#else static quint32 appRootWindow(int screen=-1); -#endif static int appScreen(); - static unsigned long appTime(); - static unsigned long appUserTime(); + static quint32 appTime(); + static quint32 appUserTime(); - static void setAppTime(unsigned long time); - static void setAppUserTime(unsigned long time); + static void setAppTime(quint32 time); + static void setAppUserTime(quint32 time); - static unsigned long getTimestamp(); + static quint32 getTimestamp(); static QByteArray nextStartupId(); static void setNextStartupId(const QByteArray &id); |