[PATCH] Consistently use WITH_QTDBUS instead of USE_DBUS

USE_DBUS still uses an hardcoded list of architectures, whereas there
is already WITH_QTDBUS defined in case the D-Bus support is available.

Followup of commit 6bdab62068c89b61796246508813ae63aa3ef872.

Gbp-Pq: Name upstream_Consistently-use-WITH_QTDBUS-instead-of-USE_DBUS.patch

diff --git a/src/gui/openfilemanagerwindowjob.cpp b/src/gui/openfilemanagerwindowjob.cpp
index 974f92e9063da05eea2b8917acd2f6d9e0bcfb91..75a9a63a9d12a1a3d592ed0e5593e3b7f797ef8d 100644 (file)
--- a/src/gui/openfilemanagerwindowjob.cpp
+++ b/src/gui/openfilemanagerwindowjob.cpp
@@ -45,7 +45,7 @@ public:
 
     ~OpenFileManagerWindowJobPrivate() = default;
 
-#if USE_DBUS
+#ifdef WITH_QTDBUS
     void createDBusStrategy()
     {
         strategy = std::make_unique<OpenFileManagerWindowDBusStrategy>(q);

diff --git a/src/gui/openfilemanagerwindowjob_p.h b/src/gui/openfilemanagerwindowjob_p.h
index 63ddcacb98653c369122cbdcdf6b3fa977ca6dc8..22ad9fdb77c6444fbe4681bc98be1a6f82276d05 100644 (file)
--- a/src/gui/openfilemanagerwindowjob_p.h
+++ b/src/gui/openfilemanagerwindowjob_p.h
@@ -8,12 +8,6 @@
 #ifndef OPENFILEMANAGERWINDOWJOB_P_H
 #define OPENFILEMANAGERWINDOWJOB_P_H
 
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-#define USE_DBUS 1
-#else
-#define USE_DBUS 0
-#endif
-
 #include <KJob>
 
 namespace KIO
@@ -43,7 +37,7 @@ protected:
     OpenFileManagerWindowJob *m_job;
 };
 
-#if USE_DBUS
+#ifdef WITH_QTDBUS
 class OpenFileManagerWindowDBusStrategy : public AbstractOpenFileManagerWindowStrategy
 {
 public: