diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt index 91a8c9547..81b616362 100644 --- a/interfaces/CMakeLists.txt +++ b/interfaces/CMakeLists.txt @@ -1,16 +1,34 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdeconnect-interfaces\") -function(geninterface source_h output_h) - set(xml_file ${CMAKE_CURRENT_BINARY_DIR}/generated/${output_h}.xml) - qt_generate_dbus_interface( ${source_h} ${xml_file}) +# geninterface generates a Qt class that is an interface to DBus +# source_file can a DBus XML definition or QObject class header that is exposed through DBus +# output_basename is the path and filename that will be generated (.h and .cpp will be appended to this) +# The new targets are appended to the ${interfaces_SRC} variable in the parent scope. +function(geninterface source_file output_basename) + if(${source_file} MATCHES ".*\.xml$") + set(xml_file ${source_file}) + else() + set(xml_file ${CMAKE_CURRENT_BINARY_DIR}/${output_basename}.xml) + qt_generate_dbus_interface(${source_file} ${xml_file}) + endif() + # Fixes "redefinition of 'MediaPlayer2' as different kind of symbol" set_source_files_properties(${xml_file} PROPERTIES NO_NAMESPACE true) - qt_add_dbus_interface(libkdeconnect_SRC ${xml_file} generated/${output_h}) - set(libkdeconnect_SRC ${libkdeconnect_SRC} PARENT_SCOPE) + qt_add_dbus_interface(generated_sources ${xml_file} ${output_basename}) + + # Hack to append clazy:skip to generated files + set(fake_file ${output_basename}_replaced) + add_custom_command(OUTPUT ${fake_file} + COMMAND ${CMAKE_COMMAND} -E echo "// clazy:skip" >> ${output_basename}.h + COMMAND ${CMAKE_COMMAND} -E touch ${fake_file} + DEPENDS ${output_basename}.h + ) + + set(interfaces_SRC ${interfaces_SRC} ${generated_sources} ${fake_file} PARENT_SCOPE) endfunction() -set(libkdeconnect_SRC +set(interfaces_SRC dbusinterfaces.cpp devicesmodel.cpp notificationsmodel.cpp @@ -23,36 +41,44 @@ set(libkdeconnect_SRC commandsmodel.cpp ) -geninterface(${PROJECT_SOURCE_DIR}/core/daemon.h daemoninterface) -geninterface(${PROJECT_SOURCE_DIR}/core/device.h deviceinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/battery/batteryplugin.h batteryinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/connectivity-report/connectivity_reportplugin.h connectivityinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/sftp/sftpplugin.h devicesftpinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/notifications/notificationsplugin.h devicenotificationsinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/findmyphone/findmyphoneplugin.h devicefindmyphoneinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/notifications/notification.h notificationinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/mprisremote/mprisremoteplugin.h mprisremoteinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/remotecontrol/remotecontrolplugin.h remotecontrolinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/lockdevice/lockdeviceplugin.h lockdeviceinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/remotecommands/remotecommandsplugin.h remotecommandsinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/remotekeyboard/remotekeyboardplugin.h remotekeyboardinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/sms/smsplugin.h smsinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/sms/conversationsdbusinterface.h conversationsinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/share/shareplugin.h shareinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/remotesystemvolume/remotesystemvolumeplugin.h remotesystemvolumeinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/bigscreen/bigscreenplugin.h bigscreeninterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/virtualmonitor/virtualmonitorplugin.h virtualmonitorinterface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/photo/photoplugin.h photointerface) -geninterface(${PROJECT_SOURCE_DIR}/plugins/clipboard/clipboardplugin.h deviceclipboardinterface) +# KDE Connect interfaces +geninterface(${PROJECT_SOURCE_DIR}/core/daemon.h generated/daemoninterface) +geninterface(${PROJECT_SOURCE_DIR}/core/device.h generated/deviceinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/battery/batteryplugin.h generated/batteryinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/connectivity-report/connectivity_reportplugin.h generated/connectivityinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/sftp/sftpplugin.h generated/devicesftpinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/notifications/notificationsplugin.h generated/devicenotificationsinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/findmyphone/findmyphoneplugin.h generated/devicefindmyphoneinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/notifications/notification.h generated/notificationinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/mprisremote/mprisremoteplugin.h generated/mprisremoteinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/remotecontrol/remotecontrolplugin.h generated/remotecontrolinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/lockdevice/lockdeviceplugin.h generated/lockdeviceinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/remotecommands/remotecommandsplugin.h generated/remotecommandsinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/remotekeyboard/remotekeyboardplugin.h generated/remotekeyboardinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/sms/smsplugin.h generated/smsinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/sms/conversationsdbusinterface.h generated/conversationsinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/share/shareplugin.h generated/shareinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/remotesystemvolume/remotesystemvolumeplugin.h generated/remotesystemvolumeinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/bigscreen/bigscreenplugin.h generated/bigscreeninterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/virtualmonitor/virtualmonitorplugin.h generated/virtualmonitorinterface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/photo/photoplugin.h generated/photointerface) +geninterface(${PROJECT_SOURCE_DIR}/plugins/clipboard/clipboardplugin.h generated/deviceclipboardinterface) -if ("${QT_MAJOR_VERSION}" STREQUAL "6") - add_library(kdeconnectinterfaces STATIC) - set_property(TARGET kdeconnectinterfaces PROPERTY POSITION_INDEPENDENT_CODE ON) -else() - add_library(kdeconnectinterfaces) +# System dbus interfaces +if (UNIX AND NOT APPLE) + geninterface(systeminterfaces/org.freedesktop.login1.xml generated/systeminterfaces/login1) + geninterface(systeminterfaces/org.freedesktop.ScreenSaver.xml generated/systeminterfaces/screensaver) + geninterface(systeminterfaces/org.freedesktop.DBus.Properties.xml generated/systeminterfaces/dbusproperties) + geninterface(systeminterfaces/org.mpris.MediaPlayer2.Player.xml generated/systeminterfaces/mprisplayer) + geninterface(systeminterfaces/org.mpris.MediaPlayer2.xml generated/systeminterfaces/mprisroot) + geninterface(systeminterfaces/org.freedesktop.portal.RemoteDesktop.xml generated/systeminterfaces/remotedesktop) endif() -target_sources(kdeconnectinterfaces PRIVATE ${libkdeconnect_SRC}) +add_library(kdeconnectinterfaces STATIC) +set_property(TARGET kdeconnectinterfaces PROPERTY POSITION_INDEPENDENT_CODE ON) + +target_sources(kdeconnectinterfaces PRIVATE ${interfaces_SRC}) + ecm_qt_declare_logging_category(kdeconnectinterfaces HEADER interfaces_conversation_message_debug.h IDENTIFIER CONVERSATION_MESSAGE_LOGGING_CATEGORY CATEGORY_NAME kdeconnect.interfaces.conversationmessage @@ -71,10 +97,6 @@ set_target_properties(kdeconnectinterfaces PROPERTIES SOVERSION ${KDECONNECT_VERSION_MAJOR} ) -# pretend the dbus generated headers are from the system so that clazy and other similar -# tools do not show warnings about their contents -target_include_directories(kdeconnectinterfaces SYSTEM PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/generated) - generate_export_header(kdeconnectinterfaces EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kdeconnectinterfaces_export.h BASE_NAME KDEConnectInterfaces) target_link_libraries(kdeconnectinterfaces diff --git a/interfaces/dbusinterfaces.h b/interfaces/dbusinterfaces.h index fd6c2f735..aea561dec 100644 --- a/interfaces/dbusinterfaces.h +++ b/interfaces/dbusinterfaces.h @@ -9,27 +9,27 @@ #include "kdeconnectinterfaces_export.h" -#include "batteryinterface.h" -#include "bigscreeninterface.h" -#include "connectivityinterface.h" -#include "conversationsinterface.h" -#include "daemoninterface.h" -#include "deviceclipboardinterface.h" -#include "devicefindmyphoneinterface.h" -#include "deviceinterface.h" -#include "devicenotificationsinterface.h" -#include "devicesftpinterface.h" -#include "lockdeviceinterface.h" -#include "mprisremoteinterface.h" -#include "notificationinterface.h" -#include "photointerface.h" -#include "remotecommandsinterface.h" -#include "remotecontrolinterface.h" -#include "remotekeyboardinterface.h" -#include "remotesystemvolumeinterface.h" -#include "shareinterface.h" -#include "smsinterface.h" -#include "virtualmonitorinterface.h" +#include "generated/batteryinterface.h" +#include "generated/bigscreeninterface.h" +#include "generated/connectivityinterface.h" +#include "generated/conversationsinterface.h" +#include "generated/daemoninterface.h" +#include "generated/deviceclipboardinterface.h" +#include "generated/devicefindmyphoneinterface.h" +#include "generated/deviceinterface.h" +#include "generated/devicenotificationsinterface.h" +#include "generated/devicesftpinterface.h" +#include "generated/lockdeviceinterface.h" +#include "generated/mprisremoteinterface.h" +#include "generated/notificationinterface.h" +#include "generated/photointerface.h" +#include "generated/remotecommandsinterface.h" +#include "generated/remotecontrolinterface.h" +#include "generated/remotekeyboardinterface.h" +#include "generated/remotesystemvolumeinterface.h" +#include "generated/shareinterface.h" +#include "generated/smsinterface.h" +#include "generated/virtualmonitorinterface.h" /** * Using these "proxy" classes just in case we need to rename the diff --git a/plugins/lockdevice/org.freedesktop.DBus.Properties.xml b/interfaces/systeminterfaces/org.freedesktop.DBus.Properties.xml similarity index 100% rename from plugins/lockdevice/org.freedesktop.DBus.Properties.xml rename to interfaces/systeminterfaces/org.freedesktop.DBus.Properties.xml diff --git a/plugins/screensaver-inhibit/org.freedesktop.ScreenSaver.xml b/interfaces/systeminterfaces/org.freedesktop.ScreenSaver.xml similarity index 52% rename from plugins/screensaver-inhibit/org.freedesktop.ScreenSaver.xml rename to interfaces/systeminterfaces/org.freedesktop.ScreenSaver.xml index 50d0fd660..68f4a42ae 100644 --- a/plugins/screensaver-inhibit/org.freedesktop.ScreenSaver.xml +++ b/interfaces/systeminterfaces/org.freedesktop.ScreenSaver.xml @@ -42,39 +42,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/lockdevice/org.freedesktop.login1.xml b/interfaces/systeminterfaces/org.freedesktop.login1.xml similarity index 100% rename from plugins/lockdevice/org.freedesktop.login1.xml rename to interfaces/systeminterfaces/org.freedesktop.login1.xml diff --git a/plugins/mousepad/xdp_dbus_remotedesktop_interface.xml b/interfaces/systeminterfaces/org.freedesktop.portal.RemoteDesktop.xml similarity index 100% rename from plugins/mousepad/xdp_dbus_remotedesktop_interface.xml rename to interfaces/systeminterfaces/org.freedesktop.portal.RemoteDesktop.xml diff --git a/plugins/mpriscontrol/org.mpris.MediaPlayer2.Player.xml b/interfaces/systeminterfaces/org.mpris.MediaPlayer2.Player.xml similarity index 99% rename from plugins/mpriscontrol/org.mpris.MediaPlayer2.Player.xml rename to interfaces/systeminterfaces/org.mpris.MediaPlayer2.Player.xml index 5f9d0d1d1..8b094bd1c 100644 --- a/plugins/mpriscontrol/org.mpris.MediaPlayer2.Player.xml +++ b/interfaces/systeminterfaces/org.mpris.MediaPlayer2.Player.xml @@ -105,4 +105,3 @@ - diff --git a/plugins/mpriscontrol/org.mpris.MediaPlayer2.xml b/interfaces/systeminterfaces/org.mpris.MediaPlayer2.xml similarity index 97% rename from plugins/mpriscontrol/org.mpris.MediaPlayer2.xml rename to interfaces/systeminterfaces/org.mpris.MediaPlayer2.xml index bd9df3ea3..9d16cc167 100644 --- a/plugins/mpriscontrol/org.mpris.MediaPlayer2.xml +++ b/interfaces/systeminterfaces/org.mpris.MediaPlayer2.xml @@ -38,4 +38,3 @@ - diff --git a/plugins/bigscreen/CMakeLists.txt b/plugins/bigscreen/CMakeLists.txt index 982cb6537..79a0cb01d 100644 --- a/plugins/bigscreen/CMakeLists.txt +++ b/plugins/bigscreen/CMakeLists.txt @@ -4,4 +4,8 @@ set(kdeconnect_bigscreen_SRCS kdeconnect_add_plugin(kdeconnect_bigscreen SOURCES ${kdeconnect_bigscreen_SRCS}) -target_link_libraries(kdeconnect_bigscreen kdeconnectcore Qt${QT_MAJOR_VERSION}::DBus KF${QT_MAJOR_VERSION}::I18n) +target_link_libraries(kdeconnect_bigscreen + kdeconnectcore + kdeconnectinterfaces + Qt${QT_MAJOR_VERSION}::DBus + KF${QT_MAJOR_VERSION}::I18n) diff --git a/plugins/lockdevice/CMakeLists.txt b/plugins/lockdevice/CMakeLists.txt index b64e1582a..31cc51d63 100644 --- a/plugins/lockdevice/CMakeLists.txt +++ b/plugins/lockdevice/CMakeLists.txt @@ -1,6 +1,3 @@ -qt_add_dbus_interface(lockdevice_SRCS org.freedesktop.login1.xml login1dbusinterface) -qt_add_dbus_interface(lockdevice_SRCS org.freedesktop.DBus.Properties.xml propertiesdbusinterface) - if (WIN32) list(APPEND lockdevice_SRCS lockdeviceplugin-win.cpp) else () @@ -14,8 +11,10 @@ ecm_qt_declare_logging_category(kdeconnect_lockdevice IDENTIFIER KDECONNECT_PLUGIN_LOCKREMOTE CATEGORY_NAME kdeconnect.plugin.lock DEFAULT_SEVERITY Warning EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin lockremote)") + target_link_libraries(kdeconnect_lockdevice kdeconnectcore + kdeconnectinterfaces Qt::DBus KF${QT_MAJOR_VERSION}::I18n ) diff --git a/plugins/lockdevice/lockdeviceplugin.h b/plugins/lockdevice/lockdeviceplugin.h index 39489b518..66c555444 100644 --- a/plugins/lockdevice/lockdeviceplugin.h +++ b/plugins/lockdevice/lockdeviceplugin.h @@ -10,8 +10,8 @@ #include -#include "login1dbusinterface.h" -#include "propertiesdbusinterface.h" +#include "generated/systeminterfaces/dbusproperties.h" +#include "generated/systeminterfaces/login1.h" #define PACKET_TYPE_LOCK QStringLiteral("kdeconnect.lock") #define PACKET_TYPE_LOCK_REQUEST QStringLiteral("kdeconnect.lock.request") diff --git a/plugins/lockdevice/org.freedesktop.ScreenSaver.xml b/plugins/lockdevice/org.freedesktop.ScreenSaver.xml deleted file mode 100644 index 5efd9433c..000000000 --- a/plugins/lockdevice/org.freedesktop.ScreenSaver.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/mousepad/CMakeLists.txt b/plugins/mousepad/CMakeLists.txt index 3a1cc4468..5d54052c9 100644 --- a/plugins/mousepad/CMakeLists.txt +++ b/plugins/mousepad/CMakeLists.txt @@ -1,12 +1,6 @@ kdeconnect_add_plugin(kdeconnect_mousepad SOURCES mousepadplugin.cpp abstractremoteinput.cpp) if(UNIX AND NOT APPLE) - qt_add_dbus_interface( - SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/xdp_dbus_remotedesktop_interface.xml - xdp_dbus_remotedesktop_interface - ) - target_sources(kdeconnect_mousepad PUBLIC waylandremoteinput.cpp ${SRCS}) target_sources(kdeconnect_mousepad PRIVATE ${wayland_SRCS}) @@ -32,7 +26,7 @@ endif() configure_file(config-mousepad.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-mousepad.h) -target_link_libraries(kdeconnect_mousepad kdeconnectcore Qt::Gui KF${QT_MAJOR_VERSION}::I18n) +target_link_libraries(kdeconnect_mousepad kdeconnectcore kdeconnectinterfaces Qt::Gui KF${QT_MAJOR_VERSION}::I18n) if (WIN32) target_sources(kdeconnect_mousepad PUBLIC windowsremoteinput.cpp) diff --git a/plugins/mousepad/waylandremoteinput.h b/plugins/mousepad/waylandremoteinput.h index 4605ade4e..4369407df 100644 --- a/plugins/mousepad/waylandremoteinput.h +++ b/plugins/mousepad/waylandremoteinput.h @@ -8,7 +8,7 @@ #pragma once #include "abstractremoteinput.h" -#include "xdp_dbus_remotedesktop_interface.h" +#include "generated/systeminterfaces/remotedesktop.h" #include class FakeInput; diff --git a/plugins/mpriscontrol/CMakeLists.txt b/plugins/mpriscontrol/CMakeLists.txt index 2a437d7c9..2a05d8077 100644 --- a/plugins/mpriscontrol/CMakeLists.txt +++ b/plugins/mpriscontrol/CMakeLists.txt @@ -6,18 +6,6 @@ else() set(kdeconnect_mpriscontrol_SRCS mpriscontrolplugin.cpp ) - -set_source_files_properties( - org.freedesktop.DBus.Properties.xml - org.mpris.MediaPlayer2.Player.xml - org.mpris.MediaPlayer2.xml - PROPERTIES - NO_NAMESPACE ON) - -qt_add_dbus_interface(kdeconnect_mpriscontrol_SRCS org.freedesktop.DBus.Properties.xml dbusproperties) -qt_add_dbus_interface(kdeconnect_mpriscontrol_SRCS org.mpris.MediaPlayer2.Player.xml mprisplayer) -qt_add_dbus_interface(kdeconnect_mpriscontrol_SRCS org.mpris.MediaPlayer2.xml mprisroot) - endif() kdeconnect_add_plugin(kdeconnect_mpriscontrol SOURCES ${kdeconnect_mpriscontrol_SRCS}) @@ -27,9 +15,10 @@ ecm_qt_declare_logging_category(kdeconnect_mpriscontrol IDENTIFIER KDECONNECT_PLUGIN_MPRIS CATEGORY_NAME kdeconnect.plugin.mpris DEFAULT_SEVERITY Warning EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin mpris)") + if(WIN32) target_link_libraries(kdeconnect_mpriscontrol kdeconnectcore windowsapp) target_compile_features(kdeconnect_mpriscontrol PUBLIC cxx_std_17) else() - target_link_libraries(kdeconnect_mpriscontrol Qt::DBus kdeconnectcore) + target_link_libraries(kdeconnect_mpriscontrol Qt::DBus kdeconnectcore kdeconnectinterfaces) endif() diff --git a/plugins/mpriscontrol/mpriscontrolplugin.cpp b/plugins/mpriscontrol/mpriscontrolplugin.cpp index 30853a82d..5a20ea14d 100644 --- a/plugins/mpriscontrol/mpriscontrolplugin.cpp +++ b/plugins/mpriscontrol/mpriscontrolplugin.cpp @@ -17,9 +17,9 @@ #include #include -#include "dbusproperties.h" -#include "mprisplayer.h" -#include "mprisroot.h" +#include "generated/systeminterfaces/dbusproperties.h" +#include "generated/systeminterfaces/mprisplayer.h" +#include "generated/systeminterfaces/mprisroot.h" #include "plugin_mpris_debug.h" K_PLUGIN_CLASS_WITH_JSON(MprisControlPlugin, "kdeconnect_mpriscontrol.json") diff --git a/plugins/mpriscontrol/org.freedesktop.DBus.Properties.xml b/plugins/mpriscontrol/org.freedesktop.DBus.Properties.xml deleted file mode 100644 index 3bbf8268d..000000000 --- a/plugins/mpriscontrol/org.freedesktop.DBus.Properties.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/pausemusic/CMakeLists.txt b/plugins/pausemusic/CMakeLists.txt index d8542ddc4..fe37f3843 100644 --- a/plugins/pausemusic/CMakeLists.txt +++ b/plugins/pausemusic/CMakeLists.txt @@ -8,8 +8,6 @@ else() ) endif() -qt_add_dbus_interface(kdeconnect_pausemusic_SRCS org.mpris.MediaPlayer2.Player.xml mprisplayer) - kdeconnect_add_plugin(kdeconnect_pausemusic SOURCES ${kdeconnect_pausemusic_SRCS}) ecm_qt_declare_logging_category(kdeconnect_pausemusic @@ -17,8 +15,10 @@ ecm_qt_declare_logging_category(kdeconnect_pausemusic IDENTIFIER KDECONNECT_PLUGIN_PAUSEMUSIC CATEGORY_NAME kdeconnect.plugin.pausemusic DEFAULT_SEVERITY Warning EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin pausemusic)") + target_link_libraries(kdeconnect_pausemusic kdeconnectcore + kdeconnectinterfaces Qt::Core Qt::DBus ) diff --git a/plugins/pausemusic/org.mpris.MediaPlayer2.Player.xml b/plugins/pausemusic/org.mpris.MediaPlayer2.Player.xml deleted file mode 100644 index 5f9d0d1d1..000000000 --- a/plugins/pausemusic/org.mpris.MediaPlayer2.Player.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/pausemusic/pausemusicplugin.cpp b/plugins/pausemusic/pausemusicplugin.cpp index 7ddae5a70..1e84a03d0 100644 --- a/plugins/pausemusic/pausemusicplugin.cpp +++ b/plugins/pausemusic/pausemusicplugin.cpp @@ -10,7 +10,7 @@ #include #include -#include "mprisplayer.h" +#include "generated/systeminterfaces/mprisplayer.h" #include #include "plugin_pausemusic_debug.h" diff --git a/plugins/screensaver-inhibit/CMakeLists.txt b/plugins/screensaver-inhibit/CMakeLists.txt index 418e5e7ac..2120575ee 100644 --- a/plugins/screensaver-inhibit/CMakeLists.txt +++ b/plugins/screensaver-inhibit/CMakeLists.txt @@ -10,7 +10,6 @@ else() set(kdeconnect_screensaver_inhibit_SRCS screensaverinhibitplugin.cpp ) - qt_add_dbus_interface(kdeconnect_screensaver_inhibit_SRCS org.freedesktop.ScreenSaver.xml screensaverinterface) endif() @@ -21,7 +20,8 @@ ecm_qt_declare_logging_category(kdeconnect_screensaver_inhibit IDENTIFIER KDECONNECT_PLUGIN_SCREENSAVERINHIBIT CATEGORY_NAME kdeconnect.plugin.screensaverinhibit DEFAULT_SEVERITY Warning EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin screensaverinhibit)") -target_link_libraries(kdeconnect_screensaver_inhibit kdeconnectcore) + +target_link_libraries(kdeconnect_screensaver_inhibit kdeconnectcore kdeconnectinterfaces) if(NOT APPLE AND NOT WIN32) target_link_libraries(kdeconnect_screensaver_inhibit Qt::DBus diff --git a/plugins/screensaver-inhibit/screensaverinhibitplugin.cpp b/plugins/screensaver-inhibit/screensaverinhibitplugin.cpp index 9dd3acf6d..e197040da 100644 --- a/plugins/screensaver-inhibit/screensaverinhibitplugin.cpp +++ b/plugins/screensaver-inhibit/screensaverinhibitplugin.cpp @@ -6,8 +6,8 @@ #include "screensaverinhibitplugin.h" +#include "generated/systeminterfaces/screensaver.h" #include "kdeconnect_screensaverinhibit_debug.h" -#include "screensaverinterface.h" #include #include #include