diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-05-09 14:24:50 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-05-09 14:24:50 +0200 |
| commit | dc16d7e588328888160b904d71213c26dea0ac0c (patch) | |
| tree | 0688fe249229c71d1393c35a77c770442290654c /src/sources | |
| parent | d7fce8ee6a5c227241788727096f7a3a54eb9e21 (diff) | |
| download | kima-dc16d7e588328888160b904d71213c26dea0ac0c.tar.gz kima-dc16d7e588328888160b904d71213c26dea0ac0c.zip | |
Updated to use new standalone tdehw library.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'src/sources')
| -rw-r--r-- | src/sources/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/sources/batterysrc.cpp | 8 | ||||
| -rw-r--r-- | src/sources/batterysrc.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/sources/CMakeLists.txt b/src/sources/CMakeLists.txt index b83baea..f881602 100644 --- a/src/sources/CMakeLists.txt +++ b/src/sources/CMakeLists.txt @@ -42,6 +42,7 @@ tde_add_library( sources STATIC_PIC AUTOMOC uptimesrc.cpp LINK tdecore-shared + ${TDEHW_LIBRARIES} ${NVCONTROL_LIBRARIES} ${XEXT_LIBRARIES} ) diff --git a/src/sources/batterysrc.cpp b/src/sources/batterysrc.cpp index 32a2d77..42f056a 100644 --- a/src/sources/batterysrc.cpp +++ b/src/sources/batterysrc.cpp @@ -22,7 +22,7 @@ #include <tdelocale.h> #include <kdebug.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef HAVE_TDEWHLIB #include <tdehardwaredevices.h> #endif @@ -31,7 +31,7 @@ BatterySrc::BatterySrc(TQWidget* inParent, TQString inUDI): mTrigger(this, 5000), mUDI(inUDI), mHardwareDevices(NULL){ -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef HAVE_TDEHWLIB mHardwareDevices = TDEGlobal::hardwareDevices(); TDEGenericDevice* hwdevice = mHardwareDevices->findByUniqueID(inUDI); @@ -52,7 +52,7 @@ BatterySrc::~BatterySrc(){ std::list<Source*>BatterySrc::createInstances(TQWidget* inParent){ std::list<Source*> list; -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef HAVE_TDEHWLIB TDEHardwareDevices* hardwareDevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList hwlist = hardwareDevices->listAllPhysicalDevices(); TDEGenericDevice *hwdevice; @@ -67,7 +67,7 @@ std::list<Source*>BatterySrc::createInstances(TQWidget* inParent){ TQString BatterySrc::fetchValue() { TQString s = "n/a"; -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef HAVE_TDEHWLIB if (mHardwareDevices != NULL) { TDEGenericDevice* hwdevice = mHardwareDevices->findByUniqueID(mUDI); if (hwdevice->type() != TDEGenericDeviceType::Battery) { diff --git a/src/sources/batterysrc.h b/src/sources/batterysrc.h index bcd805f..5ff3268 100644 --- a/src/sources/batterysrc.h +++ b/src/sources/batterysrc.h @@ -26,7 +26,7 @@ #include <tqstring.h> #include <list> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef HAVE_TDEHWLIB class TDEHardwareDevices; #else #define TDEHardwareDevices void |