From 3b076e5e64d34684db50326b73fc1e280c3d6dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 17 Jul 2019 16:45:43 +0200 Subject: [PATCH] EekGtkRenderer: Simplify type declaration It's 2019. --- eek/eek-gtk-renderer.c | 4 ++++ eek/eek-gtk-renderer.h | 25 +------------------------ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/eek/eek-gtk-renderer.c b/eek/eek-gtk-renderer.c index b16966e9..56a44d91 100644 --- a/eek/eek-gtk-renderer.c +++ b/eek/eek-gtk-renderer.c @@ -28,6 +28,10 @@ #include "eek-gtk-renderer.h" #include "eek-key.h" +struct _EekGtkRenderer { + EekRenderer parent; +}; + G_DEFINE_TYPE (EekGtkRenderer, eek_gtk_renderer, EEK_TYPE_RENDERER); static cairo_surface_t * diff --git a/eek/eek-gtk-renderer.h b/eek/eek-gtk-renderer.h index 5948477a..dc4c27cc 100644 --- a/eek/eek-gtk-renderer.h +++ b/eek/eek-gtk-renderer.h @@ -27,30 +27,7 @@ G_BEGIN_DECLS #define EEK_TYPE_GTK_RENDERER (eek_gtk_renderer_get_type()) -#define EEK_GTK_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_GTK_RENDERER, EekGtkRenderer)) -#define EEK_GTK_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_GTK_RENDERER, EekGtkRendererClass)) -#define EEK_IS_GTK_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_GTK_RENDERER)) -#define EEK_IS_GTK_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_GTK_RENDERER)) -#define EEK_GTK_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_GTK_RENDERER, EekGtkRendererClass)) - -typedef struct _EekGtkRenderer EekGtkRenderer; -typedef struct _EekGtkRendererClass EekGtkRendererClass; -typedef struct _EekGtkRendererPrivate EekGtkRendererPrivate; - -struct _EekGtkRenderer { - EekRenderer parent; - - EekGtkRendererPrivate *priv; -}; - -struct _EekGtkRendererClass -{ - EekRendererClass parent_class; - - /*< private >*/ - /* padding */ - gpointer pdummy[24]; -}; +G_DECLARE_FINAL_TYPE (EekGtkRenderer, eek_gtk_renderer, EEK, GTK_RENDERER, EekRenderer) GType eek_gtk_renderer_get_type (void) G_GNUC_CONST; EekRenderer *eek_gtk_renderer_new (EekKeyboard *keyboard,