1 files changed, 20 insertions, 6 deletions
diff --git a/src/systeminfo/mac/qbatteryinfo_mac_p.h b/src/systeminfo/mac/qbatteryinfo_mac_p.h
index cdc783ea..ccab2a19 100644
--- a/src/systeminfo/mac/qbatteryinfo_mac_p.h
+++ b/src/systeminfo/mac/qbatteryinfo_mac_p.h
@@ -65,31 +65,43 @@ class QBatteryInfoPrivate : public QObject
 
 public:
     QBatteryInfoPrivate(QBatteryInfo *parent);
+    QBatteryInfoPrivate(int batteryIndex, QBatteryInfo *parent);
     ~QBatteryInfoPrivate();
 
     int batteryCount();
+    int batteryIndex() const;
     int currentFlow(int battery);
+    int currentFlow();
     int maximumCapacity(int battery);
+    int maximumCapacity();
     int remainingCapacity(int battery);
+    int remainingCapacity();
     int remainingChargingTime(int battery);
+    int remainingChargingTime();
     int voltage(int battery);
+    int voltage();
 
     QBatteryInfo::ChargerType chargerType();
     QBatteryInfo::ChargingState chargingState(int battery);
+    QBatteryInfo::ChargingState chargingState();
     QBatteryInfo::EnergyUnit energyUnit();
     QBatteryInfo::BatteryStatus batteryStatus(int battery);
+    QBatteryInfo::BatteryStatus batteryStatus();
     void getBatteryInfo();
     QBatteryInfo::ChargingState currentChargingState();
 
+    void setBatteryIndex(int batteryIndex);
+
 Q_SIGNALS:
     void batteryCountChanged(int count);
+    void batteryIndexChanged(int batteryIndex);
     void chargerTypeChanged(QBatteryInfo::ChargerType type);
-    void chargingStateChanged(int battery, QBatteryInfo::ChargingState state);
-    void currentFlowChanged(int battery, int flow);
-    void remainingCapacityChanged(int battery, int capacity);
-    void remainingChargingTimeChanged(int battery, int seconds);
-    void voltageChanged(int battery, int voltage);
-    void batteryStatusChanged(int battery, QBatteryInfo::BatteryStatus);
+    void chargingStateChanged(QBatteryInfo::ChargingState state);
+    void currentFlowChanged(int flow);
+    void remainingCapacityChanged(int capacity);
+    void remainingChargingTimeChanged(int seconds);
+    void voltageChanged(int voltage);
+    void batteryStatusChanged(QBatteryInfo::BatteryStatus);
 
 protected:
     void connectNotify(const QMetaMethod &signal);
@@ -117,6 +129,7 @@ private:
     int timeToFull;
     int remainingEnergy;
     int numberOfBatteries;
+    int index;
 
 //    int batteryCounts;
     QMap<int, int> currentFlows; // <battery ID, current value> pair
@@ -128,6 +141,7 @@ private:
     QBatteryInfo::ChargerType currentChargerType;
     QMap<int, QBatteryInfo::BatteryStatus> batteryStatuses;
 
+    void initialize();
 };
 
 QT_END_NAMESPACE