[gnome-photos/wip/rishi/zoom: 3/9] organize-collection-model: Use G_DECLARE_FINAL_TYPE



commit 485dd8ab750ee2637a479c9722a7aa39c460f45e
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Jun 14 20:50:34 2017 +0200

    organize-collection-model: Use G_DECLARE_FINAL_TYPE
    
    https://bugzilla.gnome.org/show_bug.cgi?id=763712

 src/photos-organize-collection-model.c |    5 -----
 src/photos-organize-collection-model.h |   18 +++++-------------
 2 files changed, 5 insertions(+), 18 deletions(-)
---
diff --git a/src/photos-organize-collection-model.c b/src/photos-organize-collection-model.c
index b762894..52f9f95 100644
--- a/src/photos-organize-collection-model.c
+++ b/src/photos-organize-collection-model.c
@@ -43,11 +43,6 @@ struct _PhotosOrganizeCollectionModel
   PhotosBaseManager *manager;
 };
 
-struct _PhotosOrganizeCollectionModelClass
-{
-  GtkListStoreClass parent_class;
-};
-
 
 G_DEFINE_TYPE (PhotosOrganizeCollectionModel, photos_organize_collection_model, GTK_TYPE_LIST_STORE);
 
diff --git a/src/photos-organize-collection-model.h b/src/photos-organize-collection-model.h
index 72a3106..1c345a1 100644
--- a/src/photos-organize-collection-model.h
+++ b/src/photos-organize-collection-model.h
@@ -30,14 +30,11 @@
 G_BEGIN_DECLS
 
 #define PHOTOS_TYPE_ORGANIZE_COLLECTION_MODEL (photos_organize_collection_model_get_type ())
-
-#define PHOTOS_ORGANIZE_COLLECTION_MODEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-   PHOTOS_TYPE_ORGANIZE_COLLECTION_MODEL, PhotosOrganizeCollectionModel))
-
-#define PHOTOS_IS_ORGANIZE_COLLECTION_MODEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-   PHOTOS_TYPE_ORGANIZE_COLLECTION_MODEL))
+G_DECLARE_FINAL_TYPE (PhotosOrganizeCollectionModel,
+                      photos_organize_collection_model,
+                      PHOTOS,
+                      ORGANIZE_COLLECTION_MODEL,
+                      GtkListStore);
 
 #define PHOTOS_COLLECTION_PLACEHOLDER_ID "collection-placeholder"
 
@@ -48,11 +45,6 @@ typedef enum
   PHOTOS_ORGANIZE_MODEL_STATE
 } PhotosOrganizeModelColumns;
 
-typedef struct _PhotosOrganizeCollectionModel      PhotosOrganizeCollectionModel;
-typedef struct _PhotosOrganizeCollectionModelClass PhotosOrganizeCollectionModelClass;
-
-GType             photos_organize_collection_model_get_type               (void) G_GNUC_CONST;
-
 GtkListStore     *photos_organize_collection_model_new                    (void);
 
 GtkTreePath      *photos_organize_collection_model_add_placeholder        (PhotosOrganizeCollectionModel 
*self);


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