From e6de2fc0d6b6fa208d81e8e7ba5f31c95f11d453 Mon Sep 17 00:00:00 2001
From: Chusslove Illich <caslav.ilic@gmx.net>
Date: Sat, 6 Dec 2008 15:38:29 +0000
Subject: [PATCH] Use new KLocale method to remove accelerator markers.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=893417
---
 src/MainWindow.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 0d3ac9fe6..fdb071ab9 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -111,18 +111,10 @@ MainWindow::MainWindow()
 }
 void MainWindow::removeMenuAccelerators()
 {
-    // regular expression to find accelerators in menu items.
-    // Matches the '&' character anywhere in the text (for Western languages) 
-    // or " (&Letters)" (for many non-Western languages)
-    //
-    // Translators can change or remove this as necessary for their language
-    static QString stripPattern = i18nc("Regular expression to remove accelerators from menu items",
-                                  "\\(\\s*\\&.*\\)|\\&");
-    static QRegExp acceleratorStripRegExp(stripPattern);
     foreach(QAction* menuItem, menuBar()->actions())
     {
         QString itemText = menuItem->text();
-        itemText.remove(acceleratorStripRegExp);
+        itemText = KGlobal::locale()->removeAcceleratorMarker(itemText);
         menuItem->setText(itemText);
     }
 }