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

kwinrc is KGlobal::config(). This maybe fixes #87253.

Browse source 
svn path=/trunk/kdebase/kwin/; revision=341348
This commit is contained in:
Luboš Luňák 2004-08-26 14:06:33 +00:00
parent 1fdde5f129
commit cd99ad5168
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
workspace.cpp
View file

@ -820,16 +820,15 @@ void Workspace::slotReconfigure()
void Workspace::loadDesktopSettings() void Workspace::loadDesktopSettings()
{ {
KConfig c("kwinrc"); KConfig* c = KGlobal::config();
QCString groupname; QCString groupname;
if (screen_number == 0) if (screen_number == 0)
groupname = "Desktops"; groupname = "Desktops";
else else
groupname.sprintf("Desktops-screen-%d", screen_number); groupname.sprintf("Desktops-screen-%d", screen_number);
c.setGroup(groupname); KConfigGroupSaver saver(c,groupname);
int n = c.readNumEntry("Number", 4); int n = c->readNumEntry("Number", 4);
number_of_desktops = n; number_of_desktops = n;
delete workarea; delete workarea;
workarea = new QRect[ n + 1 ]; workarea = new QRect[ n + 1 ];
@ -839,7 +838,7 @@ void Workspace::loadDesktopSettings()
desktop_focus_chain.resize( n ); desktop_focus_chain.resize( n );
for(int i = 1; i <= n; i++) for(int i = 1; i <= n; i++)
{ {
QString s = c.readEntry(QString("Name_%1").arg(i), QString s = c->readEntry(QString("Name_%1").arg(i),
i18n("Desktop %1").arg(i)); i18n("Desktop %1").arg(i));
rootInfo->setDesktopName( i, s.utf8().data() ); rootInfo->setDesktopName( i, s.utf8().data() );
desktop_focus_chain[i-1] = i; desktop_focus_chain[i-1] = i;
@ -848,16 +847,15 @@ void Workspace::loadDesktopSettings()
void Workspace::saveDesktopSettings() void Workspace::saveDesktopSettings()
{ {
KConfig c("kwinrc"); KConfig* c = KGlobal::config();
QCString groupname; QCString groupname;
if (screen_number == 0) if (screen_number == 0)
groupname = "Desktops"; groupname = "Desktops";
else else
groupname.sprintf("Desktops-screen-%d", screen_number); groupname.sprintf("Desktops-screen-%d", screen_number);
c.setGroup(groupname); KConfigGroupSaver saver(c,groupname);
c.writeEntry("Number", number_of_desktops ); c->writeEntry("Number", number_of_desktops );
for(int i = 1; i <= number_of_desktops; i++) for(int i = 1; i <= number_of_desktops; i++)
{ {
QString s = desktopName( i ); QString s = desktopName( i );
@ -870,13 +868,13 @@ void Workspace::saveDesktopSettings()
if (s != defaultvalue) if (s != defaultvalue)
{ {
c.writeEntry( QString("Name_%1").arg(i), s ); c->writeEntry( QString("Name_%1").arg(i), s );
} }
else else
{ {
QString currentvalue = c.readEntry(QString("Name_%1").arg(i)); QString currentvalue = c->readEntry(QString("Name_%1").arg(i));
if (currentvalue != defaultvalue) if (currentvalue != defaultvalue)
c.writeEntry( QString("Name_%1").arg(i), "" ); c->writeEntry( QString("Name_%1").arg(i), "" );
} }
} }
} }