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 /ksmserver | |
| 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 'ksmserver')
| -rw-r--r-- | ksmserver/server.cpp | 4 | ||||
| -rw-r--r-- | ksmserver/server.h | 4 | ||||
| -rw-r--r-- | ksmserver/shutdown.cpp | 4 | ||||
| -rw-r--r-- | ksmserver/shutdowndlg.cpp | 8 |
4 files changed, 12 insertions, 8 deletions
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index 505865c54..aee40fcaa 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -599,7 +599,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag clientInteracting = 0; xonCommand = config->readEntry( "xonCommand", "xon" ); -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB hwDevices = TDEGlobal::hardwareDevices(); #endif @@ -723,7 +723,7 @@ void KSMServer::cleanUp() DM().shutdown( shutdownType, shutdownMode, bootOption ); } else { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice(); if (rootDevice) { if (shutdownType == TDEApplication::ShutdownTypeHalt) { diff --git a/ksmserver/server.h b/ksmserver/server.h index 7273f057e..add28fb71 100644 --- a/ksmserver/server.h +++ b/ksmserver/server.h @@ -21,7 +21,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <tqtimer.h> #include <dcopobject.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> #endif @@ -253,7 +253,7 @@ private: WindowMap legacyWindows; -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEHardwareDevices* hwDevices; #endif int initialClientCount; diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index 8b14ceaf1..e2699a578 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -152,7 +152,7 @@ bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd, bool &mayrb, mayrb = true; } else { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice(); if (rootDevice) { if (rootDevice->canPowerOff()) { @@ -241,7 +241,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm, // If this is not done the desktop of the locked session will be shown after suspend/hibernate until the lock fully engages! kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "lock()", TQCString(""), replyType, replyData); } -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice(); if (rootDevice) { switch (selection) { diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index dc1d4dfcb..a794388c3 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -6,6 +6,10 @@ Copyright (C) 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net> Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "shutdowndlg.h" #include <tqapplication.h> @@ -33,7 +37,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> #endif #include <kdebug.h> @@ -874,7 +878,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, canHybridSuspend = true; } } -#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND +#elif defined(WITH_TDEHWLIB) // COMPILE_HALBACKEND TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice(); if (rootDevice) { canFreeze = rootDevice->canFreeze(); |