[nautilus] icon-info: ported declaration to G_DECLARE*



commit 2660473c3c7cd7b3d9b9adf968d8960574f06694
Author: Vyas Giridharan <vyasgiridhar27 gmail com>
Date:   Tue Aug 22 20:41:44 2017 +0530

    icon-info: ported declaration to G_DECLARE*
    
    This patch ports declaration of NautilusIconInfo to
    the G_DECLARE* format.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=771777

 src/nautilus-icon-info.c |    5 -----
 src/nautilus-icon-info.h |   15 ++-------------
 2 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/src/nautilus-icon-info.c b/src/nautilus-icon-info.c
index 854feb2..ad5a7f7 100644
--- a/src/nautilus-icon-info.c
+++ b/src/nautilus-icon-info.c
@@ -35,11 +35,6 @@ struct _NautilusIconInfo
     gint orig_scale;
 };
 
-struct _NautilusIconInfoClass
-{
-    GObjectClass parent_class;
-};
-
 static void schedule_reap_cache (void);
 
 G_DEFINE_TYPE (NautilusIconInfo,
diff --git a/src/nautilus-icon-info.h b/src/nautilus-icon-info.h
index 592b534..505a7be 100644
--- a/src/nautilus-icon-info.h
+++ b/src/nautilus-icon-info.h
@@ -48,19 +48,8 @@ typedef enum {
 /* Maximum size of an icon that the icon factory will ever produce */
 #define NAUTILUS_ICON_MAXIMUM_SIZE     320
 
-typedef struct _NautilusIconInfo      NautilusIconInfo;
-typedef struct _NautilusIconInfoClass NautilusIconInfoClass;
-
-
-#define NAUTILUS_TYPE_ICON_INFO                 (nautilus_icon_info_get_type ())
-#define NAUTILUS_ICON_INFO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_ICON_INFO, 
NautilusIconInfo))
-#define NAUTILUS_ICON_INFO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_ICON_INFO, 
NautilusIconInfoClass))
-#define NAUTILUS_IS_ICON_INFO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_ICON_INFO))
-#define NAUTILUS_IS_ICON_INFO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_ICON_INFO))
-#define NAUTILUS_ICON_INFO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_ICON_INFO, 
NautilusIconInfoClass))
-
-
-GType    nautilus_icon_info_get_type (void) G_GNUC_CONST;
+#define NAUTILUS_TYPE_ICON_INFO (nautilus_icon_info_get_type ())
+G_DECLARE_FINAL_TYPE (NautilusIconInfo, nautilus_icon_info, NAUTILUS, ICON_INFO, GObject)
 
 NautilusIconInfo *    nautilus_icon_info_new_for_pixbuf               (GdkPixbuf         *pixbuf,
                                                                       int                scale);


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