- reinstate AppletBrowser to the build

- refer to the now-_p.h'd private headers
- const the dptr

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=717938

CMakeLists.txt

@@ -17,6 +17,12 @@ set(plasma_LIB_SRCS
     abstractrunner.cpp
     animator.cpp
     applet.cpp
+    appletbrowser.cpp
+    appletbrowser/appletbrowserwindow.cpp
+    appletbrowser/kcategorizeditemsview.cpp
+    appletbrowser/kcategorizeditemsviewdelegate.cpp
+    appletbrowser/kcategorizeditemsviewmodels.cpp
+    appletbrowser/plasmaappletitemmodel.cpp
     configxml.cpp
     containment.cpp
     corona.cpp
@@ -52,14 +58,6 @@ set(plasma_LIB_SRCS
     widgets/widget.cpp
     widgets/signalplotter.cpp
     widgets/meter.cpp
-
-    #    appletbrowser.cpp
-    appletbrowser/appletbrowserwindow.cpp
-    appletbrowser/kcategorizeditemsview.cpp
-    appletbrowser/kcategorizeditemsviewdelegate.cpp
-    appletbrowser/kcategorizeditemsviewmodels.cpp
-    appletbrowser/plasmaappletitemmodel.cpp
-
 )
 
 kde4_add_ui_files (
@@ -106,7 +104,7 @@ set(plasma_LIB_INCLUDES
     abstractrunner.h
     animator.h
     applet.h
-    #    appletbrowser.h
+    appletbrowser.h
     configxml.h
     containment.h
     corona.h

appletbrowser.cpp

@@ -18,7 +18,7 @@
  */
 
 #include <appletbrowser.h>
-#include <appletbrowser/appletbrowserwindow.h>
+#include <appletbrowser/appletbrowserwindow_p.h>
 
 #include <corona.h>
 #include <containment.h>
@@ -44,8 +44,8 @@ public:
     void show() { if (window) window->show(); };
     void hide() { if (window) window->hide(); };
 
-    AppletBrowserWindow * window;
     AppletBrowser * q;
+    AppletBrowserWindow * window;
 };
 
 AppletBrowser::AppletBrowser(Corona * corona)

appletbrowser.h

@@ -49,7 +49,7 @@ namespace Plasma
 
     private:
         class Private;
-        Private * d;
+        Private * const d;
     };
 
 } // namespace Plasma

containment.cpp

@@ -49,8 +49,7 @@
 #include "ksmserver_interface.h"
 #include "screensaver_interface.h"
 
-//#include "appletbrowser.h"
-class AppletBrowser;
+#include "appletbrowser.h"
 
 namespace Plasma
 {
@@ -78,7 +77,7 @@ public:
         applets.clear();
         delete layout;
         delete bitmapBackground;
-        //delete appletBrowser;
+        delete appletBrowser;
     }
 
     FormFactor formFactor;
@@ -197,10 +196,12 @@ void Containment::launchExplorer()
 void Containment::launchAppletBrowser()
 {
     if (!d->appletBrowser) {
-//        d->appletBrowser = new AppletBrowser(this);
+        //TODO: should we delete this after some point, so as to conserve memory
+        //      and any possible processing tha tmight end up in AppletBrowser?
+        d->appletBrowser = new AppletBrowser(this);
     }
 
-//    d->appletBrowser->show();
+    d->appletBrowser->show();
 }
 
 void Containment::runCommand()