1 files changed, 24 insertions, 14 deletions

diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp
index 93bcce27a..105ee3aeb 100644
--- a/tdm/kfrontend/kgverify.cpp
+++ b/tdm/kfrontend/kgverify.cpp
@@ -32,10 +32,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "themer/tdmitem.h"
 #include "themer/tdmlabel.h"
 
-#include <ksslcertificate.h>
 
+#ifdef WITH_TDEHWLIB
+#include <ksslcertificate.h>
 #include <tdehardwaredevices.h>
 #include <tdecryptographiccarddevice.h>
+#endif
 
 #include <tdeapplication.h>
 #include <tdelocale.h>
@@ -98,11 +100,13 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer,
 	, isClear(true)
 	, inGreeterPlugin(false)
 	, abortRequested(false)
+#ifdef WITH_TDEHWLIB
 	, cardLoginInProgress(false)
 	, cardLoginDevice(NULL)
+#endif
 {
-	connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
-	connect( kapp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
+	connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
+	connect( kapp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) );
 
 	_parent->installEventFilter( this );
 }
@@ -121,8 +125,8 @@ KGVerify::getPlugMenu()
 		uint np = pluginList.count();
 		if (np > 1) {
 			plugMenu = new TQPopupMenu( parent );
-			connect( plugMenu, TQT_SIGNAL(activated( int )),
-			         TQT_SLOT(slotPluginSelected( int )) );
+			connect( plugMenu, TQ_SIGNAL(activated( int )),
+			         TQ_SLOT(slotPluginSelected( int )) );
 			for (uint i = 0; i < np; i++)
 				plugMenu->insertItem( i18n(greetPlugins[pluginList[i]].info->name), pluginList[i] );
 		}
@@ -324,7 +328,11 @@ KGVerify::start()
 				_autoLoginDelay = 0, timeable = false;
 			return;
 		}
-		else if (!cardLoginInProgress) {
+		else
+#ifdef WITH_TDEHWLIB
+			if (!cardLoginInProgress)
+#endif
+		{
 			applyPreset();
 		}
 	}
@@ -664,6 +672,7 @@ KGVerify::handleVerify()
 					greet->textPrompt(msg, echo, ndelay);
 					inGreeterPlugin = !ndelay;
 
+#ifdef WITH_TDEHWLIB
 					if (cardLoginInProgress) {
 						TQString autoPIN = cardLoginDevice->autoPIN(); 
 						if (autoPIN != TQString::null) {
@@ -673,6 +682,7 @@ KGVerify::handleVerify()
 						}
 						cardLoginInProgress = false;
 					}
+#endif
 				}
 				else {
 					inGreeterPlugin = true;
@@ -1076,7 +1086,7 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent,
 
 	failedLabel = new TQLabel( parent );
 	failedLabel->setFont( _failFont );
-	grid->addWidget( failedLabel, 1, 0, Qt::AlignCenter );
+	grid->addWidget( failedLabel, 1, 0, TQt::AlignCenter );
 
 	updateLockStatus();
 }
@@ -1133,7 +1143,7 @@ KGStdVerify::updateStatus()
 	if (failedLabelState != nfls) {
 		failedLabelState = nfls;
 		if (nfls < 0) {
-			failedLabel->setPaletteForegroundColor( Qt::black );
+			failedLabel->setPaletteForegroundColor( TQt::black );
 			failedLabel->setText( i18n( "Automatic login in 1 second...",
 			                            "Automatic login in %n seconds...",
 			                            timedLeft ) );
@@ -1143,11 +1153,11 @@ KGStdVerify::updateStatus()
 				failedLabel->clear();
 				break;
 			case 3:
-				failedLabel->setPaletteForegroundColor( Qt::red );
+				failedLabel->setPaletteForegroundColor( TQt::red );
 				failedLabel->setText( i18n("Warning: Caps Lock on") );
 				break;
 			case 2:
-				failedLabel->setPaletteForegroundColor( Qt::black );
+				failedLabel->setPaletteForegroundColor( TQt::black );
 				failedLabel->setText( authTok ?
 				                         i18n("Change failed") :
 				                         fixedEntity.isEmpty() ?
@@ -1254,10 +1264,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user,
 	hlay->addWidget( cancelButton );
 	hlay->addStretch( 1 );
 
-	connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
-	connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+	connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
+	connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 
-	TQTimer::singleShot( 0, verify, TQT_SLOT(start()) );
+	TQTimer::singleShot( 0, verify, TQ_SLOT(start()) );
 }
 
 KGChTok::~KGChTok()
@@ -1311,7 +1321,7 @@ QXTimer::QXTimer()
 	: inherited( 0 )
 	, left( -1 )
 {
-	connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
+	connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
 }
 
 void