Indent support for XSLT extensions output.

[inkscape.git] / src / shortcuts.cpp

diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index bf7fb8a4339561725e136fe6f11c09e57fb1f5b5..d647d30b3264aebfaf9b01e035f5ce72280dcff5 100644 (file)
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -212,7 +212,7 @@ unsigned int sp_shortcut_get_primary(Inkscape::Verb *verb)
     return result;
 }
 
-gchar* sp_shortcut_get_label (unsigned int shortcut)
+gchar *sp_shortcut_get_label(unsigned int shortcut)
 {
     // The comment below was copied from the function sp_ui_shortcut_string in interface.cpp (which was subsequently removed)
     /* TODO: This function shouldn't exist.  Our callers should use GtkAccelLabel instead of
@@ -223,13 +223,16 @@ gchar* sp_shortcut_get_label (unsigned int shortcut)
      * g_object_new(GTK_TYPE_ACCEL_LABEL, NULL) followed by
      * gtk_label_set_text_with_mnemonic(lbl, str).
      */
-    if (shortcut==GDK_VoidSymbol) return 0;
-    return gtk_accelerator_get_label(
-        shortcut&(~SP_SHORTCUT_MODIFIER_MASK),static_cast<GdkModifierType>(
-        ((shortcut&SP_SHORTCUT_SHIFT_MASK)?GDK_SHIFT_MASK:0) |
-        ((shortcut&SP_SHORTCUT_CONTROL_MASK)?GDK_CONTROL_MASK:0) |
-        ((shortcut&SP_SHORTCUT_ALT_MASK)?GDK_MOD1_MASK:0)
-        ));
+    gchar *result = 0;
+    if (shortcut != GDK_VoidSymbol) {
+        result = gtk_accelerator_get_label(
+            shortcut & (~SP_SHORTCUT_MODIFIER_MASK), static_cast<GdkModifierType>(
+                ((shortcut & SP_SHORTCUT_SHIFT_MASK) ? GDK_SHIFT_MASK : 0) |
+                ((shortcut & SP_SHORTCUT_CONTROL_MASK) ? GDK_CONTROL_MASK : 0) |
+                ((shortcut & SP_SHORTCUT_ALT_MASK) ? GDK_MOD1_MASK : 0)
+                ));
+    }
+    return result;
 }
 
 /*
@@ -241,4 +244,4 @@ gchar* sp_shortcut_get_label (unsigned int shortcut)
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :