yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix compile with new snapshot

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=493669
This commit is contained in:
Urs Wolfer 2006-01-02 21:32:34 +00:00
parent fae6e5d5cd
commit 05ca19960c
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/kdecoration_plugins_p.cpp
View file

@ -95,7 +95,7 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
{
if( nameStr.isEmpty())
{
KConfigGroup group( config, "Style" );
KConfigGroup group( config, QString("Style") );
nameStr = group.readEntry("PluginLib", defaultPlugin );
}
// make sure people can switch between HEAD and kwin_iii branch

16
sm.cpp
View file

@ -157,12 +157,12 @@ void Workspace::loadSessionInfo()
QString n = QString::number(i);
SessionInfo* info = new SessionInfo;
session.append( info );
info->sessionId = config->readEntry( QString("sessionId")+n ).latin1();
info->windowRole = config->readEntry( QString("windowRole")+n ).latin1();
info->wmCommand = config->readEntry( QString("wmCommand")+n ).latin1();
info->wmClientMachine = config->readEntry( QString("wmClientMachine")+n ).latin1();
info->resourceName = config->readEntry( QString("resourceName")+n ).latin1();
info->resourceClass = config->readEntry( QString("resourceClass")+n ).lower().latin1();
info->sessionId = config->readEntry( QString("sessionId")+n, QString() ).latin1();
info->windowRole = config->readEntry( QString("windowRole")+n, QString() ).latin1();
info->wmCommand = config->readEntry( QString("wmCommand")+n, QString() ).latin1();
info->wmClientMachine = config->readEntry( QString("wmClientMachine")+n, QString() ).latin1();
info->resourceName = config->readEntry( QString("resourceName")+n, QString() ).latin1();
info->resourceClass = config->readEntry( QString("resourceClass")+n, QString() ).lower().latin1();
info->geometry = config->readRectEntry( QString("geometry")+n );
info->restore = config->readRectEntry( QString("restore")+n );
info->fsrestore = config->readRectEntry( QString("fsrestore")+n );
@ -177,8 +177,8 @@ void Workspace::loadSessionInfo()
info->skipTaskbar = config->readBoolEntry( QString("skipTaskbar")+n, FALSE );
info->skipPager = config->readBoolEntry( QString("skipPager")+n, FALSE );
info->userNoBorder = config->readBoolEntry( QString("userNoBorder")+n, FALSE );
info->windowType = txtToWindowType( config->readEntry( QString("windowType")+n ).latin1());
info->shortcut = config->readEntry( QString("shortcut")+n );
info->windowType = txtToWindowType( config->readEntry( QString("windowType")+n, QString() ).latin1());
info->shortcut = config->readEntry( QString("shortcut")+n, QString() );
info->active = ( active_client == i );
}
}

2
workspace.cpp
View file

@ -952,7 +952,7 @@ void Workspace::saveDesktopSettings()
}
else
{
QString currentvalue = group.readEntry(QString("Name_%1").arg(i));
QString currentvalue = group.readEntry(QString("Name_%1").arg(i), QString());
if (currentvalue != defaultvalue)
group.writeEntry( QString("Name_%1").arg(i), "" );
}