Merge branch 'master' into frameworks

[dolphin.git] / src / views / dolphinview.h

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index b43957f226e05d639a0bb97ec4abae42da092443..688699096f3be34d9f4e4728961a150572cc42fb 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -21,7 +21,7 @@
 #ifndef DOLPHINVIEW_H
 #define DOLPHINVIEW_H
 
-#include <config-nepomuk.h>
+#include <config-baloo.h>
 
 #include "libdolphin_export.h"
 
@@ -30,6 +30,7 @@
 #include <KFileItemDelegate>
 #include <kio/fileundomanager.h>
 #include <KIO/Job>
+#include <KUrl>
 
 #include <QBoxLayout>
 #include <QKeyEvent>
@@ -39,7 +40,6 @@
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 class DolphinItemListView;
-class KAction;
 class KActionCollection;
 class KFileItemModel;
 class KItemListContainer;
@@ -614,24 +614,16 @@ private slots:
     void updateSortFoldersFirst(bool foldersFirst);
 
     /**
-     * Updates the status bar to show hover information for the
-     * item \a item. If currently other items are selected,
-     * no hover information is shown.
-     * @see DolphinView::clearHoverInformation()
-     */
-    void showHoverInformation(const KFileItem& item);
-
-    /**
-     * Clears the hover information shown in the status bar.
-     * @see DolphinView::showHoverInformation().
+     * Indicates in the status bar that the delete operation
+     * of the job \a job has been finished.
      */
-    void clearHoverInformation();
+    void slotDeleteFileFinished(KJob* job);
 
     /**
-     * Indicates in the status bar that the delete operation
+     * Indicates in the status bar that the trash operation
      * of the job \a job has been finished.
      */
-    void slotDeleteFileFinished(KJob* job);
+    void slotTrashFileFinished(KJob* job);
 
     void slotRenamingFailed(const KUrl& oldUrl, const KUrl& newUrl);