[gnome-control-center/wip/rancell/g-define-type] code style

[Robert Ancell <rancell src gnome org>]

commit e5cf1bec9f7511e6a91cb5844a5625c50f4b917c
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue Sep 5 12:54:17 2017 +1200

    code style

 panels/keyboard/cc-keyboard-item.h            |    3 +--
 panels/keyboard/cc-keyboard-manager.h         |    3 +--
 panels/keyboard/cc-keyboard-option.h          |    3 +--
 panels/keyboard/cc-keyboard-panel.h           |    3 +--
 panels/keyboard/cc-keyboard-shortcut-editor.h |    5 ++---
 panels/wacom/cc-drawing-area.h                |    2 +-
 panels/wacom/cc-wacom-mapping-panel.h         |    2 +-
 panels/wacom/cc-wacom-nav-button.h            |    2 +-
 panels/wacom/cc-wacom-page.h                  |    2 +-
 panels/wacom/cc-wacom-panel.h                 |    2 +-
 panels/wacom/cc-wacom-stylus-page.h           |    2 +-
 panels/wacom/gsd-wacom-key-shortcut-button.h  |    2 +-
 12 files changed, 13 insertions(+), 18 deletions(-)
---
diff --git a/panels/keyboard/cc-keyboard-item.h b/panels/keyboard/cc-keyboard-item.h
index 0f877ba..e167f88 100644
--- a/panels/keyboard/cc-keyboard-item.h
+++ b/panels/keyboard/cc-keyboard-item.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_KEYBOARD_ITEM         (cc_keyboard_item_get_type ())
-
+#define CC_TYPE_KEYBOARD_ITEM (cc_keyboard_item_get_type ())
 G_DECLARE_FINAL_TYPE (CcKeyboardItem, cc_keyboard_item, CC, KEYBOARD_ITEM, GObject)
 
 typedef enum
diff --git a/panels/keyboard/cc-keyboard-manager.h b/panels/keyboard/cc-keyboard-manager.h
index 232c4b2..ff39f51 100644
--- a/panels/keyboard/cc-keyboard-manager.h
+++ b/panels/keyboard/cc-keyboard-manager.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_KEYBOARD_MANAGER (cc_keyboard_manager_get_type())
-
+#define CC_TYPE_KEYBOARD_MANAGER (cc_keyboard_manager_get_type ())
 G_DECLARE_FINAL_TYPE (CcKeyboardManager, cc_keyboard_manager, CC, KEYBOARD_MANAGER, GObject)
 
 CcKeyboardManager*   cc_keyboard_manager_new                     (void);
diff --git a/panels/keyboard/cc-keyboard-option.h b/panels/keyboard/cc-keyboard-option.h
index 0736b21..a9504e9 100644
--- a/panels/keyboard/cc-keyboard-option.h
+++ b/panels/keyboard/cc-keyboard-option.h
@@ -33,8 +33,7 @@ enum
   XKB_OPTION_N_COLUMNS
 };
 
-#define CC_TYPE_KEYBOARD_OPTION            (cc_keyboard_option_get_type ())
-
+#define CC_TYPE_KEYBOARD_OPTION (cc_keyboard_option_get_type ())
 G_DECLARE_FINAL_TYPE (CcKeyboardOption, cc_keyboard_option, CC, KEYBOARD_OPTION, GObject)
 
 GList *         cc_keyboard_option_get_all              (void);
diff --git a/panels/keyboard/cc-keyboard-panel.h b/panels/keyboard/cc-keyboard-panel.h
index cbf8e0d..4311527 100644
--- a/panels/keyboard/cc-keyboard-panel.h
+++ b/panels/keyboard/cc-keyboard-panel.h
@@ -27,8 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_KEYBOARD_PANEL (cc_keyboard_panel_get_type())
-
+#define CC_TYPE_KEYBOARD_PANEL (cc_keyboard_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcKeyboardPanel, cc_keyboard_panel, CC, KEYBOARD_PANEL, CcPanel)
 
 CcKeyboardItem*      cc_keyboard_panel_create_custom_item        (CcKeyboardPanel    *self);
diff --git a/panels/keyboard/cc-keyboard-shortcut-editor.h b/panels/keyboard/cc-keyboard-shortcut-editor.h
index a9455a8..75199bf 100644
--- a/panels/keyboard/cc-keyboard-shortcut-editor.h
+++ b/panels/keyboard/cc-keyboard-shortcut-editor.h
@@ -28,7 +28,8 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_KEYBOARD_SHORTCUT_EDITOR (cc_keyboard_shortcut_editor_get_type())
+#define CC_TYPE_KEYBOARD_SHORTCUT_EDITOR (cc_keyboard_shortcut_editor_get_type ())
+G_DECLARE_FINAL_TYPE (CcKeyboardShortcutEditor, cc_keyboard_shortcut_editor, CC, KEYBOARD_SHORTCUT_EDITOR, 
GtkDialog)
 
 typedef enum
 {
@@ -36,8 +37,6 @@ typedef enum
   CC_SHORTCUT_EDITOR_EDIT
 } CcShortcutEditorMode;
 
-G_DECLARE_FINAL_TYPE (CcKeyboardShortcutEditor, cc_keyboard_shortcut_editor, CC, KEYBOARD_SHORTCUT_EDITOR, 
GtkDialog)
-
 GtkWidget*           cc_keyboard_shortcut_editor_new             (CcKeyboardManager        *manager);
 
 CcKeyboardItem*      cc_keyboard_shortcut_editor_get_item        (CcKeyboardShortcutEditor *self);
diff --git a/panels/wacom/cc-drawing-area.h b/panels/wacom/cc-drawing-area.h
index 088bb7e..9367163 100644
--- a/panels/wacom/cc-drawing-area.h
+++ b/panels/wacom/cc-drawing-area.h
@@ -24,7 +24,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_DRAWING_AREA (cc_drawing_area_get_type())
+#define CC_TYPE_DRAWING_AREA (cc_drawing_area_get_type ())
 G_DECLARE_FINAL_TYPE (CcDrawingArea, cc_drawing_area, CC, DRAWING_AREA, GtkEventBox)
 
 GtkWidget *cc_drawing_area_new (void);
diff --git a/panels/wacom/cc-wacom-mapping-panel.h b/panels/wacom/cc-wacom-mapping-panel.h
index fdc947e..2111267 100644
--- a/panels/wacom/cc-wacom-mapping-panel.h
+++ b/panels/wacom/cc-wacom-mapping-panel.h
@@ -26,7 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_WACOM_MAPPING_PANEL (cc_wacom_mapping_panel_get_type())
+#define CC_TYPE_WACOM_MAPPING_PANEL (cc_wacom_mapping_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcWacomMappingPanel, cc_wacom_mapping_panel, CC, WACOM_MAPPING_PANEL, GtkBox)
 
 GtkWidget * cc_wacom_mapping_panel_new (void);
diff --git a/panels/wacom/cc-wacom-nav-button.h b/panels/wacom/cc-wacom-nav-button.h
index 85ba221..74c0a14 100644
--- a/panels/wacom/cc-wacom-nav-button.h
+++ b/panels/wacom/cc-wacom-nav-button.h
@@ -25,7 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_WACOM_NAV_BUTTON (cc_wacom_nav_button_get_type())
+#define CC_TYPE_WACOM_NAV_BUTTON (cc_wacom_nav_button_get_type ())
 G_DECLARE_FINAL_TYPE (CcWacomNavButton, cc_wacom_nav_button, CC, WACOM_NAV_BUTTON, GtkBox)
 
 GtkWidget * cc_wacom_nav_button_new (void);
diff --git a/panels/wacom/cc-wacom-page.h b/panels/wacom/cc-wacom-page.h
index 0f282ef..50c242a 100644
--- a/panels/wacom/cc-wacom-page.h
+++ b/panels/wacom/cc-wacom-page.h
@@ -28,7 +28,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_WACOM_PAGE (cc_wacom_page_get_type())
+#define CC_TYPE_WACOM_PAGE (cc_wacom_page_get_type ())
 G_DECLARE_FINAL_TYPE (CcWacomPage, cc_wacom_page, CC, WACOM_PAGE, GtkBox)
 
 GtkWidget * cc_wacom_page_new (CcWacomPanel  *panel,
diff --git a/panels/wacom/cc-wacom-panel.h b/panels/wacom/cc-wacom-panel.h
index 21e4ff3..de0c74f 100644
--- a/panels/wacom/cc-wacom-panel.h
+++ b/panels/wacom/cc-wacom-panel.h
@@ -26,7 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_WACOM_PANEL (cc_wacom_panel_get_type())
+#define CC_TYPE_WACOM_PANEL (cc_wacom_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcWacomPanel, cc_wacom_panel, CC, WACOM_PANEL, CcPanel)
 
 void  cc_wacom_panel_switch_to_panel (CcWacomPanel *self,
diff --git a/panels/wacom/cc-wacom-stylus-page.h b/panels/wacom/cc-wacom-stylus-page.h
index 4eb5823..05ec291 100644
--- a/panels/wacom/cc-wacom-stylus-page.h
+++ b/panels/wacom/cc-wacom-stylus-page.h
@@ -27,7 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_WACOM_STYLUS_PAGE (cc_wacom_stylus_page_get_type())
+#define CC_TYPE_WACOM_STYLUS_PAGE (cc_wacom_stylus_page_get_type ())
 G_DECLARE_FINAL_TYPE (CcWacomStylusPage, cc_wacom_stylus_page, CC, WACOM_STYLUS_PAGE, GtkBox)
 
 GtkWidget * cc_wacom_stylus_page_new (CcWacomTool *stylus);
diff --git a/panels/wacom/gsd-wacom-key-shortcut-button.h b/panels/wacom/gsd-wacom-key-shortcut-button.h
index e7d44c0..444d527 100644
--- a/panels/wacom/gsd-wacom-key-shortcut-button.h
+++ b/panels/wacom/gsd-wacom-key-shortcut-button.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (GsdWacomKeyShortcutButton, gsd_wacom_key_shortcut_button, GSD, 
WACOM_KEY_SHORTCUT_BUTTON, GtkButton)
 
 GType gsd_wacom_key_shortcut_button_mode_type (void) G_GNUC_CONST;
-#define GSD_WACOM_TYPE_KEY_SHORTCUT_BUTTON_MODE (gsd_wacom_key_shortcut_button_mode_type())
+#define GSD_WACOM_TYPE_KEY_SHORTCUT_BUTTON_MODE (gsd_wacom_key_shortcut_button_mode_type ())
 
 typedef enum
 {