[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdenonbeta/kbatterymonitor/kbatterymonitor
From: Chris Howells <howells () kde ! org>
Date: 2004-10-31 21:00:57
Message-ID: 20041031210057.8DFC516C05 () office ! kde ! org
[Download RAW message or body]
CVS commit by howells:
fixup return info
A return.h 1.1 [GPL]
M +10 -9 kbatterymonitor.cpp 1.6
M +5 -7 kbatterymonitor.h 1.5
M +1 -2 kbatterymonitord.cpp 1.9
M +1 -6 monitor.h 1.6
--- kdenonbeta/kbatterymonitor/kbatterymonitor/kbatterymonitor.cpp #1.5:1.6
@@ -51,16 +51,17 @@ void KBatteryMonitor::setupPopupMenu()
}
-void KBatteryMonitor::setTimeRemaining(int time)
+void KBatteryMonitor::setBatteryStatus(batteryStatusStruct status)
{
- kdDebug() << "Time reamining is " << time << endl;
- mPreviousTimeRemaining = mTimeRemaining;
- mTimeRemaining = time;
-}
+ kdDebug() << "Time remaining is " << status.timeRemaining << endl;
+ kdDebug() << "Percentage remaining is " << status.percentageRemaining << endl;
+ kdDebug() << "Charging: " << (status.charging ? "true" : "false") << endl;
-void KBatteryMonitor::setPercentageRemaining(int percentage)
-{
- kdDebug() << "Percentage reamining is " << percentage << endl;
+ mPreviousTimeRemaining = mTimeRemaining;
mPreviousPercentageRemaining = mPercentageRemaining;
- mPercentageRemaining = percentage;
+ mPreviousCharging = mCharging;
+
+ mTimeRemaining = status.timeRemaining;
+ mPercentageRemaining = status.percentageRemaining;
+ mCharging = status.charging;
}
--- kdenonbeta/kbatterymonitor/kbatterymonitor/kbatterymonitor.h #1.4:1.5
@@ -23,4 +23,5 @@
#include <ksystemtray.h>
+#include "return.h"
class KPopupMenu;
@@ -35,11 +36,6 @@ class KBatteryMonitor : public KSystemTr
* remaining on the battery
*/
- void setTimeRemaining(int);
- /** Mutator called by the daemon to tell the UI how much percentage
- * is remaining in the battery
- */
- void setPercentageRemaining(int);
- /** Mutator called by the daemon to tell the UI whether the battery
- * is online or not
+ void setBatteryStatus(batteryStatusStruct);
+ /** Mutator called by the daemon to tell the UI information about the battery
*/
void setACOnline(bool);
@@ -70,4 +66,6 @@ class KBatteryMonitor : public KSystemTr
int mTimeRemaining;
int mPreviousTimeRemaining;
+ bool mCharging;
+ bool mPreviousCharging;
bool mACOnline;
bool mPreviousACOnline;
--- kdenonbeta/kbatterymonitor/kbatterymonitor/kbatterymonitord.cpp #1.8:1.9
@@ -147,6 +147,5 @@ void KBatteryMonitorD::slotTimer()
Monitor *monitor = mMonitors.first();
- //batteryMonitor->setTimeRemaining(monitor->timeRemaining());
- //batteryMonitor->setPercentageRemaining(monitor->percentageRemaining());
+ batteryMonitor->setBatteryStatus(monitor->batteryStatus());
batteryMonitor->setACOnline(monitor->ACOnline());
batteryMonitor->update();
--- kdenonbeta/kbatterymonitor/kbatterymonitor/monitor.h #1.5:1.6
@@ -23,10 +23,5 @@
#include <qobject.h>
-typedef struct
-{
- bool charging;
- int timeRemaining;
- int percentageRemaining;
-} batteryStatusStruct;
+#include "return.h"
class Monitor : public QObject
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic