5 files changed, 19 insertions, 19 deletions

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 <tqlistview.h>
 #include <tqheader.h>
 #include <tqcheckbox.h>
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #include <tqfile.h>
 #include <tdecryptographiccarddevice.h>
 #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 <config.h>
 #include <tdeglobal.h>
 
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #include <ksslcertificate.h>
 #include <kuser.h>
 #include <tdehardwaredevices.h>
@@ -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<PasswordDlg*>(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<PasswordDlg*>(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<PasswordDlg*>(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 <sys/stat.h>
 #include <tdeglobal.h>
 
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #include <ksslcertificate.h>
 #include <kuser.h>
 #include <tdehardwaredevices.h>
@@ -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 <tqdbusconnection.h>
 
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 class TDECryptographicCardDevice;
 #else
 #define TDECryptographicCardDevice void