[Xfce4-commits] [apps/xfburn] 05/06: moving type declaration to GTK+3 macros (100%)
noreply at xfce.org
noreply at xfce.org
Thu Oct 17 02:56:54 CEST 2019
This is an automated email from the git hooks/post-receive script.
k a t a n a s t e e l p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfburn.
commit c96cea994a229401f077842ba8c53ef69aaa9a57
Author: Rene Kjellerup <rk.katana.steel at gmail.com>
Date: Wed Oct 16 17:52:13 2019 -0700
moving type declaration to GTK+3 macros (100%)
fixing deprecation of call to g_type_class_add_private
---
xfburn/xfburn-audio-composition.c | 29 ------------------
xfburn/xfburn-preferences-dialog.c | 36 +++-------------------
xfburn/xfburn-progress-dialog.c | 34 ++-------------------
xfburn/xfburn-settings.c | 35 +++++----------------
xfburn/xfburn-transcoder-basic.c | 62 ++++++--------------------------------
xfburn/xfburn-transcoder-gst.c | 49 +++++++-----------------------
xfburn/xfburn-udev-manager.c | 35 +++------------------
7 files changed, 39 insertions(+), 241 deletions(-)
diff --git a/xfburn/xfburn-audio-composition.c b/xfburn/xfburn-audio-composition.c
index 906e8a8..0392401 100644
--- a/xfburn/xfburn-audio-composition.c
+++ b/xfburn/xfburn-audio-composition.c
@@ -249,35 +249,6 @@ G_DEFINE_TYPE_EXTENDED(XfburnAudioComposition,
0,
G_ADD_PRIVATE(XfburnAudioComposition)
G_IMPLEMENT_INTERFACE(XFBURN_TYPE_COMPOSITION, composition_interface_init));
-/*
-GType
-xfburn_audio_composition_get_type (void)
-{
- static GType audio_composition_type = 0;
-
- if (!audio_composition_type) {
- static const GTypeInfo audio_composition_info = {
- sizeof (XfburnAudioCompositionClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_audio_composition_class_init,
- NULL,
- NULL,
- sizeof (XfburnAudioComposition),
- 0,
- (GInstanceInitFunc) xfburn_audio_composition_init,
- NULL
- };
-
- };
-
- audio_composition_type = g_type_register_static (GTK_TYPE_BOX, "XfburnAudioComposition", &audio_composition_info, 0);
-
- g_type_add_interface_static (audio_composition_type, XFBURN_TYPE_COMPOSITION, &composition_info);
- }
-
- return audio_composition_type;
-} */
static void
xfburn_audio_composition_class_init (XfburnAudioCompositionClass * klass)
diff --git a/xfburn/xfburn-preferences-dialog.c b/xfburn/xfburn-preferences-dialog.c
index 4be7d15..4ee77e7 100644
--- a/xfburn/xfburn-preferences-dialog.c
+++ b/xfburn/xfburn-preferences-dialog.c
@@ -30,7 +30,7 @@
#define FIFO_MAX_SIZE 16384.0 /* in kb, as float */
-#define XFBURN_PREFERENCES_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_PREFERENCES_DIALOG, XfburnPreferencesDialogPrivate))
+#define XFBURN_PREFERENCES_DIALOG_GET_PRIVATE(obj) (xfburn_preferences_dialog_get_instance_private (XFBURN_PREFERENCES_DIALOG (obj)))
typedef struct
{
@@ -51,9 +51,6 @@ typedef struct
} XfburnPreferencesDialogPrivate;
/* prototypes */
-static void xfburn_preferences_dialog_class_init (XfburnPreferencesDialogClass * klass, gpointer data);
-static void xfburn_preferences_dialog_init (XfburnPreferencesDialog * sp, gpointer data);
-
static void refresh_devices_list (XfburnPreferencesDialog * dialog);
static void scan_button_clicked_cb (GtkWidget * button, gpointer user_data);
static void xfburn_preferences_dialog_response_cb (XfburnPreferencesDialog * dialog, guint response_id, XfburnPreferencesDialogPrivate * priv);
@@ -89,41 +86,16 @@ typedef struct
/*********************************/
static XfceTitledDialogClass *parent_class = NULL;
-GType
-xfburn_preferences_dialog_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnPreferencesDialogClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_preferences_dialog_class_init,
- NULL,
- NULL,
- sizeof (XfburnPreferencesDialog),
- 0,
- (GInstanceInitFunc) xfburn_preferences_dialog_init,
- NULL
- };
-
- type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnPreferencesDialog", &our_info, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnPreferencesDialog, xfburn_preferences_dialog, XFCE_TYPE_TITLED_DIALOG);
static void
-xfburn_preferences_dialog_class_init (XfburnPreferencesDialogClass * klass, gpointer data)
+xfburn_preferences_dialog_class_init (XfburnPreferencesDialogClass * klass)
{
- g_type_class_add_private (klass, sizeof (XfburnPreferencesDialogPrivate));
-
parent_class = g_type_class_peek_parent (klass);
}
static void
-xfburn_preferences_dialog_init (XfburnPreferencesDialog * obj, gpointer data)
+xfburn_preferences_dialog_init (XfburnPreferencesDialog * obj)
{
GtkBox *box = GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (obj)));
XfburnPreferencesDialogPrivate *priv = XFBURN_PREFERENCES_DIALOG_GET_PRIVATE (obj);
diff --git a/xfburn/xfburn-progress-dialog.c b/xfburn/xfburn-progress-dialog.c
index 33f4874..71201e8 100644
--- a/xfburn/xfburn-progress-dialog.c
+++ b/xfburn/xfburn-progress-dialog.c
@@ -68,9 +68,6 @@ typedef struct
/* globals */
static guint signals[LAST_SIGNAL];
-static void xfburn_progress_dialog_class_init (XfburnProgressDialogClass * klass, gpointer data);
-static void xfburn_progress_dialog_init (XfburnProgressDialog * sp, gpointer data);
-
static void xfburn_progress_dialog_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec);
static void xfburn_progress_dialog_set_property (GObject * object, guint prop_id, const GValue * value,
GParamSpec * pspec);
@@ -121,39 +118,14 @@ xfburn_progress_dialog_status_get_type (void)
/* */
static GtkDialogClass *parent_class = NULL;
-GType
-xfburn_progress_dialog_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnProgressDialogClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_progress_dialog_class_init,
- NULL,
- NULL,
- sizeof (XfburnProgressDialog),
- 0,
- (GInstanceInitFunc) xfburn_progress_dialog_init,
- NULL
- };
-
- type = g_type_register_static (GTK_TYPE_DIALOG, "XfburnProgressDialog", &our_info, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnProgressDialog, xfburn_progress_dialog, GTK_TYPE_DIALOG)
static void
-xfburn_progress_dialog_class_init (XfburnProgressDialogClass * klass, gpointer data)
+xfburn_progress_dialog_class_init (XfburnProgressDialogClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
-
- g_type_class_add_private (klass, sizeof (XfburnProgressDialogPrivate));
object_class->get_property = xfburn_progress_dialog_get_property;
object_class->set_property = xfburn_progress_dialog_set_property;
@@ -182,7 +154,7 @@ xfburn_progress_dialog_class_init (XfburnProgressDialogClass * klass, gpointer d
}
static void
-xfburn_progress_dialog_init (XfburnProgressDialog * obj, gpointer data)
+xfburn_progress_dialog_init (XfburnProgressDialog * obj)
{
XfburnProgressDialogPrivate *priv = XFBURN_PROGRESS_DIALOG_GET_PRIVATE (obj);
GtkBox *box = GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(obj)));
diff --git a/xfburn/xfburn-settings.c b/xfburn/xfburn-settings.c
index c3f4cae..19afb6c 100644
--- a/xfburn/xfburn-settings.c
+++ b/xfburn/xfburn-settings.c
@@ -38,13 +38,11 @@
#include "xfburn-settings.h"
-#define XFBURN_SETTINGS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_SETTINGS, XfburnSettingsPrivate))
+#define XFBURN_SETTINGS_GET_PRIVATE(obj) (xfburn_settings_internal_get_instance_private (XFBURN_SETTINGS (obj)))
/* global */
typedef struct _Setting Setting;
-static void xfburn_settings_class_init (XfburnSettingsClass * klass, gpointer data);
-static void xfburn_settings_internal_init (XfburnSettings * settings, gpointer data);
static void xfburn_settings_finalize (GObject * object);
static void value_destroy (Setting * val);
@@ -82,37 +80,18 @@ struct _Setting
static GObjectClass *parent_class = NULL;
static XfburnSettings *instance = NULL;
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnSettings, xfburn_settings_internal, G_TYPE_OBJECT);
+
GType
-xfburn_settings_get_type (void)
+xfburn_settings_get_type(void)
{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnSettingsClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_settings_class_init,
- NULL,
- NULL,
- sizeof (XfburnSettings),
- 0,
- (GInstanceInitFunc) xfburn_settings_internal_init,
- NULL
- };
-
- type = g_type_register_static (G_TYPE_OBJECT, "XfburnSettings", &our_info, 0);
- }
-
- return type;
+ return xfburn_settings_internal_get_type();
}
static void
-xfburn_settings_class_init (XfburnSettingsClass * klass, gpointer data)
+xfburn_settings_internal_class_init (XfburnSettingsClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- g_type_class_add_private (klass, sizeof (XfburnSettingsPrivate));
parent_class = g_type_class_peek_parent (klass);
@@ -140,7 +119,7 @@ xfburn_settings_finalize (GObject * object)
}
static void
-xfburn_settings_internal_init (XfburnSettings *settings, gpointer data)
+xfburn_settings_internal_init (XfburnSettings *settings)
{
XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings);
diff --git a/xfburn/xfburn-transcoder-basic.c b/xfburn/xfburn-transcoder-basic.c
index aef0956..dc49b6c 100644
--- a/xfburn/xfburn-transcoder-basic.c
+++ b/xfburn/xfburn-transcoder-basic.c
@@ -44,8 +44,6 @@
/** Prototypes **/
/* class initialization */
-static void xfburn_transcoder_basic_class_init (XfburnTranscoderBasicClass * klass, gpointer data);
-static void xfburn_transcoder_basic_init (XfburnTranscoderBasic * obj, gpointer data);
static void xfburn_transcoder_basic_finalize (GObject * object);
static void transcoder_interface_init (XfburnTranscoderInterface *iface, gpointer iface_data);
@@ -62,16 +60,10 @@ static gboolean valid_wav_headers (guchar header[44]);
static struct burn_track * create_burn_track (XfburnTranscoder *trans, XfburnAudioTrack *atrack, GError **error);
static gboolean needs_swap (char header[44]);
-#define XFBURN_TRANSCODER_BASIC_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_TRANSCODER_BASIC, XfburnTranscoderBasicPrivate))
-
enum {
LAST_SIGNAL,
};
-typedef struct {
- gboolean dummy;
-} XfburnTranscoderBasicPrivate;
-
/* globals */
static const gchar *errormsg_libburn_setup = "An error occurred while setting the burning backend up";
@@ -82,45 +74,19 @@ static const gchar *errormsg_libburn_setup = "An error occurred while setting th
static GObject *parent_class = NULL;
//static guint signals[LAST_SIGNAL];
-GType
-xfburn_transcoder_basic_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnTranscoderBasicClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_transcoder_basic_class_init,
- NULL,
- NULL,
- sizeof (XfburnTranscoderBasic),
- 0,
- (GInstanceInitFunc) xfburn_transcoder_basic_init,
- NULL
- };
- static const GInterfaceInfo trans_info = {
- (GInterfaceInitFunc) transcoder_interface_init,
- NULL,
- NULL
- };
-
- type = g_type_register_static (G_TYPE_OBJECT, "XfburnTranscoderBasic", &our_info, 0);
-
- g_type_add_interface_static (type, XFBURN_TYPE_TRANSCODER, &trans_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_EXTENDED(
+ XfburnTranscoderBasic,
+ xfburn_transcoder_basic,
+ G_TYPE_OBJECT,
+ 0,
+ G_IMPLEMENT_INTERFACE(XFBURN_TYPE_TRANSCODER, transcoder_interface_init)
+);
static void
-xfburn_transcoder_basic_class_init (XfburnTranscoderBasicClass * klass, gpointer data)
+xfburn_transcoder_basic_class_init (XfburnTranscoderBasicClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- g_type_class_add_private (klass, sizeof (XfburnTranscoderBasicPrivate));
-
+
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = xfburn_transcoder_basic_finalize;
@@ -134,16 +100,13 @@ xfburn_transcoder_basic_class_init (XfburnTranscoderBasicClass * klass, gpointer
}
static void
-xfburn_transcoder_basic_init (XfburnTranscoderBasic * obj, gpointer data)
+xfburn_transcoder_basic_init (XfburnTranscoderBasic * obj)
{
- //XfburnTranscoderBasicPrivate *priv = XFBURN_TRANSCODER_BASIC_GET_PRIVATE (obj);
}
static void
xfburn_transcoder_basic_finalize (GObject * object)
{
- //XfburnTranscoderBasicPrivate *priv = XFBURN_TRANSCODER_BASIC_GET_PRIVATE (object);
-
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -308,11 +271,6 @@ valid_wav_headers (guchar header[44])
static struct burn_track *
create_burn_track (XfburnTranscoder *trans, XfburnAudioTrack *atrack, GError **error)
{
- /*
- XfburnTranscoderBasic *basic = XFBURN_TRANSCODER_BASIC (trans);
- XfburnTranscoderBasicPrivate *priv= XFBURN_TRANSCODER_BASIC_GET_PRIVATE (basic);
- */
-
char header[44];
int thead=0;
struct burn_track *track;
diff --git a/xfburn/xfburn-transcoder-gst.c b/xfburn/xfburn-transcoder-gst.c
index 87872b8..2a5fcd0 100644
--- a/xfburn/xfburn-transcoder-gst.c
+++ b/xfburn/xfburn-transcoder-gst.c
@@ -64,8 +64,6 @@
/** Prototypes **/
/* class initialization */
-static void xfburn_transcoder_gst_class_init (XfburnTranscoderGstClass * klass, gpointer data);
-static void xfburn_transcoder_gst_init (XfburnTranscoderGst * obj, gpointer data);
static void xfburn_transcoder_gst_finalize (GObject * object);
static void transcoder_interface_init (XfburnTranscoderInterface *iface, gpointer iface_data);
@@ -93,7 +91,7 @@ static void on_pad_added (GstElement *element, GstPad *pad, gpointer data);
static void cb_handoff (GstElement *element, GstBuffer *buffer, gpointer data);
#endif
-#define XFBURN_TRANSCODER_GST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_TRANSCODER_GST, XfburnTranscoderGstPrivate))
+#define XFBURN_TRANSCODER_GST_GET_PRIVATE(obj) (xfburn_transcoder_gst_get_instance_private ( XFBURN_TRANSCODER_GST (obj)))
enum {
LAST_SIGNAL,
@@ -157,45 +155,20 @@ static const gchar *errormsg_missing_plugin = "%s is missing.\n"
static GObject *parent_class = NULL;
//static guint signals[LAST_SIGNAL];
-GType
-xfburn_transcoder_gst_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnTranscoderGstClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_transcoder_gst_class_init,
- NULL,
- NULL,
- sizeof (XfburnTranscoderGst),
- 0,
- (GInstanceInitFunc) xfburn_transcoder_gst_init,
- NULL
- };
- static const GInterfaceInfo trans_info = {
- (GInterfaceInitFunc) transcoder_interface_init,
- NULL,
- NULL
- };
-
- type = g_type_register_static (G_TYPE_OBJECT, "XfburnTranscoderGst", &our_info, 0);
-
- g_type_add_interface_static (type, XFBURN_TYPE_TRANSCODER, &trans_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_EXTENDED(
+ XfburnTranscoderGst,
+ xfburn_transcoder_gst,
+ G_TYPE_OBJECT,
+ 0,
+ G_ADD_PRIVATE(XfburnTranscoderGst)
+ G_IMPLEMENT_INTERFACE(XFBURN_TYPE_TRANSCODER, transcoder_interface_init)
+);
static void
-xfburn_transcoder_gst_class_init (XfburnTranscoderGstClass * klass, gpointer data)
+xfburn_transcoder_gst_class_init (XfburnTranscoderGstClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (XfburnTranscoderGstPrivate));
-
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = xfburn_transcoder_gst_finalize;
@@ -209,7 +182,7 @@ xfburn_transcoder_gst_class_init (XfburnTranscoderGstClass * klass, gpointer dat
}
static void
-xfburn_transcoder_gst_init (XfburnTranscoderGst * obj, gpointer data)
+xfburn_transcoder_gst_init (XfburnTranscoderGst * obj)
{
XfburnTranscoderGstPrivate *priv = XFBURN_TRANSCODER_GST_GET_PRIVATE (obj);
diff --git a/xfburn/xfburn-udev-manager.c b/xfburn/xfburn-udev-manager.c
index 4917755..5fba06f 100644
--- a/xfburn/xfburn-udev-manager.c
+++ b/xfburn/xfburn-udev-manager.c
@@ -41,15 +41,13 @@
#include "xfburn-udev-manager.h"
-static void xfburn_udev_manager_class_init (XfburnUdevManagerClass * klass, gpointer data);
-static void xfburn_udev_manager_init (XfburnUdevManager * obj, gpointer data);
static void xfburn_udev_manager_finalize (GObject * object);
static GObject * xfburn_udev_manager_new (void);
static void cb_device_monitor_uevent(GUdevClient *client, const gchar *action, GUdevDevice *udevice, XfburnUdevManager *obj);
-#define XFBURN_UDEV_MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_UDEV_MANAGER, XfburnUdevManagerPrivate))
+#define XFBURN_UDEV_MANAGER_GET_PRIVATE(obj) (xfburn_udev_manager_get_instance_private (XFBURN_UDEV_MANAGER (obj)))
enum {
VOLUME_CHANGED,
@@ -78,38 +76,13 @@ static XfburnUdevManager *instance = NULL;
static XfburnProgressDialogClass *parent_class = NULL;
static guint signals[LAST_SIGNAL];
-GType
-xfburn_udev_manager_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnUdevManagerClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_udev_manager_class_init,
- NULL,
- NULL,
- sizeof (XfburnUdevManager),
- 0,
- (GInstanceInitFunc) xfburn_udev_manager_init,
- NULL
- };
-
- type = g_type_register_static (G_TYPE_OBJECT, "XfburnUdevManager", &our_info, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnUdevManager, xfburn_udev_manager, G_TYPE_OBJECT);
static void
-xfburn_udev_manager_class_init (XfburnUdevManagerClass * klass, gpointer data)
+xfburn_udev_manager_class_init (XfburnUdevManagerClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (XfburnUdevManagerPrivate));
-
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = xfburn_udev_manager_finalize;
@@ -121,7 +94,7 @@ xfburn_udev_manager_class_init (XfburnUdevManagerClass * klass, gpointer data)
}
static void
-xfburn_udev_manager_init (XfburnUdevManager * obj, gpointer data)
+xfburn_udev_manager_init (XfburnUdevManager * obj)
{
XfburnUdevManagerPrivate *priv = XFBURN_UDEV_MANAGER_GET_PRIVATE (obj);
const gchar* const subsystems[] = { "block", NULL };
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list