diff -r 3916af29624a -r 7dd137878ff8 homescreenapp/examples/batterywidgetplugin/src/batterywidget.cpp --- a/homescreenapp/examples/batterywidgetplugin/src/batterywidget.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/examples/batterywidgetplugin/src/batterywidget.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -15,10 +15,6 @@ * */ - -//#define OWN_TESTING - - #include #include #include @@ -246,19 +242,13 @@ mChargingTimer->stop(); mChargingTimer->disconnect(this); connect(mDeviceInfo, SIGNAL(powerStateChanged(QSystemDeviceInfo::PowerState)), SLOT(powerStateChanged(QSystemDeviceInfo::PowerState))); -#ifdef OWN_TESTING - connect(mChargingTimer, SIGNAL(timeout()), this, SLOT(updateChargingBatteryValue())); - mChargingTimer->start(1000); -#else if (mDeviceInfo->currentPowerState() == QSystemDeviceInfo::WallPowerChargingBattery) { connect(mChargingTimer, SIGNAL(timeout()), this, SLOT(updateChargingBatteryValue())); mChargingTimer->start(500); } else { - connect(mDeviceInfo, SIGNAL(batteryStatusChanged(QSystemDeviceInfo::BatteryStatus)), SLOT(batteryStatusChanged(QSystemDeviceInfo::BatteryStatus))); connect(mDeviceInfo, SIGNAL(batteryLevelChanged(int)), SLOT(batteryLevelChanged(int))); mBatteryValue = mDeviceInfo->batteryLevel(); } -#endif drawBatteryImage(); update(); }