Merge remote-tracking branch 'origin/KDE/4.10'

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

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 07add113a43379bff439f6669a6f4a031f64c4ea..a16bb953cb90bfbceee6a3de69327c7ab73cd268 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -147,16 +147,10 @@ void RenameDialog::slotTextChanged(const QString& newName)
     bool enable = !newName.isEmpty() && (newName != QLatin1String("..")) && (newName != QLatin1String("."));
     if (enable && !m_renameOneItem) {
         // Assure that the new name contains exactly one # (or a connected sequence of #'s)
-        const int minSplitCount = 1;
-        int maxSplitCount = 2;
-        if (newName.startsWith(QLatin1Char('#'))) {
-            --maxSplitCount;
-        }
-        if (newName.endsWith(QLatin1Char('#'))) {
-            --maxSplitCount;
-        }
-        const int splitCount = newName.split(QLatin1Char('#'), QString::SkipEmptyParts).count();
-        enable = enable && (splitCount >= minSplitCount) && (splitCount <= maxSplitCount);
+        const int count = newName.count(QLatin1Char('#'));
+        const int first = newName.indexOf(QLatin1Char('#'));
+        const int last = newName.lastIndexOf(QLatin1Char('#'));
+        enable = (last - first + 1 == count);
     }
     enableButtonOk(enable);
 }