Merge remote-tracking branch 'origin/KDE/4.13'

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 2769d670d6dd514fc2a4dbf12be8af226e3b7439..c1f585da9448cf8955355db9120921b6130b8e29 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -1353,16 +1353,6 @@ void DolphinView::calculateItemCount(int& fileCount,
     }
 }
 
-void DolphinView::showHoverInformation(const KFileItem& item)
-{
-    emit requestItemInfo(item);
-}
-
-void DolphinView::clearHoverInformation()
-{
-    emit requestItemInfo(KFileItem());
-}
-
 void DolphinView::slotDeleteFileFinished(KJob* job)
 {
     if (job->error() == 0) {

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 3731464a35b8e5e88749908ed348e43ba183161f..06c09edc32583123bcfa1ec93d607b118408215b 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -613,20 +613,6 @@ 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().
-     */
-    void clearHoverInformation();
-
     /**
      * Indicates in the status bar that the delete operation
      * of the job \a job has been finished.

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index d8dbd7749dc3eb7fd91b29a3dd68fb2a90f2d9cd..5c0ae61261a4b71da987a3b180e314a61973aabd 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -30,15 +30,6 @@
 #include <QLabel>
 #include <QVBoxLayout>
 
-/**
- * Helper function for sorting items with qSort() in
- * DolphinView::renameSelectedItems().
- */
-bool lessThan(const KFileItem& item1, const KFileItem& item2)
-{
-    return KStringHandler::naturalCompare(item1.name(), item2.name()) < 0;
-}
-
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     KDialog(parent),
     m_renameOneItem(false),