qulogic/gplugin

move the gplugin-gtk-viewer types to the G_DECLARE_* macros
glib-macros
2019-07-18, Gary Kramlich
879f665c7aeb
Parents 32eb959d3b5e
Children 9aa2fa244ec0
move the gplugin-gtk-viewer types to the G_DECLARE_* macros
2 files changed, 6 insertions(+), 25 deletions(-)
  • +4 -0
    gplugin-gtk-viewer/gplugin-gtk-viewer-window.c
  • +2 -25
    gplugin-gtk-viewer/gplugin-gtk-viewer-window.h
    • --- a/gplugin-gtk-viewer/gplugin-gtk-viewer-window.c Thu Jul 18 05:25:28 2019 -0500
    +++ b/gplugin-gtk-viewer/gplugin-gtk-viewer-window.c Thu Jul 18 05:29:34 2019 -0500
    @@ -19,6 +19,10 @@
    #include "gplugin-gtk-viewer-window.h"
    +struct _GPluginGtkViewerWindow {
    + GtkWindow parent;
    +};
    +
    G_DEFINE_TYPE(GPluginGtkViewerWindow, gplugin_gtk_viewer_window, GTK_TYPE_WINDOW)
    /******************************************************************************
    --- a/gplugin-gtk-viewer/gplugin-gtk-viewer-window.h Thu Jul 18 05:25:28 2019 -0500
    +++ b/gplugin-gtk-viewer/gplugin-gtk-viewer-window.h Thu Jul 18 05:29:34 2019 -0500
    @@ -19,39 +19,16 @@
    #ifndef GPLUGIN_GTK_VIEWER_WINDOW_H
    #define GPLUGIN_GTK_VIEWER_WINDOW_H
    -#include <gtk/gtk.h>
    -
    -#define GPLUGIN_GTK_TYPE_VIEWER_WINDOW (gplugin_gtk_viewer_window_get_type())
    -#define GPLUGIN_GTK_VIEWER_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GPLUGIN_GTK_TYPE_VIEWER_WINDOW, GPluginGtkViewerWindow))
    -#define GPLUGIN_GTK_VIEWER_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GPLUGIN_GTK_TYPE_VIEWER_WINDOW, GPluginGtkViewerWindowClass))
    -#define GPLUGIN_GTK_IS_VIEWER_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GPLUGIN_GTK_TYPE_VIEWER_WINDOW))
    -#define GPLUGIN_GTK_IS_VIEWER_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GPLUGIN_GTK_TYPE_VIEWER_WINDOW))
    -#define GPLUGIN_GTK_VIEWER_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GPLUGIN_GTK_TYPE_VIEWER_WINDOW, GPluginGtkViewerWindowClass))
    -
    -typedef struct _GPluginGtkViewerWindow GPluginGtkViewerWindow;
    -typedef struct _GPluginGtkViewerWindowClass GPluginGtkViewerWindowClass;
    -
    #include <glib.h>
    #include <glib-object.h>
    #include <gtk/gtk.h>
    -struct _GPluginGtkViewerWindow {
    - GtkWindow parent;
    -
    - gpointer reserved[4];
    -};
    -
    -struct _GPluginGtkViewerWindowClass {
    - GtkWindowClass parent;
    -
    - gpointer reserved[4];
    -};
    +#define GPLUGIN_GTK_TYPE_VIEWER_WINDOW (gplugin_gtk_viewer_window_get_type())
    +G_DECLARE_FINAL_TYPE(GPluginGtkViewerWindow, gplugin_gtk_view_window, GPLUGIN_GTK_VIEWER, WINDOW, GtkWindow)
    G_BEGIN_DECLS
    -GType gplugin_gtk_viewer_window_get_type(void);
    -
    GtkWidget *gplugin_gtk_viewer_window_new(void);
    G_END_DECLS