Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kutils: remove redundant Q_WS_X11 definition checks

Browse source 
if xscreensaver or xsync extension is not found it is most likely because
X11 is not found

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-08-05 22:01:27 +03:00
parent d16c67d15b
commit 2b9b3c8d54
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kutils/kidletime/kidletime.cpp
View file

@ -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 <QtCore/qsharedpointer.h>
@ -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<XSyncBasedPoller*>(poller.data()) == 0) {
#endif
poller.data()->deleteLater();
#ifdef Q_WS_X11
#ifdef HAVE_XSYNC
}
#endif
}