Merge branch 'Applications/19.04'

[dolphin.git] / src / panels / places / placesitemsignalhandler.cpp

diff --git a/src/panels/places/placesitemsignalhandler.cpp b/src/panels/places/placesitemsignalhandler.cpp
index c9bc0db3f7b29551365a9d221bfa134ce5b5b649..1341b741306be17602cc5d8d8187f601aa4eb84d 100644 (file)
--- a/src/panels/places/placesitemsignalhandler.cpp
+++ b/src/panels/places/placesitemsignalhandler.cpp
@@ -20,7 +20,6 @@
 #include "placesitemsignalhandler.h"
 
 #include "placesitem.h"
 #include "placesitemsignalhandler.h"
 
 #include "placesitem.h"

-#include <Solid/StorageAccess>

 
 PlacesItemSignalHandler::PlacesItemSignalHandler(PlacesItem* item,
                                                  QObject* parent) :
 
 PlacesItemSignalHandler::PlacesItemSignalHandler(PlacesItem* item,
                                                  QObject* parent) :


@@ -40,10 +39,21 @@ void PlacesItemSignalHandler::onAccessibilityChanged()
     }
 }
 
     }
 }
 

-void PlacesItemSignalHandler::onTrashDirListerCompleted()
+void PlacesItemSignalHandler::onTearDownRequested(const QString& udi)

 {
 {

+    Q_UNUSED(udi)

     if (m_item) {
     if (m_item) {

-        m_item->onTrashDirListerCompleted();
+        Solid::StorageAccess *tmp = m_item->device().as<Solid::StorageAccess>();
+        if (tmp) {
+            emit tearDownExternallyRequested(tmp->filePath());
+        }
+    }
+}
+
+void PlacesItemSignalHandler::onTrashEmptinessChanged(bool isTrashEmpty)
+{
+    if (m_item) {
+        m_item->setIcon(isTrashEmpty ? QStringLiteral("user-trash") : QStringLiteral("user-trash-full"));

     }
 }
 
     }
 }