X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6bccf73e9270e698e7ca23eb2dcaa05318e7b198..dacded2afdfa85a16b99d8522284155cd5175ee5:/src/views/renamedialog.cpp

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 3b94e01e5..d3c80e3da 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -63,7 +63,7 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     QLabel* editLabel = 0;
     if (m_renameOneItem) {
         m_newName = items.first().name();
-        editLabel = new QLabel(i18nc("@label:textbox", "Rename the item <filename>%1</filename> to:", m_newName),
+        editLabel = new QLabel(xi18nc("@label:textbox", "Rename the item <filename>%1</filename> to:", m_newName),
                                page);
         editLabel->setTextFormat(Qt::PlainText);
     } else {
@@ -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) {
@@ -135,16 +149,7 @@ void RenameDialog::slotButtonClicked(int button)
 
         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();
         }
@@ -187,15 +192,7 @@ void RenameDialog::renameItems()
         }
 
         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);
         }
     }
 }
@@ -219,4 +216,3 @@ QString RenameDialog::indexedName(const QString& name, int index, const QChar& i
     return newName;
 }
 
-#include "renamedialog.moc"