due to the recent tagging freeze this commit contains several fixes in one:

* the filterbar now also filters directories (works also in the column-view :-))

* The "Additional Information" menu entry now also works for showing/hiding the columns of the details view. This also implies that the columns for the details view can now be adjusted per directory -> we have now a consistent behavior between the icons view and details view. Still open: the view properties dialog must be fixed

* Don't show a "Nepomuk not available" error message when starting Dolphin and Nepomuk is not available.

* Fix issue that the information panel blocked the application because of parsing the full meta data of a huge file.

svn path=/trunk/KDE/kdebase/apps/; revision=729704

1 files changed, 2 insertions, 7 deletions

diff --git a/src/dolphincolumnwidget.h b/src/dolphincolumnwidget.h
index 7636655a9..fdb0471f2 100644
--- a/src/dolphincolumnwidget.h
+++ b/src/dolphincolumnwidget.h
@@ -90,13 +90,6 @@ public:
      */
     void setNameFilter(const QString& nameFilter);
 
-    /**
-     * Returns the currently used name filter. All items
-     * which contain the name filter will be shown.
-     */
-    QString nameFilter() const;
-
-
 protected:
     virtual QStyleOptionViewItem viewOptions() const;
     virtual void dragEnterEvent(QDragEnterEvent* event);
@@ -145,6 +138,8 @@ private:
      */
     bool isCutItem(const KFileItem& item) const;
 
+    KFileItem itemForIndex(const QModelIndex& index) const;
+
 private:
     bool m_active;
     bool m_showPreview;