1 files changed, 27 insertions, 27 deletions

diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 67c2a063e..2efe56a8a 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -82,8 +82,8 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
             i18n("<nobr><b>The session is locked</b><br>") :
             i18n("<nobr><b>The session was locked by %1</b><br>").arg( user.fullName() ), frame );
 
-    mtqStatusLabel = new TQLabel( "<b> </b>", frame );
-    mtqStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
+    mStatusLabel = new TQLabel( "<b> </b>", frame );
+    mStatusLabel->setAlignment( TQLabel::AlignCenter );
 
     mLayoutButton = new TQPushButton( frame );
     mLayoutButton->setFlat( true );
@@ -101,9 +101,9 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
     TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
     unlockDialogLayout->addWidget( frame );
 
-    TQHBoxLayout *laytqStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
-    laytqStatus->addWidget( mtqStatusLabel );
-    laytqStatus->addWidget( mLayoutButton );
+    TQHBoxLayout *layStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
+    layStatus->addWidget( mStatusLabel );
+    layStatus->addWidget( mLayoutButton );
 
     TQHBoxLayout *layButtons = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
     layButtons->addWidget( mNewSessButton );
@@ -115,7 +115,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
     frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, AlignTop );
     frameLayout->addWidget( greetLabel, 0, 1 );
     frameLayout->addItem( greet->getLayoutItem(), 1, 1 );
-    frameLayout->addLayout( laytqStatus, 2, 1 );
+    frameLayout->addLayout( layStatus, 2, 1 );
     frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 );
     frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 );
 
@@ -123,7 +123,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
     setTabOrder( cancel, mNewSessButton );
     setTabOrder( mNewSessButton, mLayoutButton );
 
-    connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(tqlayoutClicked()));
+    connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(layoutClicked()));
     connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
     connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
     connect(mNewSessButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSwitchUser()));
@@ -135,17 +135,17 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
 
     mFailedTimerId = 0;
     mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT);
-    connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
+    connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
 
     greet->start();
 
     DCOPRef kxkb("kxkb", "kxkb");
     if( !kxkb.isNull() ) {
-        tqlayoutsList = kxkb.call("getLayoutsList");
+        layoutsList = kxkb.call("getLayoutsList");
         TQString currentLayout = kxkb.call("getCurrentLayout");
-        if( !currentLayout.isEmpty() && tqlayoutsList.count() > 1 ) {
-            currLayout = tqlayoutsList.find(currentLayout);
-            if (currLayout == tqlayoutsList.end())
+        if( !currentLayout.isEmpty() && layoutsList.count() > 1 ) {
+            currLayout = layoutsList.find(currentLayout);
+            if (currLayout == layoutsList.end())
                 setLayoutText("err");
             else
                 setLayoutText(*currLayout);
@@ -164,11 +164,11 @@ PasswordDlg::~PasswordDlg()
     delete greet;
 }
 
-void PasswordDlg::tqlayoutClicked()
+void PasswordDlg::layoutClicked()
 {
 
-    if( ++currLayout == tqlayoutsList.end() )
-        currLayout = tqlayoutsList.begin();
+    if( ++currLayout == layoutsList.end() )
+        currLayout = layoutsList.begin();
 
     DCOPRef kxkb("kxkb", "kxkb");
     setLayoutText( kxkb.call("setLayout", *currLayout) ? *currLayout : "err" );
@@ -179,7 +179,7 @@ void PasswordDlg::setLayoutText( const TQString &txt )
 {
     mLayoutButton->setText( txt );
     TQSize sz = mLayoutButton->fontMetrics().size( 0, txt );
-    int mrg = mLayoutButton->style().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2;
+    int mrg = mLayoutButton->style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
     mLayoutButton->setFixedSize( sz.width() + mrg, sz.height() + mrg );
 }
 
@@ -187,18 +187,18 @@ void PasswordDlg::updateLabel()
 {
     if (mUnlockingFailed)
     {
-        mtqStatusLabel->setPaletteForegroundColor(Qt::black);
-        mtqStatusLabel->setText(i18n("<b>Unlocking failed</b>"));
+        mStatusLabel->setPaletteForegroundColor(Qt::black);
+        mStatusLabel->setText(i18n("<b>Unlocking failed</b>"));
     }
     else
     if (mCapsLocked)
     {
-        mtqStatusLabel->setPaletteForegroundColor(Qt::red);
-        mtqStatusLabel->setText(i18n("<b>Warning: Caps Lock on</b>"));
+        mStatusLabel->setPaletteForegroundColor(Qt::red);
+        mStatusLabel->setText(i18n("<b>Warning: Caps Lock on</b>"));
     }
     else
     {
-        mtqStatusLabel->setText("<b> </b>");
+        mStatusLabel->setText("<b> </b>");
     }
 }
 
@@ -480,7 +480,7 @@ void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
     TQLabel *label2 = new TQLabel( text, winFrame );
     KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
     button->setDefault( true );
-    button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
     connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
 
     TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
@@ -667,9 +667,9 @@ void PasswordDlg::slotSwitchUser()
             ns++;
         }
         int fw = lv->frameWidth() * 2;
-        TQSize hds( lv->header()->tqsizeHint() );
+        TQSize hds( lv->header()->sizeHint() );
         lv->setMinimumWidth( fw + hds.width() +
-            (ns > 10 ? style().tqpixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) );
+            (ns > 10 ? style().pixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) );
         lv->setFixedHeight( fw + hds.height() +
             itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) );
         lv->header()->adjustHeaderSize();
@@ -709,11 +709,11 @@ void PasswordDlg::slotSessionActivated()
 
 void PasswordDlg::capsLocked()
 {
-    unsigned int ltqmask;
+    unsigned int lmask;
     Window dummy1, dummy2;
     int dummy3, dummy4, dummy5, dummy6;
-    XQueryPointer(qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ), &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, &ltqmask);
-    mCapsLocked = ltqmask & LockMask;
+    XQueryPointer(qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ), &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, &lmask);
+    mCapsLocked = lmask & LockMask;
     updateLabel();
 }