summaryrefslogtreecommitdiffstats
path: root/ksmserver
diff options
context:
space:
mode:
Diffstat (limited to 'ksmserver')
-rw-r--r--ksmserver/main.cpp6
-rw-r--r--ksmserver/server.cpp6
-rw-r--r--ksmserver/shutdown.cpp12
-rw-r--r--ksmserver/shutdowndlg.cpp24
-rw-r--r--ksmserver/startupdlg.cpp4
5 files changed, 26 insertions, 26 deletions
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 5a4360836..d095b1df7 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -192,8 +192,8 @@ extern "C" TDE_EXPORT int kdemain( int argc, char* argv[] )
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
- kapp->dcopClient()->registerAs("ksmserver", false);
- if (!kapp->dcopClient()->isRegistered())
+ tdeApp->dcopClient()->registerAs("ksmserver", false);
+ if (!tdeApp->dcopClient()->isRegistered())
{
tqWarning("[KSMServer] Could not register with DCOPServer. Aborting.");
return 1;
@@ -217,7 +217,7 @@ extern "C" TDE_EXPORT int kdemain( int argc, char* argv[] )
#endif
KSMServer *server = new KSMServer( TQString::fromLatin1(wm), TQString::fromLatin1(wmaddargs), only_local);
- kapp->dcopClient()->setDefaultObject( server->objId() );
+ tdeApp->dcopClient()->setDefaultObject( server->objId() );
IceSetIOErrorHandler( IoErrorHandler );
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 28687076d..25116593b 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -514,8 +514,8 @@ static void sighandler(int sig)
delete server;
}
- if (kapp) {
- kapp->quit();
+ if (tdeApp) {
+ tdeApp->quit();
}
//::exit(0);
}
@@ -688,7 +688,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
connect( &protectionTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( protectionTimerTick() ) );
connect( &restoreTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( tryRestoreNext() ) );
connect( &shutdownTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeoutQuit() ) );
- connect( kapp, TQ_SIGNAL( shutDown() ), this, TQ_SLOT( cleanUp() ) );
+ connect( tdeApp, TQ_SIGNAL( shutDown() ), this, TQ_SLOT( cleanUp() ) );
reconfigure();
}
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 2fa90da01..93720ee47 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -257,7 +257,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
// Set the real desktop background to black so that exit looks
// clean regardless of what was on "our" desktop.
if (!showLogoutStatusDlg) {
- kapp->desktop()->setBackgroundColor( TQt::black );
+ tdeApp->desktop()->setBackgroundColor( TQt::black );
}
state = Shutdown;
wmPhase1WaitingCount = 0;
@@ -318,7 +318,7 @@ void KSMServer::suspendInternal(int state)
TQByteArray replyData;
// Block here until lock is complete
// If this is not done the desktop of the locked session will be shown after suspend/hibernate until the lock fully engages!
- kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
+ tdeApp->dcopClient()->call("kdesktop", "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
}
#ifdef WITH_TDEHWLIB
@@ -833,12 +833,12 @@ void KSMServer::completeShutdownOrCheckpoint()
if ( state == Shutdown ) {
bool waitForKNotify = true;
- if( !kapp->dcopClient()->connectDCOPSignal( "knotify", "",
+ if( !tdeApp->dcopClient()->connectDCOPSignal( "knotify", "",
"notifySignal(TQString,TQString,TQString,TQString,TQString,int,int,int,int)",
"ksmserver", "notifySlot(TQString,TQString,TQString,TQString,TQString,int,int,int,int)", false )) {
waitForKNotify = false;
}
- if( !kapp->dcopClient()->connectDCOPSignal( "knotify", "",
+ if( !tdeApp->dcopClient()->connectDCOPSignal( "knotify", "",
"playingFinished(int,int)",
"ksmserver", "logoutSoundFinished(int,int)", false )) {
waitForKNotify = false;
@@ -1024,7 +1024,7 @@ void KSMServer::killingCompleted()
pid_t child;
child = fork();
if (child != 0) {
- kapp->quit();
+ tdeApp->quit();
}
else if (child == 0) {
// If any remaining client(s) do not exit quickly (e.g. drkonqui) terminate so that they can be seen and interacted with
@@ -1033,7 +1033,7 @@ void KSMServer::killingCompleted()
}
}
else {
- kapp->quit();
+ tdeApp->quit();
}
}
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index ed01d30d0..2cf7c9a5f 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -86,7 +86,7 @@ KSMShutdownFeedback::KSMShutdownFeedback()
m_greyImageCreated( FALSE )
{
- if (kapp->isX11CompositionAvailable()) {
+ if (tdeApp->isX11CompositionAvailable()) {
m_grayImage = TQImage( TQApplication::desktop()->width(), TQApplication::desktop()->height(), 32 );
m_grayImage = m_grayImage.convertDepth(32);
m_grayImage.setAlphaBuffer(false);
@@ -132,7 +132,7 @@ void KSMShutdownFeedback::slotPaintEffect()
float doFancyLogoutFadeTime = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000);
float doFancyLogoutFadeBackTime = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeBackTime", 1000);
- if (kapp->isX11CompositionAvailable()) {
+ if (tdeApp->isX11CompositionAvailable()) {
// We can do this in a different (simpler) manner because we have compositing support!
// if slotPaintEffect() is called first time, we have to initialize the gray image
// we also could do that in the constructor, but then the displaying of the
@@ -377,7 +377,7 @@ void KSMShutdownFeedback::slotPaintEffect()
else {
if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFadeaway", true)) {
// standard logout fade
- if (kapp->isX11CompositionAvailable()) {
+ if (tdeApp->isX11CompositionAvailable()) {
// We can do this in a different (simpler) manner because we have compositing support!
// The end effect will be very similar to the old style logout
float doFancyLogoutFadeTime = 1000;
@@ -580,7 +580,7 @@ void KSMShutdownIPFeedback::enableExports()
{
#ifdef TQ_WS_X11
kdDebug(270) << k_lineinfo << "activating background exports.\n";
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
if (!client->isAttached()) {
client->attach();
}
@@ -646,14 +646,14 @@ void KSMShutdownIPFeedback::slotPaintEffect()
pm = TQPixmap();
}
}
- if ((pm.isNull()) || (pm.width() != kapp->desktop()->width()) || (pm.height() != kapp->desktop()->height())) {
+ if ((pm.isNull()) || (pm.width() != tdeApp->desktop()->width()) || (pm.height() != tdeApp->desktop()->height())) {
if (mPixmapTimeout < 10) {
TQTimer::singleShot( 100, this, TQ_SLOT(slotPaintEffect()) );
mPixmapTimeout++;
return;
}
else {
- pm = TQPixmap(kapp->desktop()->width(), kapp->desktop()->height());
+ pm = TQPixmap(tdeApp->desktop()->width(), tdeApp->desktop()->height());
pm.fill(TQt::black);
m_paintedFromSharedRootPixmap = false;
}
@@ -1168,7 +1168,7 @@ void KSMShutdownDlg::slotHybridSuspend()
bool KSMShutdownDlg::confirmShutdown( bool maysd, bool mayrb, TDEApplication::ShutdownType& sdtype, TQString& bootOption, int* selection )
{
- kapp->enableStyles();
+ tdeApp->enableStyles();
KSMShutdownDlg* l = new KSMShutdownDlg( 0 /*KSMShutdownFeedback::self()*/, maysd, mayrb, sdtype, selection );
// Show dialog (will save the background in showEvent)
@@ -1182,16 +1182,16 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, bool mayrb, TDEApplication::Sh
delete l;
- kapp->disableStyles();
+ tdeApp->disableStyles();
return result;
}
TQWidget* KSMShutdownIPDlg::showShutdownIP()
{
- kapp->enableStyles();
+ tdeApp->enableStyles();
KSMShutdownIPDlg* l = new KSMShutdownIPDlg( 0 );
- kapp->disableStyles();
+ tdeApp->disableStyles();
return l;
}
@@ -1346,7 +1346,7 @@ void KSMDelayedMessageBox::updateText()
bool KSMDelayedMessageBox::showTicker( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay )
{
- kapp->enableStyles();
+ tdeApp->enableStyles();
KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay );
TQSize sh = msg.sizeHint();
TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
@@ -1355,7 +1355,7 @@ bool KSMDelayedMessageBox::showTicker( TDEApplication::ShutdownType sdtype, cons
rect.y() + (rect.height() - sh.height())/2);
bool result = msg.exec();
- kapp->disableStyles();
+ tdeApp->disableStyles();
return result;
}
diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp
index e236ddfee..8bd196ab0 100644
--- a/ksmserver/startupdlg.cpp
+++ b/ksmserver/startupdlg.cpp
@@ -63,10 +63,10 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
TQWidget* KSMStartupIPDlg::showStartupIP()
{
- kapp->enableStyles();
+ tdeApp->enableStyles();
KSMStartupIPDlg* l = new KSMStartupIPDlg( 0 );
- kapp->disableStyles();
+ tdeApp->disableStyles();
return l;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-06 16:20:07 +0000