Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeui: drop kde3 shortcuts support

Browse source
This commit is contained in:
Ivailo Monev 2015-08-26 02:15:26 +03:00
parent a3ec7d5356
commit f52e025ee1
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kdeui/shortcuts/kshortcut.cpp
View file

@ -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];
}

7
kdeui/tests/kshortcuttest.cpp
View file

@ -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));
}
};