Skip to content

Commit 94f7f44

Browse files
fxriraveit65
fxri
authored and
raveit65
committed
Convert to G_DEFINE_TYPE_WITH_PRIVATE part 3
origin commits: https://gitlab.gnome.org/GNOME/eog/commit/d7317d2 https://gitlab.gnome.org/GNOME/eog/commit/756dc07 https://gitlab.gnome.org/GNOME/eog/commit/c485fb8 https://gitlab.gnome.org/GNOME/eog/commit/77be951 https://gitlab.gnome.org/GNOME/eog/commit/007273d https://gitlab.gnome.org/GNOME/eog/commit/a545274 https://gitlab.gnome.org/GNOME/eog/commit/e0f99fb https://gitlab.gnome.org/GNOME/eog/commit/1222978
1 parent fb7c539 commit 94f7f44

File tree

8 files changed

+19
-60
lines changed

8 files changed

+19
-60
lines changed

‎src/eom-application.c‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@
4646
static void eom_application_load_accelerators (void);
4747
static void eom_application_save_accelerators (void);
4848

49-
#define EOM_APPLICATION_GET_PRIVATE(object) \
50-
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_APPLICATION, EomApplicationPrivate))
51-
52-
G_DEFINE_TYPE (EomApplication, eom_application, GTK_TYPE_APPLICATION);
49+
G_DEFINE_TYPE_WITH_PRIVATE (EomApplication, eom_application, GTK_TYPE_APPLICATION);
5350

5451
static void
5552
eom_application_activate (GApplication *application)
@@ -141,9 +138,6 @@ eom_application_class_init (EomApplicationClass *eom_application_class)
141138
GApplicationClass *application_class;
142139
GObjectClass *object_class;
143140

144-
g_type_class_add_private (eom_application_class,
145-
sizeof (EomApplicationPrivate));
146-
147141
application_class = (GApplicationClass *) eom_application_class;
148142
object_class = (GObjectClass *) eom_application_class;
149143

@@ -181,7 +175,7 @@ eom_application_init (EomApplication *eom_application)
181175

182176
eom_session_init (eom_application);
183177

184-
eom_application->priv = EOM_APPLICATION_GET_PRIVATE (eom_application);
178+
eom_application->priv = eom_application_get_instance_private (eom_application);
185179
priv = eom_application->priv;
186180

187181
priv->toolbars_model = egg_toolbars_model_new ();

‎src/eom-clipboard-handler.c‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ struct _EomClipboardHandlerPrivate {
4747
gchar *uri;
4848
};
4949

50-
#define EOM_CLIPBOARD_HANDLER_GET_PRIVATE(object) \
51-
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_CLIPBOARD_HANDLER, EomClipboardHandlerPrivate))
52-
53-
G_DEFINE_TYPE(EomClipboardHandler, eom_clipboard_handler, G_TYPE_INITIALLY_UNOWNED)
50+
G_DEFINE_TYPE_WITH_PRIVATE (EomClipboardHandler, eom_clipboard_handler, G_TYPE_INITIALLY_UNOWNED)
5451

5552
static GdkPixbuf*
5653
eom_clipboard_handler_get_pixbuf (EomClipboardHandler *handler)
@@ -178,16 +175,14 @@ eom_clipboard_handler_dispose (GObject *obj)
178175
static void
179176
eom_clipboard_handler_init (EomClipboardHandler *handler)
180177
{
181-
handler->priv = EOM_CLIPBOARD_HANDLER_GET_PRIVATE (handler);
178+
handler->priv = eom_clipboard_handler_get_instance_private (handler);
182179
}
183180

184181
static void
185182
eom_clipboard_handler_class_init (EomClipboardHandlerClass *klass)
186183
{
187184
GObjectClass *g_obj_class = G_OBJECT_CLASS (klass);
188185

189-
g_type_class_add_private (klass, sizeof (EomClipboardHandlerPrivate));
190-
191186
g_obj_class->get_property = eom_clipboard_handler_get_property;
192187
g_obj_class->set_property = eom_clipboard_handler_set_property;
193188
g_obj_class->dispose = eom_clipboard_handler_dispose;

‎src/eom-close-confirmation-dialog.c‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,13 @@ struct _EomCloseConfirmationDialogPrivate
6767
GtkCellRenderer *toggle_renderer;
6868
};
6969

70-
71-
#define EOM_CLOSE_CONFIRMATION_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
72-
EOM_TYPE_CLOSE_CONFIRMATION_DIALOG, \
73-
EomCloseConfirmationDialogPrivate))
74-
7570
#define GET_MODE(priv) (((priv->unsaved_images != NULL) && \
7671
(priv->unsaved_images->next == NULL)) ? \
7772
SINGLE_IMG_MODE : MULTIPLE_IMGS_MODE)
7873

7974
#define IMAGE_COLUMN_HEIGHT 40
8075

81-
G_DEFINE_TYPE(EomCloseConfirmationDialog, eom_close_confirmation_dialog, GTK_TYPE_DIALOG)
76+
G_DEFINE_TYPE_WITH_PRIVATE (EomCloseConfirmationDialog, eom_close_confirmation_dialog, GTK_TYPE_DIALOG)
8277

8378
static void set_unsaved_image (EomCloseConfirmationDialog *dlg,
8479
const GList *list);
@@ -175,7 +170,7 @@ eom_close_confirmation_dialog_init (EomCloseConfirmationDialog *dlg)
175170
{
176171
AtkObject *atk_obj;
177172

178-
dlg->priv = EOM_CLOSE_CONFIRMATION_DIALOG_GET_PRIVATE (dlg);
173+
dlg->priv = eom_close_confirmation_dialog_get_instance_private (dlg);
179174

180175
gtk_container_set_border_width (GTK_CONTAINER (dlg), 5);
181176
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), 14);
@@ -267,8 +262,6 @@ eom_close_confirmation_dialog_class_init (EomCloseConfirmationDialogClass *klass
267262
gobject_class->get_property = eom_close_confirmation_dialog_get_property;
268263
gobject_class->finalize = eom_close_confirmation_dialog_finalize;
269264

270-
g_type_class_add_private (klass, sizeof (EomCloseConfirmationDialogPrivate));
271-
272265
g_object_class_install_property (gobject_class,
273266
PROP_UNSAVED_IMAGES,
274267
g_param_spec_pointer ("unsaved_images",

‎src/eom-dialog.c‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@
2929
#include <glib-object.h>
3030
#include <gtk/gtk.h>
3131

32-
#define EOM_DIALOG_GET_PRIVATE(object) \
33-
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_DIALOG, EomDialogPrivate))
34-
35-
G_DEFINE_TYPE (EomDialog, eom_dialog, G_TYPE_OBJECT);
36-
3732
enum {
3833
PROP_0,
3934
PROP_PARENT_WINDOW,
@@ -45,6 +40,8 @@ struct _EomDialogPrivate {
4540
GtkWindow *parent;
4641
};
4742

43+
G_DEFINE_TYPE_WITH_PRIVATE (EomDialog, eom_dialog, G_TYPE_OBJECT);
44+
4845
static void
4946
eom_dialog_construct_impl (EomDialog *dialog,
5047
const gchar *ui_file,
@@ -171,14 +168,12 @@ eom_dialog_class_init (EomDialogClass *class)
171168
G_PARAM_STATIC_NAME |
172169
G_PARAM_STATIC_NICK |
173170
G_PARAM_STATIC_BLURB));
174-
175-
g_type_class_add_private (g_object_class, sizeof (EomDialogPrivate));
176171
}
177172

178173
static void
179174
eom_dialog_init (EomDialog *dialog)
180175
{
181-
dialog->priv = EOM_DIALOG_GET_PRIVATE (dialog);
176+
dialog->priv = eom_dialog_get_instance_private (dialog);
182177

183178
dialog->priv->dlg = NULL;
184179
dialog->priv->xml = NULL;

‎src/eom-exif-details.c‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@
4040

4141
#include <string.h>
4242

43-
#define EOM_EXIF_DETAILS_GET_PRIVATE(object) \
44-
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_EXIF_DETAILS, EomExifDetailsPrivate))
45-
46-
G_DEFINE_TYPE (EomExifDetails, eom_exif_details, GTK_TYPE_TREE_VIEW)
47-
4843
typedef enum {
4944
EXIF_CATEGORY_CAMERA,
5045
EXIF_CATEGORY_IMAGE_DATA,
@@ -209,6 +204,8 @@ static char* set_row_data (GtkTreeStore *store, char *path, char *parent, const
209204

210205
static void eom_exif_details_reset (EomExifDetails *exif_details);
211206

207+
G_DEFINE_TYPE_WITH_PRIVATE (EomExifDetails, eom_exif_details, GTK_TYPE_TREE_VIEW)
208+
212209
static void
213210
eom_exif_details_dispose (GObject *object)
214211
{
@@ -240,7 +237,7 @@ eom_exif_details_init (EomExifDetails *exif_details)
240237
GtkTreeViewColumn *column;
241238
GtkCellRenderer *cell;
242239

243-
exif_details->priv = EOM_EXIF_DETAILS_GET_PRIVATE (exif_details);
240+
exif_details->priv = eom_exif_details_get_instance_private (exif_details);
244241

245242
priv = exif_details->priv;
246243

@@ -277,8 +274,6 @@ eom_exif_details_class_init (EomExifDetailsClass *klass)
277274
GObjectClass *object_class = (GObjectClass*) klass;
278275

279276
object_class->dispose = eom_exif_details_dispose;
280-
281-
g_type_class_add_private (object_class, sizeof (EomExifDetailsPrivate));
282277
}
283278

284279
#ifdef HAVE_EXIF

‎src/eom-file-chooser.c‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ static char *last_dir[] = { NULL, NULL, NULL, NULL };
4141

4242
#define FILE_FORMAT_KEY "file-format"
4343

44-
#define EOM_FILE_CHOOSER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
45-
EOM_TYPE_FILE_CHOOSER, \
46-
EomFileChooserPrivate))
47-
4844
struct _EomFileChooserPrivate
4945
{
5046
MateDesktopThumbnailFactory *thumb_factory;
@@ -55,7 +51,7 @@ struct _EomFileChooserPrivate
5551
GtkWidget *creator_label;
5652
};
5753

58-
G_DEFINE_TYPE(EomFileChooser, eom_file_chooser, GTK_TYPE_FILE_CHOOSER_DIALOG)
54+
G_DEFINE_TYPE_WITH_PRIVATE (EomFileChooser, eom_file_chooser, GTK_TYPE_FILE_CHOOSER_DIALOG)
5955

6056
static void
6157
eom_file_chooser_finalize (GObject *object)
@@ -76,14 +72,12 @@ eom_file_chooser_class_init (EomFileChooserClass *klass)
7672
GObjectClass *object_class = (GObjectClass *) klass;
7773

7874
object_class->finalize = eom_file_chooser_finalize;
79-
80-
g_type_class_add_private (object_class, sizeof (EomFileChooserPrivate));
8175
}
8276

8377
static void
8478
eom_file_chooser_init (EomFileChooser *chooser)
8579
{
86-
chooser->priv = EOM_FILE_CHOOSER_GET_PRIVATE (chooser);
80+
chooser->priv = eom_file_chooser_get_instance_private (chooser);
8781
}
8882

8983
static void

‎src/eom-image.c‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@
6969
#include <librsvg/rsvg.h>
7070
#endif
7171

72-
#define EOM_IMAGE_GET_PRIVATE(object) \
73-
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_IMAGE, EomImagePrivate))
74-
75-
G_DEFINE_TYPE (EomImage, eom_image, G_TYPE_OBJECT)
72+
G_DEFINE_TYPE_WITH_PRIVATE (EomImage, eom_image, G_TYPE_OBJECT)
7673

7774
enum {
7875
SIGNAL_CHANGED,
@@ -277,14 +274,12 @@ eom_image_class_init (EomImageClass *klass)
277274
NULL, NULL,
278275
g_cclosure_marshal_VOID__VOID,
279276
G_TYPE_NONE, 0);
280-
281-
g_type_class_add_private (object_class, sizeof (EomImagePrivate));
282277
}
283278

284279
static void
285280
eom_image_init (EomImage *img)
286281
{
287-
img->priv = EOM_IMAGE_GET_PRIVATE (img);
282+
img->priv = eom_image_get_instance_private (img);
288283

289284
img->priv->file = NULL;
290285
img->priv->image = NULL;

‎src/eom-list-store.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
#define EOM_LIST_STORE_GET_PRIVATE(object) \
3333
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_LIST_STORE, EomListStorePrivate))
3434

35-
G_DEFINE_TYPE (EomListStore, eom_list_store, GTK_TYPE_LIST_STORE);
36-
3735
struct _EomListStorePrivate {
3836
GList *monitors; /* Monitors for the directories */
3937
gint initial_image; /* The image that should be selected firstly by the view. */
@@ -42,6 +40,8 @@ struct _EomListStorePrivate {
4240
GMutex mutex; /* Mutex for saving the jobs in the model */
4341
};
4442

43+
G_DEFINE_TYPE_WITH_PRIVATE (EomListStore, eom_list_store, GTK_TYPE_LIST_STORE);
44+
4545
static void
4646
foreach_monitors_free (gpointer data, gpointer user_data)
4747
{
@@ -81,8 +81,6 @@ eom_list_store_class_init (EomListStoreClass *klass)
8181
GObjectClass *object_class = G_OBJECT_CLASS (klass);
8282

8383
object_class->dispose = eom_list_store_dispose;
84-
85-
g_type_class_add_private (object_class, sizeof (EomListStorePrivate));
8684
}
8785

8886
/*
@@ -152,7 +150,7 @@ eom_list_store_init (EomListStore *self)
152150
gtk_list_store_set_column_types (GTK_LIST_STORE (self),
153151
EOM_LIST_STORE_NUM_COLUMNS, types);
154152

155-
self->priv = EOM_LIST_STORE_GET_PRIVATE (self);
153+
self->priv = eom_list_store_get_instance_private (self);
156154

157155
self->priv->monitors = NULL;
158156
self->priv->initial_image = -1;

0 commit comments

Comments
 (0)