GDBus: Avoid using the word interface in public C headers

Same deal as with e.g. index since some libraries may do crazy stuff
such as "#define interface xyz".

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/gio/gdbusinterface.h b/gio/gdbusinterface.h
index 370ec9d..c106018 100644 (file)
--- a/gio/gdbusinterface.h
+++ b/gio/gdbusinterface.h
@@ -59,16 +59,16 @@ struct _GDBusInterfaceIface
   GTypeInterface parent_iface;
 
   /* Virtual Functions */
-  GDBusInterfaceInfo   *(*get_info)   (GDBusInterface      *interface);
-  GDBusObject          *(*get_object) (GDBusInterface      *interface);
-  void                  (*set_object) (GDBusInterface      *interface,
+  GDBusInterfaceInfo   *(*get_info)   (GDBusInterface      *interface_);
+  GDBusObject          *(*get_object) (GDBusInterface      *interface_);
+  void                  (*set_object) (GDBusInterface      *interface_,
                                        GDBusObject         *object);
 };
 
 GType                 g_dbus_interface_get_type         (void) G_GNUC_CONST;
-GDBusInterfaceInfo   *g_dbus_interface_get_info         (GDBusInterface      *interface);
-GDBusObject          *g_dbus_interface_get_object       (GDBusInterface      *interface);
-void                  g_dbus_interface_set_object       (GDBusInterface      *interface,
+GDBusInterfaceInfo   *g_dbus_interface_get_info         (GDBusInterface      *interface_);
+GDBusObject          *g_dbus_interface_get_object       (GDBusInterface      *interface_);
+void                  g_dbus_interface_set_object       (GDBusInterface      *interface_,
                                                          GDBusObject         *object);
 
 G_END_DECLS

diff --git a/gio/gdbusobject.h b/gio/gdbusobject.h
index 34a0842..603229f 100644 (file)
--- a/gio/gdbusobject.h
+++ b/gio/gdbusobject.h
@@ -73,9 +73,9 @@ struct _GDBusObjectIface
 
   /* Signals */
   void (*interface_added)   (GDBusObject     *object,
-                             GDBusInterface  *interface);
+                             GDBusInterface  *interface_);
   void (*interface_removed) (GDBusObject     *object,
-                             GDBusInterface  *interface);
+                             GDBusInterface  *interface_);
 
 };
 

diff --git a/gio/gdbusobjectmanager.h b/gio/gdbusobjectmanager.h
index e849312..05cec1a 100644 (file)
--- a/gio/gdbusobjectmanager.h
+++ b/gio/gdbusobjectmanager.h
@@ -71,10 +71,10 @@ struct _GDBusObjectManagerIface
 
   void    (*interface_added)              (GDBusObjectManager   *manager,
                                            GDBusObject          *object,
-                                           GDBusInterface       *interface);
+                                           GDBusInterface       *interface_);
   void    (*interface_removed)            (GDBusObjectManager   *manager,
                                            GDBusObject          *object,
-                                           GDBusInterface       *interface);
+                                           GDBusInterface       *interface_);
 };
 
 GType            g_dbus_object_manager_get_type        (void) G_GNUC_CONST;

diff --git a/gio/gdbusobjectstub.h b/gio/gdbusobjectstub.h
index 5925790..c93d476 100644 (file)
--- a/gio/gdbusobjectstub.h
+++ b/gio/gdbusobjectstub.h
@@ -78,9 +78,9 @@ GType                g_dbus_object_stub_get_type                  (void) G_GNUC_
 GDBusObjectStub     *g_dbus_object_stub_new                       (const gchar        *object_path);
 void                 g_dbus_object_stub_flush                     (GDBusObjectStub    *object);
 void                 g_dbus_object_stub_add_interface             (GDBusObjectStub    *object,
-                                                                   GDBusInterfaceStub *interface);
+                                                                   GDBusInterfaceStub *interface_);
 void                 g_dbus_object_stub_remove_interface          (GDBusObjectStub    *object,
-                                                                   GDBusInterfaceStub *interface);
+                                                                   GDBusInterfaceStub *interface_);
 void                 g_dbus_object_stub_remove_interface_by_name  (GDBusObjectStub    *object,
                                                                    const gchar        *interface_name);
 void                 g_dbus_object_stub_set_object_path           (GDBusObjectStub    *object,