move explicitDockOccupyEdge to layout

app/dockcorona.cpp

@@ -758,22 +758,6 @@ int DockCorona::screenForContainment(const Plasma::Containment *containment) con
     return -1;
 }
 
-bool DockCorona::explicitDockOccupyEdge(int screen, Plasma::Types::Location location) const
-{
-    foreach (auto containment, containments()) {
-        bool onPrimary = containment->config().readEntry("onPrimary", true);
-        int id = containment->lastScreen();
-        Plasma::Types::Location contLocation = containment->location();
-
-        if (!onPrimary && id == screen && contLocation == location) {
-            return true;
-        }
-
-    }
-
-    return false;
-}
-
 void DockCorona::recreateDock(Plasma::Containment *containment)
 {
     m_layoutManager->recreateDock(containment);

app/dockcorona.h

@@ -133,7 +133,6 @@ private:
 
     bool appletExists(uint containmentId, uint appletId) const;
     bool containmentExists(uint id) const;
-    bool explicitDockOccupyEdge(int screen, Plasma::Types::Location location)const;
 
     int noOfDocks();
     int primaryScreenId() const;

app/layout.cpp

@@ -672,7 +672,7 @@ void Layout::addDock(Plasma::Containment *containment, bool forceLoading, int ex
             return;
         }
     } else if (onPrimary) {
-        if (m_corona->explicitDockOccupyEdge(m_corona->screenPool()->primaryScreenId(), containment->location())) {
+        if (explicitDockOccupyEdge(m_corona->screenPool()->primaryScreenId(), containment->location())) {
             qDebug() << "CORONA ::: adding dock rejected, the edge is occupied by explicit dock ! : " <<  containment->location();
             //we must check that an onPrimary dock should never catch up the same edge on
             //the same screen with an explicit dock
@@ -1403,8 +1403,34 @@ QList<Plasma::Types::Location> Layout::freeEdges(int screen) const
     return edges;
 }
 
+bool Layout::explicitDockOccupyEdge(int screen, Plasma::Types::Location location) const
+{
+    if (!m_corona) {
+        return false;
+    }
+
+    foreach (auto containment, m_containments) {
+        if (containment->pluginMetaData().pluginId() == "org.kde.latte.containment") {
+            bool onPrimary = containment->config().readEntry("onPrimary", true);
+            int id = containment->lastScreen();
+            Plasma::Types::Location contLocation = containment->location();
+
+            if (!onPrimary && id == screen && contLocation == location) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+
 int Layout::noDocksWithTasks() const
 {
+    if (!m_corona) {
+        return 0;
+    }
+
     int result = 0;
 
     foreach (auto view, m_dockViews) {

app/layout.h

@@ -142,6 +142,8 @@ private:
     void setName(QString name);
     void setFile(QString file);
 
+    bool explicitDockOccupyEdge(int screen, Plasma::Types::Location location) const;
+
     QString availableId(QStringList all, QStringList assigned, int base);
     //! provides a new file path based the provided file. The new file
     //! has updated ids for containments and applets based on the corona