aboutsummaryrefslogtreecommitdiffstats
path: root/testing/asteroid-btsyncd/0001-batteryservice-use-systemsettings.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/asteroid-btsyncd/0001-batteryservice-use-systemsettings.patch')
-rw-r--r--testing/asteroid-btsyncd/0001-batteryservice-use-systemsettings.patch94
1 files changed, 0 insertions, 94 deletions
diff --git a/testing/asteroid-btsyncd/0001-batteryservice-use-systemsettings.patch b/testing/asteroid-btsyncd/0001-batteryservice-use-systemsettings.patch
deleted file mode 100644
index 0119e5814ca..00000000000
--- a/testing/asteroid-btsyncd/0001-batteryservice-use-systemsettings.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 5371d8b9de845407769217082729a52af1ee9242 Mon Sep 17 00:00:00 2001
-From: MagneFire <IDaNLContact@gmail.com>
-Date: Mon, 5 Apr 2021 15:03:42 +0200
-Subject: [PATCH] BatteryService: Use systemsettings for battery information.
-
----
- asteroid-btsyncd.pro | 2 +-
- batteryservice.cpp | 17 +++++++++--------
- batteryservice.h | 6 +++---
- 3 files changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/asteroid-btsyncd.pro b/asteroid-btsyncd.pro
-index 2c2eac4..4852f21 100644
---- a/asteroid-btsyncd.pro
-+++ b/asteroid-btsyncd.pro
-@@ -2,7 +2,7 @@ TEMPLATE = app
- QT -= gui
- QT += dbus
- CONFIG += link_pkgconfig c++11
--PKGCONFIG += giomm-2.4 mpris-qt5 contextkit-statefs timed-qt5
-+PKGCONFIG += giomm-2.4 mpris-qt5 systemsettings timed-qt5
-
- HEADERS += \
- notificationservice.h \
-diff --git a/batteryservice.cpp b/batteryservice.cpp
-index d8da7ef..04f3ef6 100644
---- a/batteryservice.cpp
-+++ b/batteryservice.cpp
-@@ -15,7 +15,7 @@
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
--#include <contextproperty.h>
-+#include <batterystatus.h>
-
- #include <QTimer>
- #include <QDBusMessage>
-@@ -27,19 +27,20 @@
-
- BatteryLvlChrc::BatteryLvlChrc(QDBusConnection bus, int index, Service *service) : Characteristic(bus, index, BATTERY_LVL_UUID, {"encrypt-authenticated-read", "notify"}, service)
- {
-- m_battery = new ContextProperty("Battery.ChargePercentage", this);
-- connect(m_battery, SIGNAL(valueChanged()), this, SLOT(onBatteryPercentageChanged()));
-+ m_battery = new BatteryStatus(this);
-+ connect(m_battery, &BatteryStatus::chargePercentageChanged,
-+ this, &BatteryLvlChrc::onBatteryPercentageChanged);
- connect(this, SIGNAL(valueChanged()), this, SLOT(emitPropertiesChanged()));
- m_value = QByteArray(1, 100);
-- QTimer::singleShot(0, this, SLOT(onBatteryPercentageChanged()));
- }
-
--void BatteryLvlChrc::onBatteryPercentageChanged()
-+void BatteryLvlChrc::onBatteryPercentageChanged(int percentage)
- {
-- char val = m_battery->value().toUInt();
-- m_value = QByteArray(1, val);
-+ if (percentage >= 0) {
-+ m_value = QByteArray(1, percentage);
-
-- emit valueChanged();
-+ emit valueChanged();
-+ }
- }
-
- void BatteryLvlChrc::emitPropertiesChanged()
-diff --git a/batteryservice.h b/batteryservice.h
-index 8ff8154..9ced969 100644
---- a/batteryservice.h
-+++ b/batteryservice.h
-@@ -22,7 +22,7 @@
-
- #include "service.h"
-
--class ContextProperty;
-+class BatteryStatus;
-
- class BatteryLvlChrc : public Characteristic
- {
-@@ -42,13 +42,13 @@ public slots:
-
- private slots:
- void emitPropertiesChanged();
-- void onBatteryPercentageChanged();
-+ void onBatteryPercentageChanged(int percentage);
-
- signals:
- void valueChanged();
-
- private:
-- ContextProperty *m_battery;
-+ BatteryStatus *m_battery;
- QByteArray m_value;
-
- QByteArray getValue()