diff options
| author | Rohit Kaushik <kaushikrohit325@gmail.com> | 2017-01-30 16:31:09 +0530 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@src.gnome.org> | 2017-02-03 15:53:36 +0200 |
| commit | 04811bc6da418f4bab13fd1cf45d7c026857dcca (patch) | |
| tree | b46f882aecd6c9db680819fbd8138f52f366eba3 /src/nautilus-canvas-view.h | |
| parent | 928b806cb559e9509c0d81d45bd118243fa33ab0 (diff) | |
| download | nautilus-04811bc6da418f4bab13fd1cf45d7c026857dcca.tar.gz | |
canvas-view: port to G_DECLARE* type declaration
This patch reduces the manual definition of macros and ports it
to G_Declare type declaration, which make the code cleaner and
easier to read and understand.
https://bugzilla.gnome.org/show_bug.cgi?id=777607
Diffstat (limited to 'src/nautilus-canvas-view.h')
| -rw-r--r-- | src/nautilus-canvas-view.h | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/src/nautilus-canvas-view.h b/src/nautilus-canvas-view.h index cc5cb1dfb..799cc932d 100644 --- a/src/nautilus-canvas-view.h +++ b/src/nautilus-canvas-view.h @@ -28,36 +28,18 @@ #include "nautilus-files-view.h" #include "nautilus-canvas-container.h" -typedef struct NautilusCanvasView NautilusCanvasView; -typedef struct NautilusCanvasViewClass NautilusCanvasViewClass; +G_BEGIN_DECLS #define NAUTILUS_TYPE_CANVAS_VIEW nautilus_canvas_view_get_type() -#define NAUTILUS_CANVAS_VIEW(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_CANVAS_VIEW, NautilusCanvasView)) -#define NAUTILUS_CANVAS_VIEW_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CANVAS_VIEW, NautilusCanvasViewClass)) -#define NAUTILUS_IS_CANVAS_VIEW(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_CANVAS_VIEW)) -#define NAUTILUS_IS_CANVAS_VIEW_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CANVAS_VIEW)) -#define NAUTILUS_CANVAS_VIEW_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_CANVAS_VIEW, NautilusCanvasViewClass)) -typedef struct NautilusCanvasViewDetails NautilusCanvasViewDetails; +G_DECLARE_DERIVABLE_TYPE (NautilusCanvasView, nautilus_canvas_view, NAUTILUS, CANVAS_VIEW, NautilusFilesView) -struct NautilusCanvasView { - NautilusFilesView parent; - NautilusCanvasViewDetails *details; -}; - -struct NautilusCanvasViewClass { +struct _NautilusCanvasViewClass { NautilusFilesViewClass parent_class; NautilusCanvasContainer * (* create_canvas_container) (NautilusCanvasView *canvas_view); }; -/* GObject support */ -GType nautilus_canvas_view_get_type (void); int nautilus_canvas_view_compare_files (NautilusCanvasView *canvas_view, NautilusFile *a, NautilusFile *b); @@ -69,4 +51,6 @@ NautilusFilesView * nautilus_canvas_view_new (NautilusWindowSlot *slot); NautilusCanvasContainer * nautilus_canvas_view_get_canvas_container (NautilusCanvasView *view); +G_END_DECLS + #endif /* NAUTILUS_CANVAS_VIEW_H */ |