From 2b9b3c8d54b4e9526274872a3ae95d9db255b014 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 5 Aug 2023 22:01:27 +0300 Subject: [PATCH] kutils: remove redundant Q_WS_X11 definition checks if xscreensaver or xsync extension is not found it is most likely because X11 is not found Signed-off-by: Ivailo Monev --- kutils/kidletime/kidletime.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/kutils/kidletime/kidletime.cpp b/kutils/kidletime/kidletime.cpp index 68670d1a..44cfc35e 100644 --- a/kutils/kidletime/kidletime.cpp +++ b/kutils/kidletime/kidletime.cpp @@ -20,13 +20,11 @@ #include "config.h" -#ifdef Q_WS_X11 #ifdef HAVE_XSCREENSAVER -#include "xscreensaverbasedpoller.h" +# include "xscreensaverbasedpoller.h" #endif #ifdef HAVE_XSYNC -#include "xsyncbasedpoller.h" -#endif +# include "xsyncbasedpoller.h" #endif #include @@ -173,7 +171,6 @@ void KIdleTimePrivate::loadSystem() } // Priority order -#ifdef Q_WS_X11 #ifdef HAVE_XSYNC if (XSyncBasedPoller::instance()->isAvailable()) { poller = XSyncBasedPoller::instance(); @@ -183,7 +180,6 @@ void KIdleTimePrivate::loadSystem() if (poller.isNull()) { poller = new XScreensaverBasedPoller(); } -#endif #endif if (!poller.isNull()) { @@ -198,11 +194,11 @@ void KIdleTimePrivate::unloadCurrentSystem() { if (!poller.isNull()) { poller.data()->unloadPoller(); -#ifdef Q_WS_X11 +#ifdef HAVE_XSYNC if (qobject_cast(poller.data()) == 0) { #endif poller.data()->deleteLater(); -#ifdef Q_WS_X11 +#ifdef HAVE_XSYNC } #endif }