summaryrefslogtreecommitdiffstats
path: root/ksmserver
diff options
context:
space:
mode:
Diffstat (limited to 'ksmserver')
-rw-r--r--ksmserver/client.cpp8
-rw-r--r--ksmserver/global.h4
-rw-r--r--ksmserver/legacy.cpp14
-rw-r--r--ksmserver/main.cpp4
-rw-r--r--ksmserver/server.cpp16
-rw-r--r--ksmserver/shutdown.cpp2
-rw-r--r--ksmserver/shutdowndlg.cpp46
-rw-r--r--ksmserver/shutdowndlg.h11
-rw-r--r--ksmserver/startup.cpp4
-rw-r--r--ksmserver/timed.ui42
10 files changed, 79 insertions, 72 deletions
diff --git a/ksmserver/client.cpp b/ksmserver/client.cpp
index 2f6708963..b1927890a 100644
--- a/ksmserver/client.cpp
+++ b/ksmserver/client.cpp
@@ -146,7 +146,7 @@ TQString KSMClient::program() const
SmProp* p = property( SmProgram );
if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1)
return TQString::null;
- return TQString::fromLatin1( (const char*) p->vals[0].value );
+ return TQString::tqfromLatin1( (const char*) p->vals[0].value );
}
TQStringList KSMClient::restartCommand() const
@@ -156,7 +156,7 @@ TQStringList KSMClient::restartCommand() const
if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1)
return result;
for ( int i = 0; i < p->num_vals; i++ )
- result +=TQString::fromLatin1( (const char*) p->vals[i].value );
+ result +=TQString::tqfromLatin1( (const char*) p->vals[i].value );
return result;
}
@@ -167,7 +167,7 @@ TQStringList KSMClient::discardCommand() const
if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1)
return result;
for ( int i = 0; i < p->num_vals; i++ )
- result +=TQString::fromLatin1( (const char*) p->vals[i].value );
+ result +=TQString::tqfromLatin1( (const char*) p->vals[i].value );
return result;
}
@@ -184,7 +184,7 @@ TQString KSMClient::userId() const
SmProp* p = property( SmUserID );
if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1)
return TQString::null;
- return TQString::fromLatin1( (const char*) p->vals[0].value );
+ return TQString::tqfromLatin1( (const char*) p->vals[0].value );
}
diff --git a/ksmserver/global.h b/ksmserver/global.h
index 326587ac6..b76a8b363 100644
--- a/ksmserver/global.h
+++ b/ksmserver/global.h
@@ -10,4 +10,8 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#define KSMVendorString "KDE"
#define KSMReleaseString "1.0"
+#ifdef USE_QT4
+#define NO_QT3_DBUS_SUPPORT
+#endif
+
#endif
diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp
index 773cd514d..d7838253b 100644
--- a/ksmserver/legacy.cpp
+++ b/ksmserver/legacy.cpp
@@ -73,7 +73,7 @@ extern Time qt_x_time;
static int winsErrorHandler(Display *, XErrorEvent *ev)
{
if (windowMapPtr) {
- WindowMap::Iterator it = windowMapPtr->find(ev->resourceid);
+ WindowMap::Iterator it = windowMapPtr->tqfind(ev->resourceid);
if (it != windowMapPtr->end())
(*it).type = SM_ERROR;
}
@@ -103,7 +103,7 @@ void KSMServer::performLegacySessionSave()
for ( TQValueList<WId>::ConstIterator it = module.windows().begin();
it != module.windows().end(); ++it) {
WId leader = windowWmClientLeader( *it );
- if (!legacyWindows.contains(leader) && windowSessionId( *it, leader ).isEmpty()) {
+ if (!legacyWindows.tqcontains(leader) && windowSessionId( *it, leader ).isEmpty()) {
SMType wtype = SM_WMCOMMAND;
int nprotocols = 0;
Atom *protocols = 0;
@@ -167,7 +167,7 @@ void KSMServer::performLegacySessionSave()
XNextEvent(newdisplay, &ev);
if ( ( ev.xany.type == UnmapNotify ) ||
( ev.xany.type == PropertyNotify && ev.xproperty.atom == XA_WM_COMMAND ) ) {
- WindowMap::Iterator it = legacyWindows.find( ev.xany.window );
+ WindowMap::Iterator it = legacyWindows.tqfind( ev.xany.window );
if ( it != legacyWindows.end() && (*it).type != SM_WMCOMMAND ) {
awaiting_replies -= 1;
if ( (*it).type != SM_ERROR )
@@ -219,8 +219,8 @@ void KSMServer::storeLegacySession( KConfig* config )
int count = 0;
for (WindowMap::ConstIterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) {
if ( (*it).type != SM_ERROR) {
- if( excludeApps.contains( (*it).wmclass1.lower())
- || excludeApps.contains( (*it).wmclass2.lower()) || (*it).wmCommand[0] == "compiz" || (*it).wmCommand[0] == "beryl" || (*it).wmCommand[0] == "aquamarine" || (*it).wmCommand[0] == "beryl-manager" || (*it).wmCommand[0] == "beryl-settings" || (*it).wmCommand[0] == "kde-window-decorator" || (*it).wmCommand[0] == "emerald")
+ if( excludeApps.tqcontains( (*it).wmclass1.lower())
+ || excludeApps.tqcontains( (*it).wmclass2.lower()) || (*it).wmCommand[0] == "compiz" || (*it).wmCommand[0] == "beryl" || (*it).wmCommand[0] == "aquamarine" || (*it).wmCommand[0] == "beryl-manager" || (*it).wmCommand[0] == "beryl-settings" || (*it).wmCommand[0] == "kde-window-decorator" || (*it).wmCommand[0] == "emerald")
continue;
if ( !(*it).wmCommand.isEmpty() && !(*it).wmClientMachine.isEmpty() ) {
count++;
@@ -317,7 +317,7 @@ static TQStringList getQStringListProperty(WId w, Atom prop)
if (!data)
return result;
for (int i=0; i<(int)nitems; i++) {
- result << TQString::fromLatin1( (const char*)data + i );
+ result << TQString::tqfromLatin1( (const char*)data + i );
while(data[i]) i++;
}
XFree(data);
@@ -365,7 +365,7 @@ TQString KSMServer::windowWmClientMachine(WId w)
}
}
}
- return TQString::fromLatin1(result);
+ return TQString::tqfromLatin1(result);
}
WId KSMServer::windowWmClientLeader(WId w)
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index d41cfc1fa..797edae96 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -170,7 +170,7 @@ void sanity_check( int argc, char* argv[] )
qmsg.sprintf(msg.data(), path.data());
qmsg = msg_pre+qmsg+msg_post;
TQMessageBox::critical(0, "KDE Installation Problem!",
- TQString::fromLatin1(qmsg.data()));
+ TQString::tqfromLatin1(qmsg.data()));
exit(255);
}
}
@@ -218,7 +218,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
only_local = false;
#endif
- KSMServer *server = new KSMServer( TQString::fromLatin1(wm), only_local);
+ KSMServer *server = new KSMServer( TQString::tqfromLatin1(wm), only_local);
kapp->dcopClient()->setDefaultObject( server->objId() );
IceSetIOErrorHandler( IoErrorHandler );
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index d98faf09a..fc3afb288 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -297,7 +297,7 @@ void KSMGetPropertiesProc (
}
-class KSMListener : public QSocketNotifier
+class KSMListener : public TQSocketNotifier
{
public:
KSMListener( IceListenObj obj )
@@ -310,7 +310,7 @@ public:
IceListenObj listenObj;
};
-class KSMConnection : public QSocketNotifier
+class KSMConnection : public TQSocketNotifier
{
public:
KSMConnection( IceConn conn )
@@ -632,9 +632,9 @@ KSMServer::KSMServer( const TQString& windowManager, bool _only_local )
TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver"));
TQCString display = ::getenv("DISPLAY");
// strip the screen number from the display
- display.replace(TQRegExp("\\.[0-9]+$"), "");
+ display.tqreplace(TQRegExp("\\.[0-9]+$"), "");
int i;
- while( (i = display.find(':')) >= 0)
+ while( (i = display.tqfind(':')) >= 0)
display[i] = '_';
fName += "_"+display;
@@ -697,9 +697,9 @@ void KSMServer::cleanUp()
TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver"));
TQCString display = ::getenv("DISPLAY");
// strip the screen number from the display
- display.replace(TQRegExp("\\.[0-9]+$"), "");
+ display.tqreplace(TQRegExp("\\.[0-9]+$"), "");
int i;
- while( (i = display.find(':')) >= 0)
+ while( (i = display.tqfind(':')) >= 0)
display[i] = '_';
fName += "_"+display;
@@ -761,7 +761,7 @@ KSMClient* KSMServer::newClient( SmsConn conn )
void KSMServer::deleteClient( KSMClient* client )
{
- if ( clients.findRef( client ) == -1 ) // paranoia
+ if ( clients.tqfindRef( client ) == -1 ) // paranoia
return;
clients.removeRef( client );
if ( client == clientInteracting ) {
@@ -868,7 +868,7 @@ void KSMServer::storeSession()
TQStringList restartCommand = c->restartCommand();
if (program.isEmpty() && restartCommand.isEmpty())
continue;
- if (excludeApps.contains( program.lower()))
+ if (excludeApps.tqcontains( program.lower()))
continue;
count++;
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index a850d40be..c97b05ffb 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -184,7 +184,7 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
// Set the real desktop background to black so that exit looks
// clean regardless of what was on "our" desktop.
- kapp->desktop()->setBackgroundColor( Qt::black );
+ TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( Qt::black );
state = Shutdown;
wmPhase1WaitingCount = 0;
saveType = saveSession?SmSaveBoth:SmSaveGlobal;
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 0c7211efd..354328677 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -79,7 +79,7 @@ KSMShutdownFeedback::KSMShutdownFeedback()
{
DCOPRef("kicker", "KMenu").call("hideMenu"); // Make sure the K Menu is completely removed from the screen before taking a snapshot...
- m_grayImage = TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height()).convertToImage();
+ m_grayImage = TQPixmap(TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height())).convertToImage();
m_unfadedImage = TQImage::TQImage();
resize(0, 0);
setShown(true);
@@ -247,7 +247,7 @@ void KSMShutdownFeedback::slotPaintEffect()
}
KPixmap pixmap;
- pixmap = TQPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 );
+ pixmap = TQPixmap(TQPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 ));
TQImage image = pixmap.convertToImage();
KImageEffect::blend( Qt::black, image, 0.4 );
KImageEffect::toGray( image, true );
@@ -264,7 +264,7 @@ void KSMShutdownFeedback::slotPaintEffect()
KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
bool maysd, KApplication::ShutdownType sdtype )
- : TQDialog( parent, 0, TRUE, WType_Popup ), targets(0)
+ : TQDialog( parent, 0, TRUE, (WFlags)WType_Popup ), targets(0)
// this is a WType_Popup on purpose. Do not change that! Not
// having a popup here has severe side effects.
@@ -274,7 +274,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
TQFrame* frame = new TQFrame( this );
frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
- frame->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) );
+ frame->setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) );
// we need to set the minimum size for the logout box, since it
// gets too small if there isn't all options available
frame->setMinimumWidth(400);
@@ -315,12 +315,12 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
{
// first line of buttons
hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() );
- hbuttonbox->setAlignment( Qt::AlignHCenter );
+ hbuttonbox->tqsetAlignment( Qt::AlignHCenter );
// End session
FlatButton* btnLogout = new FlatButton( frame );
btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false );
btnLogout->setPixmap( DesktopIcon( "back") );
- int i = btnLogout->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
+ int i = btnLogout->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1
btnLogout->setAccel( "ALT+" + btnLogout->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnLogout );
connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout()));
@@ -335,12 +335,12 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
hbox->addWidget( lfrm, AlignCenter );
buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() );
- buttonlay->setAlignment( Qt::AlignHCenter );
+ buttonlay->tqsetAlignment( Qt::AlignHCenter );
TQLabel* icon = new TQLabel( lfrm );
icon->setPixmap( UserIcon( "shutdownkonq" ) );
- lfrm->setFixedSize( icon->sizeHint());
- icon->setFixedSize( icon->sizeHint());
+ lfrm->setFixedSize( icon->tqsizeHint());
+ icon->setFixedSize( icon->tqsizeHint());
buttonlay->addStretch( 1 );
// End session
@@ -431,7 +431,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
FlatButton* btnSuspend = new FlatButton( frame );
btnSuspend->setTextLabel( i18n("&Suspend"), false );
btnSuspend->setPixmap( DesktopIcon( "suspend") );
- int i = btnSuspend->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
+ int i = btnSuspend->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1
btnSuspend->setAccel( "ALT+" + btnSuspend->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnSuspend);
connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend()));
@@ -443,7 +443,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
FlatButton* btnHibernate = new FlatButton( frame );
btnHibernate->setTextLabel( i18n("&Hibernate"), false );
btnHibernate->setPixmap( DesktopIcon( "hibernate") );
- int i = btnHibernate->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
+ int i = btnHibernate->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1
btnHibernate->setAccel( "ALT+" + btnHibernate->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnHibernate);
connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate()));
@@ -454,13 +454,13 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
// bottom buttons
TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
- hbuttonbox2->setAlignment( Qt::AlignHCenter );
+ hbuttonbox2->tqsetAlignment( Qt::AlignHCenter );
// Reboot
FlatButton* btnReboot = new FlatButton( frame );
btnReboot->setTextLabel( i18n("&Restart"), false );
btnReboot->setPixmap( DesktopIcon( "reload") );
- int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
+ int i = btnReboot->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1
btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ;
hbuttonbox2->addWidget ( btnReboot);
connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
@@ -479,7 +479,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
for (TQStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index)
{
TQString label = (*it);
- label=label.replace('&',"&&");
+ label=label.tqreplace('&',"&&");
if (index == cur)
targets->insertItem( label + i18n("current option in boot loader", " (current)"), index);
else
@@ -495,7 +495,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
FlatButton* btnHalt = new FlatButton( frame );
btnHalt->setTextLabel( i18n("&Turn Off"), false );
btnHalt->setPixmap( DesktopIcon( "exit") );
- i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
+ i = btnHalt->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1
btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
hbuttonbox2->addWidget ( btnHalt );
connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
@@ -504,7 +504,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
// cancel buttonbox
TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
- hbuttonbox3->setAlignment( Qt::AlignRight );
+ hbuttonbox3->tqsetAlignment( Qt::AlignRight );
// Back to Desktop
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
@@ -544,7 +544,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
for (TQStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index)
{
TQString label = (*it);
- label=label.replace('&',"&&");
+ label=label.tqreplace('&',"&&");
if (index == cur)
targets->insertItem( label + i18n("current option in boot loader", " (current)"), index);
else
@@ -591,7 +591,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
{
// cancel buttonbox
TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
- hbuttonbox3->setAlignment( Qt::AlignRight );
+ hbuttonbox3->tqsetAlignment( Qt::AlignRight );
// Back to Desktop
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
@@ -716,7 +716,7 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sd
maysd, sdtype );
// Show dialog (will save the background in showEvent)
- TQSize sh = l->sizeHint();
+ TQSize sh = l->tqsizeHint();
TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
l->move(rect.x() + (rect.width() - sh.width())/2,
@@ -770,7 +770,7 @@ void KSMDelayedPushButton::slotTimeout()
}
KSMDelayedMessageBox::KSMDelayedMessageBox( KApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay )
- : TimedLogoutDlg( 0, 0, true, WType_Popup ), m_remaining(confirmDelay)
+ : TimedLogoutDlg( 0, 0, true, (WFlags)WType_Popup ), m_remaining(confirmDelay)
{
if ( sdtype == KApplication::ShutdownTypeHalt )
{
@@ -798,7 +798,7 @@ KSMDelayedMessageBox::KSMDelayedMessageBox( KApplication::ShutdownType sdtype, c
adjustSize();
if ( double( height() ) / width() < 0.25 )
{
- setFixedHeight( qRound( width() * 0.3 ) );
+ setFixedHeight( tqRound( width() * 0.3 ) );
adjustSize();
}
TQTimer *timer = new TQTimer( this );
@@ -822,7 +822,7 @@ bool KSMDelayedMessageBox::showTicker( KApplication::ShutdownType sdtype, const
{
kapp->enableStyles();
KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay );
- TQSize sh = msg.sizeHint();
+ TQSize sh = msg.tqsizeHint();
TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
msg.move(rect.x() + (rect.width() - sh.width())/2,
@@ -910,7 +910,7 @@ void FlatButton::init()
setUsesBigPixmap(true);
setAutoRaise(true);
setTextPosition( TQToolButton::Under );
- setFocusPolicy(TQWidget::StrongFocus);
+ setFocusPolicy(TQ_StrongFocus);
}
diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
index 65081e1c3..e3c67eb31 100644
--- a/ksmserver/shutdowndlg.h
+++ b/ksmserver/shutdowndlg.h
@@ -30,13 +30,16 @@ class KAction;
#include <kapplication.h>
#include <kpixmapio.h>
+#ifndef NO_QT3_DBUS_SUPPORT
/* We acknowledge the the dbus API is unstable */
#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/connection.h>
-#include <libhal.h>
+#endif // NO_QT3_DBUS_SUPPORT
+
+#include <hal/libhal.h>
// The (singleton) widget that makes/fades the desktop gray.
-class KSMShutdownFeedback : public QWidget
+class KSMShutdownFeedback : public TQWidget
{
Q_OBJECT
@@ -72,7 +75,7 @@ private:
// The confirmation dialog
-class KSMShutdownDlg : public QDialog
+class KSMShutdownDlg : public TQDialog
{
Q_OBJECT
@@ -140,7 +143,7 @@ private:
-class FlatButton : public QToolButton
+class FlatButton : public TQToolButton
{
Q_OBJECT
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index 2778b9dd9..e74083de6 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -363,14 +363,14 @@ bool KSMServer::checkStartupSuspend()
void KSMServer::suspendStartup( TQCString app )
{
- if( !startupSuspendCount.contains( app ))
+ if( !startupSuspendCount.tqcontains( app ))
startupSuspendCount[ app ] = 0;
++startupSuspendCount[ app ];
}
void KSMServer::resumeStartup( TQCString app )
{
- if( !startupSuspendCount.contains( app ))
+ if( !startupSuspendCount.tqcontains( app ))
return;
if( --startupSuspendCount[ app ] == 0 ) {
startupSuspendCount.remove( app );
diff --git a/ksmserver/timed.ui b/ksmserver/timed.ui
index 23d7aa2a0..14337f6cd 100644
--- a/ksmserver/timed.ui
+++ b/ksmserver/timed.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>TimedLogoutDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>TimedLogoutDlg</cstring>
</property>
@@ -33,7 +33,7 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>frame3</cstring>
</property>
@@ -64,7 +64,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout10</cstring>
</property>
@@ -78,7 +78,7 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout8</cstring>
</property>
@@ -86,7 +86,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout6</cstring>
</property>
@@ -110,14 +110,14 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>2</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_logo</cstring>
</property>
@@ -129,7 +129,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>48</width>
<height>48</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>2</height>
@@ -158,7 +158,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout7</cstring>
</property>
@@ -169,7 +169,7 @@
<property name="margin">
<number>7</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_title</cstring>
</property>
@@ -192,11 +192,11 @@
<property name="textFormat">
<enum>PlainText</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignLeft</set>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_text</cstring>
</property>
@@ -215,7 +215,7 @@ after X automatically.</string>
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -229,7 +229,7 @@ after X automatically.</string>
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -240,7 +240,7 @@ after X automatically.</string>
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout9</cstring>
</property>
@@ -258,14 +258,14 @@ after X automatically.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>90</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>pushButton1</cstring>
</property>
@@ -286,14 +286,14 @@ after X automatically.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>90</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>pushButton2</cstring>
</property>
@@ -319,7 +319,7 @@ after X automatically.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>90</width>
<height>20</height>