Rename profile1_p to profilemanager1_p

The new QBluetoothSocketPrivateBluezDBus implementation requires the
ProfileManger1 and Profile1 interface spec. The old profile1_p header
really is the profilemanager1_p header.

Task-number: QTBUG-68550
Change-Id: I8ffdb5f7969a2e93b2a167b178b32ff4b5f264c5
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

5 files changed, 9 insertions, 9 deletions

diff --git a/src/bluetooth/bluez/bluez.pri b/src/bluetooth/bluez/bluez.pri
index a8ca8e22..e2c320e1 100644
--- a/src/bluetooth/bluez/bluez.pri
+++ b/src/bluetooth/bluez/bluez.pri
@@ -13,7 +13,7 @@ HEADERS += bluez/manager_p.h \
            bluez/properties_p.h \
            bluez/adapter1_bluez5_p.h \
            bluez/device1_bluez5_p.h \
-           bluez/profile1_p.h \
+           bluez/profilemanager1_p.h \
            bluez/obex_client1_bluez5_p.h \
            bluez/obex_objectpush1_bluez5_p.h \
            bluez/obex_transfer1_bluez5_p.h \
@@ -40,7 +40,7 @@ SOURCES += bluez/manager.cpp \
            bluez/adapter1_bluez5.cpp \
            bluez/device1_bluez5.cpp \
            bluez/bluez5_helper.cpp \
-           bluez/profile1.cpp \
+           bluez/profilemanager1.cpp \
            bluez/obex_client1_bluez5.cpp \
            bluez/obex_objectpush1_bluez5.cpp \
            bluez/obex_transfer1_bluez5.cpp \
diff --git a/src/bluetooth/bluez/generate b/src/bluetooth/bluez/generate
index 5c401ffe..b2c4bd9e 100755
--- a/src/bluetooth/bluez/generate
+++ b/src/bluetooth/bluez/generate
@@ -14,7 +14,7 @@ qdbusxml2cpp -a obex_agent_p.h:obex_agent.cpp org.openobex.agent.xml org.openobe
 #Bluez 5
 qdbusxml2cpp -p adapter1_bluez5_p.h:adapter1_bluez5.cpp org.bluez.Adapter1.xml
 qdbusxml2cpp -i bluez5_helper_p.h -p device1_bluez5_p.h:device1_bluez5.cpp org.bluez.Device1.xml
-qdbusxml2cpp -p profile1_p.h:profile1.cpp org.bluez.ProfileManager1.xml
+qdbusxml2cpp -p profilemanager1_p.h:profilemanager1.cpp org.bluez.ProfileManager1.xml
 qdbusxml2cpp -i bluez5_helper_p.h -p objectmanager_p.h:objectmanager.cpp org.freedesktop.dbus.objectmanager.xml
 qdbusxml2cpp -p properties_p.h:properties.cpp org.freedesktop.dbus.properties.xml
 qdbusxml2cpp -p obex_client1_bluez5_p.h:obex_client1_bluez5_p.h org.bluez.Client1.xml
diff --git a/src/bluetooth/bluez/profile1.cpp b/src/bluetooth/bluez/profilemanager1.cpp
index 26d42c7c..fe685c63 100644
--- a/src/bluetooth/bluez/profile1.cpp
+++ b/src/bluetooth/bluez/profilemanager1.cpp
@@ -1,6 +1,6 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p profile1_p.h:profile1.cpp org.bluez.ProfileManager1.xml
+ * Command line was: qdbusxml2cpp -p profilemanager1_p.h:profilemanager1.cpp org.bluez.ProfileManager1.xml
  *
  * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
@@ -9,7 +9,7 @@
  * before re-generating it.
  */
 
-#include "profile1_p.h"
+#include "profilemanager1_p.h"
 
 /*
  * Implementation of interface class OrgBluezProfileManager1Interface
diff --git a/src/bluetooth/bluez/profile1_p.h b/src/bluetooth/bluez/profilemanager1_p.h
index e61fb2a9..5530783b 100644
--- a/src/bluetooth/bluez/profile1_p.h
+++ b/src/bluetooth/bluez/profilemanager1_p.h
@@ -1,6 +1,6 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p profile1_p.h:profile1.cpp org.bluez.ProfileManager1.xml
+ * Command line was: qdbusxml2cpp -p profilemanager1_p.h:profilemanager1.cpp org.bluez.ProfileManager1.xml
  *
  * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
@@ -8,8 +8,8 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef PROFILE1_P_H
-#define PROFILE1_P_H
+#ifndef PROFILEMANAGER1_P_H
+#define PROFILEMANAGER1_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
diff --git a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp
index 9040348c..87c715c4 100644
--- a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp
+++ b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp
@@ -43,7 +43,7 @@
 #include "bluez/manager_p.h"
 #include "bluez/service_p.h"
 #include "bluez/bluez5_helper_p.h"
-#include "bluez/profile1_p.h"
+#include "bluez/profilemanager1_p.h"
 
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QXmlStreamWriter>