diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-05-17 18:10:38 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-05-18 02:14:50 +0200 |
| commit | e031e12d06c77e0a05ad0c30c21f3afea94764af (patch) | |
| tree | 0ff0fc4a899b33b2fe83f7c3a2c98b6f48a2f9a9 /kcontrol/hwmanager | |
| parent | 1389e296969df0acf7f393b698a3a0f1fb572026 (diff) | |
| download | tdebase-e031e12d06c77e0a05ad0c30c21f3afea94764af.tar.gz tdebase-e031e12d06c77e0a05ad0c30c21f3afea94764af.zip | |
Respect build option WITH_TDEHWLIB, otherwise it can lead to FTBFS in special cases.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kcontrol/hwmanager')
| -rw-r--r-- | kcontrol/hwmanager/hwdevicetray.cpp | 12 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwdevicetray.h | 2 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwdevicetray_app.cpp | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp index 1980f90d1..5ba24e563 100644 --- a/kcontrol/hwmanager/hwdevicetray.cpp +++ b/kcontrol/hwmanager/hwdevicetray.cpp @@ -17,6 +17,10 @@ * License along with cryptocardwatcher. If not, see http://www.gnu.org/licenses/. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <tqtimer.h> #include <tqimage.h> #include <tqtooltip.h> @@ -84,7 +88,7 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name) new TDEActionMenu(i18n("Eject"), SmallIcon("player_eject", TQIconSet::Automatic), actionCollection(), "eject_menu"); new TDEActionMenu(i18n("Properties"), SmallIcon("edit", TQIconSet::Automatic), actionCollection(), "properties_menu"); -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(deviceAdded(TDEGenericDevice*))); connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(deviceRemoved(TDEGenericDevice*))); @@ -636,7 +640,7 @@ void HwDeviceSystemTray::slotEditShortcutKeys() { } void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEConfig config("mediamanagerrc"); config.setGroup("Global"); if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true)) @@ -662,7 +666,7 @@ void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device) { } void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEConfig config("mediamanagerrc"); config.setGroup("Global"); if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true)) @@ -688,7 +692,7 @@ void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device) { } void HwDeviceSystemTray::deviceChanged(TDEGenericDevice* device) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEConfig config("mediamanagerrc"); config.setGroup("Global"); if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true)) diff --git a/kcontrol/hwmanager/hwdevicetray.h b/kcontrol/hwmanager/hwdevicetray.h index 4b1e148bd..4f36c797a 100644 --- a/kcontrol/hwmanager/hwdevicetray.h +++ b/kcontrol/hwmanager/hwdevicetray.h @@ -27,7 +27,7 @@ #include <ksimpleconfig.h> #include <tdepassivepopupstack.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> #else #define TDEGenericDevice void diff --git a/kcontrol/hwmanager/hwdevicetray_app.cpp b/kcontrol/hwmanager/hwdevicetray_app.cpp index 3f96f76a4..0928a399d 100644 --- a/kcontrol/hwmanager/hwdevicetray_app.cpp +++ b/kcontrol/hwmanager/hwdevicetray_app.cpp @@ -17,6 +17,10 @@ * License along with cryptocardwatcher. If not, see http://www.gnu.org/licenses/. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <kdebug.h> #include "hwdevicetray_app.h" |