diff options
Diffstat (limited to 'kdesktop/lock')
-rw-r--r-- | kdesktop/lock/autologout.cc | 10 | ||||
-rw-r--r-- | kdesktop/lock/autologout.h | 2 | ||||
-rw-r--r-- | kdesktop/lock/infodlg.cc | 14 | ||||
-rw-r--r-- | kdesktop/lock/infodlg.h | 4 | ||||
-rw-r--r-- | kdesktop/lock/lockdlg.cc | 54 | ||||
-rw-r--r-- | kdesktop/lock/lockdlg.h | 6 | ||||
-rw-r--r-- | kdesktop/lock/lockprocess.cc | 22 | ||||
-rw-r--r-- | kdesktop/lock/querydlg.cc | 16 | ||||
-rw-r--r-- | kdesktop/lock/querydlg.h | 4 |
9 files changed, 66 insertions, 66 deletions
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc index 79a59787b..b51791d98 100644 --- a/kdesktop/lock/autologout.cc +++ b/kdesktop/lock/autologout.cc @@ -39,8 +39,8 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog" TQLabel *greetLabel = new TQLabel(i18n("<nobr><qt><b>Automatic Log Out</b></qt><nobr>"), frame); TQLabel *infoLabel = new TQLabel(i18n("<qt>To prevent being logged out, resume using this session by moving the mouse or pressing a key.</qt>"), frame); - mtqStatusLabel = new TQLabel("<b> </b>", frame); - mtqStatusLabel->tqsetAlignment(TQLabel::AlignCenter); + mStatusLabel = new TQLabel("<b> </b>", frame); + mStatusLabel->setAlignment(TQLabel::AlignCenter); TQLabel *mProgressLabel = new TQLabel("Time Remaining:", frame); mProgressRemaining = new TQProgressBar(frame); @@ -52,7 +52,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog" frameLayout = new TQGridLayout(frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint()); frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, Qt::AlignCenter | Qt::AlignTop); frameLayout->addWidget(greetLabel, 0, 1); - frameLayout->addWidget(mtqStatusLabel, 1, 1); + frameLayout->addWidget(mStatusLabel, 1, 1); frameLayout->addWidget(infoLabel, 2, 1); frameLayout->addWidget(mProgressLabel, 3, 1); frameLayout->addWidget(mProgressRemaining, 4, 1); @@ -66,7 +66,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog" mCountdownTimerId = startTimer(1000/25); - connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity())); + connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity())); } AutoLogout::~AutoLogout() @@ -76,7 +76,7 @@ AutoLogout::~AutoLogout() void AutoLogout::updateInfo(int timeout) { - mtqStatusLabel->setText(i18n("<nobr><qt>You will be automatically logged out in 1 second</qt></nobr>", + mStatusLabel->setText(i18n("<nobr><qt>You will be automatically logged out in 1 second</qt></nobr>", "<nobr><qt>You will be automatically logged out in %n seconds</qt></nobr>", timeout / 25) ); mProgressRemaining->setProgress(timeout); diff --git a/kdesktop/lock/autologout.h b/kdesktop/lock/autologout.h index 355ac8635..f40ac5f0d 100644 --- a/kdesktop/lock/autologout.h +++ b/kdesktop/lock/autologout.h @@ -39,7 +39,7 @@ private: void updateInfo(int); TQFrame *frame; TQGridLayout *frameLayout; - TQLabel *mtqStatusLabel; + TQLabel *mStatusLabel; int mCountdownTimerId; int mRemaining; TQTimer countDownTimer; diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc index 460c8d590..2249dc46e 100644 --- a/kdesktop/lock/infodlg.cc +++ b/kdesktop/lock/infodlg.cc @@ -71,18 +71,18 @@ InfoDlg::InfoDlg(LockProcess *parent) KUser user; - mtqStatusLabel = new TQLabel( "<b> </b>", frame ); - mtqStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); + mStatusLabel = new TQLabel( "<b> </b>", frame ); + mStatusLabel->setAlignment( TQLabel::AlignCenter ); TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); unlockDialogLayout->addWidget( frame ); - TQHBoxLayout *laytqStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); - laytqStatus->addWidget( mtqStatusLabel ); + TQHBoxLayout *layStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); + layStatus->addWidget( mStatusLabel ); frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop ); - frameLayout->addLayout( laytqStatus, 1, 1 ); + frameLayout->addLayout( layStatus, 1, 1 ); installEventFilter(this); } @@ -94,8 +94,8 @@ InfoDlg::~InfoDlg() void InfoDlg::updateLabel(TQString &txt) { - mtqStatusLabel->setPaletteForegroundColor(Qt::black); - mtqStatusLabel->setText("<b>" + txt + "</b>"); + mStatusLabel->setPaletteForegroundColor(Qt::black); + mStatusLabel->setText("<b>" + txt + "</b>"); } void InfoDlg::setUnlockIcon() diff --git a/kdesktop/lock/infodlg.h b/kdesktop/lock/infodlg.h index 687a7c28a..a0ca3b8c0 100644 --- a/kdesktop/lock/infodlg.h +++ b/kdesktop/lock/infodlg.h @@ -43,11 +43,11 @@ public: private: TQFrame *frame; TQGridLayout *frameLayout; - TQLabel *mtqStatusLabel; + TQLabel *mStatusLabel; TQLabel *mpixLabel; int mCapsLocked; bool mUnlockingFailed; - TQStringList tqlayoutsList; + TQStringList layoutsList; TQStringList::iterator currLayout; int sPid, sFd; }; 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, <qmask); - mCapsLocked = ltqmask & LockMask; + XQueryPointer(qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ), &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, &lmask); + mCapsLocked = lmask & LockMask; updateLabel(); } diff --git a/kdesktop/lock/lockdlg.h b/kdesktop/lock/lockdlg.h index fa506ee50..258339314 100644 --- a/kdesktop/lock/lockdlg.h +++ b/kdesktop/lock/lockdlg.h @@ -55,7 +55,7 @@ private slots: void slotSessionActivated(); void slotStartNewSession(); void slotOK(); - void tqlayoutClicked(); + void layoutClicked(); void slotActivity(); private: @@ -77,14 +77,14 @@ private: KGreeterPlugin *greet; TQFrame *frame; TQGridLayout *frameLayout; - TQLabel *mtqStatusLabel; + TQLabel *mStatusLabel; KPushButton *mNewSessButton, *ok, *cancel; TQPushButton *mLayoutButton; int mFailedTimerId; int mTimeoutTimerId; int mCapsLocked; bool mUnlockingFailed; - TQStringList tqlayoutsList; + TQStringList layoutsList; TQStringList::iterator currLayout; int sPid, sFd; TQListView *lv; diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 3d264a08c..cdd5581e7 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -88,7 +88,7 @@ extern "C" { #include <X11/extensions/dpms.h> #ifndef HAVE_DPMSINFO_PROTO -tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * ); +Status DPMSInfo ( Display *, CARD16 *, BOOL * ); #endif } #endif @@ -195,7 +195,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly) TQStringList dmopt = TQStringList::split(TQChar(','), - TQString::tqfromLatin1( ::getenv( "XDM_MANAGED" ))); + TQString::fromLatin1( ::getenv( "XDM_MANAGED" ))); for (TQStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it) if ((*it).startsWith("method=")) mMethod = (*it).mid(7); @@ -944,7 +944,7 @@ void LockProcess::stopSaver() TQVariant LockProcess::getConf(void *ctx, const char *key, const TQVariant &dflt) { LockProcess *that = (LockProcess *)ctx; - TQString fkey = TQString::tqfromLatin1( key ) + '='; + TQString fkey = TQString::fromLatin1( key ) + '='; for (TQStringList::ConstIterator it = that->mPluginOptions.begin(); it != that->mPluginOptions.end(); ++it) if ((*it).startsWith( fkey )) @@ -1174,7 +1174,7 @@ int LockProcess::execDialog( TQDialog *dlg ) currentDialog=dlg; dlg->adjustSize(); - TQRect rect = dlg->tqgeometry(); + TQRect rect = dlg->geometry(); rect.moveCenter(KGlobalSettings::desktopGeometry(TQCursor::pos()).center()); dlg->move( rect.topLeft() ); @@ -1341,7 +1341,7 @@ bool LockProcess::x11Event(XEvent *event) { XEvent ev2 = *event; ev2.xkey.window = ev2.xkey.subwindow = mDialogs.first()->winId(); - tqApp->x11ProcessEvent( &ev2 ); + qApp->x11ProcessEvent( &ev2 ); return true; } @@ -1453,7 +1453,7 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt ) TQLabel *label2 = new TQLabel( txt, 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() ), &box, TQT_SLOT( accept() ) ); TQVBoxLayout *vbox = new TQVBoxLayout( &box ); @@ -1481,7 +1481,7 @@ void LockProcess::showVkbd() mKWinModule = new KWinModule( NULL, KWinModule::INFO_WINDOWS ); connect( mKWinModule, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId ))); mVkbdProcess = new KProcess; - *mVkbdProcess << "xvkbd" << "-compact" << "-tqgeometry" << "-0-0" << "-xdm"; + *mVkbdProcess << "xvkbd" << "-compact" << "-geometry" << "-0-0" << "-xdm"; mVkbdProcess->start(); } } @@ -1525,7 +1525,7 @@ void LockProcess::windowAdded( WId w, bool managed ) &length, &after, &data ); bool withdrawn = true; if ( r == Success && data && format == 32 ) { - TQ_UINT32 *wstate = (TQ_UINT32*)data; + Q_UINT32 *wstate = (Q_UINT32*)data; withdrawn = (*wstate == WithdrawnState ); XFree( (char *)data ); } @@ -1576,15 +1576,15 @@ bool LockProcess::forwardVkbdEvent( XEvent* event ) for( TQValueList< VkbdWindow >::ConstIterator it = mVkbdWindows.begin(); it != mVkbdWindows.end(); ++it ) { - if( (*it).rect.tqcontains( pos )) { + if( (*it).rect.contains( pos )) { // Find the subwindow where the event should actually go. // Not exactly cheap in the number of X roundtrips but oh well. Window window = (*it).id; Window root, child; int root_x, root_y, x, y; - unsigned int tqmask; + unsigned int mask; for(;;) { - if( !XQueryPointer( qt_xdisplay(), window, &root, &child, &root_x, &root_y, &x, &y, &tqmask )) + if( !XQueryPointer( qt_xdisplay(), window, &root, &child, &root_x, &root_y, &x, &y, &mask )) return false; if( child == None ) break; diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc index ea1d1bc06..d4ad06e88 100644 --- a/kdesktop/lock/querydlg.cc +++ b/kdesktop/lock/querydlg.cc @@ -71,9 +71,9 @@ QueryDlg::QueryDlg(LockProcess *parent) KUser user; - mtqStatusLabel = new TQLabel( "<b> </b>", frame ); - //mtqStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); - mtqStatusLabel->tqsetAlignment( TQLabel::AlignLeft ); + mStatusLabel = new TQLabel( "<b> </b>", frame ); + //mStatusLabel->setAlignment( TQLabel::AlignCenter ); + mStatusLabel->setAlignment( TQLabel::AlignLeft ); KSeparator *sep = new KSeparator( KSeparator::HLine, frame ); @@ -82,8 +82,8 @@ QueryDlg::QueryDlg(LockProcess *parent) TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); unlockDialogLayout->addWidget( frame ); - TQHBoxLayout *laytqStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); - laytqStatus->addWidget( mtqStatusLabel ); + TQHBoxLayout *layStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); + layStatus->addWidget( mStatusLabel ); TQHBoxLayout *layPin = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); pin_box = new KPasswordEdit( this, "pin_box" ); @@ -96,7 +96,7 @@ QueryDlg::QueryDlg(LockProcess *parent) frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop ); - frameLayout->addLayout( laytqStatus, 0, 1 ); + frameLayout->addLayout( layStatus, 0, 1 ); frameLayout->addLayout( layPin, 2, 1 ); frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 ); frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 ); @@ -123,8 +123,8 @@ const char * QueryDlg::getEntry() void QueryDlg::updateLabel(TQString &txt) { - mtqStatusLabel->setPaletteForegroundColor(Qt::black); - mtqStatusLabel->setText("<b>" + txt + "</b>"); + mStatusLabel->setPaletteForegroundColor(Qt::black); + mStatusLabel->setText("<b>" + txt + "</b>"); } void QueryDlg::setUnlockIcon() diff --git a/kdesktop/lock/querydlg.h b/kdesktop/lock/querydlg.h index 698d7805d..e6a768369 100644 --- a/kdesktop/lock/querydlg.h +++ b/kdesktop/lock/querydlg.h @@ -46,11 +46,11 @@ private slots: private: TQFrame *frame; TQGridLayout *frameLayout; - TQLabel *mtqStatusLabel; + TQLabel *mStatusLabel; TQLabel *mpixLabel; int mCapsLocked; bool mUnlockingFailed; - TQStringList tqlayoutsList; + TQStringList layoutsList; TQStringList::iterator currLayout; int sPid, sFd; KPushButton *ok; |