X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fa988586bc923b33497cbc97aaac07fc93a4ca83..464b13f3828e5cdd03438d0881c3a62c7cda6333:/src/dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index bd4141db5..877089e4c 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -70,7 +70,7 @@ public:
     };
 
     DolphinViewContainer(const QUrl& url, QWidget* parent);
-    virtual ~DolphinViewContainer();
+    ~DolphinViewContainer() override;
 
     /**
      * Returns the current active URL, where all actions are applied.
@@ -129,6 +129,11 @@ public:
      */
     QString placesText() const;
 
+    /**
+     * Reload the view of this container. This will also hide messages in a messagewidget.
+     */
+    void reload();
+
 public slots:
     /**
      * Sets the current active URL, where all actions are applied. The
@@ -239,12 +244,6 @@ private slots:
      */
     void activate();
 
-    /**
-     * Is invoked if the signal urlAboutToBeChanged() from the DolphinView
-     * is emitted. Tries to save the view-state.
-     */
-    void slotViewUrlAboutToBeChanged(const QUrl& url);
-
     /**
      * Is invoked if the signal urlAboutToBeChanged() from the URL navigator
      * is emitted. Tries to save the view-state.
@@ -258,22 +257,9 @@ private slots:
     void slotUrlNavigatorLocationChanged(const QUrl& url);
 
     /**
-     * Is connected with the URL navigator and drops the URLs
-     * above the destination \a destination.
-     *
-     * Creates a copy of \a event and invokes \a dropUrlsDelayed with a
-     * queued connection.
+     * @see KUrlNavigator::urlSelectionRequested
      */
-    void dropUrls(const QUrl& destination, QDropEvent* event);
-
-    /**
-     * Is invoked with a queued connection by \a dropUrls to prevent that the
-     * drop actions are executed in the URL navigator menu's nested event loop,
-     * which might cause a crash. Simply using a queued connection from the URL
-     * navigator to \a dropUrls would not work because the \a event pointer
-     * would be dangling then.
-     */
-    void dropUrlsDelayed();
+    void slotUrlSelectionRequested(const QUrl& url);
 
     /**
      * Is invoked when a redirection is done and changes the
@@ -291,8 +277,6 @@ private slots:
      */
     void saveUrlCompletionMode(KCompletion::CompletionMode completion);
 
-    void slotHistoryChanged();
-
     void slotReturnPressed();
 
     /**
@@ -326,6 +310,12 @@ private:
      */
     void saveViewState();
 
+    /**
+     * Restores the state of the current view iff the URL navigator contains a
+     * non-empty location state.
+     */
+    void tryRestoreViewState();
+
 private:
     QVBoxLayout* m_topLayout;
     KUrlNavigator* m_urlNavigator;
@@ -341,9 +331,6 @@ private:
     QElapsedTimer m_statusBarTimestamp;  // Time in ms since last update
     bool m_autoGrabFocus;
 
-    QUrl m_dropDestination;
-    QScopedPointer<QDropEvent> m_dropEvent;
-
 #ifdef KF5Activities_FOUND
 private:
     KActivities::ResourceInstance * m_activityResourceInstance;