Use G_DECLARE_FINAL_TYPE where possible

4 files changed, 19 insertions, 46 deletions

diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c
index 8a2f0b43..1d2d88f5 100644
--- a/src/thumbview/cheese-thumb-view.c
+++ b/src/thumbview/cheese-thumb-view.c
@@ -38,6 +38,11 @@ const guint THUMB_VIEW_MINIMUM_HEIGHT = 100;
 
 const gchar CHEESE_OLD_VIDEO_NAME_SUFFIX[] = ".ogv";
 
+struct _CheeseThumbView
+{
+  GtkIconView parent;
+};
+
 typedef struct
 {
   GtkListStore *store;
diff --git a/src/thumbview/cheese-thumb-view.h b/src/thumbview/cheese-thumb-view.h
index 368a8ed1..b7f7c1b1 100644
--- a/src/thumbview/cheese-thumb-view.h
+++ b/src/thumbview/cheese-thumb-view.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CHEESE_THUMB_VIEW_H__
-#define __CHEESE_THUMB_VIEW_H__
+#ifndef CHEESE_THUMB_VIEW_H_
+#define CHEESE_THUMB_VIEW_H_
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -28,26 +28,8 @@
 G_BEGIN_DECLS
 
 #define CHEESE_TYPE_THUMB_VIEW (cheese_thumb_view_get_type ())
-#define CHEESE_THUMB_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHEESE_TYPE_THUMB_VIEW, CheeseThumbView))
-#define CHEESE_THUMB_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CHEESE_TYPE_THUMB_VIEW, \
-                                                                    CheeseThumbViewClass))
-#define CHEESE_IS_THUMB_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHEESE_TYPE_THUMB_VIEW))
-#define CHEESE_IS_THUMB_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CHEESE_TYPE_THUMB_VIEW))
-#define CHEESE_THUMB_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CHEESE_TYPE_THUMB_VIEW, \
-                                                                      CheeseThumbViewClass))
-
-typedef struct
-{
-  GtkIconView parent;
-} CheeseThumbView;
-
-typedef struct
-{
-  GtkIconViewClass parent_class;
-} CheeseThumbViewClass;
-
-
-GType      cheese_thumb_view_get_type (void);
+G_DECLARE_FINAL_TYPE (CheeseThumbView, cheese_thumb_view, CHEESE, THUMB_VIEW, GtkIconView)
+
 GtkWidget *cheese_thumb_view_new (void);
 
 GList *cheese_thumb_view_get_selected_images_list (CheeseThumbView *thumb_view);
@@ -60,4 +42,4 @@ void cheese_thumb_view_start_monitoring_video_path (CheeseThumbView *thumbview,
 
 G_END_DECLS
 
-#endif /* __CHEESE_THUMB_VIEW_H__ */
+#endif /* CHEESE_THUMB_VIEW_H__ */
diff --git a/src/thumbview/eog-thumb-nav.c b/src/thumbview/eog-thumb-nav.c
index 5a4114d1..6c489ab6 100644
--- a/src/thumbview/eog-thumb-nav.c
+++ b/src/thumbview/eog-thumb-nav.c
@@ -33,6 +33,11 @@
 #include <string.h>
 #include <math.h>
 
+struct _EogThumbNav
+{
+  GtkBox base_instance;
+};
+
 typedef struct
 {
   gboolean show_buttons;
diff --git a/src/thumbview/eog-thumb-nav.h b/src/thumbview/eog-thumb-nav.h
index b63374a7..572bf03f 100644
--- a/src/thumbview/eog-thumb-nav.h
+++ b/src/thumbview/eog-thumb-nav.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __EOG_THUMB_NAV_H__
-#define __EOG_THUMB_NAV_H__
+#ifndef EOG_THUMB_NAV_H_
+#define EOG_THUMB_NAV_H_
 
 #include "cheese-thumb-view.h"
 
@@ -30,27 +30,8 @@
 
 G_BEGIN_DECLS
 
-typedef struct _EogThumbNav EogThumbNav;
-typedef struct _EogThumbNavClass EogThumbNavClass;
-
 #define EOG_TYPE_THUMB_NAV (eog_thumb_nav_get_type ())
-#define EOG_THUMB_NAV(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EOG_TYPE_THUMB_NAV, EogThumbNav))
-#define EOG_THUMB_NAV_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EOG_TYPE_THUMB_NAV, EogThumbNavClass))
-#define EOG_IS_THUMB_NAV(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EOG_TYPE_THUMB_NAV))
-#define EOG_IS_THUMB_NAV_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EOG_TYPE_THUMB_NAV))
-#define EOG_THUMB_NAV_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EOG_TYPE_THUMB_NAV, EogThumbNavClass))
-
-struct _EogThumbNav
-{
-  GtkBox base_instance;
-};
-
-struct _EogThumbNavClass
-{
-  GtkBoxClass parent_class;
-};
-
-GType eog_thumb_nav_get_type (void);
+G_DECLARE_FINAL_TYPE (EogThumbNav, eog_thumb_nav, EOG, THUMB_NAV, GtkBox)
 
 GtkWidget *eog_thumb_nav_new (GtkWidget *thumbview,
                               gboolean   show_buttons);
@@ -71,4 +52,4 @@ void eog_thumb_nav_set_policy (EogThumbNav  *nav,
 
 G_END_DECLS
 
-#endif /* __EOG_THUMB_NAV_H__ */
+#endif /* EOG_THUMB_NAV_H__ */