Skip to content

Commit fb7c539

Browse files
fxriraveit65
fxri
authored and
raveit65
committed
Convert to G_DEFINE_TYPE_WITH_PRIVATE part 2
origin commits: https://gitlab.gnome.org/GNOME/eog/commit/ffc4137 https://gitlab.gnome.org/GNOME/eog/commit/ad8c963 https://gitlab.gnome.org/GNOME/eog/commit/afa0dc8 https://gitlab.gnome.org/GNOME/eog/commit/119a768 https://gitlab.gnome.org/GNOME/eog/commit/7725a55 https://gitlab.gnome.org/GNOME/eog/commit/80cf422
1 parent 5a5612a commit fb7c539

File tree

7 files changed

+28
-61
lines changed

7 files changed

+28
-61
lines changed

‎src/eom-metadata-reader-jpg.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,15 @@ struct _EomMetadataReaderJpgPrivate {
8686
int bytes_read;
8787
};
8888

89-
#define EOM_METADATA_READER_JPG_GET_PRIVATE(object) \
90-
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_METADATA_READER_JPG, EomMetadataReaderJpgPrivate))
91-
9289
static void
9390
eom_metadata_reader_jpg_init_emr_iface (gpointer g_iface, gpointer iface_data);
9491

9592

9693
G_DEFINE_TYPE_WITH_CODE (EomMetadataReaderJpg, eom_metadata_reader_jpg,
9794
G_TYPE_OBJECT,
9895
G_IMPLEMENT_INTERFACE (EOM_TYPE_METADATA_READER,
99-
eom_metadata_reader_jpg_init_emr_iface))
96+
eom_metadata_reader_jpg_init_emr_iface) \
97+
G_ADD_PRIVATE (EomMetadataReaderJpg))
10098

10199

102100
static void
@@ -128,11 +126,11 @@ eom_metadata_reader_jpg_dispose (GObject *object)
128126
}
129127

130128
static void
131-
eom_metadata_reader_jpg_init (EomMetadataReaderJpg *obj)
129+
eom_metadata_reader_jpg_init (EomMetadataReaderJpg *emr)
132130
{
133131
EomMetadataReaderJpgPrivate *priv;
134132

135-
priv = obj->priv = EOM_METADATA_READER_JPG_GET_PRIVATE (obj);
133+
priv = emr->priv = eom_metadata_reader_jpg_get_instance_private (emr);
136134
priv->exif_chunk = NULL;
137135
priv->exif_len = 0;
138136
priv->iptc_chunk = NULL;
@@ -147,8 +145,6 @@ eom_metadata_reader_jpg_class_init (EomMetadataReaderJpgClass *klass)
147145
GObjectClass *object_class = (GObjectClass*) klass;
148146

149147
object_class->dispose = eom_metadata_reader_jpg_dispose;
150-
151-
g_type_class_add_private (klass, sizeof (EomMetadataReaderJpgPrivate));
152148
}
153149

154150
static gboolean

‎src/eom-metadata-reader-png.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,14 @@ struct _EomMetadataReaderPngPrivate {
8585
gboolean hasIHDR;
8686
};
8787

88-
#define EOM_METADATA_READER_PNG_GET_PRIVATE(object) \
89-
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_METADATA_READER_PNG, EomMetadataReaderPngPrivate))
90-
9188
static void
9289
eom_metadata_reader_png_init_emr_iface (gpointer g_iface, gpointer iface_data);
9390

9491
G_DEFINE_TYPE_WITH_CODE (EomMetadataReaderPng, eom_metadata_reader_png,
9592
G_TYPE_OBJECT,
9693
G_IMPLEMENT_INTERFACE (EOM_TYPE_METADATA_READER,
97-
eom_metadata_reader_png_init_emr_iface))
94+
eom_metadata_reader_png_init_emr_iface) \
95+
G_ADD_PRIVATE(EomMetadataReaderPng))
9896

9997
static void
10098
eom_metadata_reader_png_dispose (GObject *object)
@@ -121,11 +119,11 @@ eom_metadata_reader_png_dispose (GObject *object)
121119
}
122120

123121
static void
124-
eom_metadata_reader_png_init (EomMetadataReaderPng *obj)
122+
eom_metadata_reader_png_init (EomMetadataReaderPng *emr)
125123
{
126124
EomMetadataReaderPngPrivate *priv;
127125

128-
priv = obj->priv = EOM_METADATA_READER_PNG_GET_PRIVATE (obj);
126+
priv = emr->priv = eom_metadata_reader_png_get_instance_private (emr);
129127
priv->icc_chunk = NULL;
130128
priv->icc_len = 0;
131129
priv->xmp_chunk = NULL;
@@ -148,8 +146,6 @@ eom_metadata_reader_png_class_init (EomMetadataReaderPngClass *klass)
148146
GObjectClass *object_class = (GObjectClass*) klass;
149147

150148
object_class->dispose = eom_metadata_reader_png_dispose;
151-
152-
g_type_class_add_private (klass, sizeof (EomMetadataReaderPngPrivate));
153149
}
154150

155151
static gboolean

‎src/eom-metadata-sidebar.c‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,7 @@ struct _EomMetadataSidebarPrivate {
101101
#endif
102102
};
103103

104-
#define EOM_METADATA_SIDEBAR_GET_PRIVATE(object) \
105-
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_METADATA_SIDEBAR, EomMetadataSidebarPrivate))
106-
107-
G_DEFINE_TYPE(EomMetadataSidebar, eom_metadata_sidebar, GTK_TYPE_SCROLLED_WINDOW)
104+
G_DEFINE_TYPE_WITH_PRIVATE(EomMetadataSidebar, eom_metadata_sidebar, GTK_TYPE_SCROLLED_WINDOW)
108105

109106
static GtkWidget*
110107
_gtk_grid_append_title_line (GtkGrid *grid, GtkWidget *sibling,
@@ -492,7 +489,7 @@ eom_metadata_sidebar_init (EomMetadataSidebar *sidebar)
492489
EomMetadataSidebarPrivate *priv;
493490
GtkWidget *label;
494491

495-
priv = sidebar->priv = EOM_METADATA_SIDEBAR_GET_PRIVATE (sidebar);
492+
priv = sidebar->priv = eom_metadata_sidebar_get_instance_private (sidebar);
496493
priv->grid = gtk_grid_new ();
497494
g_object_set (G_OBJECT (priv->grid),
498495
"row-spacing", 6,
@@ -655,8 +652,6 @@ eom_metadata_sidebar_class_init (EomMetadataSidebarClass *klass)
655652
{
656653
GObjectClass *g_obj_class = G_OBJECT_CLASS (klass);
657654

658-
g_type_class_add_private (klass, sizeof(EomMetadataSidebarPrivate));
659-
660655
g_obj_class->constructed = eom_metadata_sidebar_constructed;
661656
g_obj_class->get_property = eom_metadata_sidebar_get_property;
662657
g_obj_class->set_property = eom_metadata_sidebar_set_property;

‎src/eom-plugin-engine.c‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,11 @@
3838

3939
#define USER_EOM_PLUGINS_LOCATION "plugins/"
4040

41-
G_DEFINE_TYPE (EomPluginEngine, eom_plugin_engine, PEAS_TYPE_ENGINE)
42-
4341
struct _EomPluginEnginePrivate {
4442
GSettings *plugins_settings;
4543
};
4644

47-
static void
48-
eom_plugin_engine_init (EomPluginEngine *engine)
49-
{
50-
eom_debug (DEBUG_PLUGINS);
51-
52-
engine->priv = G_TYPE_INSTANCE_GET_PRIVATE (engine,
53-
EOM_TYPE_PLUGIN_ENGINE,
54-
EomPluginEnginePrivate);
55-
56-
engine->priv->plugins_settings = g_settings_new (EOM_CONF_PLUGINS);
57-
}
45+
G_DEFINE_TYPE_WITH_PRIVATE (EomPluginEngine, eom_plugin_engine, PEAS_TYPE_ENGINE)
5846

5947
static void
6048
eom_plugin_engine_dispose (GObject *object)
@@ -76,8 +64,16 @@ eom_plugin_engine_class_init (EomPluginEngineClass *klass)
7664
GObjectClass *object_class = G_OBJECT_CLASS (klass);
7765

7866
object_class->dispose = eom_plugin_engine_dispose;
67+
}
68+
69+
static void
70+
eom_plugin_engine_init (EomPluginEngine *engine)
71+
{
72+
eom_debug (DEBUG_PLUGINS);
7973

80-
g_type_class_add_private (klass, sizeof (EomPluginEnginePrivate));
74+
engine->priv = eom_plugin_engine_get_instance_private (engine);
75+
76+
engine->priv->plugins_settings = g_settings_new (EOM_CONF_PLUGINS);
8177
}
8278

8379
EomPluginEngine *

‎src/eom-preferences-dialog.c‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@
3838
#include <gio/gio.h>
3939
#include <libpeas-gtk/peas-gtk-plugin-manager.h>
4040

41-
#define EOM_PREFERENCES_DIALOG_GET_PRIVATE(object) \
42-
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_PREFERENCES_DIALOG, EomPreferencesDialogPrivate))
43-
44-
G_DEFINE_TYPE (EomPreferencesDialog, eom_preferences_dialog, EOM_TYPE_DIALOG);
45-
4641
#define GSETTINGS_OBJECT_KEY "GSETTINGS_KEY"
4742
#define GSETTINGS_OBJECT_VALUE "GSETTINGS_VALUE"
4843

@@ -54,6 +49,8 @@ struct _EomPreferencesDialogPrivate {
5449

5550
static GObject *instance = NULL;
5651

52+
G_DEFINE_TYPE_WITH_PRIVATE (EomPreferencesDialog, eom_preferences_dialog, EOM_TYPE_DIALOG);
53+
5754
static gboolean
5855
pd_string_to_rgba_mapping (GValue *value,
5956
GVariant *variant,
@@ -329,14 +326,12 @@ eom_preferences_dialog_class_init (EomPreferencesDialogClass *class)
329326

330327
g_object_class->constructor = eom_preferences_dialog_constructor;
331328
g_object_class->dispose = eom_preferences_dialog_dispose;
332-
333-
g_type_class_add_private (g_object_class, sizeof (EomPreferencesDialogPrivate));
334329
}
335330

336331
static void
337332
eom_preferences_dialog_init (EomPreferencesDialog *pref_dlg)
338333
{
339-
pref_dlg->priv = EOM_PREFERENCES_DIALOG_GET_PRIVATE (pref_dlg);
334+
pref_dlg->priv = eom_preferences_dialog_get_instance_private (pref_dlg);
340335

341336
pref_dlg->priv->view_settings = g_settings_new (EOM_CONF_VIEW);
342337
pref_dlg->priv->fullscreen_settings = g_settings_new (EOM_CONF_FULLSCREEN);

‎src/eom-print-image-setup.c‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@
4848
* interactively.
4949
*/
5050

51-
#define EOM_PRINT_IMAGE_SETUP_GET_PRIVATE(object) \
52-
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_PRINT_IMAGE_SETUP, EomPrintImageSetupPrivate))
53-
54-
G_DEFINE_TYPE (EomPrintImageSetup, eom_print_image_setup, GTK_TYPE_GRID);
55-
5651
struct _EomPrintImageSetupPrivate {
5752
GtkWidget *left;
5853
GtkWidget *right;
@@ -114,6 +109,7 @@ static void on_bottom_value_changed (GtkSpinButton *spinbutton, gpointer user_da
114109
static void on_width_value_changed (GtkSpinButton *spinbutton, gpointer user_data);
115110
static void on_height_value_changed (GtkSpinButton *spinbutton, gpointer user_data);
116111

112+
G_DEFINE_TYPE_WITH_PRIVATE (EomPrintImageSetup, eom_print_image_setup, GTK_TYPE_GRID);
117113

118114
static void
119115
block_handlers (EomPrintImageSetup *setup)
@@ -836,8 +832,6 @@ eom_print_image_setup_class_init (EomPrintImageSetupClass *class)
836832
_("The information for the page where the image will be printed"),
837833
GTK_TYPE_PAGE_SETUP,
838834
G_PARAM_READWRITE));
839-
840-
g_type_class_add_private (class, sizeof (EomPrintImageSetupPrivate));
841835
}
842836

843837
static void
@@ -854,7 +848,7 @@ eom_print_image_setup_init (EomPrintImageSetup *setup)
854848
gchar *locale_scale = NULL;
855849
#endif
856850

857-
priv = setup->priv = EOM_PRINT_IMAGE_SETUP_GET_PRIVATE (setup);
851+
priv = setup->priv = eom_print_image_setup_get_instance_private (setup);
858852

859853
priv->image = NULL;
860854

‎src/eom-print-preview.c‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
#include "eom-image.h"
2727
#include "eom-print-preview.h"
2828

29-
#define EOM_PRINT_PREVIEW_GET_PRIVATE(object) \
30-
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_PRINT_PREVIEW, EomPrintPreviewPrivate))
31-
32-
G_DEFINE_TYPE (EomPrintPreview, eom_print_preview, GTK_TYPE_ASPECT_FRAME)
33-
3429
struct _EomPrintPreviewPrivate {
3530
GtkWidget *area;
3631
GdkPixbuf *image;
@@ -96,6 +91,8 @@ enum {
9691
PROP_PAGE_BOTTOM_MARGIN
9792
};
9893

94+
G_DEFINE_TYPE_WITH_PRIVATE (EomPrintPreview, eom_print_preview, GTK_TYPE_ASPECT_FRAME)
95+
9996
static void eom_print_preview_draw (EomPrintPreview *preview, cairo_t *cr);
10097
static void eom_print_preview_finalize (GObject *object);
10198
static void update_relative_sizes (EomPrintPreview *preview);
@@ -389,8 +386,6 @@ eom_print_preview_class_init (EomPrintPreviewClass *klass)
389386
G_SIGNAL_RUN_FIRST, 0, NULL, NULL,
390387
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE,
391388
0, NULL);
392-
393-
g_type_class_add_private (klass, sizeof (EomPrintPreviewPrivate));
394389
}
395390

396391
static void
@@ -424,7 +419,7 @@ eom_print_preview_init (EomPrintPreview *preview)
424419
EomPrintPreviewPrivate *priv;
425420
gfloat ratio;
426421

427-
priv = preview->priv = EOM_PRINT_PREVIEW_GET_PRIVATE (preview);
422+
priv = preview->priv = eom_print_preview_get_instance_private (preview);
428423

429424
priv->area = GTK_WIDGET (gtk_drawing_area_new ());
430425

0 commit comments

Comments
 (0)