From f52e025ee13f7ec5cbb307b592536b165a4a4e48 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Wed, 26 Aug 2015 02:15:26 +0300
Subject: [PATCH] kdeui: drop kde3 shortcuts support

---
 kdeui/shortcuts/kshortcut.cpp | 7 +------
 kdeui/tests/kshortcuttest.cpp | 7 -------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/kdeui/shortcuts/kshortcut.cpp b/kdeui/shortcuts/kshortcut.cpp
index a15dea86..ac352f24 100644
--- a/kdeui/shortcuts/kshortcut.cpp
+++ b/kdeui/shortcuts/kshortcut.cpp
@@ -105,9 +105,6 @@ KShortcut::KShortcut(const QString &s)
 
     if (sCuts.count() >= 1) {
         QString k = sCuts.at(0);
-        k.replace( "Win+", "Meta+" ); // workaround for KDE3-style shortcuts
-        k.replace("Plus", "+"); // workaround for KDE3-style "Alt+Plus"
-        k.replace("Minus", "-"); // workaround for KDE3-style "Alt+Plus"
         d->primary = QKeySequence::fromString(k);
         // Complain about a unusable shortcuts sequence only if we have got
         // something.
@@ -117,9 +114,7 @@ KShortcut::KShortcut(const QString &s)
     }
 
     if (sCuts.count() >= 2) {
-        QString k = sCuts.at(1);
-        k.replace( "Win+", "Meta+" ); // workaround for KDE3-style shortcuts
-        d->alternate = QKeySequence::fromString(k);
+        d->alternate = QKeySequence::fromString(sCuts.at(1));
         if (d->alternate.isEmpty()) {
             kDebug(240) << "unusable alternate shortcut sequence " << sCuts[1];
         }
diff --git a/kdeui/tests/kshortcuttest.cpp b/kdeui/tests/kshortcuttest.cpp
index d76f0024..8e761ca3 100644
--- a/kdeui/tests/kshortcuttest.cpp
+++ b/kdeui/tests/kshortcuttest.cpp
@@ -106,13 +106,6 @@ private Q_SLOTS:
 
         cut = KShortcut("Meta+E");
         QVERIFY(cut.primary()[0] == (Qt::META | Qt::Key_E));
-
-        //qDebug() << QKeySequence(Qt::ALT | Qt::Key_Plus).toString();
-        //qDebug() << QKeySequence(Qt::ALT | Qt::Key_Minus).toString();
-        cut = KShortcut("Alt+Plus"); // KDE3 said "Alt+Plus", while Qt4 says "Alt++", so KShortcut has to handle this
-        QVERIFY(cut.primary()[0] == (Qt::ALT | Qt::Key_Plus));
-        cut = KShortcut("Alt+Minus"); // KDE3 said "Alt+Minus", while Qt4 says "Alt+-", so KShortcut has to handle this
-        QVERIFY(cut.primary()[0] == (Qt::ALT | Qt::Key_Minus));
     }
 };