Get back names, and use "using" keyword to keep GCC silent on "method foo on base...

[dolphin.git] / src / dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 1f8f1caf6259dc56082ece151bbc02f683f40aa9..50d7c94613af51ac2d9773638a26eb1bc8301a6f 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -41,10 +41,8 @@ class KUrl;
 class DolphinModel;
 class KUrlNavigator;
 class DolphinDirLister;
-class DolphinMainWindow;
 class DolphinSortFilterProxyModel;
 class DolphinStatusBar;
-class QModelIndex;
 
 /**
  * @short Represents a view for the directory content
@@ -63,26 +61,14 @@ class DolphinViewContainer : public QWidget
     Q_OBJECT
 
 public:
-    DolphinViewContainer(DolphinMainWindow* mainwindow,
-                         QWidget *parent,
-                         const KUrl& url);
-
+    DolphinViewContainer(const KUrl& url, QWidget* parent);
     virtual ~DolphinViewContainer();
 
-    /**
-     * Sets the current active URL, where all actions are applied. The
-     * URL navigator is synchronized with this URL. The signals
-     * KUrlNavigator::urlChanged() and KUrlNavigator::historyChanged()
-     * are emitted.
-     * @see DolphinViewContainer::urlNavigator()
-     */
-    void setUrl(const KUrl& url);
-
     /**
      * Returns the current active URL, where all actions are applied.
      * The URL navigator is synchronized with this URL.
      */
-    const KUrl& url() const;
+    KUrl url() const;
 
     /**
      * If \a active is true, the view container will marked as active. The active
@@ -94,12 +80,6 @@ public:
     const DolphinStatusBar* statusBar() const;
     DolphinStatusBar* statusBar();
 
-    /**
-     * Returns true, if the URL shown by the navigation bar is editable.
-     * @see KUrlNavigator
-     */
-    bool isUrlEditable() const;
-
     const KUrlNavigator* urlNavigator() const;
     KUrlNavigator* urlNavigator();
 
@@ -115,6 +95,15 @@ public:
     bool isFilterBarVisible() const;
 
 public slots:
+    /**
+     * Sets the current active URL, where all actions are applied. The
+     * URL navigator is synchronized with this URL. The signals
+     * KUrlNavigator::urlChanged() and KUrlNavigator::historyChanged()
+     * are emitted.
+     * @see DolphinViewContainer::urlNavigator()
+     */
+    void setUrl(const KUrl& url);
+
     /**
      * Popups the filter bar above the status bar if \a show is true.
      */
@@ -126,7 +115,14 @@ signals:
      */
     void showFilterBarChanged(bool shown);
 
-private slots: 
+    /**
+     * Is emitted when the write state of the folder has been changed. The application
+     * should disable all actions like "Create New..." that depend on the write
+     * state.
+     */
+    void writeStateChanged(bool isFolderWritable);
+
+private slots:
     /**
      * Updates the number of items (= number of files + number of
      * directories) in the statusbar. If files are selected, the number
@@ -142,6 +138,8 @@ private slots:
      */
     void updateStatusBar();
 
+    void initializeProgress();
+
     void updateProgress(int percent);
 
     /**
@@ -187,30 +185,6 @@ private slots:
      */
     void setNameFilter(const QString& nameFilter);
 
-    /**
-     * Opens the context menu on the current mouse position.
-     * @item          File item context. If item is null, the context menu
-     *                should be applied to \a url.
-     * @url           URL which contains \a item.
-     * @customActions Actions that should be added to the context menu,
-     *                if the file item is null.
-     */
-    void openContextMenu(const KFileItem& item,
-                         const KUrl& url,
-                         const QList<QAction*>& customActions);
-
-    /**
-     * Saves the position of the contents to the
-     * current history element.
-     */
-    void saveContentsPos(int x, int y);
-
-    /**
-     * Restores the contents position of the view, if the view
-     * is part of the history.
-     */
-    void restoreContentsPos();
-
     /**
      * Marks the view container as active
      * (see DolphinViewContainer::setActive()).
@@ -218,16 +192,16 @@ private slots:
     void activate();
 
     /**
-     * Restores the current view to show \a url and assures
-     * that the root URL of the view is respected.
+     * Saves the state of the current view: contents position,
+     * root URL, ...
      */
-    void restoreView(const KUrl& url);
+    void saveViewState();
 
     /**
-     * Saves the root URL of the current URL \a url
-     * into the URL navigator.
+     * Restores the current view to show \a url and assures
+     * that the root URL of the view is respected.
      */
-    void saveRootUrl(const KUrl& url);
+    void slotUrlNavigatorLocationChanged(const KUrl& url);
 
     /**
      * Is connected with the URL navigator and drops the URLs
@@ -254,10 +228,8 @@ private slots:
     void slotHistoryChanged();
 
 private:
-    bool m_showProgress;
     bool m_isFolderWritable;
 
-    DolphinMainWindow* m_mainWindow;
     QVBoxLayout* m_topLayout;
     KUrlNavigator* m_urlNavigator;