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

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/plasma
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-05-01 3:24:21
Message-ID: 1209612261.233092.24041.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 802892 by aseigo:

resetConfigurationObject()->pimpl


 M  +8 -8      applet.cpp  
 M  +0 -5      applet.h  
 M  +1 -0      applet_p.h  
 M  +2 -1      containment.cpp  


--- trunk/KDE/kdebase/workspace/libs/plasma/applet.cpp #802891:802892
@@ -103,7 +103,7 @@
 Applet::~Applet()
 {
     if (d->transient) {
-        resetConfigurationObject();
+        d->resetConfigurationObject();
     }
 
     delete d;
@@ -264,13 +264,6 @@
     deleteLater();
 }
 
-void Applet::resetConfigurationObject()
-{
-    d->mainConfigGroup()->deleteGroup();
-    delete d->mainConfig;
-    d->mainConfig = 0;
-}
-
 ConfigXml* Applet::configScheme() const
 {
     return d->configXml;
@@ -1409,6 +1402,13 @@
     q->update();
 }
 
+void Applet::Private::resetConfigurationObject()
+{
+    mainConfigGroup()->deleteGroup();
+    delete mainConfig;
+    mainConfig = 0;
+}
+
 uint Applet::Private::s_maxAppletId = 0;
 uint Applet::Private::s_maxZValue = 0;
 uint Applet::Private::s_minZValue = 0;
--- trunk/KDE/kdebase/workspace/libs/plasma/applet.h #802891:802892
@@ -425,11 +425,6 @@
         enum { Type = Plasma::AppletType };
 
         /**
-         * @internal
-         */
-        void resetConfigurationObject();
-
-        /**
          * @return the Containment, if any, this applet belongs to
          **/
         Containment* containment() const;
--- trunk/KDE/kdebase/workspace/libs/plasma/applet_p.h #802891:802892
@@ -59,6 +59,7 @@
     QString visibleFailureText(const QString& reason);
     void checkImmutability();
     void themeChanged();
+    void resetConfigurationObject();
 
     static uint s_maxAppletId;
     static uint s_maxZValue;
--- trunk/KDE/kdebase/workspace/libs/plasma/containment.cpp #802891:802892
@@ -42,6 +42,7 @@
 #include <KStandardDirs>
 #include <KWindowSystem>
 
+#include "applet_p.h"
 #include "applethandle_p.h"
 #include "corona.h"
 #include "animator.h"
@@ -445,7 +446,7 @@
         // now move the old config to the new location
         KConfigGroup c = config().group("Applets").group(QString::number(applet->id()));
         oldConfig.reparent(&c);
-        applet->resetConfigurationObject();
+        applet->d->resetConfigurationObject();
     } else {
 	applet->setParentItem(this);
     }
[prev in list] [next in list] [prev in thread] [next in thread]