SVN commit 638152 by mbroadst:

Get-Plasma-Building

 M  +1 -1      CMakeLists.txt  
 M  +1 -1      plasma/CMakeLists.txt  
 M  +7 -0      plasma/plasmaapp.cpp  
 M  +18 -15    plasma/plasmaapp.h  


--- trunk/KDE/kdebase/workspace/plasma/CMakeLists.txt #638151:638152
@@ -1,7 +1,7 @@
 
 project(plasma)
 
-#add_subdirectory( plasma )
+add_subdirectory( plasma )
 
 
 
--- trunk/KDE/kdebase/workspace/plasma/plasma/CMakeLists.txt #638151:638152
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/workspace/plasma/lib ${CMAKE_SOURCE_DIR}/workspace/lib)
 
 set(plasma_SRCS 
     main.cpp
--- trunk/KDE/kdebase/workspace/plasma/plasma/plasmaapp.cpp #638151:638152
@@ -26,6 +26,7 @@
 
 #include <kcrash.h>
 
+#include "desktop.h"
 #include "plasmaapp.h"
 #include "plasmaapp.moc"
 
@@ -61,9 +62,15 @@
 
     m_interface = this;
     m_engineManager = new DataEngineManager;
+    m_desktop = new Desktop;
+
     notifyStartup(true);
 }
 
+PlasmaApp::~PlasmaApp()
+{
+}
+
 void PlasmaApp::setCrashHandler()
 {
 //    KCrash::setEmergencySaveFunction(Kicker::crashHandler);
--- trunk/KDE/kdebase/workspace/plasma/plasma/plasmaapp.h #638151:638152
@@ -19,35 +19,38 @@
 #ifndef PLASMA_APP_H
 #define PLASMA_APP_H
 
-
 #include <KUniqueApplication>
 
 #include "interface.h"
 #include "enginemanager.h"
 
+class Desktop;
 class QGraphicsView;
 class QGraphicsScene;
-class PlasmaApp : public KUniqueApplication, public Plasma::Interface
+class PlasmaApp : public KUniqueApplication,
+                  public Plasma::Interface
 {
-    public:
-        PlasmaApp();
-        ~PlasmaApp();
+    Q_OBJECT
+public:
+    PlasmaApp();
+    ~PlasmaApp();
 
-        static PlasmaApp* self();
+    static PlasmaApp* self();
 
-        // Plasma::Interface
-        bool loadDataEngine(const QString& name);
-        void unloadDataEngine(const QString& name);
+    // Plasma::Interface
+    bool loadDataEngine(const QString& name);
+    void unloadDataEngine(const QString& name);
 
-        void notifyStartup(bool completed);
+    void notifyStartup(bool completed);
 
-    private slots:
-        void setCrashHandler();
+private slots:
+    void setCrashHandler();
 
-    private:
-        void crashHandler(int signal);
+private:
+    void crashHandler(int signal);
 
-        DataEngineManager *m_engineManager;
+    DataEngineManager *m_engineManager;
+    Desktop *m_desktop;
 
 };