1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove double negation ifdefs in QGenericUnixTheme

Browse Source 
Replace ifndef QT_NO_DBUS antipattern by if QT_CONFIG(dbus).

Change-Id: Ifca080594358df0d836db25721b43ad31129cf48
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
Axel Spoerl 2025-04-04 09:17:42 +02:00
parent f4e892d797
commit f86a0ccdfb
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/platform/unix/qgenericunixtheme.cpp
View File

@ -21,7 +21,7 @@
#endif
#if QT_CONFIG(settings)
#include <QSettings>
#ifndef QT_NO_DBUS
#if QT_CONFIG(dbus)
#include "qkdetheme_p.h"
#endif
#endif
@ -32,7 +32,7 @@
#include <qpa/qplatformdialoghelper.h>
#include <qpa/qplatformtheme_p.h>
#ifndef QT_NO_DBUS
#if QT_CONFIG(dbus)
#include <QJsonDocument>
#include <QJsonArray>
#include <QJsonObject>
@ -47,7 +47,7 @@
#include <private/qguiapplication_p.h>
#include <qpa/qplatformintegration.h>
#include <QtCore/QStandardPaths>
#ifndef QT_NO_DBUS
#if QT_CONFIG(dbus)
#include <QtDBus/QDBusConnectionInterface>
#include <private/qdbustrayicon_p.h>
#endif
@ -96,7 +96,7 @@ const QFont *QGenericUnixTheme::font(Font type) const
}
}
#ifndef QT_NO_DBUS
#if QT_CONFIG(dbus)
QPlatformMenuBar *QGenericUnixTheme::createPlatformMenuBar() const
{
if (isDBusGlobalMenuAvailable())
@ -105,7 +105,7 @@ QPlatformMenuBar *QGenericUnixTheme::createPlatformMenuBar() const
}
#endif
#if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
#if QT_CONFIG(dbus) && QT_CONFIG(systemtrayicon)
QPlatformSystemTrayIcon *QGenericUnixTheme::createPlatformSystemTrayIcon() const
{
if (shouldUseDBusTray())
@ -161,7 +161,7 @@ QStringList QGenericUnixTheme::themeNames()
<< "LXDE";
const QList<QByteArray> desktopNames = desktopEnvironment.split(':');
for (const QByteArray &desktopName : desktopNames) {
#if !defined QT_NO_DBUS && QT_CONFIG(settings) && (QT_CONFIG(xcb) || QT_CONFIG(wayland))
#if QT_CONFIG(dbus) && QT_CONFIG(settings) && (QT_CONFIG(xcb) || QT_CONFIG(wayland))
if (desktopEnvironment == "KDE") {
result.push_back(QLatin1StringView(QKdeTheme::name));
} else
@ -191,7 +191,7 @@ QPlatformTheme *QGenericUnixTheme::createUnixTheme(const QString &name)
{
if (name == QLatin1StringView(QGenericUnixTheme::name))
return new QGenericUnixTheme;
#if !defined QT_NO_DBUS && QT_CONFIG(settings) && (QT_CONFIG(xcb) || QT_CONFIG(wayland))
#if QT_CONFIG(dbus) && QT_CONFIG(settings) && (QT_CONFIG(xcb) || QT_CONFIG(wayland))
if (name == QLatin1StringView(QKdeTheme::name))
return QKdeTheme::createKdeTheme();
#endif
@ -240,7 +240,7 @@ QSize QGenericUnixTheme::mouseCursorSize()
return QSize(s, s);
}
#ifndef QT_NO_DBUS
#if QT_CONFIG(dbus)
static bool checkDBusGlobalMenuAvailable()
{
const QDBusConnection connection = QDBusConnection::sessionBus();
@ -276,7 +276,7 @@ QIcon QGenericUnixTheme::xdgFileIcon(const QFileInfo &fileInfo)
#endif
#if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
#if QT_CONFIG(dbus) && QT_CONFIG(systemtrayicon)
bool QGenericUnixTheme::shouldUseDBusTray()
{
// There's no other tray implementation to fallback to on non-X11

6
src/gui/platform/unix/qgenericunixtheme_p.h
View File

@ -46,10 +46,10 @@ public:
const QFont *font(Font type) const override;
QVariant themeHint(ThemeHint hint) const override;
#ifndef QT_NO_DBUS
#if QT_CONFIG(dbus)
QPlatformMenuBar *createPlatformMenuBar() const override;
#endif
#if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
#if QT_CONFIG(dbus) && QT_CONFIG(systemtrayicon)
QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override;
#endif
@ -72,7 +72,7 @@ protected:
static QSize mouseCursorSize();
static QList<QSize> availableXdgFileIconSizes();
#if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
#if QT_CONFIG(dbus) && QT_CONFIG(systemtrayicon)
static bool shouldUseDBusTray();
#endif
#if QT_CONFIG(mimetype)