diff options
Diffstat (limited to 'twin/sm.cpp')
| -rw-r--r-- | twin/sm.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/twin/sm.cpp b/twin/sm.cpp index 53d2a5f29..5ef97f62d 100644 --- a/twin/sm.cpp +++ b/twin/sm.cpp @@ -42,13 +42,13 @@ bool SessionManaged::saveState( TQSessionManager& sm ) { Workspace::self()->sessionSaveStarted(); if( ksmserver ) // save stacking order etc. before "save file?" etc. dialogs change it - Workspace::self()->storeSession( kapp->sessionConfig(), SMSavePhase0 ); + Workspace::self()->storeSession( tdeApp->sessionConfig(), SMSavePhase0 ); sm.release(); // Qt doesn't automatically release in this case (bug?) sm.requestPhase2(); return true; } - Workspace::self()->storeSession( kapp->sessionConfig(), ksmserver ? SMSavePhase2 : SMSavePhase2Full ); - kapp->sessionConfig()->sync(); + Workspace::self()->storeSession( tdeApp->sessionConfig(), ksmserver ? SMSavePhase2 : SMSavePhase2Full ); + tdeApp->sessionConfig()->sync(); return true; } @@ -94,7 +94,7 @@ void Workspace::storeSession( TDEConfig* config, SMSavePhase phase ) config->writeEntry( TQString("wmClientMachine")+n, c->wmClientMachine( true ).data() ); config->writeEntry( TQString("resourceName")+n, c->resourceName().data() ); config->writeEntry( TQString("resourceClass")+n, c->resourceClass().data() ); - config->writeEntry( TQString("geometry")+n, TQRect( c->calculateGravitation(TRUE), c->clientSize() ) ); // FRAME + config->writeEntry( TQString("geometry")+n, TQRect( c->calculateGravitation(true), c->clientSize() ) ); // FRAME config->writeEntry( TQString("restore")+n, c->geometryRestore() ); config->writeEntry( TQString("fsrestore")+n, c->geometryFSRestore() ); config->writeEntry( TQString("maximize")+n, (int) c->maximizeMode() ); @@ -149,7 +149,7 @@ void Workspace::storeSession( TDEConfig* config, SMSavePhase phase ) void Workspace::loadSessionInfo() { session.clear(); - TDEConfig* config = kapp->sessionConfig(); + TDEConfig* config = tdeApp->sessionConfig(); config->setGroup("Session" ); int count = config->readNumEntry( "count" ); int active_client = config->readNumEntry( "active" ); @@ -170,15 +170,15 @@ void Workspace::loadSessionInfo() info->maximized = config->readNumEntry( TQString("maximize")+n, 0 ); info->fullscreen = config->readNumEntry( TQString("fullscreen")+n, 0 ); info->desktop = config->readNumEntry( TQString("desktop")+n, 0 ); - info->minimized = config->readBoolEntry( TQString("iconified")+n, FALSE ); - info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, FALSE ); - info->shaded = config->readBoolEntry( TQString("shaded")+n, FALSE ); - info->shadowed = config->readBoolEntry( TQString("shadowed")+n, TRUE ); - info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, FALSE ); - info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, FALSE ); - info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, FALSE ); - info->skipPager = config->readBoolEntry( TQString("skipPager")+n, FALSE ); - info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, FALSE ); + info->minimized = config->readBoolEntry( TQString("iconified")+n, false ); + info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, false ); + info->shaded = config->readBoolEntry( TQString("shaded")+n, false ); + info->shadowed = config->readBoolEntry( TQString("shadowed")+n, true ); + info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, false ); + info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, false ); + info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, false ); + info->skipPager = config->readBoolEntry( TQString("skipPager")+n, false ); + info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, false ); info->windowType = txtToWindowType( config->readEntry( TQString("windowType")+n ).latin1()); info->shortcut = config->readEntry( TQString("shortcut")+n ); info->active = ( active_client == i ); @@ -416,8 +416,8 @@ SessionSaveDoneHelper::SessionSaveDoneHelper() SmProp* p[ 5 ] = { &props[ 0 ], &props[ 1 ], &props[ 2 ], &props[ 3 ], &props[ 4 ] }; SmcSetProperties( conn, 5, p ); notifier = new TQSocketNotifier( IceConnectionNumber( SmcGetIceConnection( conn )), - TQSocketNotifier::Read, TQT_TQOBJECT(this) ); - connect( notifier, TQT_SIGNAL( activated( int )), TQT_SLOT( processData())); + TQSocketNotifier::Read, this ); + connect( notifier, TQ_SIGNAL( activated( int )), TQ_SLOT( processData())); } SessionSaveDoneHelper::~SessionSaveDoneHelper() |