diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5e3f62fa2..5805f1417 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -610,43 +610,42 @@ optional_source(HAVE_VLC SOURCES engine/vlcengine.cpp HEADERS engine/vlcengine.h # DBUS and MPRIS - Unix specific if(UNIX AND HAVE_DBUS) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) optional_source(HAVE_DBUS SOURCES core/mpris2.cpp HEADERS core/mpris2.h) optional_source(HAVE_UDISKS2 SOURCES device/udisks2lister.cpp HEADERS device/udisks2lister.h) # MPRIS 2.0 DBUS interfaces - qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Player.xml core/mpris2.h mpris::Mpris2 core/mpris2_player Mpris2Player) - qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.xml core/mpris2.h mpris::Mpris2 core/mpris2_root Mpris2Root) - qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.TrackList.xml core/mpris2.h mpris::Mpris2 core/mpris2_tracklist Mpris2TrackList) + qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Player.xml core/mpris2.h mpris::Mpris2 mpris2_player Mpris2Player) + qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.xml core/mpris2.h mpris::Mpris2 mpris2_root Mpris2Root) + qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.TrackList.xml core/mpris2.h mpris::Mpris2 mpris2_tracklist Mpris2TrackList) # MPRIS 2.1 DBUS interfaces - qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Playlists.xml core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists) + qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Playlists.xml core/mpris2.h mpris::Mpris2 mpris2_playlists Mpris2Playlists) # org.freedesktop.Notifications DBUS interface - qt_add_dbus_interface(SOURCES dbus/org.freedesktop.Notifications.xml dbus/notification) + qt_add_dbus_interface(SOURCES dbus/org.freedesktop.Notifications.xml notification) # org.gnome.SettingsDaemon interface - qt_add_dbus_interface(SOURCES dbus/org.gnome.SettingsDaemon.MediaKeys.xml dbus/gnomesettingsdaemon) + qt_add_dbus_interface(SOURCES dbus/org.gnome.SettingsDaemon.MediaKeys.xml gnomesettingsdaemon) # org.mate.SettingsDaemon interface - qt_add_dbus_interface(SOURCES dbus/org.mate.SettingsDaemon.MediaKeys.xml dbus/matesettingsdaemon) + qt_add_dbus_interface(SOURCES dbus/org.mate.SettingsDaemon.MediaKeys.xml matesettingsdaemon) # org.kde.KGlobalAccel interface - qt_add_dbus_interface(SOURCES dbus/org.kde.KGlobalAccel.xml dbus/kglobalaccel) - qt_add_dbus_interface(SOURCES dbus/org.kde.KGlobalAccel.Component.xml dbus/kglobalaccelcomponent) + qt_add_dbus_interface(SOURCES dbus/org.kde.KGlobalAccel.xml kglobalaccel) + qt_add_dbus_interface(SOURCES dbus/org.kde.KGlobalAccel.Component.xml kglobalaccelcomponent) if(HAVE_UDISKS2) - set_source_files_properties(dbus/org.freedesktop.DBus.ObjectManager.xml PROPERTIES NO_NAMESPACE dbus/objectmanager INCLUDE dbus/metatypes.h) - set_source_files_properties(dbus/org.freedesktop.UDisks2.Filesystem.xml PROPERTIES NO_NAMESPACE dbus/udisks2filesystem INCLUDE dbus/metatypes.h) - set_source_files_properties(dbus/org.freedesktop.UDisks2.Block.xml PROPERTIES NO_NAMESPACE dbus/udisks2block INCLUDE dbus/metatypes.h) - set_source_files_properties(dbus/org.freedesktop.UDisks2.Drive.xml PROPERTIES NO_NAMESPACE dbus/udisks2drive INCLUDE dbus/metatypes.h) - set_source_files_properties(dbus/org.freedesktop.UDisks2.Job.xml PROPERTIES NO_NAMESPACE dbus/udisks2job INCLUDE dbus/metatypes.h) - qt_add_dbus_interface(SOURCES dbus/org.freedesktop.DBus.ObjectManager.xml dbus/objectmanager) - qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Filesystem.xml dbus/udisks2filesystem) - qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Block.xml dbus/udisks2block) - qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Drive.xml dbus/udisks2drive) - qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Job.xml dbus/udisks2job) + set_source_files_properties(dbus/org.freedesktop.DBus.ObjectManager.xml PROPERTIES NO_NAMESPACE objectmanager INCLUDE dbus/metatypes.h) + set_source_files_properties(dbus/org.freedesktop.UDisks2.Filesystem.xml PROPERTIES NO_NAMESPACE udisks2filesystem INCLUDE dbus/metatypes.h) + set_source_files_properties(dbus/org.freedesktop.UDisks2.Block.xml PROPERTIES NO_NAMESPACE udisks2block INCLUDE dbus/metatypes.h) + set_source_files_properties(dbus/org.freedesktop.UDisks2.Drive.xml PROPERTIES NO_NAMESPACE udisks2drive INCLUDE dbus/metatypes.h) + set_source_files_properties(dbus/org.freedesktop.UDisks2.Job.xml PROPERTIES NO_NAMESPACE udisks2job INCLUDE dbus/metatypes.h) + qt_add_dbus_interface(SOURCES dbus/org.freedesktop.DBus.ObjectManager.xml objectmanager) + qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Filesystem.xml udisks2filesystem) + qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Block.xml udisks2block) + qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Drive.xml udisks2drive) + qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Job.xml udisks2job) endif(HAVE_UDISKS2) endif(UNIX AND HAVE_DBUS) diff --git a/src/core/mpris2.cpp b/src/core/mpris2.cpp index 8e78e0af9..22efe0a48 100644 --- a/src/core/mpris2.cpp +++ b/src/core/mpris2.cpp @@ -57,10 +57,10 @@ #include "covermanager/currentalbumcoverloader.h" #include "covermanager/albumcoverloaderresult.h" -#include -#include -#include -#include +#include "mpris2_player.h" +#include "mpris2_playlists.h" +#include "mpris2_root.h" +#include "mpris2_tracklist.h" QDBusArgument &operator<<(QDBusArgument &arg, const MprisPlaylist &playlist) { arg.beginStructure(); diff --git a/src/device/udisks2lister.cpp b/src/device/udisks2lister.cpp index cc23684fe..d1ab2e537 100644 --- a/src/device/udisks2lister.cpp +++ b/src/device/udisks2lister.cpp @@ -24,12 +24,6 @@ #include #include -#include -#include -#include -#include -#include - #include #include #include @@ -52,6 +46,12 @@ #include "udisks2lister.h" +#include "objectmanager.h" +#include "udisks2block.h" +#include "udisks2drive.h" +#include "udisks2filesystem.h" +#include "udisks2job.h" + Udisks2Lister::Udisks2Lister(QObject *parent) : DeviceLister(parent) {} Udisks2Lister::~Udisks2Lister() = default; diff --git a/src/globalshortcuts/globalshortcutsbackend-gnome.cpp b/src/globalshortcuts/globalshortcutsbackend-gnome.cpp index 6a7525e9c..dbe4821cf 100644 --- a/src/globalshortcuts/globalshortcutsbackend-gnome.cpp +++ b/src/globalshortcuts/globalshortcutsbackend-gnome.cpp @@ -21,8 +21,6 @@ #include "config.h" -#include - #include #include #include @@ -37,6 +35,8 @@ #include "globalshortcutsbackend.h" #include "globalshortcutsbackend-gnome.h" +#include "gnomesettingsdaemon.h" + const char *GlobalShortcutsBackendGnome::kService1 = "org.gnome.SettingsDaemon.MediaKeys"; const char *GlobalShortcutsBackendGnome::kService2 = "org.gnome.SettingsDaemon"; const char *GlobalShortcutsBackendGnome::kPath = "/org/gnome/SettingsDaemon/MediaKeys"; diff --git a/src/globalshortcuts/globalshortcutsbackend-kde.cpp b/src/globalshortcuts/globalshortcutsbackend-kde.cpp index 3a6b1d18f..f6003fc7c 100644 --- a/src/globalshortcuts/globalshortcutsbackend-kde.cpp +++ b/src/globalshortcuts/globalshortcutsbackend-kde.cpp @@ -17,9 +17,6 @@ * */ -#include -#include - #include #include #include @@ -38,6 +35,9 @@ #include "globalshortcutsbackend-kde.h" +#include "kglobalaccel.h" +#include "kglobalaccelcomponent.h" + const char *GlobalShortcutsBackendKDE::kKdeService = "org.kde.kglobalaccel"; const char *GlobalShortcutsBackendKDE::kKdePath = "/kglobalaccel"; diff --git a/src/globalshortcuts/globalshortcutsbackend-mate.cpp b/src/globalshortcuts/globalshortcutsbackend-mate.cpp index ded77936c..c4531b6a8 100644 --- a/src/globalshortcuts/globalshortcutsbackend-mate.cpp +++ b/src/globalshortcuts/globalshortcutsbackend-mate.cpp @@ -19,8 +19,6 @@ #include "config.h" -#include - #include #include #include @@ -35,6 +33,8 @@ #include "globalshortcutsbackend.h" #include "globalshortcutsbackend-mate.h" +#include "matesettingsdaemon.h" + const char *GlobalShortcutsBackendMate::kService1 = "org.mate.SettingsDaemon.MediaKeys"; const char *GlobalShortcutsBackendMate::kService2 = "org.mate.SettingsDaemon"; const char *GlobalShortcutsBackendMate::kPath = "/org/mate/SettingsDaemon/MediaKeys"; diff --git a/src/osd/osddbus.cpp b/src/osd/osddbus.cpp index 4b310304d..22dd2520c 100644 --- a/src/osd/osddbus.cpp +++ b/src/osd/osddbus.cpp @@ -23,8 +23,6 @@ #include -#include - #include #include #include @@ -45,6 +43,8 @@ #include "core/logging.h" #include "osddbus.h" +#include "notification.h" + QDBusArgument &operator<<(QDBusArgument &arg, const QImage &image) { if (image.isNull()) {