When renaming one item don't replace # by numbers

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

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 7f79b0d4304dd4d8eda1cd7456701ad869fd19cc..810562a51a37b17e1c4bfbe0e0ece31283cd4cdf 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -19,10 +19,10 @@
 
 #include "renamedialog.h"
 
-#include <klineedit.h>
-#include <klocale.h>
+#include <KLineEdit>
+#include <KLocale>
 #include <konq_operations.h>
-#include <kstringhandler.h>
+#include <KStringHandler>
 
 #include <QLabel>
 #include <QVBoxLayout>
@@ -130,7 +130,17 @@ RenameDialog::~RenameDialog()
 void RenameDialog::slotButtonClicked(int button)
 {
     if (button == KDialog::Ok) {
-        renameItems();
+        m_newName = m_lineEdit->text();
+
+        if (m_renameOneItem) {
+            Q_ASSERT(m_items.count() == 1);
+            const KUrl oldUrl = m_items.first().url();
+            KUrl newUrl = oldUrl;
+            newUrl.setFileName(m_newName);
+            KonqOperations::rename(this, oldUrl, newUrl);
+        } else {
+            renameItems();
+        }
     }
 
     KDialog::slotButtonClicked(button);
@@ -138,9 +148,7 @@ void RenameDialog::slotButtonClicked(int button)
 
 void RenameDialog::slotTextChanged(const QString& newName)
 {
-    m_newName = m_lineEdit->text();
-
-    bool enable = !newName.isEmpty() && (m_renameOneItem ? (newName != m_newName) : newName.contains('#'));
+    bool enable = !newName.isEmpty();
     if (enable) {
         if (m_renameOneItem) {
             enable = enable && (newName != m_newName);