diff options
Diffstat (limited to 'tdm/kfrontend/kgverify.cpp')
| -rw-r--r-- | tdm/kfrontend/kgverify.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp index d3b0a71b8..105ee3aeb 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 <ksslcertificate.h> #include <tdehardwaredevices.h> #include <tdecryptographiccarddevice.h> @@ -100,13 +100,13 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer, , isClear(true) , inGreeterPlugin(false) , abortRequested(false) -#ifdef __TDE_HAVE_TDEHWLIB +#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 ); } @@ -125,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] ); } @@ -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) { @@ -1086,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(); } @@ -1143,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 ) ); @@ -1153,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() ? @@ -1264,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() @@ -1321,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 |