summaryrefslogtreecommitdiffstats
path: root/ksmserver
diff options
context:
space:
mode:
Diffstat (limited to 'ksmserver')
-rw-r--r--ksmserver/main.cpp2
-rw-r--r--ksmserver/server.cpp24
-rw-r--r--ksmserver/shutdown.cpp10
-rw-r--r--ksmserver/shutdowndlg.cpp14
-rw-r--r--ksmserver/startup.cpp10
5 files changed, 30 insertions, 30 deletions
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index ba8c0454d..0f7d699d0 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -225,7 +225,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
IceSetIOErrorHandler( IoErrorHandler );
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup( "General" );
int realScreenCount = ScreenCount( tqt_xdisplay() );
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index cdf3f98c5..03a0e0b15 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -131,11 +131,11 @@ void KSMServer::executeCommand( const TQStringList& command )
{
if ( command.isEmpty() )
return;
- KProcess proc;
+ TDEProcess proc;
for ( TQStringList::ConstIterator it = command.begin();
it != command.end(); ++it )
proc << (*it).latin1();
- proc.start( KProcess::Block );
+ proc.start( TDEProcess::Block );
}
IceAuthDataEntry *authDataEntries = 0;
@@ -432,16 +432,16 @@ Status SetAuthentication (int count, IceListenObj *listenObjs,
addAuthFile.close();
remAuthFile->close();
- TQString iceAuth = KGlobal::dirs()->findExe("iceauth");
+ TQString iceAuth = TDEGlobal::dirs()->findExe("iceauth");
if (iceAuth.isEmpty())
{
tqWarning("[KSMServer] could not find iceauth");
return 0;
}
- KProcess p;
+ TDEProcess p;
p << iceAuth << "source" << addAuthFile.name();
- p.start(KProcess::Block);
+ p.start(TDEProcess::Block);
return (1);
}
@@ -462,16 +462,16 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
free (authDataEntries);
- TQString iceAuth = KGlobal::dirs()->findExe("iceauth");
+ TQString iceAuth = TDEGlobal::dirs()->findExe("iceauth");
if (iceAuth.isEmpty())
{
tqWarning("[KSMServer] could not find iceauth");
return;
}
- KProcess p;
+ TDEProcess p;
p << iceAuth << "source" << remAuthFile->name();
- p.start(KProcess::Block);
+ p.start(TDEProcess::Block);
delete remAuthFile;
remAuthFile = 0;
@@ -592,7 +592,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
dialogActive = false;
saveSession = false;
wmPhase1WaitingCount = 0;
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("General" );
clientInteracting = 0;
xonCommand = config->readEntry( "xonCommand", "xon" );
@@ -807,7 +807,7 @@ TQString KSMServer::currentSession()
void KSMServer::discardSession()
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup( sessionGroup );
int count = config->readNumEntry( "count", 0 );
for ( KSMClient* c = clients.first(); c; c = clients.next() ) {
@@ -828,7 +828,7 @@ void KSMServer::discardSession()
void KSMServer::storeSession()
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->reparseConfiguration(); // config may have changed in the KControl module
config->setGroup("General" );
excludeApps = TQStringList::split( TQRegExp( "[,:]" ), config->readEntry( "excludeApps" ).lower());
@@ -895,7 +895,7 @@ void KSMServer::storeSession()
TQStringList KSMServer::sessionList()
{
TQStringList sessions = "default";
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
TQStringList groups = config->groupList();
for ( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); it++ )
if ( (*it).startsWith( "Session: " ) )
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index d7440e92c..87c8d37cb 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -125,7 +125,7 @@ bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd,
return false;
}
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->reparseConfiguration(); // config may have changed in the KControl module
config->setGroup("General" );
@@ -156,7 +156,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
if ( !checkStatus( logoutConfirmed, maysd, confirm, sdtype, sdmode ) )
return;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("General" );
if (!maysd) {
@@ -168,7 +168,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
sdmode = TDEApplication::ShutdownModeInteractive;
// shall we show a logout status dialog box?
- bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
+ bool showLogoutStatusDlg = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
if (showLogoutStatusDlg) {
KSMShutdownIPFeedback::start();
@@ -294,7 +294,7 @@ void KSMServer::logoutTimed( int sdtype, int sdmode, TQString bootOption )
{
int confirmDelay;
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup( "General" );
if ( sdtype == TDEApplication::ShutdownTypeHalt )
@@ -525,7 +525,7 @@ void KSMServer::completeShutdownOrCheckpoint()
if ( waitForPhase2 )
return;
- bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
+ bool showLogoutStatusDlg = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
if (showLogoutStatusDlg && state != Checkpoint) {
KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index bd705675b..ecc1ed5b4 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -119,14 +119,14 @@ void KSMShutdownFeedback::fadeBack( void )
void KSMShutdownFeedback::slotPaintEffect()
{
// determine which fade to use
- if (KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true))
+ if (KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true))
{
- float doFancyLogoutAdditionalDarkness = (float)KConfigGroup(KGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutAdditionalDarkness", 0.6);
+ float doFancyLogoutAdditionalDarkness = (float)KConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutAdditionalDarkness", 0.6);
- float doFancyLogoutFadeTime = (float)KConfigGroup(KGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000);
+ float doFancyLogoutFadeTime = (float)KConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000);
- float doFancyLogoutFadeBackTime = (float)KConfigGroup(KGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeBackTime", 1000);
+ float doFancyLogoutFadeBackTime = (float)KConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeBackTime", 1000);
if (kapp->isX11CompositionAvailable()) {
// We can do this in a different (simpler) manner because we have compositing support!
@@ -697,7 +697,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
2 * KDialog::spacingHint() );
// default factor
- bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false);
+ bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false);
// slighty more space for the new logout
int factor = 2;
@@ -1169,7 +1169,7 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, TDEApplication::ShutdownType&
// Show dialog (will save the background in showEvent)
TQSize sh = l->sizeHint();
- TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
+ TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
l->move(rect.x() + (rect.width() - sh.width())/2,
rect.y() + (rect.height() - sh.height())/2);
@@ -1299,7 +1299,7 @@ bool KSMDelayedMessageBox::showTicker( TDEApplication::ShutdownType sdtype, cons
kapp->enableStyles();
KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay );
TQSize sh = msg.sizeHint();
- TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
+ TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
msg.move(rect.x() + (rect.width() - sh.width())/2,
rect.y() + (rect.height() - sh.height())/2);
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index 7ef0fcc5f..33620e79b 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -95,7 +95,7 @@ bool trinity_startup_main_sequence_done = FALSE;
*/
void KSMServer::restoreSession( TQString sessionName )
{
- showFancyLogin = KConfigGroup(KGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
+ showFancyLogin = KConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
KConfig ksplashcfg( "ksplashrc", true );
ksplashcfg.setGroup( "KSplash" );
if ( ksplashcfg.readEntry( "Theme", "Default" ) != TQString("Unified") )
@@ -107,7 +107,7 @@ void KSMServer::restoreSession( TQString sessionName )
kdDebug( 1218 ) << "KSMServer::restoreSession " << sessionName << endl;
upAndRunning( "restore session");
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
sessionGroup = "Session: " + sessionName;
@@ -161,7 +161,7 @@ void KSMServer::restoreSession( TQString sessionName )
*/
void KSMServer::startDefaultSession()
{
- showFancyLogin = KConfigGroup(KGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
+ showFancyLogin = KConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
KConfig ksplashcfg( "ksplashrc", true );
ksplashcfg.setGroup( "KSplash" );
if ( ksplashcfg.readEntry( "Theme", "Default" ) != TQString("None") )
@@ -286,7 +286,7 @@ void KSMServer::tryRestoreNext()
if( state != Restoring )
return;
restoreTimer.stop();
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup( sessionGroup );
while ( lastAppStarted < appsToStart ) {
@@ -336,7 +336,7 @@ void KSMServer::autoStart2()
TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase2Timeout())); // protection
DCOPRef( "kcminit", "kcminit" ).send( "runPhase2" );
if( !defaultSession())
- restoreLegacySession( KGlobal::config());
+ restoreLegacySession( TDEGlobal::config());
KNotifyClient::event( 0, "starttde" ); // this is the time KDE is up, more or less
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-30 16:04:37 +0000