From: Ivailo Monev <xakepa10@laimg.moc>
Date: Fri, 30 Sep 2016 02:47:23 +0000 (+0000)
Subject: khotkeys: do not rely on the QString operator for QKeySequence
X-Git-Tag: 4.22.0~1416
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b6a34535bf73621695f286f9b3f083350416fb1a;p=kde%2Fkde-workspace.git

khotkeys: do not rely on the QString operator for QKeySequence

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/khotkeys/app/kded.cpp b/khotkeys/app/kded.cpp
index 3ed5663a..b19f3580 100644
--- a/khotkeys/app/kded.cpp
+++ b/khotkeys/app/kded.cpp
@@ -149,7 +149,7 @@ QString KHotKeysModule::get_menuentry_shortcut(const QString &storageId)
     Q_ASSERT(shortcutTrigger);
     if (shortcutTrigger == NULL) return "";
 
-    return shortcutTrigger->shortcut().primary();
+    return shortcutTrigger->shortcut().primary().toString();
     }
 
 
@@ -197,7 +197,7 @@ QString KHotKeysModule::register_menuentry_shortcut(
         _settings.write();
 
         // Return the real shortcut
-        return newAction->trigger()->shortcut().primary();
+        return newAction->trigger()->shortcut().primary().toString();
         }
     // We found a action
     else
@@ -224,7 +224,7 @@ QString KHotKeysModule::register_menuentry_shortcut(
             _settings.write();
 
             // Remove the resulting real shortcut
-            return shortcutTrigger->shortcut().primary();
+            return shortcutTrigger->shortcut().primary().toString();
             }
         }