Fix temporary regression of sorting introduced by SVN commit 1126410

[dolphin.git] / src / dolphincolumnview.h

diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h
index 3d7432bd4d3c09f38e6776891d26756d1443acd1..d4da8665711442dc93d61669070aa0b347e2ffe9 100644 (file)
--- a/src/dolphincolumnview.h
+++ b/src/dolphincolumnview.h
@@ -65,13 +65,13 @@ public:
      * of the shown directory, it does not trigger a loading of the model.
      */
     void setChildUrl(const KUrl& url);
-    const KUrl& childUrl() const;
+    KUrl childUrl() const;
 
     /** Sets the directory URL that is shown inside the column widget. */
     void setUrl(const KUrl& url);
 
     /** Returns the directory URL that is shown inside the column widget. */
-    const KUrl& url() const;
+    KUrl url() const;
 
     /**
      * Updates the background color dependent from the activation state
@@ -85,6 +85,8 @@ public:
      */
     KFileItem itemAt(const QPoint& pos) const;
 
+    virtual void setSelectionModel(QItemSelectionModel* model);
+
 protected:
     virtual QStyleOptionViewItem viewOptions() const;
     virtual void startDrag(Qt::DropActions supportedActions);
@@ -98,11 +100,9 @@ protected:
     virtual void contextMenuEvent(QContextMenuEvent* event);
     virtual void wheelEvent(QWheelEvent* event);
     virtual void leaveEvent(QEvent* event);
-    virtual void selectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
     virtual void currentChanged(const QModelIndex& current, const QModelIndex& previous);
 
 private slots:
-    void setNameFilter(const QString& nameFilter);
     void setZoomLevel(int level);
 
     void slotEntered(const QModelIndex& index);
@@ -150,7 +150,7 @@ inline void DolphinColumnView::setChildUrl(const KUrl& url)
     m_childUrl = url;
 }
 
-inline const KUrl& DolphinColumnView::childUrl() const
+inline KUrl DolphinColumnView::childUrl() const
 {
     return m_childUrl;
 }
@@ -163,7 +163,7 @@ inline void DolphinColumnView::setUrl(const KUrl& url)
     }
 }
 
-inline const KUrl& DolphinColumnView::url() const
+inline KUrl DolphinColumnView::url() const
 {
     return m_url;
 }