wifi-p2p: rename Wi-Fi P2P

After renaming the files, also rename all the content
to follow the "Wi-Fi P2P" naming scheme.

3 files changed, 29 insertions, 29 deletions

diff --git a/introspection/meson.build b/introspection/meson.build
index e5bbe2a284..e442ac85f8 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -3,27 +3,30 @@ ifaces_secret_agent_xml = files('org.freedesktop.NetworkManager.SecretAgent.xml'
 ifaces_vpn_plugin_xml = files('org.freedesktop.NetworkManager.VPN.Plugin.xml')
 
 ifaces = [
+  'org.freedesktop.NetworkManager',
   'org.freedesktop.NetworkManager.AccessPoint',
   'org.freedesktop.NetworkManager.AgentManager',
   'org.freedesktop.NetworkManager.Checkpoint',
   'org.freedesktop.NetworkManager.Connection.Active',
+  'org.freedesktop.NetworkManager.DHCP4Config',
+  'org.freedesktop.NetworkManager.DHCP6Config',
+  'org.freedesktop.NetworkManager.Device',
   'org.freedesktop.NetworkManager.Device.Adsl',
   'org.freedesktop.NetworkManager.Device.Bluetooth',
   'org.freedesktop.NetworkManager.Device.Bond',
   'org.freedesktop.NetworkManager.Device.Bridge',
   'org.freedesktop.NetworkManager.Device.Dummy',
   'org.freedesktop.NetworkManager.Device.Generic',
-  'org.freedesktop.NetworkManager.Device.Infiniband',
   'org.freedesktop.NetworkManager.Device.IPTunnel',
+  'org.freedesktop.NetworkManager.Device.Infiniband',
   'org.freedesktop.NetworkManager.Device.Lowpan',
   'org.freedesktop.NetworkManager.Device.Macsec',
   'org.freedesktop.NetworkManager.Device.Macvlan',
   'org.freedesktop.NetworkManager.Device.Modem',
   'org.freedesktop.NetworkManager.Device.OlpcMesh',
+  'org.freedesktop.NetworkManager.Device.OvsBridge',
   'org.freedesktop.NetworkManager.Device.OvsInterface',
   'org.freedesktop.NetworkManager.Device.OvsPort',
-  'org.freedesktop.NetworkManager.Device.OvsBridge',
-  'org.freedesktop.NetworkManager.Device.P2PWireless',
   'org.freedesktop.NetworkManager.Device.Ppp',
   'org.freedesktop.NetworkManager.Device.Statistics',
   'org.freedesktop.NetworkManager.Device.Team',
@@ -32,25 +35,22 @@ ifaces = [
   'org.freedesktop.NetworkManager.Device.Vlan',
   'org.freedesktop.NetworkManager.Device.Vxlan',
   'org.freedesktop.NetworkManager.Device.WiMax',
-  'org.freedesktop.NetworkManager.Device.Wpan',
+  'org.freedesktop.NetworkManager.Device.WifiP2P',
   'org.freedesktop.NetworkManager.Device.WireGuard',
   'org.freedesktop.NetworkManager.Device.Wired',
   'org.freedesktop.NetworkManager.Device.Wireless',
-  'org.freedesktop.NetworkManager.Device',
-  'org.freedesktop.NetworkManager.DHCP4Config',
-  'org.freedesktop.NetworkManager.DHCP6Config',
+  'org.freedesktop.NetworkManager.Device.Wpan',
   'org.freedesktop.NetworkManager.DnsManager',
   'org.freedesktop.NetworkManager.IP4Config',
   'org.freedesktop.NetworkManager.IP6Config',
-  'org.freedesktop.NetworkManager',
-  'org.freedesktop.NetworkManager.P2PPeer',
   'org.freedesktop.NetworkManager.PPP',
   'org.freedesktop.NetworkManager.SecretAgent',
-  'org.freedesktop.NetworkManager.Settings.Connection',
   'org.freedesktop.NetworkManager.Settings',
+  'org.freedesktop.NetworkManager.Settings.Connection',
   'org.freedesktop.NetworkManager.VPN.Connection',
   'org.freedesktop.NetworkManager.VPN.Plugin',
   'org.freedesktop.NetworkManager.WiMax.Nsp',
+  'org.freedesktop.NetworkManager.WifiP2PPeer',
 ]
 
 ifaces_xmls = []
diff --git a/introspection/org.freedesktop.NetworkManager.Device.P2PWireless.xml b/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml
index 0e6a1cbca2..82a0e89b62 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.P2PWireless.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
   <!--
-      org.freedesktop.NetworkManager.Device.P2PWireless:
-      @short_description: P2P Wi-Fi Device
+      org.freedesktop.NetworkManager.Device.WifiP2P:
+      @short_description: Wi-Fi P2P Device
 
       Since: 1.16
   -->
-  <interface name="org.freedesktop.NetworkManager.Device.P2PWireless">
-    <annotation name="org.gtk.GDBus.C.Name" value="Device_P2P_Wifi"/>
+  <interface name="org.freedesktop.NetworkManager.Device.WifiP2P">
+    <annotation name="org.gtk.GDBus.C.Name" value="Device_Wifi_P2P"/>
 
     <!--
         HwAddress:
@@ -44,7 +44,7 @@
     <!--
         Peers:
 
-        List of object paths of peers visible to this p2p wireless device.
+        List of object paths of peers visible to this Wi-Fi P2P device.
 
         Since: 1.16
     -->
@@ -56,7 +56,7 @@
                   in the range of 1-600 seconds is supported. The default is
                   30 seconds.
 
-        Start a find operation for P2P peers.
+        Start a find operation for Wi-Fi P2P peers.
 
         Since: 1.16
     -->
@@ -78,7 +78,7 @@
         PeerAdded:
         @peer: The object path of the newly found access point.
 
-        Emitted when a new P2P peer is found by the device.
+        Emitted when a new Wi-Fi P2P peer is found by the device.
 
         Since: 1.16
     -->
@@ -88,9 +88,9 @@
 
     <!--
         PeerRemoved:
-        @peer: The object path of the P2P peer that has disappeared.
+        @peer: The object path of the Wi-Fi P2P peer that has disappeared.
 
-        Emitted when a P2P peer disappears from view of the device.
+        Emitted when a Wi-Fi P2P peer disappears from view of the device.
 
         Since: 1.16
     -->
diff --git a/introspection/org.freedesktop.NetworkManager.P2PPeer.xml b/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml
index 4ffba1d14e..9068f071de 100644
--- a/introspection/org.freedesktop.NetworkManager.P2PPeer.xml
+++ b/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
   <!--
-      org.freedesktop.NetworkManager.P2PPeer:
-      @short_description: P2P Wi-Fi Peer
+      org.freedesktop.NetworkManager.WifiP2PPeer:
+      @short_description: Wi-Fi P2P Peer
 
       Since: 1.16
   -->
-  <interface name="org.freedesktop.NetworkManager.P2PPeer">
-    <annotation name="org.gtk.GDBus.C.Name" value="P2P_Peer"/>
+  <interface name="org.freedesktop.NetworkManager.WifiP2PPeer">
+    <annotation name="org.gtk.GDBus.C.Name" value="Wifi_P2P_Peer"/>
 
     <!--
         Flags:
@@ -23,7 +23,7 @@
     <!--
         Manufacturer:
 
-        The manufacturer of the P2P peer.
+        The manufacturer of the Wi-Fi P2P peer.
 
         Since: 1.16
     -->
@@ -32,7 +32,7 @@
     <!--
         Model:
 
-        The model of the P2P peer.
+        The model of the Wi-Fi P2P peer.
 
         Since: 1.16
     -->
@@ -41,7 +41,7 @@
     <!--
         ModelNumber:
 
-        The model number of the P2P peer.
+        The model number of the Wi-Fi P2P peer.
 
         Since: 1.16
     -->
@@ -50,16 +50,16 @@
     <!--
         Serial:
 
-        The serial number of the P2P peer.
+        The serial number of the Wi-Fi P2P peer.
 
         Since: 1.16
     -->
     <property name="Serial" type="s" access="read"/>
 
     <!--
-        Wfdies:
+        WfdIEs:
 
-        The Wi-Fi Display Information Elements of the P2P peer.
+        The Wi-Fi Display Information Elements of the Wi-Fi P2P peer.
 
         Since: 1.16
     -->