From d32bf74fefa0e48c37b2f247443b8436f6328f91 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Fri, 4 Jul 2014 08:50:22 +0200
Subject: [PATCH] Fix build on OSX (cherry picked from commit
 ce9e93cc701e6e220a3e9f001dadd823fc07ed66)

---
 .../devices/backends/iokit/iokitbattery.cpp      |  2 +-
 src/solid/devices/backends/iokit/iokitbattery.h  | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/solid/devices/backends/iokit/iokitbattery.cpp b/src/solid/devices/backends/iokit/iokitbattery.cpp
index 69c4e30..04646cc 100644
--- a/src/solid/devices/backends/iokit/iokitbattery.cpp
+++ b/src/solid/devices/backends/iokit/iokitbattery.cpp
@@ -37,7 +37,7 @@ Battery::~Battery()
 
 }
 
-bool Battery::isPlugged() const
+bool Battery::isPresent() const
 {
     return m_device->property(QLatin1String("ExternalConnected")).toBool();
 }
diff --git a/src/solid/devices/backends/iokit/iokitbattery.h b/src/solid/devices/backends/iokit/iokitbattery.h
index 0165a1a..ccf6b20 100644
--- a/src/solid/devices/backends/iokit/iokitbattery.h
+++ b/src/solid/devices/backends/iokit/iokitbattery.h
@@ -41,7 +41,7 @@ public:
     Battery(IOKitDevice *device);
     virtual ~Battery();
 
-    bool isPlugged() const;
+    bool isPresent() const;
     Solid::Battery::BatteryType type() const;
 
     int chargePercent() const;
@@ -53,10 +53,18 @@ public:
     Solid::Battery::ChargeState chargeState() const;
 
     // ### the ones below are TODO
+    qlonglong timeToEmpty() const { return 0; }
+    qlonglong timeToFull() const { return 0; }
     Solid::Battery::Technology technology() const { return Solid::Battery::UnknownTechnology; }
     double energy() const { return 0.0; }
     double energyRate() const { return 0.0; }
     double voltage() const { return 0.0; }
+    double temperature() const { return 0.0; }
+
+    bool isRecalled() const { return false; }
+    QString recallVendor() const { return QString(); }
+    QString recallUrl() const { return QString(); }
+    QString serial() const { return QString(); }
 
 Q_SIGNALS:
     void energyChanged(double energy, const QString &udi);
@@ -64,8 +72,12 @@ Q_SIGNALS:
     void chargePercentChanged(int value, const QString &udi);
     void capacityChanged(int value, const QString &udi);
     void chargeStateChanged(int newState, const QString &udi);
-    void plugStateChanged(bool newState, const QString &udi);
+    void presentStateChanged(bool newState, const QString &udi);
     void powerSupplyStateChanged(bool newState, const QString &udi);
+    void timeToEmptyChanged(qlonglong time, const QString &udi);
+    void timeToFullChanged(qlonglong time, const QString &udi);
+    void temperatureChanged(double temperature, const QString &udi);
+    void voltageChanged(double voltage, const QString &udi);
 };
 }
 }
-- 
GitLab