From a5540328233f1b0bc0bab027013f3c3d324a8e27 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 3 Jul 2018 21:21:33 +0200 Subject: [PATCH] Fix compile without dbus --- src/CMakeLists.txt | 20 +++++++++---------- src/device/devicekitlister.cpp | 5 +++-- src/device/devicemanager.cpp | 16 +++++++++------ src/device/udisks2lister.cpp | 11 +++++----- .../gnomeglobalshortcutbackend.cpp | 2 +- src/widgets/osd.cpp | 8 ++++---- src/widgets/osd.h | 2 ++ src/widgets/osd_x11.cpp | 5 ++++- 8 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 41df83041..efd51f1ec 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -416,7 +416,6 @@ set(HEADERS device/connecteddevice.h device/devicedatabasebackend.h - device/devicekitlister.h device/devicelister.h device/devicemanager.h device/deviceproperties.h @@ -649,15 +648,16 @@ optional_source(HAVE_DBUS core/mpris2.h ) -optional_source(HAVE_DEVICEKIT - SOURCES device/devicekitlister.cpp - HEADERS device/devicekitlister.h -) - -optional_source(HAVE_UDISKS2 - SOURCES device/udisks2lister.cpp - HEADERS device/udisks2lister.h -) +if(HAVE_DBUS) + optional_source(HAVE_DEVICEKIT + SOURCES device/devicekitlister.cpp + HEADERS device/devicekitlister.h + ) + optional_source(HAVE_UDISKS2 + SOURCES device/udisks2lister.cpp + HEADERS device/udisks2lister.h + ) +endif() # Libgpod device backend optional_source(HAVE_LIBGPOD diff --git a/src/device/devicekitlister.cpp b/src/device/devicekitlister.cpp index e9d797c53..fc8adc9c2 100644 --- a/src/device/devicekitlister.cpp +++ b/src/device/devicekitlister.cpp @@ -20,6 +20,9 @@ #include "config.h" +#include +#include + #include #include #include @@ -36,8 +39,6 @@ #include "core/logging.h" #include "core/utilities.h" -#include "dbus/udisks.h" -#include "dbus/udisksdevice.h" #include "devicekitlister.h" DeviceKitLister::DeviceKitLister() {} diff --git a/src/device/devicemanager.cpp b/src/device/devicemanager.cpp index 5d80a1231..222785328 100644 --- a/src/device/devicemanager.cpp +++ b/src/device/devicemanager.cpp @@ -60,7 +60,6 @@ #include "connecteddevice.h" #include "devicelister.h" #include "devicedatabasebackend.h" -#include "devicekitlister.h" #include "devicestatefiltermodel.h" #if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER) @@ -84,8 +83,13 @@ #ifdef HAVE_LIBMTP # include "mtpdevice.h" #endif -#ifdef HAVE_UDISKS2 -# include "udisks2lister.h" +#ifdef HAVE_DBUS +# ifdef HAVE_DEVICEKIT +# include "devicekitlister.h" +# endif +# ifdef HAVE_UDISKS2 +# include "udisks2lister.h" +# endif #endif using std::bind; @@ -219,14 +223,14 @@ DeviceManager::DeviceManager(Application *app, QObject *parent) connected_devices_model_ = new DeviceStateFilterModel(this); connected_devices_model_->setSourceModel(this); -// CD devices are detected via the DiskArbitration framework instead on Darwin. +// CD devices are detected via the DiskArbitration framework instead on MacOs. #if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER) && !defined(Q_OS_MACOS) AddLister(new CddaLister); #endif -#ifdef HAVE_DEVICEKIT +#if defined(HAVE_DBUS) && defined(HAVE_DEVICEKIT) AddLister(new DeviceKitLister); #endif -#ifdef HAVE_UDISKS2 +#if defined(HAVE_DBUS) && defined(HAVE_UDISKS2) AddLister(new Udisks2Lister); #endif #ifdef HAVE_GIO diff --git a/src/device/udisks2lister.cpp b/src/device/udisks2lister.cpp index eb81e192c..413e3a7f2 100644 --- a/src/device/udisks2lister.cpp +++ b/src/device/udisks2lister.cpp @@ -17,6 +17,12 @@ #include "config.h" +#include +#include +#include +#include +#include + #include #include #include @@ -37,11 +43,6 @@ #include "core/logging.h" #include "core/utilities.h" -#include "dbus/objectmanager.h" -#include "dbus/udisks2block.h" -#include "dbus/udisks2drive.h" -#include "dbus/udisks2filesystem.h" -#include "dbus/udisks2job.h" #include "udisks2lister.h" diff --git a/src/globalshortcuts/gnomeglobalshortcutbackend.cpp b/src/globalshortcuts/gnomeglobalshortcutbackend.cpp index 497b3b279..6e7057165 100644 --- a/src/globalshortcuts/gnomeglobalshortcutbackend.cpp +++ b/src/globalshortcuts/gnomeglobalshortcutbackend.cpp @@ -21,7 +21,7 @@ #include "config.h" #ifdef HAVE_DBUS -# include "dbus/gnomesettingsdaemon.h" +# include #endif #include diff --git a/src/widgets/osd.cpp b/src/widgets/osd.cpp index 41c1f2bdc..67e081d79 100644 --- a/src/widgets/osd.cpp +++ b/src/widgets/osd.cpp @@ -20,6 +20,10 @@ #include "config.h" +#ifdef HAVE_DBUS +# include +#endif + #include #include #include @@ -41,10 +45,6 @@ #include "core/systemtrayicon.h" #include "covermanager/currentartloader.h" -#ifdef HAVE_DBUS -# include "dbus/notification.h" -#endif - const char *OSD::kSettingsGroup = "OSD"; OSD::OSD(SystemTrayIcon *tray_icon, Application *app, QObject *parent) diff --git a/src/widgets/osd.h b/src/widgets/osd.h index 941d3256a..be82a01c2 100644 --- a/src/widgets/osd.h +++ b/src/widgets/osd.h @@ -100,7 +100,9 @@ class OSD : public QObject { QString ReplaceVariable(const QString &variable, const Song &song); private slots: +#if defined(HAVE_DBUS) && defined(HAVE_X11) void CallFinished(QDBusPendingCallWatcher *watcher); +#endif void AlbumArtLoaded(const Song &song, const QString &uri, const QImage &image); private: diff --git a/src/widgets/osd_x11.cpp b/src/widgets/osd_x11.cpp index 9577e7909..e6f2f3ba9 100644 --- a/src/widgets/osd_x11.cpp +++ b/src/widgets/osd_x11.cpp @@ -23,6 +23,10 @@ #include #include +#ifdef HAVE_DBUS +# include +#endif + #include #include #include @@ -48,7 +52,6 @@ #include "osd.h" #ifdef HAVE_DBUS -# include "dbus/notification.h" QDBusArgument& operator<<(QDBusArgument& arg, const QImage& image) {