sim: rename 'MMSim' to 'MMBaseSim'

Just so that we don't have same header names in src/ and /libmm-glib.

3 files changed, 22 insertions, 22 deletions

diff --git a/plugins/nokia/mm-broadband-modem-nokia.c b/plugins/nokia/mm-broadband-modem-nokia.c
index 26f6d070..21e76dd8 100644
--- a/plugins/nokia/mm-broadband-modem-nokia.c
+++ b/plugins/nokia/mm-broadband-modem-nokia.c
@@ -47,7 +47,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemNokia, mm_broadband_modem_nokia, MM_TYPE
 /*****************************************************************************/
 /* Create SIM (Modem interface) */
 
-static MMSim *
+static MMBaseSim *
 create_sim_finish (MMIfaceModem *self,
                    GAsyncResult *res,
                    GError **error)
diff --git a/plugins/nokia/mm-sim-nokia.c b/plugins/nokia/mm-sim-nokia.c
index 6497b041..043d6349 100644
--- a/plugins/nokia/mm-sim-nokia.c
+++ b/plugins/nokia/mm-sim-nokia.c
@@ -26,11 +26,11 @@
 
 #include "mm-sim-nokia.h"
 
-G_DEFINE_TYPE (MMSimNokia, mm_sim_nokia, MM_TYPE_SIM);
+G_DEFINE_TYPE (MMSimNokia, mm_sim_nokia, MM_TYPE_BASE_SIM)
 
 /*****************************************************************************/
 
-MMSim *
+MMBaseSim *
 mm_sim_nokia_new_finish (GAsyncResult  *res,
                          GError       **error)
 {
@@ -45,9 +45,9 @@ mm_sim_nokia_new_finish (GAsyncResult  *res,
         return NULL;
 
     /* Only export valid SIMs */
-    mm_sim_export (MM_SIM (sim));
+    mm_base_sim_export (MM_BASE_SIM (sim));
 
-    return MM_SIM (sim);
+    return MM_BASE_SIM (sim);
 }
 
 void
@@ -61,7 +61,7 @@ mm_sim_nokia_new (MMBaseModem *modem,
                                 cancellable,
                                 callback,
                                 user_data,
-                                MM_SIM_MODEM, modem,
+                                MM_BASE_SIM_MODEM, modem,
                                 NULL);
 }
 
@@ -73,13 +73,13 @@ mm_sim_nokia_init (MMSimNokia *self)
 static void
 mm_sim_nokia_class_init (MMSimNokiaClass *klass)
 {
-    MMSimClass *sim_class = MM_SIM_CLASS (klass);
+    MMBaseSimClass *base_sim_class = MM_BASE_SIM_CLASS (klass);
 
     /* Skip querying most SIM card info, +CRSM not supported by Nokia modems */
-    sim_class->load_sim_identifier = NULL;
-    sim_class->load_sim_identifier_finish = NULL;
-    sim_class->load_operator_identifier = NULL;
-    sim_class->load_operator_identifier_finish = NULL;
-    sim_class->load_operator_name = NULL;
-    sim_class->load_operator_name_finish = NULL;
+    base_sim_class->load_sim_identifier = NULL;
+    base_sim_class->load_sim_identifier_finish = NULL;
+    base_sim_class->load_operator_identifier = NULL;
+    base_sim_class->load_operator_identifier_finish = NULL;
+    base_sim_class->load_operator_name = NULL;
+    base_sim_class->load_operator_name_finish = NULL;
 }
diff --git a/plugins/nokia/mm-sim-nokia.h b/plugins/nokia/mm-sim-nokia.h
index 22230979..05d6e2b1 100644
--- a/plugins/nokia/mm-sim-nokia.h
+++ b/plugins/nokia/mm-sim-nokia.h
@@ -19,7 +19,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "mm-sim.h"
+#include "mm-base-sim.h"
 
 #define MM_TYPE_SIM_NOKIA            (mm_sim_nokia_get_type ())
 #define MM_SIM_NOKIA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SIM_NOKIA, MMSimNokia))
@@ -32,20 +32,20 @@ typedef struct _MMSimNokia MMSimNokia;
 typedef struct _MMSimNokiaClass MMSimNokiaClass;
 
 struct _MMSimNokia {
-    MMSim parent;
+    MMBaseSim parent;
 };
 
 struct _MMSimNokiaClass {
-    MMSimClass parent;
+    MMBaseSimClass parent;
 };
 
 GType mm_sim_nokia_get_type (void);
 
-void   mm_sim_nokia_new        (MMBaseModem *modem,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
-MMSim *mm_sim_nokia_new_finish (GAsyncResult  *res,
-                                GError       **error);
+void       mm_sim_nokia_new        (MMBaseModem *modem,
+                                    GCancellable *cancellable,
+                                    GAsyncReadyCallback callback,
+                                    gpointer user_data);
+MMBaseSim *mm_sim_nokia_new_finish (GAsyncResult  *res,
+                                    GError       **error);
 
 #endif /* MM_SIM_NOKIA_H */