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

compilation fixes with new KConfigBase::writeEntry

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=496327
This commit is contained in:
David Faure 2006-01-10 11:51:06 +00:00
parent e664161f4d
commit d6fabbf89e
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rules.cpp
View file

@ -177,7 +177,7 @@ void Rules::readFromCfg( KConfig& cfg )
if( !var.isEmpty() || force ) \
{ \
cfg.writeEntry( #var, cast var ); \
cfg.writeEntry( #var "match", var##match ); \
cfg.writeEntry( #var "match", (int)var##match ); \
} \
else \
{ \
@ -189,7 +189,7 @@ void Rules::readFromCfg( KConfig& cfg )
if( var##rule != UnusedSetRule ) \
{ \
cfg.writeEntry( #var, func ( var )); \
cfg.writeEntry( #var "rule", var##rule ); \
cfg.writeEntry( #var "rule", (int)var##rule ); \
} \
else \
{ \
@ -201,7 +201,7 @@ void Rules::readFromCfg( KConfig& cfg )
if( var##rule != UnusedForceRule ) \
{ \
cfg.writeEntry( #var, func ( var )); \
cfg.writeEntry( #var "rule", var##rule ); \
cfg.writeEntry( #var "rule", (int)var##rule ); \
} \
else \
{ \
@ -236,7 +236,7 @@ void Rules::write( KConfig& cfg ) const
WRITE_FORCE_RULE( opacityinactive, );
WRITE_FORCE_RULE( ignoreposition, );
WRITE_SET_RULE( desktop, );
WRITE_FORCE_RULE( type, );
WRITE_FORCE_RULE( type, int );
WRITE_SET_RULE( maximizevert, );
WRITE_SET_RULE( maximizehoriz, );
WRITE_SET_RULE( minimize, );

12
sm.cpp
View file

@ -88,12 +88,12 @@ void Workspace::storeSession( KConfig* config, SMSavePhase phase )
QString n = QString::number(count);
if( phase == SMSavePhase2 || phase == SMSavePhase2Full )
{
config->writeEntry( QString("sessionId")+n, sessionId.data() );
config->writeEntry( QString("windowRole")+n, c->windowRole().data() );
config->writeEntry( QString("wmCommand")+n, wmCommand.data() );
config->writeEntry( QString("wmClientMachine")+n, c->wmClientMachine( true ).data() );
config->writeEntry( QString("resourceName")+n, c->resourceName().data() );
config->writeEntry( QString("resourceClass")+n, c->resourceClass().data() );
config->writeEntry( QString("sessionId")+n, sessionId.constData() );
config->writeEntry( QString("windowRole")+n, c->windowRole().constData() );
config->writeEntry( QString("wmCommand")+n, wmCommand.constData() );
config->writeEntry( QString("wmClientMachine")+n, c->wmClientMachine( true ).constData() );
config->writeEntry( QString("resourceName")+n, c->resourceName().constData() );
config->writeEntry( QString("resourceClass")+n, c->resourceClass().constData() );
config->writeEntry( QString("geometry")+n, QRect( c->calculateGravitation(TRUE), c->clientSize() ) ); // FRAME
config->writeEntry( QString("restore")+n, c->geometryRestore() );
config->writeEntry( QString("fsrestore")+n, c->geometryFSRestore() );