Port away from ResourceInstance

The information reported here isn't used by anything

Instead only report that the url was accessed, which is used for things

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 076551e5dc3d432614e2065c4c53d06791233c70..1e0fd527e924c07ecd5c6fe7f7019d44668ea0ac 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -71,9 +71,6 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
     , m_statusBarTimer(nullptr)
     , m_statusBarTimestamp()
     , m_autoGrabFocus(true)
     , m_statusBarTimer(nullptr)
     , m_statusBarTimestamp()
     , m_autoGrabFocus(true)

-#if HAVE_KACTIVITIES
-    , m_activityResourceInstance(nullptr)
-#endif

 {
     hide();
 
 {
     hide();
 


@@ -189,13 +186,6 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
     connect(placesModel, &KFilePlacesModel::rowsRemoved, this, &DolphinViewContainer::slotPlacesModelChanged);
 
     connect(this, &DolphinViewContainer::searchModeEnabledChanged, this, &DolphinViewContainer::captionChanged);
     connect(placesModel, &KFilePlacesModel::rowsRemoved, this, &DolphinViewContainer::slotPlacesModelChanged);
 
     connect(this, &DolphinViewContainer::searchModeEnabledChanged, this, &DolphinViewContainer::captionChanged);

-
-    // Initialize kactivities resource instance
-
-#if HAVE_KACTIVITIES
-    m_activityResourceInstance = new KActivities::ResourceInstance(window()->winId(), url);
-    m_activityResourceInstance->setParent(this);
-#endif

 }
 
 DolphinViewContainer::~DolphinViewContainer()
 }
 
 DolphinViewContainer::~DolphinViewContainer()


@@ -219,14 +209,6 @@ void DolphinViewContainer::setActive(bool active)
         m_urlNavigatorConnected->setActive(active);
     }
     m_view->setActive(active);
         m_urlNavigatorConnected->setActive(active);
     }
     m_view->setActive(active);

-
-#if HAVE_KACTIVITIES
-    if (active) {
-        m_activityResourceInstance->notifyFocusedIn();
-    } else {
-        m_activityResourceInstance->notifyFocusedOut();
-    }
-#endif

 }
 
 bool DolphinViewContainer::isActive() const
 }
 
 bool DolphinViewContainer::isActive() const


@@ -592,7 +574,7 @@ void DolphinViewContainer::setUrl(const QUrl &newUrl)
     }
 
 #if HAVE_KACTIVITIES
     }
 
 #if HAVE_KACTIVITIES

-    m_activityResourceInstance->setUri(newUrl);
+    KActivities::ResourceInstance::notifyAccessed(newUrl);

 #endif
 }
 
 #endif
 }
 

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 52fd688f6fc32f279149b3ee154bc31de5a49705..89fd697607422ff6344f4c84ac9cf5cb0fd5bbd8 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -20,13 +20,6 @@
 #include <QPushButton>
 #include <QWidget>
 
 #include <QPushButton>
 #include <QWidget>
 

-#if HAVE_KACTIVITIES
-namespace KActivities
-{
-class ResourceInstance;
-}
-#endif
-

 class FilterBar;
 class KMessageWidget;
 class QAction;
 class FilterBar;
 class KMessageWidget;
 class QAction;


@@ -474,11 +467,6 @@ private:
      * connected to this ViewContainer.
      */
     std::unique_ptr<DolphinUrlNavigator::VisualState> m_urlNavigatorVisualState;
      * connected to this ViewContainer.
      */
     std::unique_ptr<DolphinUrlNavigator::VisualState> m_urlNavigatorVisualState;

-
-#if HAVE_KACTIVITIES
-private:
-    KActivities::ResourceInstance *m_activityResourceInstance;
-#endif

 };
 
 #endif // DOLPHINVIEWCONTAINER_H
 };
 
 #endif // DOLPHINVIEWCONTAINER_H