OSDN Git Service

khotkeys: do not rely on the QString operator for QKeySequence
authorIvailo Monev <xakepa10@laimg.moc>
Fri, 30 Sep 2016 02:47:23 +0000 (02:47 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Fri, 30 Sep 2016 02:47:23 +0000 (02:47 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
khotkeys/app/kded.cpp

index 3ed5663..b19f358 100644 (file)
@@ -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();
             }
         }