From 889d039f8d4d433fe1f954d8f7d6b1fbb6855c82 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval R Date: Fri, 25 Mar 2022 15:29:55 +0100 Subject: [PATCH 1/6] make window final --- src/gtr-window.c | 2 +- src/gtr-window.h | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/gtr-window.c b/src/gtr-window.c index 3ecbdc7a..e3aea6f5 100644 --- a/src/gtr-window.c +++ b/src/gtr-window.c @@ -93,7 +93,7 @@ typedef struct guint dispose_has_run : 1; } GtrWindowPrivate; -G_DEFINE_TYPE_WITH_PRIVATE(GtrWindow, gtr_window, GTK_TYPE_APPLICATION_WINDOW) +G_DEFINE_FINAL_TYPE_WITH_PRIVATE(GtrWindow, gtr_window, GTK_TYPE_APPLICATION_WINDOW) enum { diff --git a/src/gtr-window.h b/src/gtr-window.h index 444f18f5..36efb4de 100644 --- a/src/gtr-window.h +++ b/src/gtr-window.h @@ -35,14 +35,8 @@ G_BEGIN_DECLS #define GTR_TYPE_WINDOW (gtr_window_get_type ()) -#define GTR_WINDOW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_WINDOW, GtrWindow)) -#define GTR_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_WINDOW, GtrWindowClass)) -#define GTR_IS_WINDOW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_WINDOW)) -#define GTR_IS_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_WINDOW)) -#define GTR_WINDOW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_WINDOW, GtrWindowClass)) -typedef struct _GtrWindow GtrWindow; -typedef struct _GtrWindowClass GtrWindowClass; +G_DECLARE_FINAL_TYPE (GtrWindow, gtr_window, GTR, WINDOW, GtkApplicationWindow) struct _GtrWindow { @@ -54,10 +48,6 @@ struct _GtrWindowClass GtkApplicationWindowClass parent_class; }; -GType gtr_window_get_type (void) G_GNUC_CONST; - -GType gtr_window_register_type (GTypeModule * module); - GtrTab *gtr_window_create_tab (GtrWindow * window, GtrPo * po); GtrTab *gtr_window_get_active_tab (GtrWindow * window); -- GitLab From a3021c47c889b939197b0c0473683cc34594de29 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval R Date: Fri, 25 Mar 2022 15:30:10 +0100 Subject: [PATCH 2/6] Make msg derivable --- src/gtr-msg.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/gtr-msg.h b/src/gtr-msg.h index 53d1e7d1..75506154 100644 --- a/src/gtr-msg.h +++ b/src/gtr-msg.h @@ -31,19 +31,8 @@ G_BEGIN_DECLS #define GTR_TYPE_MSG (gtr_msg_get_type ()) -#define GTR_MSG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MSG, GtrMsg)) -#define GTR_MSG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_MSG, GtrMsgClass)) -#define GTR_IS_MSG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_MSG)) -#define GTR_IS_MSG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_MSG)) -#define GTR_MSG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_MSG, GtrMsgClass)) -typedef struct _GtrMsg GtrMsg; -typedef struct _GtrMsgClass GtrMsgClass; - -struct _GtrMsg -{ - GObject parent_instance; -}; +G_DECLARE_DERIVABLE_TYPE (GtrMsg, gtr_msg, GTR, MSG, GObject) struct _GtrMsgClass { @@ -58,8 +47,6 @@ typedef enum } GtrMsgStatus; /* Public methods */ -GType gtr_msg_get_type (void) G_GNUC_CONST; - gboolean gtr_msg_is_translated (GtrMsg *msg); gboolean gtr_msg_is_fuzzy (GtrMsg *msg); -- GitLab From b427641e3fb4bf4eae4888d7952194eb73806c47 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval R Date: Fri, 25 Mar 2022 15:31:24 +0100 Subject: [PATCH 3/6] Make header final --- src/gtr-header.c | 2 +- src/gtr-header.h | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/gtr-header.c b/src/gtr-header.c index 3c350951..02f53776 100644 --- a/src/gtr-header.c +++ b/src/gtr-header.c @@ -50,7 +50,7 @@ struct _GtrHeader GtrMsg parent_instance; }; -G_DEFINE_TYPE_WITH_PRIVATE (GtrHeader, gtr_header, GTR_TYPE_MSG) +G_DEFINE_FINAL_TYPE_WITH_PRIVATE (GtrHeader, gtr_header, GTR_TYPE_MSG) static void gtr_header_set_field (GtrHeader * header, diff --git a/src/gtr-header.h b/src/gtr-header.h index 47d29559..955c0492 100644 --- a/src/gtr-header.h +++ b/src/gtr-header.h @@ -34,17 +34,8 @@ G_BEGIN_DECLS /* Utility Macros */ #define GTR_TYPE_HEADER (gtr_header_get_type ()) -#define GTR_HEADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_HEADER, GtrHeader)) -#define GTR_HEADER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_HEADER, GtrHeaderClass)) -#define GTR_IS_HEADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_HEADER)) -#define GTR_IS_HEADER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_HEADER)) -#define GTR_HEADER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_HEADER, GtrHeaderClass)) -/* Main object structure */ -typedef struct _GtrHeader GtrHeader; - -/* Class definition */ -typedef struct _GtrHeaderClass GtrHeaderClass; +G_DECLARE_FINAL_TYPE (GtrHeader, gtr_header, GTR, HEADER, GtrMsg) struct _GtrHeaderClass { @@ -52,8 +43,6 @@ struct _GtrHeaderClass }; /* Public methods */ -GType gtr_header_get_type (void) G_GNUC_CONST; - GtrHeader *gtr_header_new (po_message_iterator_t iter, po_message_t message); -- GitLab From 7af1c33a989cf9098e54e698a6da2971ed686ab2 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval R Date: Fri, 25 Mar 2022 15:31:47 +0100 Subject: [PATCH 4/6] make gda final --- src/translation-memory/gda/gtr-gda.c | 12 ++++++------ src/translation-memory/gda/gtr-gda.h | 12 +----------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/translation-memory/gda/gtr-gda.c b/src/translation-memory/gda/gtr-gda.c index 0a165970..84d9ea67 100644 --- a/src/translation-memory/gda/gtr-gda.c +++ b/src/translation-memory/gda/gtr-gda.c @@ -59,12 +59,12 @@ typedef struct GHashTable *lookup_query_cache; } GtrGdaPrivate; -G_DEFINE_TYPE_WITH_CODE (GtrGda, - gtr_gda, - G_TYPE_OBJECT, - G_ADD_PRIVATE (GtrGda) - G_IMPLEMENT_INTERFACE (GTR_TYPE_TRANSLATION_MEMORY, - gtr_translation_memory_iface_init)) +G_DEFINE_FINAL_TYPE_WITH_CODE (GtrGda, + gtr_gda, + G_TYPE_OBJECT, + G_ADD_PRIVATE (GtrGda) + G_IMPLEMENT_INTERFACE (GTR_TYPE_TRANSLATION_MEMORY, + gtr_translation_memory_iface_init)) static gint select_integer (GdaConnection *db, diff --git a/src/translation-memory/gda/gtr-gda.h b/src/translation-memory/gda/gtr-gda.h index 3afef596..019e8373 100644 --- a/src/translation-memory/gda/gtr-gda.h +++ b/src/translation-memory/gda/gtr-gda.h @@ -25,14 +25,8 @@ G_BEGIN_DECLS #define GTR_TYPE_GDA (gtr_gda_get_type ()) -#define GTR_GDA(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_GDA, GtrGda)) -#define GTR_GDA_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_GDA, GtrGdaClass)) -#define GTR_IS_GDA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_GDA)) -#define GTR_IS_GDA_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_GDA)) -#define GTR_GDA_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_GDA, GtrGdaClass)) -typedef struct _GtrGda GtrGda; -typedef struct _GtrGdaClass GtrGdaClass; +G_DECLARE_FINAL_TYPE (GtrGda, gtr_gda, GTR, GDA, GObject) struct _GtrGda { @@ -44,10 +38,6 @@ struct _GtrGdaClass GObjectClass parent_class; }; -GType gtr_gda_get_type (void) G_GNUC_CONST; - -GType gtr_gda_register_type (GTypeModule *module); - GtrGda *gtr_gda_new (void); G_END_DECLS -- GitLab From abbcfc1cbbc520cc086f8b51a33c10c103f25d1d Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval R Date: Fri, 25 Mar 2022 15:34:52 +0100 Subject: [PATCH 5/6] make po final --- src/gtr-po.c | 8 ++++---- src/gtr-po.h | 22 ++-------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/gtr-po.c b/src/gtr-po.c index a1ef77f6..05c8f8e9 100644 --- a/src/gtr-po.c +++ b/src/gtr-po.c @@ -113,10 +113,10 @@ typedef struct } GtrPoPrivate; -G_DEFINE_TYPE_WITH_CODE (GtrPo, gtr_po, G_TYPE_OBJECT, - G_ADD_PRIVATE (GtrPo) - G_IMPLEMENT_INTERFACE (GTR_TYPE_MESSAGE_CONTAINER, - gtr_po_message_container_init)) +G_DEFINE_FINAL_TYPE_WITH_CODE (GtrPo, gtr_po, G_TYPE_OBJECT, + G_ADD_PRIVATE (GtrPo) + G_IMPLEMENT_INTERFACE (GTR_TYPE_MESSAGE_CONTAINER, + gtr_po_message_container_init)) enum { diff --git a/src/gtr-po.h b/src/gtr-po.h index c710508b..6d3089e1 100644 --- a/src/gtr-po.h +++ b/src/gtr-po.h @@ -37,26 +37,14 @@ G_BEGIN_DECLS * Type checking and casting macros */ #define GTR_TYPE_PO (gtr_po_get_type ()) -#define GTR_PO(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_PO, GtrPo)) -#define GTR_PO_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_PO, GtrPoClass)) -#define GTR_IS_PO(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_PO)) -#define GTR_IS_PO_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_PO)) -#define GTR_PO_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_PO, GtrPoClass)) -/* - * Main object structure - */ -typedef struct _GtrPo GtrPo; + +G_DECLARE_FINAL_TYPE (GtrPo, gtr_po, GTR, PO, GObject) struct _GtrPo { GObject parent_instance; }; -/* - * Class definition - */ -typedef struct _GtrPoClass GtrPoClass; - struct _GtrPoClass { GObjectClass parent_class; @@ -86,12 +74,6 @@ typedef enum */ GQuark gtr_po_error_quark (void); -GType -gtr_po_get_type (void) - G_GNUC_CONST; - - GType gtr_po_register_type (GTypeModule * module); - GtrPo *gtr_po_new (void); gboolean gtr_po_parse (GtrPo * po, GFile * location, GError ** error); -- GitLab From de18b3c5ce621c569501d4282f0aafbe07cf6c32 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval R Date: Fri, 25 Mar 2022 15:49:40 +0100 Subject: [PATCH 6/6] Make view final --- src/gtr-view.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/gtr-view.h b/src/gtr-view.h index c9cf6f19..f766c35a 100644 --- a/src/gtr-view.h +++ b/src/gtr-view.h @@ -29,12 +29,10 @@ G_BEGIN_DECLS * Type checking and casting macros */ #define GTR_TYPE_VIEW (gtr_view_get_type ()) -#define GTR_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_VIEW, GtrView)) -#define GTR_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_VIEW, GtrViewClass)) -#define GTR_IS_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_VIEW)) -#define GTR_IS_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_VIEW)) -#define GTR_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_VIEW, GtrViewClass)) - typedef enum + +G_DECLARE_FINAL_TYPE (GtrView, gtr_view, GTR, VIEW, GtkSourceView) + +typedef enum { GTR_SEARCH_DONT_SET_FLAGS = 1 << 0, GTR_SEARCH_ENTIRE_WORD = 1 << 1, @@ -44,8 +42,6 @@ G_BEGIN_DECLS /* * Main object structure */ -typedef struct _GtrView GtrView; - struct _GtrView { GtkSourceView parent_instance; @@ -54,8 +50,6 @@ struct _GtrView /* * Class definition */ -typedef struct _GtrViewClass GtrViewClass; - struct _GtrViewClass { GtkSourceViewClass parent_class; @@ -65,12 +59,6 @@ struct _GtrViewClass /* * Public methods */ -GType -gtr_view_get_type (void) - G_GNUC_CONST; - - GType gtr_view_register_type (GTypeModule * module); - GtkWidget *gtr_view_new (void); gboolean gtr_view_get_selected_text (GtrView * view, -- GitLab