wifi-p2p: rename files for consistent Wi-Fi P2P naming

We named the types inconsistently:

  - "p2p-wireless" ("libnm-core/nm-setting-p2p-wireless.h")

  - "p2p" ("libnm/nm-p2p-peer.h")

  - "p2p-wifi" ("src/devices/wifi/nm-device-p2p-wifi.h")

It seems to me, "libnm/nm-p2p-peer.h" should be qualified with a "Wi-Fi"
specific name. It's not just peer-to-peer, it's Wi-Fi P2P.
Yes, there is an inconsistency now, because there is already
"libnm/nm-access-point.h".

It seems to me (from looking at the internet), that the name "Wi-Fi P2P"
is more common than "P2P Wi-Fi" -- although both are used. There is also
the name "Wi-Fi Direct". But it's not clear which name should be
preferred here, so stick to "Wi-Fi P2P".

In this first commit only rename the files. The following commit will
rename the content.

7 files changed, 22 insertions, 22 deletions

diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h
index 1f98e50b11..1e59d11758 100644
--- a/libnm/NetworkManager.h
+++ b/libnm/NetworkManager.h
@@ -43,15 +43,15 @@
 #include "nm-device-macvlan.h"
 #include "nm-device-modem.h"
 #include "nm-device-olpc-mesh.h"
+#include "nm-device-ovs-bridge.h"
 #include "nm-device-ovs-interface.h"
 #include "nm-device-ovs-port.h"
-#include "nm-device-ovs-bridge.h"
-#include "nm-device-p2p-wifi.h"
 #include "nm-device-ppp.h"
 #include "nm-device-team.h"
 #include "nm-device-tun.h"
 #include "nm-device-vlan.h"
 #include "nm-device-vxlan.h"
+#include "nm-device-wifi-p2p.h"
 #include "nm-device-wifi.h"
 #include "nm-device-wimax.h"
 #include "nm-device-wireguard.h"
@@ -61,7 +61,6 @@
 #include "nm-enum-types.h"
 #include "nm-ip-config.h"
 #include "nm-object.h"
-#include "nm-p2p-peer.h"
 #include "nm-remote-connection.h"
 #include "nm-setting-6lowpan.h"
 #include "nm-setting-8021x.h"
@@ -90,7 +89,7 @@
 #include "nm-setting-ovs-interface.h"
 #include "nm-setting-ovs-patch.h"
 #include "nm-setting-ovs-port.h"
-#include "nm-setting-p2p-wireless.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-setting-ppp.h"
 #include "nm-setting-pppoe.h"
 #include "nm-setting-proxy.h"
@@ -119,6 +118,7 @@
 #include "nm-vpn-editor-plugin.h"
 #include "nm-vpn-plugin-info.h"
 #include "nm-vpn-service-plugin.h"
+#include "nm-wifi-p2p-peer.h"
 #include "nm-wimax-nsp.h"
 
 #include "nm-autoptr.h"
diff --git a/libnm/meson.build b/libnm/meson.build
index dee4e36bdf..f538dbfbaf 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -40,30 +40,29 @@ libnm_headers = files(
   'nm-device-dummy.h',
   'nm-device-ethernet.h',
   'nm-device-generic.h',
-  'nm-device.h',
   'nm-device-infiniband.h',
   'nm-device-ip-tunnel.h',
   'nm-device-macsec.h',
   'nm-device-macvlan.h',
   'nm-device-modem.h',
   'nm-device-olpc-mesh.h',
+  'nm-device-ovs-bridge.h',
   'nm-device-ovs-interface.h',
   'nm-device-ovs-port.h',
-  'nm-device-ovs-bridge.h',
-  'nm-device-p2p-wifi.h',
   'nm-device-ppp.h',
   'nm-device-team.h',
   'nm-device-tun.h',
   'nm-device-vlan.h',
   'nm-device-vxlan.h',
+  'nm-device-wifi-p2p.h',
   'nm-device-wifi.h',
   'nm-device-wimax.h',
   'nm-device-wireguard.h',
   'nm-device-wpan.h',
+  'nm-device.h',
   'nm-dhcp-config.h',
   'nm-ip-config.h',
   'nm-object.h',
-  'nm-p2p-peer.h',
   'nm-remote-connection.h',
   'nm-secret-agent-old.h',
   'nm-types.h',
@@ -71,6 +70,7 @@ libnm_headers = files(
   'nm-vpn-editor.h',
   'nm-vpn-plugin-old.h',
   'nm-vpn-service-plugin.h',
+  'nm-wifi-p2p-peer.h',
   'nm-wimax-nsp.h',
 )
 
@@ -103,7 +103,6 @@ libnm_sources = files(
   'nm-device-bond.c',
   'nm-device-bridge.c',
   'nm-device-bt.c',
-  'nm-device.c',
   'nm-device-dummy.c',
   'nm-device-ethernet.c',
   'nm-device-generic.c',
@@ -113,19 +112,20 @@ libnm_sources = files(
   'nm-device-macvlan.c',
   'nm-device-modem.c',
   'nm-device-olpc-mesh.c',
+  'nm-device-ovs-bridge.c',
   'nm-device-ovs-interface.c',
   'nm-device-ovs-port.c',
-  'nm-device-ovs-bridge.c',
-  'nm-device-p2p-wifi.c',
   'nm-device-ppp.c',
   'nm-device-team.c',
   'nm-device-tun.c',
   'nm-device-vlan.c',
   'nm-device-vxlan.c',
+  'nm-device-wifi-p2p.c',
   'nm-device-wifi.c',
   'nm-device-wimax.c',
   'nm-device-wireguard.c',
   'nm-device-wpan.c',
+  'nm-device.c',
   'nm-dhcp-config.c',
   'nm-dhcp4-config.c',
   'nm-dhcp6-config.c',
@@ -135,14 +135,14 @@ libnm_sources = files(
   'nm-ip6-config.c',
   'nm-manager.c',
   'nm-object.c',
-  'nm-p2p-peer.c',
   'nm-remote-connection.c',
   'nm-remote-settings.c',
   'nm-secret-agent-old.c',
   'nm-vpn-connection.c',
-  'nm-vpn-plugin-old.c',
   'nm-vpn-editor.c',
+  'nm-vpn-plugin-old.c',
   'nm-vpn-service-plugin.c',
+  'nm-wifi-p2p-peer.c',
   'nm-wimax-nsp.c',
 )
 
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index e5902ad051..1cb73b73a6 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -66,26 +66,26 @@
 #include "nm-device-macvlan.h"
 #include "nm-device-modem.h"
 #include "nm-device-olpc-mesh.h"
+#include "nm-device-ovs-bridge.h"
 #include "nm-device-ovs-interface.h"
 #include "nm-device-ovs-port.h"
-#include "nm-device-ovs-bridge.h"
-#include "nm-device-p2p-wifi.h"
 #include "nm-device-ppp.h"
 #include "nm-device-team.h"
 #include "nm-device-tun.h"
 #include "nm-device-vlan.h"
 #include "nm-device-vxlan.h"
+#include "nm-device-wifi-p2p.h"
 #include "nm-device-wifi.h"
 #include "nm-device-wimax.h"
 #include "nm-device-wireguard.h"
 #include "nm-device-wpan.h"
+#include "nm-dhcp-config.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp6-config.h"
-#include "nm-dhcp-config.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-manager.h"
-#include "nm-p2p-peer.h"
+#include "nm-wifi-p2p-peer.h"
 #include "nm-remote-connection.h"
 #include "nm-remote-settings.h"
 #include "nm-vpn-connection.h"
diff --git a/libnm/nm-device-p2p-wifi.c b/libnm/nm-device-wifi-p2p.c
index c9be88ff1a..65be8d2aaf 100644
--- a/libnm/nm-device-p2p-wifi.c
+++ b/libnm/nm-device-wifi-p2p.c
@@ -19,15 +19,15 @@
 
 #include "nm-default.h"
 
-#include "nm-device-p2p-wifi.h"
+#include "nm-device-wifi-p2p.h"
 
 #include <string.h>
 
 #include "nm-setting-connection.h"
-#include "nm-setting-p2p-wireless.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-utils.h"
 
-#include "nm-p2p-peer.h"
+#include "nm-wifi-p2p-peer.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
 #include "nm-dbus-helpers.h"
diff --git a/libnm/nm-device-p2p-wifi.h b/libnm/nm-device-wifi-p2p.h
index bd5841fde2..bd5841fde2 100644
--- a/libnm/nm-device-p2p-wifi.h
+++ b/libnm/nm-device-wifi-p2p.h
diff --git a/libnm/nm-p2p-peer.c b/libnm/nm-wifi-p2p-peer.c
index 164a758e83..5edbef090e 100644
--- a/libnm/nm-p2p-peer.c
+++ b/libnm/nm-wifi-p2p-peer.c
@@ -19,13 +19,13 @@
 
 #include "nm-default.h"
 
-#include "nm-p2p-peer.h"
+#include "nm-wifi-p2p-peer.h"
 
 #include <string.h>
 
 #include "nm-connection.h"
 #include "nm-setting-connection.h"
-#include "nm-setting-p2p-wireless.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-utils.h"
 
 #include "nm-dbus-interface.h"
diff --git a/libnm/nm-p2p-peer.h b/libnm/nm-wifi-p2p-peer.h
index 0c52ecb3c0..0c52ecb3c0 100644
--- a/libnm/nm-p2p-peer.h
+++ b/libnm/nm-wifi-p2p-peer.h