[gnome-software] star widget: Port to G_DECLARE_DERIVABLE_TYPE macro



commit 2a2d242edd314a3cfdeb780fa609af00d76ceab9
Author: Kalev Lember <klember redhat com>
Date:   Mon Sep 7 15:40:14 2015 +0200

    star widget: Port to G_DECLARE_DERIVABLE_TYPE macro

 src/gs-star-widget.c |    4 ++--
 src/gs-star-widget.h |   18 ++----------------
 2 files changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/src/gs-star-widget.c b/src/gs-star-widget.c
index 7fe6eb6..2d9f3ab 100644
--- a/src/gs-star-widget.c
+++ b/src/gs-star-widget.c
@@ -26,7 +26,7 @@
 
 #include "gs-star-widget.h"
 
-struct _GsStarWidgetPrivate
+typedef struct
 {
        GsAppRatingKind  rating_kind;
        gint             rating;
@@ -40,7 +40,7 @@ struct _GsStarWidgetPrivate
        GtkWidget       *image3;
        GtkWidget       *image4;
        GtkWidget       *image5;
-};
+} GsStarWidgetPrivate;
 
 G_DEFINE_TYPE_WITH_PRIVATE (GsStarWidget, gs_star_widget, GTK_TYPE_BIN)
 
diff --git a/src/gs-star-widget.h b/src/gs-star-widget.h
index e625d6d..8db1563 100644
--- a/src/gs-star-widget.h
+++ b/src/gs-star-widget.h
@@ -26,24 +26,11 @@
 
 #include "gs-app.h"
 
-#define GS_TYPE_STAR_WIDGET            (gs_star_widget_get_type())
-#define GS_STAR_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GS_TYPE_STAR_WIDGET, GsStarWidget))
-#define GS_STAR_WIDGET_CLASS(cls)      (G_TYPE_CHECK_CLASS_CAST((cls), GS_TYPE_STAR_WIDGET, 
GsStarWidgetClass))
-#define GS_IS_STAR_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GS_TYPE_STAR_WIDGET))
-#define GS_IS_STAR_WIDGET_CLASS(cls)   (G_TYPE_CHECK_CLASS_TYPE((cls), GS_TYPE_STAR_WIDGET))
-#define GS_STAR_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GS_TYPE_STAR_WIDGET, 
GsStarWidgetClass))
-
 G_BEGIN_DECLS
 
-typedef struct _GsStarWidget                   GsStarWidget;
-typedef struct _GsStarWidgetClass              GsStarWidgetClass;
-typedef struct _GsStarWidgetPrivate            GsStarWidgetPrivate;
+#define GS_TYPE_STAR_WIDGET (gs_star_widget_get_type ())
 
-struct _GsStarWidget
-{
-       GtkBin             parent;
-       GsStarWidgetPrivate     *priv;
-};
+G_DECLARE_DERIVABLE_TYPE (GsStarWidget, gs_star_widget, GS, STAR_WIDGET, GtkBin)
 
 struct _GsStarWidgetClass
 {
@@ -52,7 +39,6 @@ struct _GsStarWidgetClass
        void                    (*rating_changed)               (GsStarWidget   *star);
 };
 
-GType           gs_star_widget_get_type                (void);
 GtkWidget      *gs_star_widget_new                     (void);
 gint            gs_star_widget_get_rating              (GsStarWidget   *star);
 void            gs_star_widget_set_rating              (GsStarWidget   *star,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]