Display correct folder names in tabs, if they contain a '&' character. Thanks to...

BUG: 181765

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

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index f623d5eba8cd78014d84a6c35a330cd88bd53aa6..92c0cfc80a5051dd91d80f1fde7dc34c38b27a62 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1343,6 +1343,10 @@ QString DolphinMainWindow::tabName(const KUrl& url) const
         name = url.fileName();
         if (name.isEmpty()) {
             name = url.protocol();
+        } else {
+            // Make sure that a '&' inside the directory name is displayed correctly
+            // and not misinterpreted as a keyboard shortcut in QTabBar::setTabText()
+            name.replace('&', "&&");
         }
     }
     return name;