Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-17 01:24:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replaced depracted QX11Info by QGuiApplication

Browse source
This commit is contained in:
Christoph Johannes Kleine 2025-07-20 20:48:07 +02:00 • committed by thunder2
parent 95127592d7
commit 26088a7cbb
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
retroshare-gui/src/idle/idle_platform.cpp
View file

@ -24,10 +24,15 @@
#ifdef HAVE_XSS #ifdef HAVE_XSS
#include <qapplication.h> #include <qapplication.h>
#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
#include <QGuiApplication>
#else
#include <QX11Info>
#endif
#if QT_VERSION < QT_VERSION_CHECK(5,0,0) #if QT_VERSION < QT_VERSION_CHECK(5,0,0)
#include <QDesktopWidget> #include <QDesktopWidget>
#endif #endif
#include <QX11Info>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
@ -75,7 +80,10 @@ bool IdlePlatform::init()
old_handler = XSetErrorHandler(xerrhandler); old_handler = XSetErrorHandler(xerrhandler);
int event_base, error_base; int event_base, error_base;
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) #if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
QNativeInterface::QX11Application *nativeInterface = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();
if (nativeInterface && XScreenSaverQueryExtension(nativeInterface->display(), &event_base, &error_base)) {
#elif QT_VERSION >= QT_VERSION_CHECK(5,0,0)
if(QX11Info::isPlatformX11() && XScreenSaverQueryExtension(QX11Info::display(), &event_base, &error_base)) { if(QX11Info::isPlatformX11() && XScreenSaverQueryExtension(QX11Info::display(), &event_base, &error_base)) {
#else #else
if(XScreenSaverQueryExtension(QApplication::desktop()->screen()->x11Info().display(), &event_base, &error_base)) { if(XScreenSaverQueryExtension(QApplication::desktop()->screen()->x11Info().display(), &event_base, &error_base)) {
@ -90,7 +98,10 @@ int IdlePlatform::secondsIdle()
{ {
if(!d->ss_info) if(!d->ss_info)
return 0; return 0;
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) #if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
QNativeInterface::QX11Application *nativeInterface = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();
if(!nativeInterface || !XScreenSaverQueryInfo(nativeInterface->display(), DefaultRootWindow(nativeInterface->display()), d->ss_info))
#elif QT_VERSION >= QT_VERSION_CHECK(5,0,0)
if(!QX11Info::isPlatformX11() || !XScreenSaverQueryInfo(QX11Info::display(), QX11Info::appRootWindow(), d->ss_info)) if(!QX11Info::isPlatformX11() || !XScreenSaverQueryInfo(QX11Info::display(), QX11Info::appRootWindow(), d->ss_info))
#else #else
if(!XScreenSaverQueryInfo(QApplication::desktop()->screen()->x11Info().display(), QX11Info::appRootWindow(), d->ss_info)) if(!XScreenSaverQueryInfo(QApplication::desktop()->screen()->x11Info().display(), QX11Info::appRootWindow(), d->ss_info))