shared-xmm: use G_DECLARE|DEFINE_INTERFACE() macros

5 files changed, 16 insertions, 40 deletions

diff --git a/src/plugins/intel/mm-broadband-modem-mbim-intel.c b/src/plugins/intel/mm-broadband-modem-mbim-intel.c
index 105043a7..c9147cb7 100644
--- a/src/plugins/intel/mm-broadband-modem-mbim-intel.c
+++ b/src/plugins/intel/mm-broadband-modem-mbim-intel.c
@@ -31,7 +31,7 @@
 #include "mm-shared-xmm.h"
 
 static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
-static void shared_xmm_init           (MMSharedXmm                   *iface);
+static void shared_xmm_init           (MMSharedXmmInterface          *iface);
 
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
 
@@ -131,7 +131,7 @@ peek_parent_location_interface (MMSharedXmm *self)
 }
 
 static void
-shared_xmm_init (MMSharedXmm *iface)
+shared_xmm_init (MMSharedXmmInterface *iface)
 {
     iface->peek_parent_broadband_modem_class = peek_parent_broadband_modem_class;
     iface->peek_parent_location_interface    = peek_parent_location_interface;
diff --git a/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c
index 04308fec..58c538fc 100644
--- a/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c
+++ b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c
@@ -29,7 +29,7 @@
 
 static void iface_modem_init          (MMIfaceModemInterface         *iface);
 static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
-static void shared_xmm_init           (MMSharedXmm                   *iface);
+static void shared_xmm_init           (MMSharedXmmInterface          *iface);
 
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
 
@@ -125,7 +125,7 @@ peek_parent_location_interface (MMSharedXmm *self)
 }
 
 static void
-shared_xmm_init (MMSharedXmm *iface)
+shared_xmm_init (MMSharedXmmInterface *iface)
 {
     iface->peek_parent_broadband_modem_class = peek_parent_broadband_modem_class;
     iface->peek_parent_location_interface    = peek_parent_location_interface;
diff --git a/src/plugins/xmm/mm-broadband-modem-xmm.c b/src/plugins/xmm/mm-broadband-modem-xmm.c
index b2ab6b35..3364c639 100644
--- a/src/plugins/xmm/mm-broadband-modem-xmm.c
+++ b/src/plugins/xmm/mm-broadband-modem-xmm.c
@@ -28,7 +28,7 @@
 #include "mm-shared-xmm.h"
 
 static void iface_modem_init          (MMIfaceModemInterface         *iface);
-static void shared_xmm_init           (MMSharedXmm                   *iface);
+static void shared_xmm_init           (MMSharedXmmInterface          *iface);
 static void iface_modem_signal_init   (MMIfaceModemSignalInterface   *iface);
 static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
 
@@ -137,7 +137,7 @@ iface_modem_signal_init (MMIfaceModemSignalInterface *iface)
 }
 
 static void
-shared_xmm_init (MMSharedXmm *iface)
+shared_xmm_init (MMSharedXmmInterface *iface)
 {
     iface->peek_parent_broadband_modem_class = peek_parent_broadband_modem_class;
     iface->peek_parent_location_interface    = peek_parent_location_interface;
diff --git a/src/plugins/xmm/mm-shared-xmm.c b/src/plugins/xmm/mm-shared-xmm.c
index 69820dfc..d63cf1b6 100644
--- a/src/plugins/xmm/mm-shared-xmm.c
+++ b/src/plugins/xmm/mm-shared-xmm.c
@@ -31,6 +31,8 @@
 #include "mm-shared-xmm.h"
 #include "mm-modem-helpers-xmm.h"
 
+G_DEFINE_INTERFACE (MMSharedXmm, mm_shared_xmm, MM_TYPE_IFACE_MODEM)
+
 /*****************************************************************************/
 /* Private data context */
 
@@ -103,12 +105,12 @@ get_private (MMSharedXmm *self)
         priv->nmea_regex     = g_regex_new ("(?:\\r\\n)?(?:\\r\\n)?(\\$G.*)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
 
         /* Setup parent class' MMBroadbandModemClass */
-        g_assert (MM_SHARED_XMM_GET_INTERFACE (self)->peek_parent_broadband_modem_class);
-        priv->broadband_modem_class_parent = MM_SHARED_XMM_GET_INTERFACE (self)->peek_parent_broadband_modem_class (self);
+        g_assert (MM_SHARED_XMM_GET_IFACE (self)->peek_parent_broadband_modem_class);
+        priv->broadband_modem_class_parent = MM_SHARED_XMM_GET_IFACE (self)->peek_parent_broadband_modem_class (self);
 
         /* Setup parent class' MMIfaceModemLocation */
-        g_assert (MM_SHARED_XMM_GET_INTERFACE (self)->peek_parent_location_interface);
-        priv->iface_modem_location_parent = MM_SHARED_XMM_GET_INTERFACE (self)->peek_parent_location_interface (self);
+        g_assert (MM_SHARED_XMM_GET_IFACE (self)->peek_parent_location_interface);
+        priv->iface_modem_location_parent = MM_SHARED_XMM_GET_IFACE (self)->peek_parent_location_interface (self);
 
         g_object_set_qdata_full (G_OBJECT (self), private_quark, priv, (GDestroyNotify)private_free);
     }
@@ -1706,26 +1708,6 @@ mm_shared_xmm_setup_ports (MMBroadbandModem *self)
 /*****************************************************************************/
 
 static void
-shared_xmm_init (gpointer g_iface)
-{
-}
-
-GType
-mm_shared_xmm_get_type (void)
+mm_shared_xmm_default_init (MMSharedXmmInterface *iface)
 {
-    static GType shared_xmm_type = 0;
-
-    if (!G_UNLIKELY (shared_xmm_type)) {
-        static const GTypeInfo info = {
-            sizeof (MMSharedXmm),  /* class_size */
-            shared_xmm_init,       /* base_init */
-            NULL,                  /* base_finalize */
-        };
-
-        shared_xmm_type = g_type_register_static (G_TYPE_INTERFACE, "MMSharedXmm", &info, 0);
-        g_type_interface_add_prerequisite (shared_xmm_type, MM_TYPE_IFACE_MODEM);
-        g_type_interface_add_prerequisite (shared_xmm_type, MM_TYPE_IFACE_MODEM_LOCATION);
-    }
-
-    return shared_xmm_type;
 }
diff --git a/src/plugins/xmm/mm-shared-xmm.h b/src/plugins/xmm/mm-shared-xmm.h
index 7fb4fdb3..e78467e7 100644
--- a/src/plugins/xmm/mm-shared-xmm.h
+++ b/src/plugins/xmm/mm-shared-xmm.h
@@ -27,14 +27,10 @@
 #include "mm-iface-modem-signal.h"
 #include "mm-iface-modem-location.h"
 
-#define MM_TYPE_SHARED_XMM               (mm_shared_xmm_get_type ())
-#define MM_SHARED_XMM(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SHARED_XMM, MMSharedXmm))
-#define MM_IS_SHARED_XMM(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_SHARED_XMM))
-#define MM_SHARED_XMM_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), MM_TYPE_SHARED_XMM, MMSharedXmm))
+#define MM_TYPE_SHARED_XMM mm_shared_xmm_get_type ()
+G_DECLARE_INTERFACE (MMSharedXmm, mm_shared_xmm, MM, SHARED_XMM, MMIfaceModem)
 
-typedef struct _MMSharedXmm MMSharedXmm;
-
-struct _MMSharedXmm {
+struct _MMSharedXmmInterface {
     GTypeInterface g_iface;
 
     /* Peek broadband modem class of the parent class of the object */
@@ -44,8 +40,6 @@ struct _MMSharedXmm {
     MMIfaceModemLocationInterface *  (* peek_parent_location_interface) (MMSharedXmm *self);
 };
 
-GType mm_shared_xmm_get_type (void);
-
 /* Shared XMM device setup */
 
 void mm_shared_xmm_setup_ports (MMBroadbandModem *self);