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

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index bc58531a2..877089e4c 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -21,8 +21,7 @@
 #define DOLPHINVIEWCONTAINER_H
 
 #include <KFileItem>
-#include <KFileItemDelegate>
-#include <KGlobalSettings>
+#include <KCompletion>
 #include <KIO/Job>
 
 #include <KUrlNavigator>
@@ -31,9 +30,9 @@
 #include <QWidget>
 
 #include <views/dolphinview.h>
-#include <config-apps.h>
+#include <config-dolphin.h>
 
-#ifdef KActivities_FOUND
+#ifdef KF5Activities_FOUND
 namespace KActivities {
     class ResourceInstance;
 }
@@ -41,7 +40,7 @@ namespace KActivities {
 
 class FilterBar;
 class KMessageWidget;
-class KUrl;
+class QUrl;
 class KUrlNavigator;
 class DolphinSearchBox;
 class DolphinStatusBar;
@@ -70,14 +69,14 @@ public:
         Error
     };
 
-    DolphinViewContainer(const KUrl& url, QWidget* parent);
-    virtual ~DolphinViewContainer();
+    DolphinViewContainer(const QUrl& url, QWidget* parent);
+    ~DolphinViewContainer() override;
 
     /**
      * Returns the current active URL, where all actions are applied.
      * The URL navigator is synchronized with this URL.
      */
-    KUrl url() const;
+    QUrl url() const;
 
     /**
      * If \a active is true, the view container will marked as active. The active
@@ -130,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
@@ -138,7 +142,7 @@ public slots:
      * are emitted.
      * @see DolphinViewContainer::urlNavigator()
      */
-    void setUrl(const KUrl& url);
+    void setUrl(const QUrl& url);
 
     /**
      * Popups the filter bar above the status bar if \a visible is true.
@@ -205,7 +209,7 @@ private slots:
      * Is called if the URL set by DolphinView::setUrl() represents
      * a file and not a directory. Takes care to activate the file.
      */
-    void slotUrlIsFileError(const KUrl& url);
+    void slotUrlIsFileError(const QUrl& url);
 
     /**
      * Handles clicking on an item. If the item is a directory, the
@@ -240,36 +244,29 @@ private slots:
      */
     void activate();
 
-    /**
-     * Is invoked if the signal urlAboutToBeChanged() from the DolphinView
-     * is emitted. Tries to save the view-state.
-     */
-    void slotViewUrlAboutToBeChanged(const KUrl& url);
-
     /**
      * Is invoked if the signal urlAboutToBeChanged() from the URL navigator
      * is emitted. Tries to save the view-state.
      */
-    void slotUrlNavigatorLocationAboutToBeChanged(const KUrl& url);
+    void slotUrlNavigatorLocationAboutToBeChanged(const QUrl& url);
 
     /**
      * Restores the current view to show \a url and assures
      * that the root URL of the view is respected.
      */
-    void slotUrlNavigatorLocationChanged(const KUrl& url);
+    void slotUrlNavigatorLocationChanged(const QUrl& url);
 
     /**
-     * Is connected with the URL navigator and drops the URLs
-     * above the destination \a destination.
+     * @see KUrlNavigator::urlSelectionRequested
      */
-    void dropUrls(const KUrl& destination, QDropEvent* event);
+    void slotUrlSelectionRequested(const QUrl& url);
 
     /**
      * Is invoked when a redirection is done and changes the
      * URL of the URL navigator to \a newUrl without triggering
      * a reloading of the directory.
      */
-    void redirect(const KUrl& oldUrl, const KUrl& newUrl);
+    void redirect(const QUrl& oldUrl, const QUrl& newUrl);
 
     /** Requests the focus for the view \a m_view. */
     void requestFocus();
@@ -278,9 +275,7 @@ private slots:
      * Saves the currently used URL completion mode of
      * the URL navigator.
      */
-    void saveUrlCompletionMode(KGlobalSettings::Completion completion);
-
-    void slotHistoryChanged();
+    void saveUrlCompletionMode(KCompletion::CompletionMode completion);
 
     void slotReturnPressed();
 
@@ -305,9 +300,9 @@ private slots:
 
 private:
     /**
-     * @return True if the URL protocol is a search URL (e. g. nepomuksearch:// or filenamesearch://).
+     * @return True if the URL protocol is a search URL (e. g. baloosearch:// or filenamesearch://).
      */
-    bool isSearchUrl(const KUrl& url) const;
+    bool isSearchUrl(const QUrl& url) const;
 
     /**
      * Saves the state of the current view: contents position,
@@ -315,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;
@@ -330,7 +331,7 @@ private:
     QElapsedTimer m_statusBarTimestamp;  // Time in ms since last update
     bool m_autoGrabFocus;
 
-#ifdef KActivities_FOUND
+#ifdef KF5Activities_FOUND
 private:
     KActivities::ResourceInstance * m_activityResourceInstance;
 #endif