extract method renameItem, factorizes the common code

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 5b20942d524144c8710d6641dd4b74f59fa98303..d3c80e3da54a2a7047f649c8fa97e69441617345 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -128,6 +128,20 @@ RenameDialog::~RenameDialog()
 {
 }
 
 {
 }
 

+void RenameDialog::renameItem(const KFileItem &item, const QString& newName)
+{
+    const KUrl oldUrl = item.url();
+    KUrl newUrl = oldUrl;
+    newUrl.setFileName(KIO::encodeFileName(newName));
+
+    QWidget* widget = parentWidget();
+    if (!widget) {
+        widget = this;
+    }
+
+    KonqOperations::rename(widget, oldUrl, newUrl);
+}
+

 void RenameDialog::slotButtonClicked(int button)
 {
     if (button == KDialog::Ok) {
 void RenameDialog::slotButtonClicked(int button)
 {
     if (button == KDialog::Ok) {


@@ -135,16 +149,7 @@ void RenameDialog::slotButtonClicked(int button)
 
         if (m_renameOneItem) {
             Q_ASSERT(m_items.count() == 1);
 
         if (m_renameOneItem) {
             Q_ASSERT(m_items.count() == 1);

-            const KUrl oldUrl = m_items.first().url();
-            KUrl newUrl = oldUrl;
-            newUrl.setFileName(KIO::encodeFileName(m_newName));
-
-            QWidget* widget = parentWidget();
-            if (!widget) {
-                widget = this;
-            }
-
-            KonqOperations::rename(widget, oldUrl, newUrl);
+            renameItem(m_items.first(), m_newName);

         } else {
             renameItems();
         }
         } else {
             renameItems();
         }


@@ -187,15 +192,7 @@ void RenameDialog::renameItems()
         }
 
         if (oldUrl.fileName() != newName) {
         }
 
         if (oldUrl.fileName() != newName) {

-            KUrl newUrl = oldUrl;
-            newUrl.setFileName(KIO::encodeFileName(newName));
-
-            QWidget* widget = parentWidget();
-            if (!widget) {
-                widget = this;
-            }
-
-            KonqOperations::rename(widget, oldUrl, newUrl);
+            renameItem(item, newName);

         }
     }
 }
         }
     }
 }

diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h
index 29ef8bdf131f7608bb87437679ac8811e5669c71..430c707a3c85dbb15a640b37a77a28cf0ca4b8c8 100644 (file)
--- a/src/views/renamedialog.h
+++ b/src/views/renamedialog.h
@@ -49,6 +49,7 @@ private slots:
 
 private:
     void renameItems();
 
 private:
     void renameItems();

+    void renameItem(const KFileItem &item, const QString& newName);

 
     /**
      * @return Returns the string \p name, where the characters represented by
 
     /**
      * @return Returns the string \p name, where the characters represented by