clean up code #79

app/dockcorona.cpp

@@ -58,7 +58,6 @@ DockCorona::DockCorona(QObject *parent)
     qmlRegisterTypes();
     
     connect(this, &Corona::containmentAdded, this, &DockCorona::addDock);
-    
     connect(m_activityConsumer, &KActivities::Consumer::serviceStatusChanged, this, &DockCorona::load);
 }
 
@@ -175,7 +174,7 @@ QList<Plasma::Types::Location> DockCorona::freeEdges(int screen) const
     //when screen=-1 is passed then the primaryScreenid is used
     int fixedScreen = (screen == -1) ? primaryScreenId() : screen;
     
-    for (const auto &view : m_dockViews) {
+    for (auto *view : m_dockViews) {
         if (view && view->containment()
             && view->containment()->screen() == fixedScreen) {
             edges.removeOne(view->location());
@@ -203,19 +202,17 @@ void DockCorona::addDock(Plasma::Containment *containment)
         return;
     }
     
+    auto metadata = containment->kPackage().metadata();
+    
     // the system tray is a containment that behaves as an applet
     // so a dockview shouldnt be created for it
-    KPluginMetaData metadata = containment->kPackage().metadata();
+    if (metadata.pluginId() != "org.kde.latte.containment")
-    
-    if (metadata.pluginId() == "org.kde.plasma.private.systemtray") {
         return;
-    }
         
-    foreach (DockView *dock, m_dockViews) {
+    for (auto *dock : m_dockViews) {
-        if (dock->containment() == containment) {
+        if (dock->containment() == containment)
             return;
     }
-    }
     
     qDebug() << "Adding dock for container...";
     
@@ -229,7 +226,7 @@ void DockCorona::addDock(Plasma::Containment *containment)
     
     m_dockViews[containment] = dockView;
     
-    emit containmentsNoChanged();
+    emit docksCountChanged();
 }
 
 void DockCorona::destroyedChanged(bool destroyed)
@@ -246,15 +243,18 @@ void DockCorona::destroyedChanged(bool destroyed)
         m_dockViews[sender] = m_waitingDockViews.take(static_cast<Plasma::Containment *>(sender));
     }
     
-    emit containmentsNoChanged();
+    emit docksCountChanged();
 }
 
 void DockCorona::dockContainmentDestroyed(QObject *cont)
 {
     auto view = m_waitingDockViews.take(static_cast<Plasma::Containment *>(cont));
-    delete view;
+    
+    if (view)
+        view->destroy();
+        
     //view->deleteLater();
-    emit containmentsNoChanged();
+    emit docksCountChanged();
 }
 
 void DockCorona::loadDefaultLayout()
@@ -300,13 +300,6 @@ void DockCorona::loadDefaultLayout()
 
 inline void DockCorona::qmlRegisterTypes() const
 {
-    constexpr auto uri = "org.kde.latte.shell";
-    constexpr auto vMajor = 0;
-    constexpr auto vMinor = 2;
-    
-    //    qmlRegisterUncreatableType<Candil::Dock>(uri, vMajor, vMinor, "Dock", "class Dock uncreatable");
-    //    qmlRegisterUncreatableType<Candil::VisibilityManager>(uri, vMajor, vMinor, "VisibilityManager", "class VisibilityManager uncreatable");
-    //    qmlRegisterUncreatableType<NowDockView>(uri, vMajor, vMinor, "DockView", "class DockView uncreatable");
     qmlRegisterType<QScreen>();
 }
 

app/dockcorona.h

@@ -64,7 +64,7 @@ public slots:
     
 signals:
     void configurationShown(PlasmaQuick::ConfigView *configView);
-    void containmentsNoChanged();
+    void docksCountChanged();
     
 private slots:
     void destroyedChanged(bool destroyed);

app/dockview.cpp

@@ -46,7 +46,6 @@ namespace Latte {
 
 DockView::DockView(Plasma::Corona *corona, QScreen *targetScreen)
     : PlasmaQuick::ContainmentView(corona),
-      m_docksCount(0),
       m_contextMenu(nullptr)
 {
     setVisible(false);
@@ -88,10 +87,10 @@ DockView::DockView(Plasma::Corona *corona, QScreen *targetScreen)
         
     }, Qt::DirectConnection);
     
-    DockCorona *dcorona = qobject_cast<DockCorona *>(this->corona());
+    auto *dockCorona = qobject_cast<DockCorona *>(this->corona());
     
-    if (dcorona) {
+    if (dockCorona) {
-        connections << connect(dcorona, &DockCorona::containmentsNoChanged, this, &DockView::updateDocksCount);
+        connect(dockCorona, &DockCorona::docksCountChanged, this, &DockView::docksCountChanged);
     }
 }
 
@@ -130,7 +129,6 @@ void DockView::init()
     
     setVisible(true);
     
-    updateDocksCount();
     syncGeometry();
     qDebug() << "SOURCE:" << source();
 }
@@ -152,16 +150,16 @@ void DockView::adaptToScreen(QScreen *screen)
 
 void DockView::addNewDock()
 {
-    DockCorona *corona = qobject_cast<DockCorona *>(this->corona());
+    auto *dockCorona = qobject_cast<DockCorona *>(this->corona());
     
-    if (corona) {
+    if (dockCorona) {
-        corona->loadDefaultLayout();
+        dockCorona->loadDefaultLayout();
     }
 }
 
 void DockView::removeDock()
 {
-    if (m_docksCount > 1) {
+    if (docksCount() > 1) {
         QAction *removeAct = containment()->actions()->action(QStringLiteral("remove"));
         
         if (removeAct) {
@@ -199,7 +197,6 @@ void DockView::showConfigurationInterface(Plasma::Applet *applet)
             m_configView->hide();
         } else {
             m_configView->show();
-            //m_configView->requestActivate();
         }
         
         return;
@@ -281,7 +278,6 @@ void DockView::updatePosition()
     QPoint position;
     
     position = {0, 0};
-    m_maxLength = screenGeometry.width();
     
     switch (location()) {
         case Plasma::Types::TopEdge:
@@ -330,13 +326,8 @@ void DockView::statusChanged(Plasma::Types::ItemStatus status)
     } else {
         m_visibility->setBlockHiding(false);
     }
-
-    /*} else if (status == Plasma::Types::AcceptingInputStatus) {
-             KWindowSystem::forceActiveWindow(winId());*/
-
 }
 
-
 int DockView::currentThickness() const
 {
     if (formFactor() == Plasma::Types::Vertical) {
@@ -356,25 +347,6 @@ int DockView::docksCount() const
     return dockCorona->docksCount(containment()->screen());
 }
 
-void DockView::updateDocksCount()
-{
-    auto *dockCorona = qobject_cast<DockCorona *>(this->corona());
-    
-    if (!dockCorona || !containment()) {
-        return ;
-    }
-
-    int count = dockCorona->docksCount(containment()->screen());
-
-    if (count == m_docksCount) {
-        return;
-    }
-
-    m_docksCount = count;
-
-    emit docksCountChanged();
-}
-
 void DockView::updateFormFactor()
 {
     if (!containment())
@@ -411,25 +383,6 @@ void DockView::setMaxThickness(int thickness)
     emit maxThicknessChanged();
 }
 
-int DockView::length() const
-{
-    return m_length;
-}
-
-void DockView::setLength(int length)
-{
-    if (m_length == length)
-        return;
-
-    if (length > m_maxLength)
-        m_length = m_maxLength;
-    else
-        m_length = length;
-
-    syncGeometry();
-    emit lengthChanged();
-}
-
 int DockView::maxLength() const
 {
     return m_maxLength;
@@ -444,7 +397,6 @@ void DockView::setMaxLength(int maxLength)
     emit maxLengthChanged();
 }
 
-
 QRect DockView::maskArea() const
 {
     return m_maskArea;
@@ -456,7 +408,6 @@ void DockView::setMaskArea(QRect area)
         return;
         
     m_maskArea = area;
-    
     setMask(m_maskArea);
     
     //qDebug() << "dock mask set:" << m_maskArea;
@@ -470,12 +421,10 @@ int DockView::shadow() const
 
 void DockView::setShadow(int shadow)
 {
-    if (m_shadow == shadow) {
+    if (m_shadow == shadow)
         return;
-    }
         
     m_shadow = shadow;
-
     emit shadowChanged();
 }
 
@@ -484,10 +433,9 @@ bool DockView::tasksPresent()
     foreach (Plasma::Applet *applet, containment()->applets()) {
         KPluginMetaData meta = applet->kPackage().metadata();
         
-        if (meta.pluginId() == "org.kde.latte.plasmoid") {
+        if (meta.pluginId() == "org.kde.latte.plasmoid")
             return true;
     }
-    }
     
     return false;
 }
@@ -506,7 +454,7 @@ bool DockView::event(QEvent *e)
 
 QList<int> DockView::freeEdges() const
 {
-    QList<Plasma::Types::Location> edges = corona()->freeEdges(containment()->screen());
+    const auto edges = corona()->freeEdges(containment()->screen());
     
     QList<int> edgesInt;
     
@@ -519,14 +467,14 @@ QList<int> DockView::freeEdges() const
 
 void DockView::closeApplication()
 {
-    DockCorona *corona = qobject_cast<DockCorona *>(this->corona());
+    DockCorona *dockCorona = qobject_cast<DockCorona *>(this->corona());
     
-    if (corona) {
+    if (dockCorona) {
         //m_configView->hide();
         if (m_configView)
             m_configView->deleteLater();
             
-        corona->closeApplication();
+        dockCorona->closeApplication();
     }
 }
 

app/dockview.h

@@ -48,7 +48,6 @@ class DockView : public PlasmaQuick::ContainmentView {
     Q_PROPERTY(int docksCount READ docksCount NOTIFY docksCountChanged)
     Q_PROPERTY(int width READ width NOTIFY widthChanged)
     Q_PROPERTY(int height READ height NOTIFY heightChanged)
-    Q_PROPERTY(int length READ length WRITE setLength NOTIFY lengthChanged)
     Q_PROPERTY(int maxLength READ maxLength WRITE setMaxLength NOTIFY maxLengthChanged)
     Q_PROPERTY(int maxThickness READ maxThickness WRITE setMaxThickness NOTIFY maxThicknessChanged)
     Q_PROPERTY(int shadow READ shadow WRITE setShadow NOTIFY shadowChanged)
@@ -73,9 +72,6 @@ public:
     
     int docksCount() const;
     
-    int length() const;
-    void setLength(int length);
-
     int maxLength() const;
     void setMaxLength(int maxLength);
     
@@ -124,7 +120,6 @@ signals:
     void docksCountChanged();
     void widthChanged();
     void heightChanged();
-    void lengthChanged();
     void maxLengthChanged();
     void maxThicknessChanged();
     void visibilityChanged();
@@ -143,15 +138,9 @@ private:
     void addAppletActions(QMenu *desktopMenu, Plasma::Applet *applet, QEvent *event);
     void addContainmentActions(QMenu *desktopMenu, QEvent *event);
     void updatePosition();
-
-    void updateDocksCount();
     void updateFormFactor();
     
 private:
-    bool m_secondInitPass;
-
-    int m_docksCount;
-    int m_length{0};
     int m_maxLength{INT_MAX};
     int m_maxThickness{24};
     int m_shadow{0};

shell/contents/views/Panel.qml

@@ -90,23 +90,6 @@ PlasmaCore.FrameSvgItem {
         }
     }
 
-    Binding {
-        target: dock
-        property: "length"
-        when: containment
-        value: {
-            if (!containment) {
-                return;
-            }
-            if (verticalPanel) {
-                return containment.Layout.preferredHeight
-            } else {
-                return containment.Layout.preferredWidth
-            }
-        }
-    }
-
-
     Item {
         id: containmentParent
         anchors.fill: parent