From e031e12d06c77e0a05ad0c30c21f3afea94764af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 17 May 2021 18:10:38 +0200 Subject: [PATCH] Respect build option WITH_TDEHWLIB, otherwise it can lead to FTBFS in special cases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- drkonqi/backtrace.cpp | 4 ++-- kcontrol/displayconfig/displayconfig.cpp | 8 ++++++-- kcontrol/displayconfig/displayconfig.h | 6 +----- kcontrol/hwmanager/hwdevicetray.cpp | 12 ++++++++---- kcontrol/hwmanager/hwdevicetray.h | 2 +- kcontrol/hwmanager/hwdevicetray_app.cpp | 4 ++++ kcontrol/randr/CMakeLists.txt | 1 + kcontrol/randr/tderandrtray.cpp | 8 ++++++-- kcontrol/randr/tderandrtray.h | 2 +- kdesktop/lock/lockdlg.cpp | 10 +++++----- kdesktop/lock/lockprocess.cpp | 16 ++++++++-------- kdesktop/lock/lockprocess.h | 2 +- kdesktop/lockeng.cpp | 8 ++++---- kdesktop/lockeng.h | 2 +- kicker/kicker/ui/k_new_mnu.cpp | 12 ++++++++---- ksmserver/server.cpp | 4 ++-- ksmserver/server.h | 4 ++-- ksmserver/shutdown.cpp | 4 ++-- ksmserver/shutdowndlg.cpp | 8 ++++++-- tdeioslave/media/medianotifier/CMakeLists.txt | 1 + .../media/medianotifier/notificationdialog.cpp | 6 +++++- tdeioslave/media/mounthelper/CMakeLists.txt | 1 + .../mounthelper/tdeio_media_mounthelper.cpp | 10 +++++++--- tdm/kfrontend/kgapp.cpp | 6 +++--- tdm/kfrontend/kgapp.h | 2 +- tdm/kfrontend/kgreeter.cpp | 14 +++++++++----- tdm/kfrontend/kgverify.cpp | 8 ++++---- tdm/kfrontend/kgverify.h | 4 ++-- tdm/kfrontend/sakdlg.cpp | 8 ++++---- 29 files changed, 106 insertions(+), 71 deletions(-) diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index 70bb35fa7..8078f94be 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -36,7 +36,7 @@ #include #include #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #endif @@ -358,7 +358,7 @@ void BackTrace::processBacktrace() } #endif // HAVE_ELFICON -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB // Append potentially important hardware information m_strBt.append("\n==== (tdehwlib) hardware information ====\n"); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 8311b428e..4408e2c74 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -744,7 +748,7 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) { KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &) : TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); #endif @@ -863,7 +867,7 @@ KDisplayConfig::~KDisplayConfig() } void KDisplayConfig::deviceChanged (TDEGenericDevice* device) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (device->type() == TDEGenericDeviceType::Monitor) { if (base->rescanHardware->isEnabled()) { base->rescanHardware->setEnabled(false); diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h index 78b033f14..8ce466daa 100644 --- a/kcontrol/displayconfig/displayconfig.h +++ b/kcontrol/displayconfig/displayconfig.h @@ -21,10 +21,6 @@ #ifndef _KCM_DisplayCONFIG_H #define _KCM_DisplayCONFIG_H -#ifdef HAVE_CONFIG_H -#include -#endif - #include #include #include @@ -34,7 +30,7 @@ #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #else #define TDEGenericDevice void 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 +#endif + #include #include #include @@ -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 #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #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 +#endif + #include #include "hwdevicetray_app.h" diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt index cedfb8f09..1101f1ee1 100644 --- a/kcontrol/randr/CMakeLists.txt +++ b/kcontrol/randr/CMakeLists.txt @@ -11,6 +11,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index a443c3781..647f0eca7 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -92,7 +96,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) applyIccConfiguration(cur_profile, NULL); } -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); #endif @@ -888,7 +892,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) } void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (device->type() == TDEGenericDeviceType::Monitor) { KRandrPassivePopup::message( i18n("New display output options are available!"), diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h index 334e1ef31..ef6fd7bd0 100644 --- a/kcontrol/randr/tderandrtray.h +++ b/kcontrol/randr/tderandrtray.h @@ -24,7 +24,7 @@ #include #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #else #define TDEGenericDevice void diff --git a/kdesktop/lock/lockdlg.cpp b/kdesktop/lock/lockdlg.cpp index 961442506..890aa7c53 100644 --- a/kdesktop/lock/lockdlg.cpp +++ b/kdesktop/lock/lockdlg.cpp @@ -44,7 +44,7 @@ #include #include #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #include #endif @@ -481,7 +481,7 @@ void PasswordDlg::reapVerify() switch (WEXITSTATUS(status)) { case AuthOk: { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB KUser userinfo; TQString fileName = userinfo.homeDir() + "/.tde_card_login_state"; TQFile flagFile(fileName); @@ -559,7 +559,7 @@ void PasswordDlg::handleVerify() setFixedSize( sizeHint().width(), sizeHint().height() + 1 ); setFixedSize( sizeHint() ); -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB // Check if cryptographic card login is being used if (mCardLoginInProgress) { // Attempt authentication if configured @@ -980,7 +980,7 @@ void PasswordDlg::capsLocked() } void PasswordDlg::attemptCardLogin() { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #ifndef HAVE_KRB5 // Don't enable card-based logins if Kerberos integration was disabled return; @@ -1020,7 +1020,7 @@ void PasswordDlg::attemptCardLogin() { } void PasswordDlg::resetCardLogin() { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB validUserCardInserted = false; greet->abort(); greet->clear(); diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp index bb68186cb..b2db4a5cf 100644 --- a/kdesktop/lock/lockprocess.cpp +++ b/kdesktop/lock/lockprocess.cpp @@ -19,7 +19,7 @@ #include #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #include #include @@ -298,7 +298,7 @@ LockProcess::LockProcess() } } -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB // Initialize SmartCard readers TDEGenericDevice *hwdevice; TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); @@ -2832,7 +2832,7 @@ void LockProcess::processInputPipeCommand(TQString inputcommand) { } void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TQString login_name = TQString::null; X509CertificatePtrList certList = cdevice->cardX509Certificates(); if (certList.count() > 0) { @@ -2870,7 +2870,7 @@ void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) } void LockProcess::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB PasswordDlg* passDlg = dynamic_cast(currentDialog); if (passDlg) { passDlg->resetCardLogin(); @@ -2884,7 +2884,7 @@ void LockProcess::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) void LockProcess::signalPassDlgToAttemptCardLogin() { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB PasswordDlg* passDlg = dynamic_cast(currentDialog); if (passDlg && m_loginCardDevice) { passDlg->attemptCardLogin(); @@ -2900,7 +2900,7 @@ void LockProcess::signalPassDlgToAttemptCardLogin() void LockProcess::signalPassDlgToAttemptCardAbort() { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB PasswordDlg* passDlg = dynamic_cast(currentDialog); if (passDlg) { passDlg->resetCardLogin(); @@ -2916,7 +2916,7 @@ void LockProcess::signalPassDlgToAttemptCardAbort() void LockProcess::cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TQCString password; TQString pin_entry; @@ -2937,7 +2937,7 @@ void LockProcess::cryptographicCardPinRequested(TQString prompt, TDECryptographi TDECryptographicCardDevice* LockProcess::cryptographicCardDevice() { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB return m_loginCardDevice; #else return NULL; diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h index ff017b0a1..51cef069f 100644 --- a/kdesktop/lock/lockprocess.h +++ b/kdesktop/lock/lockprocess.h @@ -29,7 +29,7 @@ class KLibrary; class KWinModule; class KSMModalDialog; class LockProcess; -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB class TDECryptographicCardDevice; #else #define TDECryptographicCardDevice void diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp index 75c2e5f98..5e32fd0f6 100644 --- a/kdesktop/lockeng.cpp +++ b/kdesktop/lockeng.cpp @@ -13,7 +13,7 @@ #include #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #include #include @@ -200,7 +200,7 @@ SaverEngine::SaverEngine() delete config; config = NULL; -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB // Initialize SmartCard readers TDEGenericDevice *hwdevice; TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); @@ -265,7 +265,7 @@ void SaverEngine::cardStartupTimeout() { } void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TQString login_name = TQString::null; X509CertificatePtrList certList = cdevice->cardX509Certificates(); if (certList.count() > 0) { @@ -291,7 +291,7 @@ void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) } void SaverEngine::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (mValidCryptoCardInserted) { mValidCryptoCardInserted = false; diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h index 4d7823ab6..f8b461547 100644 --- a/kdesktop/lockeng.h +++ b/kdesktop/lockeng.h @@ -18,7 +18,7 @@ #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB class TDECryptographicCardDevice; #else #define TDECryptographicCardDevice void diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 8ea8e07ca..cafe65bb8 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -21,6 +21,10 @@ ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -52,7 +56,7 @@ #include #include #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #endif #include @@ -1377,7 +1381,7 @@ void KMenu::insertStaticExitItems() #if defined(COMPILE_HALBACKEND) if (ksmserver.readBoolEntry( "offerShutdown", true ) && DM().canShutdown()) maysd = true; -#elif defined(__TDE_HAVE_TDEHWLIB) +#elif defined(WITH_TDEHWLIB) TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice(); if( rootDevice ) { maysd = rootDevice->canPowerOff(); @@ -3810,7 +3814,7 @@ void KMenu::insertSuspendOption( int &nId, int &index ) "/org/freedesktop/Hal/devices/computer", "power_management.can_suspend_hybrid", NULL); -#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND +#elif defined(WITH_TDEHWLIB) // COMPILE_HALBACKEND TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice(); if (rootDevice) { suspend_ram = rootDevice->canSuspend(); @@ -3924,7 +3928,7 @@ void KMenu::slotSuspend(int id) } dbus_message_unref(msg); } -#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND +#elif defined(WITH_TDEHWLIB) // COMPILE_HALBACKEND TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice(); if (rootDevice) { if (id == SuspendType::Freeze) { 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 #include #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #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 Copyright (C) 2000 Matthias Ettrich ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "shutdowndlg.h" #include @@ -33,7 +37,7 @@ Copyright (C) 2000 Matthias Ettrich #include #include #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #endif #include @@ -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(); diff --git a/tdeioslave/media/medianotifier/CMakeLists.txt b/tdeioslave/media/medianotifier/CMakeLists.txt index ff2a8d802..215ee6de3 100644 --- a/tdeioslave/media/medianotifier/CMakeLists.txt +++ b/tdeioslave/media/medianotifier/CMakeLists.txt @@ -14,6 +14,7 @@ include_directories( ${CMAKE_BINARY_DIR}/tdeioslave/media/libmediacommon ${CMAKE_SOURCE_DIR}/tdeioslave/media/libmediacommon ${CMAKE_SOURCE_DIR}/tdmlib + ${CMAKE_BINARY_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp index 7e4004e8c..392fbad94 100644 --- a/tdeioslave/media/medianotifier/notificationdialog.cpp +++ b/tdeioslave/media/medianotifier/notificationdialog.cpp @@ -17,6 +17,10 @@ Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "notificationdialog.h" #include @@ -28,7 +32,7 @@ #include #include #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #endif diff --git a/tdeioslave/media/mounthelper/CMakeLists.txt b/tdeioslave/media/mounthelper/CMakeLists.txt index 18c48fc10..cf7ca553f 100644 --- a/tdeioslave/media/mounthelper/CMakeLists.txt +++ b/tdeioslave/media/mounthelper/CMakeLists.txt @@ -12,6 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/tdeioslave/media/libmediacommon + ${CMAKE_BINARY_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index 159f5140a..ef3f10e8e 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -19,6 +19,10 @@ Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -32,7 +36,7 @@ #include #include #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #endif @@ -173,7 +177,7 @@ void MountHelper::lock(const Medium &medium) void MountHelper::eject(const TQString &device, bool quiet) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB // Try TDE HW library eject first... TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device); @@ -203,7 +207,7 @@ void MountHelper::eject(const TQString &device, bool quiet) void MountHelper::releaseHolders(const Medium &medium, bool handleThis) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (medium.id().isEmpty()) { m_errorStr = i18n("Try to release holders from an unknown medium."); diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index a48dcf93a..6c77b444b 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -124,14 +124,14 @@ void GreeterApp::init() startTimer( pingInterval * 60000 ); } -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); #endif } void GreeterApp::deviceChanged(TDEGenericDevice* device) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #ifdef WITH_XRANDR if (device->type() == TDEGenericDeviceType::Monitor) { KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI(); @@ -139,7 +139,7 @@ void GreeterApp::deviceChanged(TDEGenericDevice* device) { delete randrsimple; } #endif // WITH_XRANDR -#endif // __TDE_HAVE_TDEHWLIB +#endif // WITH_TDEHWLIB } void diff --git a/tdm/kfrontend/kgapp.h b/tdm/kfrontend/kgapp.h index c9e2802c1..4b6c65f6a 100644 --- a/tdm/kfrontend/kgapp.h +++ b/tdm/kfrontend/kgapp.h @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define KGAPP_H #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #else #define TDEGenericDevice void diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 27905e61d..c5e5e37e7 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -22,6 +22,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "kgreeter.h" #include "kconsole.h" #include "tdmconfig.h" @@ -35,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #include #include @@ -247,7 +251,7 @@ KGreeter::~KGreeter() void KGreeter::cryptographicCardWatcherSetup() { cardLoginUser = TQString::null; -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB // Initialize SmartCard readers TDEGenericDevice *hwdevice; TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); @@ -861,7 +865,7 @@ KGreeter::verifySetUser( const TQString &user ) } void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #ifndef HAVE_KRB5 // Don't enable card-based logins if Kerberos integration was disabled return; @@ -945,7 +949,7 @@ void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { } void KGreeter::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB cardLoginUser = TQString::null; userView->setEnabled(false); verify->lockUserEntry(false); @@ -1338,7 +1342,7 @@ KThemedGreeter::updateStatus( bool fail, bool caps, int timedleft ) } } -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (cardLoginUser != TQString::null) { verify->setPasswordPrompt(i18n("PIN:")); } diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp index d3b0a71b8..44353087a 100644 --- a/tdm/kfrontend/kgverify.cpp +++ b/tdm/kfrontend/kgverify.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "themer/tdmlabel.h" -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #include #include @@ -100,7 +100,7 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer, , isClear(true) , inGreeterPlugin(false) , abortRequested(false) -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB , cardLoginInProgress(false) , cardLoginDevice(NULL) #endif @@ -329,7 +329,7 @@ KGVerify::start() return; } else -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (!cardLoginInProgress) #endif { @@ -672,7 +672,7 @@ KGVerify::handleVerify() greet->textPrompt(msg, echo, ndelay); inGreeterPlugin = !ndelay; -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (cardLoginInProgress) { TQString autoPIN = cardLoginDevice->autoPIN(); if (autoPIN != TQString::null) { diff --git a/tdm/kfrontend/kgverify.h b/tdm/kfrontend/kgverify.h index b76cf55f1..7e3b7f89f 100644 --- a/tdm/kfrontend/kgverify.h +++ b/tdm/kfrontend/kgverify.h @@ -77,7 +77,7 @@ class TQPopupMenu; class TQTimer; class KPushButton; class KLibrary; -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB class TDECryptographicCardDevice; #endif @@ -184,7 +184,7 @@ class KGVerify : public TQObject, public KGreeterPluginHandler { static TQVariant getConf( void *ctx, const char *key, const TQVariant &dflt ); -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB bool cardLoginInProgress; TDECryptographicCardDevice* cardLoginDevice; #endif diff --git a/tdm/kfrontend/sakdlg.cpp b/tdm/kfrontend/sakdlg.cpp index 52bffc47e..a15012a17 100644 --- a/tdm/kfrontend/sakdlg.cpp +++ b/tdm/kfrontend/sakdlg.cpp @@ -10,7 +10,7 @@ #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #include #include @@ -136,7 +136,7 @@ SAKDlg::SAKDlg(TQWidget *parent) connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited())); mSAKProcess->start(); -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB // Initialize SmartCard readers TDEGenericDevice *hwdevice; TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); @@ -175,7 +175,7 @@ void SAKDlg::processInputPipeCommand(TQString command) { } void SAKDlg::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TQString login_name = TQString::null; X509CertificatePtrList certList = cdevice->cardX509Certificates(); if (certList.count() > 0) { @@ -221,7 +221,7 @@ void SAKDlg::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { } void SAKDlg::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB // #endif }