iface-modem-voice: use G_DECLARE|DEFINE_INTERFACE() macros

4 files changed, 17 insertions, 17 deletions

diff --git a/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
index 7ae1dde2..d670b26d 100644
--- a/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
+++ b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
@@ -29,11 +29,11 @@
 #include "mm-shared-simtech.h"
 
 static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
-static void iface_modem_voice_init    (MMIfaceModemVoice             *iface);
+static void iface_modem_voice_init    (MMIfaceModemVoiceInterface    *iface);
 static void shared_simtech_init       (MMSharedSimtech               *iface);
 
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
-static MMIfaceModemVoice             *iface_modem_voice_parent;
+static MMIfaceModemVoiceInterface    *iface_modem_voice_parent;
 
 G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiSimtech, mm_broadband_modem_qmi_simtech, MM_TYPE_BROADBAND_MODEM_QMI, 0,
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_LOCATION, iface_modem_location_init)
@@ -90,7 +90,7 @@ peek_parent_location_interface (MMSharedSimtech *self)
 }
 
 static void
-iface_modem_voice_init (MMIfaceModemVoice *iface)
+iface_modem_voice_init (MMIfaceModemVoiceInterface *iface)
 {
     iface_modem_voice_parent = g_type_interface_peek_parent (iface);
 
@@ -110,7 +110,7 @@ iface_modem_voice_init (MMIfaceModemVoice *iface)
     iface->cleanup_in_call_audio_channel_finish = mm_shared_simtech_voice_cleanup_in_call_audio_channel_finish;
 }
 
-static MMIfaceModemVoice *
+static MMIfaceModemVoiceInterface *
 peek_parent_voice_interface (MMSharedSimtech *self)
 {
     return iface_modem_voice_parent;
diff --git a/src/plugins/simtech/mm-broadband-modem-simtech.c b/src/plugins/simtech/mm-broadband-modem-simtech.c
index e70dbd4a..49ac86e3 100644
--- a/src/plugins/simtech/mm-broadband-modem-simtech.c
+++ b/src/plugins/simtech/mm-broadband-modem-simtech.c
@@ -40,13 +40,13 @@
 static void iface_modem_init          (MMIfaceModemInterface         *iface);
 static void iface_modem_3gpp_init     (MMIfaceModem3gppInterface     *iface);
 static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
-static void iface_modem_voice_init    (MMIfaceModemVoice             *iface);
+static void iface_modem_voice_init    (MMIfaceModemVoiceInterface    *iface);
 static void shared_simtech_init       (MMSharedSimtech               *iface);
 
 static MMIfaceModemInterface         *iface_modem_parent;
 static MMIfaceModem3gppInterface     *iface_modem_3gpp_parent;
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
-static MMIfaceModemVoice             *iface_modem_voice_parent;
+static MMIfaceModemVoiceInterface    *iface_modem_voice_parent;
 
 G_DEFINE_TYPE_EXTENDED (MMBroadbandModemSimtech, mm_broadband_modem_simtech, MM_TYPE_BROADBAND_MODEM, 0,
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -1495,7 +1495,7 @@ peek_parent_location_interface (MMSharedSimtech *self)
 }
 
 static void
-iface_modem_voice_init (MMIfaceModemVoice *iface)
+iface_modem_voice_init (MMIfaceModemVoiceInterface *iface)
 {
     iface_modem_voice_parent = g_type_interface_peek_parent (iface);
 
@@ -1516,7 +1516,7 @@ iface_modem_voice_init (MMIfaceModemVoice *iface)
 
 }
 
-static MMIfaceModemVoice *
+static MMIfaceModemVoiceInterface *
 peek_parent_voice_interface (MMSharedSimtech *self)
 {
     return iface_modem_voice_parent;
diff --git a/src/plugins/simtech/mm-shared-simtech.c b/src/plugins/simtech/mm-shared-simtech.c
index 8992d7b8..117ea65e 100644
--- a/src/plugins/simtech/mm-shared-simtech.c
+++ b/src/plugins/simtech/mm-shared-simtech.c
@@ -49,14 +49,14 @@ typedef struct {
     MMModemLocationSource          enabled_sources;
     FeatureSupport                 cgps_support;
     /* voice */
-    MMIfaceModemVoice     *iface_modem_voice_parent;
-    FeatureSupport         cpcmreg_support;
-    FeatureSupport         clcc_urc_support;
-    GRegex                *clcc_urc_regex;
-    GRegex                *voice_call_regex;
-    GRegex                *missed_call_regex;
-    GRegex                *cring_regex;
-    GRegex                *rxdtmf_regex;
+    MMIfaceModemVoiceInterface *iface_modem_voice_parent;
+    FeatureSupport              cpcmreg_support;
+    FeatureSupport              clcc_urc_support;
+    GRegex                     *clcc_urc_regex;
+    GRegex                     *voice_call_regex;
+    GRegex                     *missed_call_regex;
+    GRegex                     *cring_regex;
+    GRegex                     *rxdtmf_regex;
 } Private;
 
 static void
diff --git a/src/plugins/simtech/mm-shared-simtech.h b/src/plugins/simtech/mm-shared-simtech.h
index 028c5894..13e0eee6 100644
--- a/src/plugins/simtech/mm-shared-simtech.h
+++ b/src/plugins/simtech/mm-shared-simtech.h
@@ -41,7 +41,7 @@ struct _MMSharedSimtech {
     MMIfaceModemLocationInterface *  (* peek_parent_location_interface) (MMSharedSimtech *self);
 
     /* Peek voice interface of the parent class of the object */
-    MMIfaceModemVoice *  (* peek_parent_voice_interface) (MMSharedSimtech *self);
+    MMIfaceModemVoiceInterface *  (* peek_parent_voice_interface) (MMSharedSimtech *self);
 };
 
 GType mm_shared_simtech_get_type (void);