[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-10-27 14:18:37
Message-ID: 20101027141837.0100FAC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1190381 by ervin:

Use the KConfigGroup overload, the other one (KConfigBase based) being deprecated.


 M  +1 -1      desktop/shell/activity.cpp  
 M  +1 -1      netbook/shell/netcorona.cpp  


--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/activity.cpp #1190380:1190381
@@ -338,7 +338,7 @@
     KConfig external(fileName, KConfig::SimpleConfig, "appdata");
 
     //TODO only load existing screens
-    foreach (Plasma::Containment *newContainment, m_corona->importLayout(external)) \
{ +    foreach (Plasma::Containment *newContainment, \
m_corona->importLayout(external.group(QByteArray()))) {  \
                insertContainment(newContainment);
         //ensure it's hooked up (if something odd happened we don't want orphan \
containments)  Plasma::Context *context = newContainment->context();
--- trunk/KDE/kdebase/workspace/plasma/netbook/shell/netcorona.cpp #1190380:1190381
@@ -89,7 +89,7 @@
         // temporary to importLayout, ie importLayout(KConfig(defaultConfig)) fails
         // on gcc < 4.3.0
         KConfig c(defaultConfig);
-        importLayout(c);
+        importLayout(c.group(QByteArray()));
 
         return;
     }


[prev in list] [next in list] [prev in thread] [next in thread]