[nautilus/menial-but-very-rewarding-work-that-made-my-fingers-numb: 4/7] canvas-view-container: Use GLib macros to define type

[Carlos Soriano <csoriano src gnome org>]

commit c268039b3288523db49e7df02fc3cf9c7089c34e
Author: Ernestas Kulik <ernestask gnome org>
Date:   Fri May 18 14:19:21 2018 +0300

    canvas-view-container: Use GLib macros to define type

 src/nautilus-canvas-view-container.c |  7 +++++++
 src/nautilus-canvas-view-container.h | 40 ++++++++----------------------------
 2 files changed, 15 insertions(+), 32 deletions(-)
---
diff --git a/src/nautilus-canvas-view-container.c b/src/nautilus-canvas-view-container.c
index 0811080e1..9b7063be2 100644
--- a/src/nautilus-canvas-view-container.c
+++ b/src/nautilus-canvas-view-container.c
@@ -30,6 +30,13 @@
 #include "nautilus-file-attributes.h"
 #include "nautilus-thumbnails.h"
 
+struct _NautilusCanvasViewContainer
+{
+    NautilusCanvasContainer parent;
+
+    NautilusCanvasView *view;
+};
+
 G_DEFINE_TYPE (NautilusCanvasViewContainer, nautilus_canvas_view_container, NAUTILUS_TYPE_CANVAS_CONTAINER);
 
 static GQuark attribute_none_q;
diff --git a/src/nautilus-canvas-view-container.h b/src/nautilus-canvas-view-container.h
index 6e8e50dae..5c431531c 100644
--- a/src/nautilus-canvas-view-container.h
+++ b/src/nautilus-canvas-view-container.h
@@ -26,36 +26,12 @@
 
 #include "nautilus-canvas-container.h"
 
-typedef struct NautilusCanvasViewContainer NautilusCanvasViewContainer;
-typedef struct NautilusCanvasViewContainerClass NautilusCanvasViewContainerClass;
-
 #define NAUTILUS_TYPE_CANVAS_VIEW_CONTAINER nautilus_canvas_view_container_get_type()
-#define NAUTILUS_CANVAS_VIEW_CONTAINER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_CANVAS_VIEW_CONTAINER, NautilusCanvasViewContainer))
-#define NAUTILUS_CANVAS_VIEW_CONTAINER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CANVAS_VIEW_CONTAINER, NautilusCanvasViewContainerClass))
-#define NAUTILUS_IS_CANVAS_VIEW_CONTAINER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_CANVAS_VIEW_CONTAINER))
-#define NAUTILUS_IS_CANVAS_VIEW_CONTAINER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CANVAS_VIEW_CONTAINER))
-#define NAUTILUS_CANVAS_VIEW_CONTAINER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_CANVAS_VIEW_CONTAINER, NautilusCanvasViewContainerClass))
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(NautilusCanvasViewContainer, g_object_unref)
-
-typedef struct NautilusCanvasViewContainerDetails NautilusCanvasViewContainerDetails;
-
-struct NautilusCanvasViewContainer {
-       NautilusCanvasContainer parent;
-
-       NautilusCanvasView *view;
-};
-
-struct NautilusCanvasViewContainerClass {
-       NautilusCanvasContainerClass parent_class;
-};
-
-GType                  nautilus_canvas_view_container_get_type         (void);
-NautilusCanvasContainer *nautilus_canvas_view_container_construct        (NautilusCanvasViewContainer 
*canvas_container,
-                                                                     NautilusCanvasView      *view);
-NautilusCanvasContainer *nautilus_canvas_view_container_new              (NautilusCanvasView      *view);
+
+G_DECLARE_FINAL_TYPE (NautilusCanvasViewContainer, nautilus_canvas_view_container,
+                      NAUTILUS, CANVAS_VIEW_CONTAINER,
+                      NautilusCanvasContainer)
+
+NautilusCanvasContainer *nautilus_canvas_view_container_construct (NautilusCanvasViewContainer 
*canvas_container,
+                                                                   NautilusCanvasView      *view);
+NautilusCanvasContainer *nautilus_canvas_view_container_new       (NautilusCanvasView      *view);