shared-quectel: use G_DECLARE|DEFINE_INTERFACE() macros

5 files changed, 18 insertions, 41 deletions

diff --git a/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
index c41205f6..9f2dc7d3 100644
--- a/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
@@ -26,7 +26,7 @@ static void iface_modem_init          (MMIfaceModemInterface         *iface);
 static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
 static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
 static void iface_modem_time_init     (MMIfaceModemTimeInterface     *iface);
-static void shared_quectel_init       (MMSharedQuectel               *iface);
+static void shared_quectel_init       (MMSharedQuectelInterface      *iface);
 
 static MMIfaceModemInterface         *iface_modem_parent;
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
@@ -126,7 +126,7 @@ peek_parent_broadband_modem_class (MMSharedQuectel *self)
 }
 
 static void
-shared_quectel_init (MMSharedQuectel *iface)
+shared_quectel_init (MMSharedQuectelInterface *iface)
 {
     iface->peek_parent_modem_interface          = peek_parent_modem_interface;
     iface->peek_parent_modem_location_interface = peek_parent_modem_location_interface;
diff --git a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
index b9283479..eef3438b 100644
--- a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
@@ -30,7 +30,7 @@ static void iface_modem_firmware_init             (MMIfaceModemFirmwareInterface
 static void iface_modem_location_init             (MMIfaceModemLocationInterface           *iface);
 static void iface_modem_time_init                 (MMIfaceModemTimeInterface               *iface);
 static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManagerInterface *iface);
-static void shared_quectel_init                   (MMSharedQuectel                         *iface);
+static void shared_quectel_init                   (MMSharedQuectelInterface                *iface);
 
 static MMIfaceModemInterface                   *iface_modem_parent;
 static MMIfaceModemLocationInterface           *iface_modem_location_parent;
@@ -217,7 +217,7 @@ iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManagerInterface *
 }
 
 static void
-shared_quectel_init (MMSharedQuectel *iface)
+shared_quectel_init (MMSharedQuectelInterface *iface)
 {
     iface->peek_parent_modem_interface          = peek_parent_modem_interface;
     iface->peek_parent_modem_location_interface = peek_parent_modem_location_interface;
diff --git a/src/plugins/quectel/mm-broadband-modem-quectel.c b/src/plugins/quectel/mm-broadband-modem-quectel.c
index 8d763131..ef11196a 100644
--- a/src/plugins/quectel/mm-broadband-modem-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-quectel.c
@@ -26,7 +26,7 @@ static void iface_modem_init          (MMIfaceModemInterface         *iface);
 static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
 static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
 static void iface_modem_time_init     (MMIfaceModemTimeInterface     *iface);
-static void shared_quectel_init       (MMSharedQuectel               *iface);
+static void shared_quectel_init       (MMSharedQuectelInterface      *iface);
 
 static MMIfaceModemInterface         *iface_modem_parent;
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
@@ -123,7 +123,7 @@ peek_parent_modem_location_interface (MMSharedQuectel *self)
 }
 
 static void
-shared_quectel_init (MMSharedQuectel *iface)
+shared_quectel_init (MMSharedQuectelInterface *iface)
 {
     iface->peek_parent_modem_interface          = peek_parent_modem_interface;
     iface->peek_parent_modem_location_interface = peek_parent_modem_location_interface;
diff --git a/src/plugins/quectel/mm-shared-quectel.c b/src/plugins/quectel/mm-shared-quectel.c
index ea6358b1..b6b96afc 100644
--- a/src/plugins/quectel/mm-shared-quectel.c
+++ b/src/plugins/quectel/mm-shared-quectel.c
@@ -35,6 +35,8 @@
 #include "mm-broadband-modem-mbim.h"
 #endif
 
+G_DEFINE_INTERFACE (MMSharedQuectel, mm_shared_quectel, MM_TYPE_IFACE_MODEM)
+
 /*****************************************************************************/
 /* Private context */
 
@@ -91,14 +93,14 @@ get_private (MMSharedQuectel *self)
         g_assert (priv->qlwurc_regex);
         g_assert (priv->rdy_regex);
 
-        g_assert (MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_broadband_modem_class);
-        priv->broadband_modem_class_parent = MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_broadband_modem_class (self);
+        g_assert (MM_SHARED_QUECTEL_GET_IFACE (self)->peek_parent_broadband_modem_class);
+        priv->broadband_modem_class_parent = MM_SHARED_QUECTEL_GET_IFACE (self)->peek_parent_broadband_modem_class (self);
 
-        g_assert (MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_modem_location_interface);
-        priv->iface_modem_location_parent = MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_modem_location_interface (self);
+        g_assert (MM_SHARED_QUECTEL_GET_IFACE (self)->peek_parent_modem_location_interface);
+        priv->iface_modem_location_parent = MM_SHARED_QUECTEL_GET_IFACE (self)->peek_parent_modem_location_interface (self);
 
-        g_assert (MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_modem_interface);
-        priv->iface_modem_parent = MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_modem_interface (self);
+        g_assert (MM_SHARED_QUECTEL_GET_IFACE (self)->peek_parent_modem_interface);
+        priv->iface_modem_parent = MM_SHARED_QUECTEL_GET_IFACE (self)->peek_parent_modem_interface (self);
 
         g_object_set_qdata_full (G_OBJECT (self), private_quark, priv, (GDestroyNotify)private_free);
     }
@@ -1124,25 +1126,6 @@ mm_shared_quectel_time_check_support (MMIfaceModemTime    *self,
 /*****************************************************************************/
 
 static void
-shared_quectel_init (gpointer g_iface)
-{
-}
-
-GType
-mm_shared_quectel_get_type (void)
+mm_shared_quectel_default_init (MMSharedQuectelInterface *iface)
 {
-    static GType shared_quectel_type = 0;
-
-    if (!G_UNLIKELY (shared_quectel_type)) {
-        static const GTypeInfo info = {
-            sizeof (MMSharedQuectel),  /* class_size */
-            shared_quectel_init,       /* base_init */
-            NULL,                      /* base_finalize */
-        };
-
-        shared_quectel_type = g_type_register_static (G_TYPE_INTERFACE, "MMSharedQuectel", &info, 0);
-        g_type_interface_add_prerequisite (shared_quectel_type, MM_TYPE_IFACE_MODEM_FIRMWARE);
-    }
-
-    return shared_quectel_type;
 }
diff --git a/src/plugins/quectel/mm-shared-quectel.h b/src/plugins/quectel/mm-shared-quectel.h
index b63a1641..20180515 100644
--- a/src/plugins/quectel/mm-shared-quectel.h
+++ b/src/plugins/quectel/mm-shared-quectel.h
@@ -28,22 +28,16 @@
 #include "mm-iface-modem-location.h"
 #include "mm-iface-modem-time.h"
 
-#define MM_TYPE_SHARED_QUECTEL               (mm_shared_quectel_get_type ())
-#define MM_SHARED_QUECTEL(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SHARED_QUECTEL, MMSharedQuectel))
-#define MM_IS_SHARED_QUECTEL(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_SHARED_QUECTEL))
-#define MM_SHARED_QUECTEL_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), MM_TYPE_SHARED_QUECTEL, MMSharedQuectel))
+#define MM_TYPE_SHARED_QUECTEL mm_shared_quectel_get_type ()
+G_DECLARE_INTERFACE (MMSharedQuectel, mm_shared_quectel, MM, SHARED_QUECTEL, MMIfaceModem)
 
-typedef struct _MMSharedQuectel MMSharedQuectel;
-
-struct _MMSharedQuectel {
+struct _MMSharedQuectelInterface {
     GTypeInterface g_iface;
     MMBroadbandModemClass         * (* peek_parent_broadband_modem_class)    (MMSharedQuectel *self);
     MMIfaceModemInterface         * (* peek_parent_modem_interface)          (MMSharedQuectel *self);
     MMIfaceModemLocationInterface * (* peek_parent_modem_location_interface) (MMSharedQuectel *self);
 };
 
-GType mm_shared_quectel_get_type (void);
-
 void                      mm_shared_quectel_setup_ports                          (MMBroadbandModem *self);
 
 void                      mm_shared_quectel_firmware_load_update_settings        (MMIfaceModemFirmware  *self,