From 0c4fd8a5e62976df287826ecbb842238e32b59c6 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Thu, 5 Apr 2018 17:38:30 +0100 Subject: [PATCH] Remove one more kdelibs4support Summary: Using the DBus API directly is done in both powerdevil and kscreen ATM. Leaving the time dataengine the odd one out. It's also not used on Linux where we use the more appropriate kernel signal, so linking a dead library is extra pointless Test Plan: Tested compile by altering some #ifdefs Reviewers: #plasma Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D11966 --- dataengines/time/CMakeLists.txt | 1 - dataengines/time/timeengine.cpp | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dataengines/time/CMakeLists.txt b/dataengines/time/CMakeLists.txt index a9c6580f4..5d802fa24 100644 --- a/dataengines/time/CMakeLists.txt +++ b/dataengines/time/CMakeLists.txt @@ -14,7 +14,6 @@ target_link_libraries(plasma_engine_time KF5::Plasma KF5::I18n KF5::Service - KF5::KDELibs4Support ) kcoreaddons_desktop_to_json(plasma_engine_time plasma-dataengine-time.desktop) diff --git a/dataengines/time/timeengine.cpp b/dataengines/time/timeengine.cpp index 2b407faba..813ff1a5b 100644 --- a/dataengines/time/timeengine.cpp +++ b/dataengines/time/timeengine.cpp @@ -25,9 +25,6 @@ #include #include #include -#include - -#include #ifdef Q_OS_LINUX #include @@ -88,7 +85,12 @@ void TimeEngine::init() }); #else dbus.connect(QString(), "/org/kde/kcmshell_clock", "org.kde.kcmshell_clock", "clockUpdated", this, SLOT(clockSkewed())); - connect( Solid::PowerManagement::notifier(), SIGNAL(resumingFromSuspend()), this , SLOT(clockSkewed()) ); + dbus.connect(QStringLiteral("org.kde.Solid.PowerManagement"), + QStringLiteral("/org/kde/Solid/PowerManagement/Actions/SuspendSession"), + QStringLiteral("org.kde.Solid.PowerManagement.Actions.SuspendSession"), + QStringLiteral("resumingFromSuspend"), + this, + SLOT(clockSkewed())); #endif }