GNOME.org
 

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

commit 2dc5127ace076366ad91c608510aecf58f792509
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue Sep 5 12:52:00 2017 +1200

    code style

 panels/common/gsd-device-manager-udev.h            |    3 +--
 panels/common/gsd-device-manager-x11.h             |    3 +--
 panels/common/gsd-device-manager.h                 |    6 ++----
 panels/network/cc-network-panel.h                  |    3 +--
 panels/network/cc-wifi-panel.h                     |    3 +--
 .../connection-editor/ce-page-8021x-security.h     |    3 +--
 panels/network/connection-editor/ce-page-details.h |    3 +--
 .../network/connection-editor/ce-page-ethernet.h   |    3 +--
 panels/network/connection-editor/ce-page-ip4.h     |    3 +--
 panels/network/connection-editor/ce-page-ip6.h     |    3 +--
 .../network/connection-editor/ce-page-security.h   |    3 +--
 panels/network/connection-editor/ce-page-vpn.h     |    3 +--
 panels/network/connection-editor/ce-page-wifi.h    |    3 +--
 panels/network/connection-editor/ce-page.h         |    3 +--
 .../connection-editor/net-connection-editor.h      |    3 +--
 panels/network/net-device-ethernet.h               |    3 +--
 panels/network/net-device-mobile.h                 |    3 +--
 panels/network/net-device-simple.h                 |    3 +--
 panels/network/net-device-wifi.h                   |    3 +--
 panels/network/net-device.h                        |    3 +--
 panels/network/net-object.h                        |    3 +--
 panels/network/net-proxy.h                         |    3 +--
 panels/network/net-vpn.h                           |    3 +--
 23 files changed, 24 insertions(+), 48 deletions(-)
---
diff --git a/panels/common/gsd-device-manager-udev.h b/panels/common/gsd-device-manager-udev.h
index 46b8f9c..eec0e5d 100644
--- a/panels/common/gsd-device-manager-udev.h
+++ b/panels/common/gsd-device-manager-udev.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define GSD_TYPE_UDEV_DEVICE_MANAGER gsd_udev_device_manager_get_type ()
-
+#define GSD_TYPE_UDEV_DEVICE_MANAGER (gsd_udev_device_manager_get_type ())
 G_DECLARE_FINAL_TYPE (GsdUdevDeviceManager, gsd_udev_device_manager, GSD, UDEV_DEVICE_MANAGER, 
GsdDeviceManager)
 
 G_END_DECLS
diff --git a/panels/common/gsd-device-manager-x11.h b/panels/common/gsd-device-manager-x11.h
index 7eef4c9..a21e711 100644
--- a/panels/common/gsd-device-manager-x11.h
+++ b/panels/common/gsd-device-manager-x11.h
@@ -27,8 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define GSD_TYPE_X11_DEVICE_MANAGER gsd_x11_device_manager_get_type ()
-
+#define GSD_TYPE_X11_DEVICE_MANAGER (gsd_x11_device_manager_get_type ())
 G_DECLARE_FINAL_TYPE (GsdX11DeviceManager, gsd_x11_device_manager, GSD, X11_DEVICE_MANAGER, GsdDeviceManager)
 
 G_END_DECLS
diff --git a/panels/common/gsd-device-manager.h b/panels/common/gsd-device-manager.h
index 3a5c3e6..68ebfc1 100644
--- a/panels/common/gsd-device-manager.h
+++ b/panels/common/gsd-device-manager.h
@@ -26,12 +26,10 @@
 
 G_BEGIN_DECLS
 
-#define GSD_TYPE_DEVICE gsd_device_get_type ()
-
+#define GSD_TYPE_DEVICE (gsd_device_get_type ())
 G_DECLARE_DERIVABLE_TYPE (GsdDevice, gsd_device, GSD, DEVICE, GObject)
 
-#define GSD_TYPE_DEVICE_MANAGER gsd_device_manager_get_type ()
-
+#define GSD_TYPE_DEVICE_MANAGER (gsd_device_manager_get_type ())
 G_DECLARE_DERIVABLE_TYPE (GsdDeviceManager, gsd_device_manager, GSD, DEVICE_MANAGER, GObject)
 
 typedef enum {
diff --git a/panels/network/cc-network-panel.h b/panels/network/cc-network-panel.h
index bae9d7e..6d3b98b 100644
--- a/panels/network/cc-network-panel.h
+++ b/panels/network/cc-network-panel.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_NETWORK_PANEL cc_network_panel_get_type()
-
+#define CC_TYPE_NETWORK_PANEL (cc_network_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcNetworkPanel, cc_network_panel, CC, NETWORK_PANEL, CcPanel)
 
 GPtrArray *cc_network_panel_get_devices (CcNetworkPanel *panel);
diff --git a/panels/network/cc-wifi-panel.h b/panels/network/cc-wifi-panel.h
index 43ad4bf..57be32c 100644
--- a/panels/network/cc-wifi-panel.h
+++ b/panels/network/cc-wifi-panel.h
@@ -24,8 +24,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_WIFI_PANEL (cc_wifi_panel_get_type())
-
+#define CC_TYPE_WIFI_PANEL (cc_wifi_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcWifiPanel, cc_wifi_panel, CC, WIFI_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/network/connection-editor/ce-page-8021x-security.h 
b/panels/network/connection-editor/ce-page-8021x-security.h
index 69c9213..035a72c 100644
--- a/panels/network/connection-editor/ce-page-8021x-security.h
+++ b/panels/network/connection-editor/ce-page-8021x-security.h
@@ -31,8 +31,7 @@
 
 #include "ce-page.h"
 
-#define CE_TYPE_PAGE_8021X_SECURITY ce_page_8021x_security_get_type ()
-
+#define CE_TYPE_PAGE_8021X_SECURITY (ce_page_8021x_security_get_type ())
 G_DECLARE_FINAL_TYPE (CEPage8021xSecurity, ce_page_8021x_security, CE, PAGE_8021X_SECURITY, CEPage)
 
 CEPage *ce_page_8021x_security_new (NMConnection     *connection,
diff --git a/panels/network/connection-editor/ce-page-details.h 
b/panels/network/connection-editor/ce-page-details.h
index faea602..744b371 100644
--- a/panels/network/connection-editor/ce-page-details.h
+++ b/panels/network/connection-editor/ce-page-details.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define CE_TYPE_PAGE_DETAILS ce_page_details_get_type ()
-
+#define CE_TYPE_PAGE_DETAILS (ce_page_details_get_type ())
 G_DECLARE_FINAL_TYPE (CEPageDetails, ce_page_details, CE, PAGE_DETAILS, CEPage)
 
 CEPage *ce_page_details_new      (NMConnection        *connection,
diff --git a/panels/network/connection-editor/ce-page-ethernet.h 
b/panels/network/connection-editor/ce-page-ethernet.h
index 706f706..a7eba3e 100644
--- a/panels/network/connection-editor/ce-page-ethernet.h
+++ b/panels/network/connection-editor/ce-page-ethernet.h
@@ -30,8 +30,7 @@
 
 G_BEGIN_DECLS
 
-#define CE_TYPE_PAGE_ETHERNET ce_page_ethernet_get_type ()
-
+#define CE_TYPE_PAGE_ETHERNET (ce_page_ethernet_get_type ())
 G_DECLARE_FINAL_TYPE (CEPageEthernet, ce_page_ethernet, CE, PAGE_ETHERNET, CEPage)
 
 CEPage *ce_page_ethernet_new      (NMConnection     *connection,
diff --git a/panels/network/connection-editor/ce-page-ip4.h b/panels/network/connection-editor/ce-page-ip4.h
index 8eb736a..463e29c 100644
--- a/panels/network/connection-editor/ce-page-ip4.h
+++ b/panels/network/connection-editor/ce-page-ip4.h
@@ -28,8 +28,7 @@
 
 G_BEGIN_DECLS
 
-#define CE_TYPE_PAGE_IP4 ce_page_ip4_get_type ()
-
+#define CE_TYPE_PAGE_IP4 (ce_page_ip4_get_type ())
 G_DECLARE_FINAL_TYPE (CEPageIP4, ce_page_ip4, CE, PAGE_IP4, CEPage)
 
 CEPage *ce_page_ip4_new      (NMConnection     *connection,
diff --git a/panels/network/connection-editor/ce-page-ip6.h b/panels/network/connection-editor/ce-page-ip6.h
index 104d19e..5499478 100644
--- a/panels/network/connection-editor/ce-page-ip6.h
+++ b/panels/network/connection-editor/ce-page-ip6.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define CE_TYPE_PAGE_IP6 ce_page_ip6_get_type ()
-
+#define CE_TYPE_PAGE_IP6 (ce_page_ip6_get_type ())
 G_DECLARE_FINAL_TYPE (CEPageIP6, ce_page_ip6, CE, PAGE_IP6, CEPage)
 
 CEPage *ce_page_ip6_new      (NMConnection     *connection,
diff --git a/panels/network/connection-editor/ce-page-security.h 
b/panels/network/connection-editor/ce-page-security.h
index d49b9b2..a5cfc9b 100644
--- a/panels/network/connection-editor/ce-page-security.h
+++ b/panels/network/connection-editor/ce-page-security.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define CE_TYPE_PAGE_SECURITY ce_page_security_get_type ()
-
+#define CE_TYPE_PAGE_SECURITY (ce_page_security_get_type ())
 G_DECLARE_FINAL_TYPE (CEPageSecurity, ce_page_security, CE, PAGE_SECURITY, CEPage)
 
 CEPage *ce_page_security_new      (NMConnection     *connection,
diff --git a/panels/network/connection-editor/ce-page-vpn.h b/panels/network/connection-editor/ce-page-vpn.h
index 83dedc3..7895588 100644
--- a/panels/network/connection-editor/ce-page-vpn.h
+++ b/panels/network/connection-editor/ce-page-vpn.h
@@ -30,8 +30,7 @@
 
 G_BEGIN_DECLS
 
-#define CE_TYPE_PAGE_VPN ce_page_vpn_get_type ()
-
+#define CE_TYPE_PAGE_VPN (ce_page_vpn_get_type ())
 G_DECLARE_FINAL_TYPE (CEPageVpn, ce_page_vpn, CE, PAGE_VPN, CEPage)
 
 CEPage *ce_page_vpn_new      (NMConnection     *connection,
diff --git a/panels/network/connection-editor/ce-page-wifi.h b/panels/network/connection-editor/ce-page-wifi.h
index 007ad7e..8c1e39e 100644
--- a/panels/network/connection-editor/ce-page-wifi.h
+++ b/panels/network/connection-editor/ce-page-wifi.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define CE_TYPE_PAGE_WIFI ce_page_wifi_get_type ()
-
+#define CE_TYPE_PAGE_WIFI (ce_page_wifi_get_type ())
 G_DECLARE_FINAL_TYPE (CEPageWifi, ce_page_wifi, CE, PAGE_WIFI, CEPage)
 
 CEPage *ce_page_wifi_new      (NMConnection     *connection,
diff --git a/panels/network/connection-editor/ce-page.h b/panels/network/connection-editor/ce-page.h
index b28bd6e..539936c 100644
--- a/panels/network/connection-editor/ce-page.h
+++ b/panels/network/connection-editor/ce-page.h
@@ -30,8 +30,7 @@
 
 G_BEGIN_DECLS
 
-#define CE_TYPE_PAGE ce_page_get_type ()
-
+#define CE_TYPE_PAGE (ce_page_get_type ())
 G_DECLARE_DERIVABLE_TYPE (CEPage, ce_page, CE, PAGE, GObject)
 
 struct _CEPageClass
diff --git a/panels/network/connection-editor/net-connection-editor.h 
b/panels/network/connection-editor/net-connection-editor.h
index b16b5cd..fc31d58 100644
--- a/panels/network/connection-editor/net-connection-editor.h
+++ b/panels/network/connection-editor/net-connection-editor.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define NET_TYPE_CONNECTION_EDITOR net_connection_editor_get_type ()
-
+#define NET_TYPE_CONNECTION_EDITOR (net_connection_editor_get_type ())
 G_DECLARE_FINAL_TYPE (NetConnectionEditor, net_connection_editor, NET, CONNECTION_EDITOR, GObject)
 
 NetConnectionEditor *net_connection_editor_new      (GtkWindow        *parent_window,
diff --git a/panels/network/net-device-ethernet.h b/panels/network/net-device-ethernet.h
index 7427980..da0070d 100644
--- a/panels/network/net-device-ethernet.h
+++ b/panels/network/net-device-ethernet.h
@@ -28,8 +28,7 @@
 
 G_BEGIN_DECLS
 
-#define NET_TYPE_DEVICE_ETHERNET net_device_ethernet_get_type ()
-
+#define NET_TYPE_DEVICE_ETHERNET (net_device_ethernet_get_type ())
 G_DECLARE_FINAL_TYPE (NetDeviceEthernet, net_device_ethernet, NET, DEVICE_ETHERNET, NetDeviceSimple)
 
 G_END_DECLS
diff --git a/panels/network/net-device-mobile.h b/panels/network/net-device-mobile.h
index e26542a..8494af5 100644
--- a/panels/network/net-device-mobile.h
+++ b/panels/network/net-device-mobile.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define NET_TYPE_DEVICE_MOBILE net_device_mobile_get_type ()
-
+#define NET_TYPE_DEVICE_MOBILE (net_device_mobile_get_type ())
 G_DECLARE_FINAL_TYPE (NetDeviceMobile, net_device_mobile, NET, DEVICE_MOBILE, NetDevice)
 
 G_END_DECLS
diff --git a/panels/network/net-device-simple.h b/panels/network/net-device-simple.h
index 4c14a7e..5178332 100644
--- a/panels/network/net-device-simple.h
+++ b/panels/network/net-device-simple.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define NET_TYPE_DEVICE_SIMPLE net_device_simple_get_type ()
-
+#define NET_TYPE_DEVICE_SIMPLE (net_device_simple_get_type ())
 G_DECLARE_DERIVABLE_TYPE (NetDeviceSimple, net_device_simple, NET, DEVICE_SIMPLE, NetDevice)
 
 struct _NetDeviceSimpleClass
diff --git a/panels/network/net-device-wifi.h b/panels/network/net-device-wifi.h
index 73e0f81..1e91c5f 100644
--- a/panels/network/net-device-wifi.h
+++ b/panels/network/net-device-wifi.h
@@ -28,8 +28,7 @@
 
 G_BEGIN_DECLS
 
-#define NET_TYPE_DEVICE_WIFI net_device_wifi_get_type ()
-
+#define NET_TYPE_DEVICE_WIFI (net_device_wifi_get_type ())
 G_DECLARE_FINAL_TYPE (NetDeviceWifi, net_device_wifi, NET, DEVICE_WIFI, NetDevice)
 
 GtkWidget       *net_device_wifi_get_header_widget (NetDeviceWifi *device_wifi);
diff --git a/panels/network/net-device.h b/panels/network/net-device.h
index 6f8cc43..b8cdac6 100644
--- a/panels/network/net-device.h
+++ b/panels/network/net-device.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define NET_TYPE_DEVICE net_device_get_type ()
-
+#define NET_TYPE_DEVICE (net_device_get_type ())
 G_DECLARE_DERIVABLE_TYPE (NetDevice, net_device, NET, DEVICE, NetObject)
 
 struct _NetDeviceClass
diff --git a/panels/network/net-object.h b/panels/network/net-object.h
index 8f936cb..82e80ca 100644
--- a/panels/network/net-object.h
+++ b/panels/network/net-object.h
@@ -30,8 +30,7 @@
 
 G_BEGIN_DECLS
 
-#define NET_TYPE_OBJECT net_object_get_type ()
-
+#define NET_TYPE_OBJECT (net_object_get_type ())
 G_DECLARE_DERIVABLE_TYPE (NetObject, net_object, NET, OBJECT, GObject)
 
 struct _NetObjectClass
diff --git a/panels/network/net-proxy.h b/panels/network/net-proxy.h
index 14020c3..f647e7d 100644
--- a/panels/network/net-proxy.h
+++ b/panels/network/net-proxy.h
@@ -28,8 +28,7 @@
 
 G_BEGIN_DECLS
 
-#define NET_TYPE_PROXY net_proxy_get_type ()
-
+#define NET_TYPE_PROXY (net_proxy_get_type ())
 G_DECLARE_FINAL_TYPE (NetProxy, net_proxy, NET, PROXY, NetObject)
 
 NetProxy        *net_proxy_new                          (void);
diff --git a/panels/network/net-vpn.h b/panels/network/net-vpn.h
index 0eae607..e12c377 100644
--- a/panels/network/net-vpn.h
+++ b/panels/network/net-vpn.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define NET_TYPE_VPN net_vpn_get_type ()
-
+#define NET_TYPE_VPN (net_vpn_get_type ())
 G_DECLARE_FINAL_TYPE (NetVpn, net_vpn, NET, VPN, NetObject)
 
 void             net_vpn_set_show_separator     (NetVpn   *self,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]