[gnome-photos] collection-icon-watcher: Use G_DECLARE_FINAL_TYPE

[Debarshi Ray <debarshir src gnome org>]

commit 5b50a263cbf0e2930d13822b14c890fef0549d14
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri Oct 7 08:42:31 2016 +0200

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

 src/photos-collection-icon-watcher.c |    5 -----
 src/photos-collection-icon-watcher.h |   18 +++++-------------
 2 files changed, 5 insertions(+), 18 deletions(-)
---
diff --git a/src/photos-collection-icon-watcher.c b/src/photos-collection-icon-watcher.c
index c153c57..bc67822 100644
--- a/src/photos-collection-icon-watcher.c
+++ b/src/photos-collection-icon-watcher.c
@@ -53,11 +53,6 @@ struct _PhotosCollectionIconWatcher
   guint to_query_remaining;
 };
 
-struct _PhotosCollectionIconWatcherClass
-{
-  GObjectClass parent_class;
-};
-
 enum
 {
   PROP_0,
diff --git a/src/photos-collection-icon-watcher.h b/src/photos-collection-icon-watcher.h
index e6635b5..920563f 100644
--- a/src/photos-collection-icon-watcher.h
+++ b/src/photos-collection-icon-watcher.h
@@ -32,22 +32,14 @@
 G_BEGIN_DECLS
 
 #define PHOTOS_TYPE_COLLECTION_ICON_WATCHER (photos_collection_icon_watcher_get_type ())
-
-#define PHOTOS_COLLECTION_ICON_WATCHER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-   PHOTOS_TYPE_COLLECTION_ICON_WATCHER, PhotosCollectionIconWatcher))
-
-#define PHOTOS_IS_COLLECTION_ICON_WATCHER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-   PHOTOS_TYPE_COLLECTION_ICON_WATCHER))
+G_DECLARE_FINAL_TYPE (PhotosCollectionIconWatcher,
+                      photos_collection_icon_watcher,
+                      PHOTOS,
+                      COLLECTION_ICON_WATCHER,
+                      GObject);
 
 typedef void (*PhotosCollectionIconWatcherCallback) (TrackerSparqlCursor *, gpointer);
 
-typedef struct _PhotosCollectionIconWatcher      PhotosCollectionIconWatcher;
-typedef struct _PhotosCollectionIconWatcherClass PhotosCollectionIconWatcherClass;
-
-GType                         photos_collection_icon_watcher_get_type    (void) G_GNUC_CONST;
-
 PhotosCollectionIconWatcher  *photos_collection_icon_watcher_new         (PhotosBaseItem *collection);
 
 void                          photos_collection_icon_watcher_refresh     (PhotosCollectionIconWatcher *self);