From c4a0aea65da598ce3aa78a66d8585e37caa811bd Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 1 May 2021 16:16:34 +0900 Subject: Fixed FTBFS without tdehw lib. Signed-off-by: Michele Calgaro --- src/sources/batterysrc.cpp | 15 ++++++++++++--- src/sources/batterysrc.h | 3 +-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/sources/batterysrc.cpp b/src/sources/batterysrc.cpp index 7b9c763..32a2d77 100644 --- a/src/sources/batterysrc.cpp +++ b/src/sources/batterysrc.cpp @@ -22,12 +22,16 @@ #include #include +#ifdef __TDE_HAVE_TDEHWLIB +#include +#endif + BatterySrc::BatterySrc(TQWidget* inParent, TQString inUDI): LabelSource(inParent), mTrigger(this, 5000), mUDI(inUDI), mHardwareDevices(NULL){ - +#ifdef __TDE_HAVE_TDEHWLIB mHardwareDevices = TDEGlobal::hardwareDevices(); TDEGenericDevice* hwdevice = mHardwareDevices->findByUniqueID(inUDI); @@ -35,6 +39,9 @@ BatterySrc::BatterySrc(TQWidget* inParent, TQString inUDI): TDEBatteryDevice* bdevice = static_cast(hwdevice); mID = bdevice->friendlyName(); } +#else + mID = TQString::null; +#endif mName = mID; mDescription = i18n("This source displays the current state of charge of your battery."); } @@ -45,7 +52,7 @@ BatterySrc::~BatterySrc(){ std::listBatterySrc::createInstances(TQWidget* inParent){ std::list list; - +#ifdef __TDE_HAVE_TDEHWLIB TDEHardwareDevices* hardwareDevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList hwlist = hardwareDevices->listAllPhysicalDevices(); TDEGenericDevice *hwdevice; @@ -54,12 +61,13 @@ std::listBatterySrc::createInstances(TQWidget* inParent){ list.push_back(new BatterySrc(inParent, hwdevice->uniqueID())); } } - +#endif return list; } TQString BatterySrc::fetchValue() { TQString s = "n/a"; +#ifdef __TDE_HAVE_TDEHWLIB if (mHardwareDevices != NULL) { TDEGenericDevice* hwdevice = mHardwareDevices->findByUniqueID(mUDI); if (hwdevice->type() != TDEGenericDeviceType::Battery) { @@ -68,6 +76,7 @@ TQString BatterySrc::fetchValue() { TDEBatteryDevice* bdevice = static_cast(hwdevice); s = TQString::number(bdevice->chargePercent()) + " %"; } +#endif return s; } #include "batterysrc.moc" diff --git a/src/sources/batterysrc.h b/src/sources/batterysrc.h index 62c6828..a61883c 100644 --- a/src/sources/batterysrc.h +++ b/src/sources/batterysrc.h @@ -26,8 +26,7 @@ #include #include -#include - +class TDEHardwareDevices; /** * BatterySrc fetches the state of charge of the battery from HAL * @author Ken Werner -- cgit v1.2.1