fix build

src/plasmaview/CMakeLists.txt

@@ -5,8 +5,6 @@ set(plasmaview_LIB_SRC
     configview.cpp
     containmentconfigview_p.cpp
     currentcontainmentactionsmodel_p.cpp
-    shellpluginloader.cpp
-    shellpackage_p.cpp
 )
 
 

src/plasmaview/view.cpp

@@ -38,7 +38,7 @@ public:
     void init();
     void setContainment(Plasma::Containment *cont);
     Plasma::Types::FormFactor formFactor() const;
-    int location() const;
+    Plasma::Types::Location location() const;
     void showConfigurationInterface(Plasma::Applet *applet);
 
     View *q;
@@ -65,8 +65,8 @@ void ViewPrivate::init()
     QSurfaceFormat format;
     format.setAlphaBufferSize(8);
 
-    setFormat(format);
-    setColor(Qt::transparent);
+    q->setFormat(format);
+    q->setColor(Qt::transparent);
 
 
     QObject::connect(q->screen(), &QScreen::virtualGeometryChanged,
@@ -79,7 +79,7 @@ void ViewPrivate::init()
     q->setResizeMode(View::SizeRootObjectToView);
     q->setSource(QUrl::fromLocalFile(corona->package().filePath("views", "Desktop.qml")));
 
-    connect(m_corona, &Plasma::Corona::packageChanged,
+    QObject::connect(corona, &Plasma::Corona::packageChanged,
             q, &View::coronaPackageChanged);
 }
 
@@ -113,22 +113,15 @@ void ViewPrivate::setContainment(Plasma::Containment *cont)
     emit q->containmentChanged();
 
     if (cont) {
-        connect(cont, &Plasma::Containment::locationChanged,
-                this, &View::locationChanged);
-        connect(cont, &Plasma::Containment::formFactorChanged,
-                this, &View::formFactorChanged);
-        connect(cont, &Plasma::Containment::configureRequested,
-                this, &View::showConfigurationInterface);
-    } else {
-        return;
-    }
-
         QObject::connect(cont, &Plasma::Containment::locationChanged,
                 q, &View::locationChanged);
         QObject::connect(cont, &Plasma::Containment::formFactorChanged,
                 q, &View::formFactorChanged);
         QObject::connect(cont, &Plasma::Containment::configureRequested,
                 q, &View::showConfigurationInterface);
+    } else {
+        return;
+    }
 
     QObject *graphicObject = containment.data()->property("graphicObject").value<QObject *>();
 
@@ -147,7 +140,7 @@ void ViewPrivate::setContainment(Plasma::Containment *cont)
     }
 }
 
-int ViewPrivate::location() const
+Plasma::Types::Location ViewPrivate::location() const
 {
     if (!containment) {
         return Plasma::Types::Desktop;

src/plasmaview/view.h

@@ -62,23 +62,16 @@ public:
      **/
     Plasma::Containment *containment() const;
 
-<<<<<<< HEAD:src/shell/view.h
-    Plasma::Types::Location location() const;
-    void setLocation(Plasma::Types::Location location);
-=======
     /**
      * @return the location of this View
      **/
-
-    //FIXME: Plasma::Types::Location should be something qml can understand
-    int location() const;
+    Plasma::Types::Location location() const;
     
     /**
      * Sets the location of the View
      * @param location the location of the View
      **/
-    void setLocation(int location);
->>>>>>> plasmaview2:src/plasmaview/view.h
+    void setLocation(Plasma::Types::Location location);
 
     /**
      * @return the formfactor of the View

src/shell/CMakeLists.txt

@@ -57,11 +57,13 @@ set(widgetexplorer_SRC
 
 add_executable(plasma-shell
     main.cpp
-    desktopcorona.cpp
     panelview.cpp
-    lookandfeelpackage.cpp
     panelconfigview.cpp
+    panelshadows.cpp
+    packages.cpp
+    shellcorona.cpp
     shellpluginloader.cpp
+    shellmanager.cpp
     ${scripting_SRC}
     ${widgetexplorer_SRC}
 )

src/shell/shellcorona.cpp

@@ -31,8 +31,6 @@
 #include <Plasma/Package>
 #include <Plasma/PluginLoader>
 
-#include "containmentconfigview.h"
-
 #include "panelview.h"
 #include "view.h"
 #include "scripting/desktopscriptengine.h"