From 4ebe0dc4275f786af6ff97094d7990d4fc2fe83e Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Tue, 17 Feb 2015 14:36:07 +0100 Subject: [PATCH] Adjust powermanagement dataengine to API change in PowerDevil REVIEW: 122603 --- .../powermanagement/powermanagementengine.cpp | 16 ++++++++-------- .../powermanagement/powermanagementjob.cpp | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dataengines/powermanagement/powermanagementengine.cpp b/dataengines/powermanagement/powermanagementengine.cpp index 9828ace86..aecf61fd4 100644 --- a/dataengines/powermanagement/powermanagementengine.cpp +++ b/dataengines/powermanagement/powermanagementengine.cpp @@ -72,7 +72,7 @@ void PowermanagementEngine::init() if (!QDBusConnection::sessionBus().connect(SOLID_POWERMANAGEMENT_SERVICE, QStringLiteral("/org/kde/Solid/PowerManagement/Actions/BrightnessControl"), QStringLiteral("org.kde.Solid.PowerManagement.Actions.BrightnessControl"), - QStringLiteral("brightnessValueChanged"), this, + QStringLiteral("brightnessChanged"), this, SLOT(screenBrightnessChanged(int)))) { qDebug() << "error connecting to Brightness changes via dbus"; } @@ -80,7 +80,7 @@ void PowermanagementEngine::init() if (!QDBusConnection::sessionBus().connect(SOLID_POWERMANAGEMENT_SERVICE, QStringLiteral("/org/kde/Solid/PowerManagement/Actions/BrightnessControl"), QStringLiteral("org.kde.Solid.PowerManagement.Actions.BrightnessControl"), - QStringLiteral("brightnessValueMaxChanged"), this, + QStringLiteral("brightnessMaxChanged"), this, SLOT(maximumScreenBrightnessChanged(int)))) { qDebug() << "error connecting to max brightness changes via dbus"; } @@ -88,7 +88,7 @@ void PowermanagementEngine::init() if (!QDBusConnection::sessionBus().connect(SOLID_POWERMANAGEMENT_SERVICE, QStringLiteral("/org/kde/Solid/PowerManagement/Actions/KeyboardBrightnessControl"), QStringLiteral("org.kde.Solid.PowerManagement.Actions.KeyboardBrightnessControl"), - QStringLiteral("keyboardBrightnessValueChanged"), this, + QStringLiteral("keyboardBrightnessChanged"), this, SLOT(keyboardBrightnessChanged(int)))) { qDebug() << "error connecting to Keyboard Brightness changes via dbus"; } @@ -96,7 +96,7 @@ void PowermanagementEngine::init() if (!QDBusConnection::sessionBus().connect(SOLID_POWERMANAGEMENT_SERVICE, QStringLiteral("/org/kde/Solid/PowerManagement/Actions/KeyboardBrightnessControl"), QStringLiteral("org.kde.Solid.PowerManagement.Actions.KeyboardBrightnessControl"), - QStringLiteral("keyboardBrightnessValueMaxChanged"), this, + QStringLiteral("keyboardBrightnessMaxChanged"), this, SLOT(maximumKeyboardBrightnessChanged(int)))) { qDebug() << "error connecting to max keyboard Brightness changes via dbus"; } @@ -219,7 +219,7 @@ bool PowermanagementEngine::sourceRequestEvent(const QString &name) QDBusMessage screenMsg = QDBusMessage::createMethodCall(SOLID_POWERMANAGEMENT_SERVICE, QStringLiteral("/org/kde/Solid/PowerManagement/Actions/BrightnessControl"), QStringLiteral("org.kde.Solid.PowerManagement.Actions.BrightnessControl"), - QStringLiteral("brightnessValue")); + QStringLiteral("brightness")); QDBusPendingReply screenReply = QDBusConnection::sessionBus().asyncCall(screenMsg); QDBusPendingCallWatcher *screenWatcher = new QDBusPendingCallWatcher(screenReply, this); QObject::connect(screenWatcher, &QDBusPendingCallWatcher::finished, this, [this](QDBusPendingCallWatcher *watcher) { @@ -233,7 +233,7 @@ bool PowermanagementEngine::sourceRequestEvent(const QString &name) QDBusMessage maxScreenMsg = QDBusMessage::createMethodCall(SOLID_POWERMANAGEMENT_SERVICE, QStringLiteral("/org/kde/Solid/PowerManagement/Actions/BrightnessControl"), QStringLiteral("org.kde.Solid.PowerManagement.Actions.BrightnessControl"), - QStringLiteral("brightnessValueMax")); + QStringLiteral("brightnessMax")); QDBusPendingReply maxScreenReply = QDBusConnection::sessionBus().asyncCall(maxScreenMsg); QDBusPendingCallWatcher *maxScreenWatcher = new QDBusPendingCallWatcher(maxScreenReply, this); QObject::connect(maxScreenWatcher, &QDBusPendingCallWatcher::finished, this, [this](QDBusPendingCallWatcher *watcher) { @@ -247,7 +247,7 @@ bool PowermanagementEngine::sourceRequestEvent(const QString &name) QDBusMessage keyboardMsg = QDBusMessage::createMethodCall(SOLID_POWERMANAGEMENT_SERVICE, QStringLiteral("/org/kde/Solid/PowerManagement/Actions/KeyboardBrightnessControl"), QStringLiteral("org.kde.Solid.PowerManagement.Actions.KeyboardBrightnessControl"), - QStringLiteral("keyboardBrightnessValue")); + QStringLiteral("keyboardBrightness")); QDBusPendingReply keyboardReply = QDBusConnection::sessionBus().asyncCall(keyboardMsg); QDBusPendingCallWatcher *keyboardWatcher = new QDBusPendingCallWatcher(keyboardReply, this); QObject::connect(keyboardWatcher, &QDBusPendingCallWatcher::finished, this, [this](QDBusPendingCallWatcher *watcher) { @@ -261,7 +261,7 @@ bool PowermanagementEngine::sourceRequestEvent(const QString &name) QDBusMessage maxKeyboardMsg = QDBusMessage::createMethodCall(SOLID_POWERMANAGEMENT_SERVICE, QStringLiteral("/org/kde/Solid/PowerManagement/Actions/KeyboardBrightnessControl"), QStringLiteral("org.kde.Solid.PowerManagement.Actions.KeyboardBrightnessControl"), - QStringLiteral("keyboardBrightnessValueMax")); + QStringLiteral("keyboardBrightnessMax")); QDBusPendingReply maxKeyboardReply = QDBusConnection::sessionBus().asyncCall(maxKeyboardMsg); QDBusPendingCallWatcher *maxKeyboardWatcher = new QDBusPendingCallWatcher(maxKeyboardReply, this); QObject::connect(maxKeyboardWatcher, &QDBusPendingCallWatcher::finished, this, [this](QDBusPendingCallWatcher *watcher) { diff --git a/dataengines/powermanagement/powermanagementjob.cpp b/dataengines/powermanagement/powermanagementjob.cpp index 633d8326d..3b1867ee7 100644 --- a/dataengines/powermanagement/powermanagementjob.cpp +++ b/dataengines/powermanagement/powermanagementjob.cpp @@ -110,7 +110,7 @@ void PowerManagementJob::setScreenBrightness(int value, bool silent) QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement/Actions/BrightnessControl", "org.kde.Solid.PowerManagement.Actions.BrightnessControl", - silent ? "setBrightnessValueSilent" : "setBrightnessValue"); + silent ? "setBrightnessSilent" : "setBrightness"); msg << value; QDBusConnection::sessionBus().asyncCall(msg); } @@ -120,7 +120,7 @@ void PowerManagementJob::setKeyboardBrightness(int value, bool silent) QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement/Actions/KeyboardBrightnessControl", "org.kde.Solid.PowerManagement.Actions.KeyboardBrightnessControl", - silent ? "setKeyboardBrightnessValueSilent" : "setKeyboardBrightnessValue"); + silent ? "setKeyboardBrightnessSilent" : "setKeyboardBrightness"); msg << value; QDBusConnection::sessionBus().asyncCall(msg); }