SVN_SILENT made messages (after extraction)

[dolphin.git] / src / views / renamedialog.cpp

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index abb37b897de9738a85ac28b9217cd01ca2364ab1..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),
@@ -146,7 +137,13 @@ void RenameDialog::slotButtonClicked(int button)
             const KUrl oldUrl = m_items.first().url();
             KUrl newUrl = oldUrl;
             newUrl.setFileName(KIO::encodeFileName(m_newName));
-            KonqOperations::rename(this, oldUrl, newUrl);
+
+            QWidget* widget = parentWidget();
+            if (!widget) {
+                widget = this;
+            }
+
+            KonqOperations::rename(widget, oldUrl, newUrl);
         } else {
             renameItems();
         }
@@ -191,7 +188,13 @@ void RenameDialog::renameItems()
         if (oldUrl.fileName() != newName) {
             KUrl newUrl = oldUrl;
             newUrl.setFileName(KIO::encodeFileName(newName));
-            KonqOperations::rename(this, oldUrl, newUrl);
+
+            QWidget* widget = parentWidget();
+            if (!widget) {
+                widget = this;
+            }
+
+            KonqOperations::rename(widget, oldUrl, newUrl);
         }
     }
 }