summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock
diff options
context:
space:
mode:
Diffstat (limited to 'kdesktop/lock')
-rw-r--r--kdesktop/lock/autologout.cc8
-rw-r--r--kdesktop/lock/autologout.h2
-rw-r--r--kdesktop/lock/infodlg.cc6
-rw-r--r--kdesktop/lock/infodlg.h2
-rw-r--r--kdesktop/lock/lockdlg.cc24
-rw-r--r--kdesktop/lock/lockprocess.cc34
-rw-r--r--kdesktop/lock/lockprocess.h4
-rw-r--r--kdesktop/lock/main.cc2
-rw-r--r--kdesktop/lock/querydlg.cc8
-rw-r--r--kdesktop/lock/querydlg.h2
10 files changed, 46 insertions, 46 deletions
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc
index b51791d98..3dbb3ac6b 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cc
@@ -27,7 +27,7 @@
#define COUNTDOWN 30
-AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog", true, WX11BypassWM)
+AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog", true, (WFlags)WX11BypassWM)
{
frame = new TQFrame(this);
frame->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
@@ -40,7 +40,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
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);
mStatusLabel = new TQLabel("<b> </b>", frame);
- mStatusLabel->setAlignment(TQLabel::AlignCenter);
+ mStatusLabel->tqsetAlignment(TQLabel::AlignCenter);
TQLabel *mProgressLabel = new TQLabel("Time Remaining:", frame);
mProgressRemaining = new TQProgressBar(frame);
@@ -66,7 +66,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
mCountdownTimerId = startTimer(1000/25);
- connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()));
+ connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()));
}
AutoLogout::~AutoLogout()
@@ -102,7 +102,7 @@ void AutoLogout::slotActivity()
void AutoLogout::logout()
{
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
DCOPRef("ksmserver","ksmserver").send("logout", 0, 0, 0);
}
diff --git a/kdesktop/lock/autologout.h b/kdesktop/lock/autologout.h
index f40ac5f0d..c15a47f07 100644
--- a/kdesktop/lock/autologout.h
+++ b/kdesktop/lock/autologout.h
@@ -20,7 +20,7 @@ class TQLabel;
class TQDialog;
class TQProgressBar;
-class AutoLogout : public QDialog
+class AutoLogout : public TQDialog
{
Q_OBJECT
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc
index 2249dc46e..60c500925 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cc
@@ -59,7 +59,7 @@
// Simple dialog for displaying an unlock status or recurring error message
//
InfoDlg::InfoDlg(LockProcess *parent)
- : TQDialog(parent, "information dialog", true, WX11BypassWM),
+ : TQDialog(parent, "information dialog", true, (WFlags)WX11BypassWM),
mUnlockingFailed(false)
{
frame = new TQFrame( this );
@@ -72,7 +72,7 @@ InfoDlg::InfoDlg(LockProcess *parent)
KUser user;
mStatusLabel = new TQLabel( "<b> </b>", frame );
- mStatusLabel->setAlignment( TQLabel::AlignCenter );
+ mStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
unlockDialogLayout->addWidget( frame );
@@ -81,7 +81,7 @@ InfoDlg::InfoDlg(LockProcess *parent)
layStatus->addWidget( mStatusLabel );
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop );
+ frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop );
frameLayout->addLayout( layStatus, 1, 1 );
installEventFilter(this);
diff --git a/kdesktop/lock/infodlg.h b/kdesktop/lock/infodlg.h
index a0ca3b8c0..bb974282f 100644
--- a/kdesktop/lock/infodlg.h
+++ b/kdesktop/lock/infodlg.h
@@ -24,7 +24,7 @@ class TQListView;
// Simple dialog for displaying an info message.
// It does not handle password validation.
//
-class InfoDlg : public QDialog
+class InfoDlg : public TQDialog
{
Q_OBJECT
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 2efe56a8a..60c382511 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -65,7 +65,7 @@
// Simple dialog for entering a password.
//
PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
- : TQDialog(parent, "password dialog", true, WX11BypassWM),
+ : TQDialog(parent, "password dialog", true, (WFlags)WX11BypassWM),
mPlugin( plugin ),
mCapsLocked(-1),
mUnlockingFailed(false)
@@ -83,7 +83,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
i18n("<nobr><b>The session was locked by %1</b><br>").arg( user.fullName() ), frame );
mStatusLabel = new TQLabel( "<b> </b>", frame );
- mStatusLabel->setAlignment( TQLabel::AlignCenter );
+ mStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
mLayoutButton = new TQPushButton( frame );
mLayoutButton->setFlat( true );
@@ -112,7 +112,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
layButtons->addWidget( cancel );
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, AlignTop );
+ frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, Qt::AlignTop );
frameLayout->addWidget( greetLabel, 0, 1 );
frameLayout->addItem( greet->getLayoutItem(), 1, 1 );
frameLayout->addLayout( layStatus, 2, 1 );
@@ -135,7 +135,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
mFailedTimerId = 0;
mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT);
- connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
+ connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
greet->start();
@@ -144,7 +144,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
layoutsList = kxkb.call("getLayoutsList");
TQString currentLayout = kxkb.call("getCurrentLayout");
if( !currentLayout.isEmpty() && layoutsList.count() > 1 ) {
- currLayout = layoutsList.find(currentLayout);
+ currLayout = layoutsList.tqfind(currentLayout);
if (currLayout == layoutsList.end())
setLayoutText("err");
else
@@ -179,7 +179,7 @@ void PasswordDlg::setLayoutText( const TQString &txt )
{
mLayoutButton->setText( txt );
TQSize sz = mLayoutButton->fontMetrics().size( 0, txt );
- int mrg = mLayoutButton->style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
+ int mrg = mLayoutButton->tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2;
mLayoutButton->setFixedSize( sz.width() + mrg, sz.height() + mrg );
}
@@ -468,7 +468,7 @@ void PasswordDlg::gplugActivity()
void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
{
- TQDialog dialog( this, 0, true, WX11BypassWM );
+ TQDialog dialog( this, 0, true, (WFlags)WX11BypassWM );
TQFrame *winFrame = new TQFrame( &dialog );
winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
@@ -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->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+ button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
@@ -513,7 +513,7 @@ void PasswordDlg::slotStartNewSession()
killTimer(mTimeoutTimerId);
mTimeoutTimerId = 0;
- TQDialog *dialog = new TQDialog( this, "warnbox", true, WX11BypassWM );
+ TQDialog *dialog = new TQDialog( this, "warnbox", true, (WFlags)WX11BypassWM );
TQFrame *winFrame = new TQFrame( dialog );
winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
@@ -627,7 +627,7 @@ void PasswordDlg::slotSwitchUser()
int p = 0;
DM dm;
- TQDialog dialog( this, "sessbox", true, WX11BypassWM );
+ TQDialog dialog( this, "sessbox", true, (WFlags)WX11BypassWM );
TQFrame *winFrame = new TQFrame( &dialog );
winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
@@ -667,9 +667,9 @@ void PasswordDlg::slotSwitchUser()
ns++;
}
int fw = lv->frameWidth() * 2;
- TQSize hds( lv->header()->sizeHint() );
+ TQSize hds( lv->header()->tqsizeHint() );
lv->setMinimumWidth( fw + hds.width() +
- (ns > 10 ? style().pixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) );
+ (ns > 10 ? tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) );
lv->setFixedHeight( fw + hds.height() +
itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) );
lv->header()->adjustHeaderSize();
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index cdd5581e7..69c121002 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -195,7 +195,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
TQStringList dmopt =
TQStringList::split(TQChar(','),
- TQString::fromLatin1( ::getenv( "XDM_MANAGED" )));
+ TQString::tqfromLatin1( ::getenv( "XDM_MANAGED" )));
for (TQStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it)
if ((*it).startsWith("method="))
mMethod = (*it).mid(7);
@@ -421,7 +421,7 @@ void LockProcess::setupSignals()
pipe(signal_pipe);
TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0],
- TQSocketNotifier::Read, this );
+ TQSocketNotifier::Read, TQT_TQOBJECT(this) );
connect( notif, TQT_SIGNAL(activated(int)), TQT_SLOT(signalPipeSignal()));
}
@@ -550,7 +550,7 @@ void LockProcess::readSaver()
bool opengl = kapp->authorize("opengl_screensavers");
bool manipulatescreen = kapp->authorize("manipulatescreen_screensavers");
KDesktopFile config(file, true);
- if (config.readEntry("X-KDE-Type").utf8())
+ if (config.readEntry("X-KDE-Type").utf8() != 0)
{
TQString saverType = config.readEntry("X-KDE-Type").utf8();
TQStringList saverTypes = TQStringList::split(";", saverType);
@@ -660,7 +660,7 @@ void LockProcess::createSaverWindow()
// screen state if necessary
setBackgroundMode(TQWidget::NoBackground);
- setCursor( blankCursor );
+ setCursor( tqblankCursor );
setGeometry(0, 0, mRootWidth, mRootHeight);
kdDebug(1204) << "Saver window Id: " << winId() << endl;
@@ -670,7 +670,7 @@ void LockProcess::desktopResized()
{
mBusy = true;
suspend();
- setCursor( blankCursor );
+ setCursor( tqblankCursor );
// Get root window size
XWindowAttributes rootAttr;
@@ -840,7 +840,7 @@ bool LockProcess::grabMouse()
{
int rv = XGrabPointer( qt_xdisplay(), TQApplication::desktop()->winId(),
True, GRABEVENTS, GrabModeAsync, GrabModeAsync, None,
- blankCursor.handle(), CurrentTime );
+ TQCursor(tqblankCursor).handle(), CurrentTime );
return (rv == GrabSuccess);
}
@@ -904,13 +904,13 @@ bool LockProcess::startSaver()
saveVRoot();
if (mParent) {
- TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, this, "notifier");
+ TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, TQT_TQOBJECT(this), "notifier");
connect(notifier, TQT_SIGNAL( activated (int)), TQT_SLOT( quitSaver()));
}
createSaverWindow();
move(0, 0);
show();
- setCursor( blankCursor );
+ setCursor( tqblankCursor );
raise();
XSync(qt_xdisplay(), False);
@@ -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::fromLatin1( key ) + '=';
+ TQString fkey = TQString::tqfromLatin1( key ) + '=';
for (TQStringList::ConstIterator it = that->mPluginOptions.begin();
it != that->mPluginOptions.end(); ++it)
if ((*it).startsWith( fkey ))
@@ -1182,7 +1182,7 @@ int LockProcess::execDialog( TQDialog *dlg )
{
suspend();
XChangeActivePointerGrab( qt_xdisplay(), GRABEVENTS,
- arrowCursor.handle(), CurrentTime);
+ TQCursor(tqarrowCursor).handle(), CurrentTime);
}
mDialogs.prepend( dlg );
fakeFocusIn( dlg->winId());
@@ -1192,7 +1192,7 @@ int LockProcess::execDialog( TQDialog *dlg )
mDialogs.remove( dlg );
if( mDialogs.isEmpty() ) {
XChangeActivePointerGrab( qt_xdisplay(), GRABEVENTS,
- blankCursor.handle(), CurrentTime);
+ TQCursor(tqblankCursor).handle(), CurrentTime);
resume( false );
} else
fakeFocusIn( mDialogs.first()->winId());
@@ -1226,7 +1226,7 @@ void LockProcess::doFunctionKeyBroadcast() {
}
mDialogControlLock = false;
}
- setCursor( blankCursor );
+ setCursor( tqblankCursor );
DCOPRef ref( "*", "MainApplication-Interface");
ref.send("sendFakeKey", DCOPArg(mkeyCode , "unsigned int"));
@@ -1341,7 +1341,7 @@ bool LockProcess::x11Event(XEvent *event)
{
XEvent ev2 = *event;
ev2.xkey.window = ev2.xkey.subwindow = mDialogs.first()->winId();
- qApp->x11ProcessEvent( &ev2 );
+ tqApp->x11ProcessEvent( &ev2 );
return true;
}
@@ -1444,7 +1444,7 @@ void LockProcess::unlockXF86()
void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
{
- TQDialog box( 0, "messagebox", true, WX11BypassWM );
+ TQDialog box( 0, "messagebox", true, (WFlags)WX11BypassWM );
TQFrame *winFrame = new TQFrame( &box );
winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
@@ -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->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+ button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) );
TQVBoxLayout *vbox = new TQVBoxLayout( &box );
@@ -1525,7 +1525,7 @@ void LockProcess::windowAdded( WId w, bool managed )
&length, &after, &data );
bool withdrawn = true;
if ( r == Success && data && format == 32 ) {
- Q_UINT32 *wstate = (Q_UINT32*)data;
+ TQ_UINT32 *wstate = (TQ_UINT32*)data;
withdrawn = (*wstate == WithdrawnState );
XFree( (char *)data );
}
@@ -1576,7 +1576,7 @@ bool LockProcess::forwardVkbdEvent( XEvent* event )
for( TQValueList< VkbdWindow >::ConstIterator it = mVkbdWindows.begin();
it != mVkbdWindows.end();
++it ) {
- if( (*it).rect.contains( pos )) {
+ if( TQT_TQRECT_OBJECT((*it).rect).tqcontains( 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;
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index 76ffb6013..9f9c2c0bf 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -41,7 +41,7 @@ struct GreeterPluginHandle {
// starting screensaver hacks, and password entry.
//
class LockProcess
- : public QWidget
+ : public TQWidget
{
Q_OBJECT
public:
@@ -153,7 +153,7 @@ private:
WId id;
QRect rect;
};
- QValueList< VkbdWindow > mVkbdWindows;
+ TQValueList< VkbdWindow > mVkbdWindows;
WId mVkbdLastEventWindow;
bool mPipeOpen;
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 6e032bebb..3f6bdb330 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -96,7 +96,7 @@ int main( int argc, char **argv )
kdDebug() << "screen " << number_of_screens << " " << kdesktop_screen_number << " " << display_name << " " << starting_screen << endl;
dpy = 0;
- if ((pos = display_name.findRev('.')) != -1)
+ if ((pos = display_name.tqfindRev('.')) != -1)
display_name.remove(pos, 10);
TQCString env;
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc
index d4ad06e88..b05d77076 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cc
@@ -59,7 +59,7 @@
// Simple dialog for displaying a password/PIN entry dialog
//
QueryDlg::QueryDlg(LockProcess *parent)
- : TQDialog(parent, "query dialog", true, WX11BypassWM),
+ : TQDialog(parent, "query dialog", true, (WFlags)WX11BypassWM),
mUnlockingFailed(false)
{
frame = new TQFrame( this );
@@ -72,8 +72,8 @@ QueryDlg::QueryDlg(LockProcess *parent)
KUser user;
mStatusLabel = new TQLabel( "<b> </b>", frame );
- //mStatusLabel->setAlignment( TQLabel::AlignCenter );
- mStatusLabel->setAlignment( TQLabel::AlignLeft );
+ //mStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
+ mStatusLabel->tqsetAlignment( TQLabel::AlignLeft );
KSeparator *sep = new KSeparator( KSeparator::HLine, frame );
@@ -95,7 +95,7 @@ QueryDlg::QueryDlg(LockProcess *parent)
layButtons->addWidget( ok );
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop );
+ frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop );
frameLayout->addLayout( layStatus, 0, 1 );
frameLayout->addLayout( layPin, 2, 1 );
frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 );
diff --git a/kdesktop/lock/querydlg.h b/kdesktop/lock/querydlg.h
index e6a768369..0da557caf 100644
--- a/kdesktop/lock/querydlg.h
+++ b/kdesktop/lock/querydlg.h
@@ -26,7 +26,7 @@ class TQListView;
// Simple dialog for displaying an query dialog.
// It does not handle password validation.
//
-class QueryDlg : public QDialog
+class QueryDlg : public TQDialog
{
Q_OBJECT
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 11:41:06 +0000