Fixed issue that when renaming a variable number of items, that only one #-character as index is allowed.

BUG: 155249

svn path=/trunk/KDE/kdebase/apps/; revision=759454

1 files changed, 4 insertions, 10 deletions

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index ddb7185f0..44fbf4b6b 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -1053,19 +1053,14 @@ void DolphinView::renameSelectedItems()
             Q_ASSERT(newName.contains('#'));
 
             // iterate through all selected items and rename them...
-            const int replaceIndex = newName.indexOf('#');
-            Q_ASSERT(replaceIndex >= 0);
             int index = 1;
-
-            KFileItemList::const_iterator it = items.begin();
-            const KFileItemList::const_iterator end = items.end();
-            while (it != end) {
-                const KUrl& oldUrl = (*it).url();
+            foreach (KFileItem item, items) {
+                const KUrl& oldUrl = item.url();
                 QString number;
                 number.setNum(index++);
 
-                QString name(newName);
-                name.replace(replaceIndex, 1, number);
+                QString name = newName;
+                name.replace('#', number);
 
                 if (oldUrl.fileName() != name) {
                     KUrl newUrl = oldUrl;
@@ -1073,7 +1068,6 @@ void DolphinView::renameSelectedItems()
                     KonqOperations::rename(this, oldUrl, newUrl);
                     emit doingOperation(KonqFileUndoManager::RENAME);
                 }
-                ++it;
             }
         }
     } else {