From 27b37407d0aa4557a4df52122beecad864b6beea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 24 Sep 2015 01:08:59 +0200 Subject: [PATCH] Don't duplicate declarations from G_DEFINE_TYPE --- src/backends/meta-cursor-renderer.h | 2 -- src/backends/meta-cursor.c | 2 -- src/backends/x11/nested/meta-cursor-renderer-x11-nested.c | 2 -- src/wayland/meta-wayland-data-device.c | 2 -- src/wayland/meta-wayland-data-device.h | 2 -- src/wayland/meta-wayland-pointer.c | 1 - src/wayland/meta-wayland-surface.c | 8 -------- src/wayland/meta-xwayland-selection.c | 2 -- src/wayland/meta-xwayland.c | 1 - 9 files changed, 22 deletions(-) diff --git a/src/backends/meta-cursor-renderer.h b/src/backends/meta-cursor-renderer.h index c5fcb6474..b6024dd94 100644 --- a/src/backends/meta-cursor-renderer.h +++ b/src/backends/meta-cursor-renderer.h @@ -54,8 +54,6 @@ struct _MetaCursorRendererClass XcursorImage *xc_image); }; -GType meta_cursor_renderer_get_type (void) G_GNUC_CONST; - MetaCursorRenderer * meta_cursor_renderer_new (void); void meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer, diff --git a/src/backends/meta-cursor.c b/src/backends/meta-cursor.c index 0ac059a05..55f9c0b12 100644 --- a/src/backends/meta-cursor.c +++ b/src/backends/meta-cursor.c @@ -60,8 +60,6 @@ struct _MetaCursorSprite gboolean theme_dirty; }; -GType meta_cursor_sprite_get_type (void) G_GNUC_CONST; - G_DEFINE_TYPE (MetaCursorSprite, meta_cursor_sprite, G_TYPE_OBJECT) static const char * diff --git a/src/backends/x11/nested/meta-cursor-renderer-x11-nested.c b/src/backends/x11/nested/meta-cursor-renderer-x11-nested.c index 4fda18de9..da1a56038 100644 --- a/src/backends/x11/nested/meta-cursor-renderer-x11-nested.c +++ b/src/backends/x11/nested/meta-cursor-renderer-x11-nested.c @@ -33,8 +33,6 @@ struct _MetaCursorRendererX11Nested MetaCursorRenderer parent; }; -GType meta_cursor_renderer_x11_nested_get_type (void) G_GNUC_CONST; - G_DEFINE_TYPE (MetaCursorRendererX11Nested, meta_cursor_renderer_x11_nested, META_TYPE_CURSOR_RENDERER); diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c index d7a1525f1..1859b5dc2 100644 --- a/src/wayland/meta-wayland-data-device.c +++ b/src/wayland/meta-wayland-data-device.c @@ -57,8 +57,6 @@ typedef struct _MetaWaylandDataSourceWayland struct wl_resource *resource; } MetaWaylandDataSourceWayland; -GType meta_wayland_data_source_wayland_get_type (void) G_GNUC_CONST; - G_DEFINE_TYPE_WITH_PRIVATE (MetaWaylandDataSource, meta_wayland_data_source, G_TYPE_OBJECT); G_DEFINE_TYPE (MetaWaylandDataSourceWayland, meta_wayland_data_source_wayland, diff --git a/src/wayland/meta-wayland-data-device.h b/src/wayland/meta-wayland-data-device.h index d23953f8b..33fadf2e1 100644 --- a/src/wayland/meta-wayland-data-device.h +++ b/src/wayland/meta-wayland-data-device.h @@ -60,8 +60,6 @@ struct _MetaWaylandDataDevice struct wl_signal dnd_ownership_signal; }; -GType meta_wayland_data_source_get_type (void) G_GNUC_CONST; - void meta_wayland_data_device_manager_init (MetaWaylandCompositor *compositor); void meta_wayland_data_device_init (MetaWaylandDataDevice *data_device); diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c index 08172fb77..993b9e331 100644 --- a/src/wayland/meta-wayland-pointer.c +++ b/src/wayland/meta-wayland-pointer.c @@ -74,7 +74,6 @@ struct _MetaWaylandSurfaceRoleCursor MetaCursorSprite *cursor_sprite; }; -GType meta_wayland_surface_role_cursor_get_type (void) G_GNUC_CONST; G_DEFINE_TYPE (MetaWaylandSurfaceRoleCursor, meta_wayland_surface_role_cursor, META_TYPE_WAYLAND_SURFACE_ROLE); diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c index f619f1ebb..2d7a9c721 100644 --- a/src/wayland/meta-wayland-surface.c +++ b/src/wayland/meta-wayland-surface.c @@ -73,11 +73,8 @@ typedef struct struct wl_listener sibling_destroy_listener; } MetaWaylandSubsurfacePlacementOp; -GType meta_wayland_surface_get_type (void) G_GNUC_CONST; - G_DEFINE_TYPE (MetaWaylandSurface, meta_wayland_surface, G_TYPE_OBJECT); -GType meta_wayland_surface_role_get_type (void) G_GNUC_CONST; G_DEFINE_TYPE_WITH_PRIVATE (MetaWaylandSurfaceRole, meta_wayland_surface_role, G_TYPE_OBJECT); @@ -87,7 +84,6 @@ struct _MetaWaylandSurfaceRoleSubsurface MetaWaylandSurfaceRole parent; }; -GType meta_wayland_surface_role_subsurface_get_type (void) G_GNUC_CONST; G_DEFINE_TYPE (MetaWaylandSurfaceRoleSubsurface, meta_wayland_surface_role_subsurface, META_TYPE_WAYLAND_SURFACE_ROLE); @@ -97,7 +93,6 @@ struct _MetaWaylandSurfaceRoleXdgSurface MetaWaylandSurfaceRole parent; }; -GType meta_wayland_surface_role_xdg_surface_get_type (void) G_GNUC_CONST; G_DEFINE_TYPE (MetaWaylandSurfaceRoleXdgSurface, meta_wayland_surface_role_xdg_surface, META_TYPE_WAYLAND_SURFACE_ROLE); @@ -107,7 +102,6 @@ struct _MetaWaylandSurfaceRoleXdgPopup MetaWaylandSurfaceRole parent; }; -GType meta_wayland_surface_role_xdg_popup_get_type (void) G_GNUC_CONST; G_DEFINE_TYPE (MetaWaylandSurfaceRoleXdgPopup, meta_wayland_surface_role_xdg_popup, META_TYPE_WAYLAND_SURFACE_ROLE); @@ -117,7 +111,6 @@ struct _MetaWaylandSurfaceRoleWlShellSurface MetaWaylandSurfaceRole parent; }; -GType meta_wayland_surface_role_wl_shell_surface_get_type (void) G_GNUC_CONST; G_DEFINE_TYPE (MetaWaylandSurfaceRoleWlShellSurface, meta_wayland_surface_role_wl_shell_surface, META_TYPE_WAYLAND_SURFACE_ROLE); @@ -127,7 +120,6 @@ struct _MetaWaylandSurfaceRoleDND MetaWaylandSurfaceRole parent; }; -GType meta_wayland_surface_role_dnd_get_type (void) G_GNUC_CONST; G_DEFINE_TYPE (MetaWaylandSurfaceRoleDND, meta_wayland_surface_role_dnd, META_TYPE_WAYLAND_SURFACE_ROLE); diff --git a/src/wayland/meta-xwayland-selection.c b/src/wayland/meta-xwayland-selection.c index b7f4830b6..105ea5cf8 100644 --- a/src/wayland/meta-xwayland-selection.c +++ b/src/wayland/meta-xwayland-selection.c @@ -39,8 +39,6 @@ #include "meta-xwayland-selection-private.h" #include "meta-wayland-data-device.h" -GType meta_wayland_data_source_xwayland_get_type (void) G_GNUC_CONST; - #define INCR_CHUNK_SIZE (128 * 1024) #define XDND_VERSION 5 diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c index 1e7cb34f7..dc7e83fdb 100644 --- a/src/wayland/meta-xwayland.c +++ b/src/wayland/meta-xwayland.c @@ -45,7 +45,6 @@ struct _MetaWaylandSurfaceRoleXWayland MetaWaylandSurfaceRole parent; }; -GType meta_wayland_surface_role_xwayland_get_type (void) G_GNUC_CONST; G_DEFINE_TYPE (MetaWaylandSurfaceRoleXWayland, meta_wayland_surface_role_xwayland, META_TYPE_WAYLAND_SURFACE_ROLE);