Rename variables and methods having Bluez5 in their name

A lot of variables and methods were doubled, having
one for BlueZ4 and one for BlueZ5. Having dropped support for BlueZ4,
there is only the Bluez5 variant left. The "Bluez5" part of their
name is not required any more. This patch removes it.

Task-number: QTBUG-75342
Change-Id: I4c27cddbcca465b877cb7f2b7372a85a38de0076
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit a3ac0c1c4f52a882a0223310108c05b7d85ccc1e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

8 files changed, 109 insertions, 117 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
index 897f2383..471f6a62 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
@@ -60,11 +60,11 @@ QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate(
     q_ptr(parent)
 {
     initializeBluez5();
-    managerBluez5 = new OrgFreedesktopDBusObjectManagerInterface(
+    manager = new OrgFreedesktopDBusObjectManagerInterface(
                                        QStringLiteral("org.bluez"),
                                        QStringLiteral("/"),
                                        QDBusConnection::systemBus(), parent);
-    QObject::connect(managerBluez5,
+    QObject::connect(manager,
                      &OrgFreedesktopDBusObjectManagerInterface::InterfacesAdded,
                      q_ptr,
                      [this](const QDBusObjectPath &objectPath, InterfaceList interfacesAndProperties) {
@@ -77,7 +77,7 @@ QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate(
 
 QBluetoothDeviceDiscoveryAgentPrivate::~QBluetoothDeviceDiscoveryAgentPrivate()
 {
-    delete adapterBluez5;
+    delete adapter;
 }
 
 //TODO: Qt6 remove the pendingCancel/pendingStart logic as it is cumbersome.
@@ -94,7 +94,7 @@ bool QBluetoothDeviceDiscoveryAgentPrivate::isActive() const
     if (pendingCancel)
         return false; //TODO Qt6: remove pending[Cancel|Start] logic (see comment above)
 
-    return adapterBluez5;
+    return adapter;
 }
 
 QBluetoothDeviceDiscoveryAgent::DiscoveryMethods QBluetoothDeviceDiscoveryAgent::supportedDiscoveryMethods()
@@ -124,16 +124,15 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent
         return;
     }
 
-    adapterBluez5 = new OrgBluezAdapter1Interface(QStringLiteral("org.bluez"),
-                                                  adapterPath,
-                                                  QDBusConnection::systemBus());
+    adapter = new OrgBluezAdapter1Interface(QStringLiteral("org.bluez"), adapterPath,
+                                            QDBusConnection::systemBus());
 
-    if (!adapterBluez5->powered()) {
+    if (!adapter->powered()) {
         qCDebug(QT_BT_BLUEZ) << "Aborting device discovery due to offline Bluetooth Adapter";
         lastError = QBluetoothDeviceDiscoveryAgent::PoweredOffError;
         errorString = QBluetoothDeviceDiscoveryAgent::tr("Device is powered off");
-        delete adapterBluez5;
-        adapterBluez5 = nullptr;
+        delete adapter;
+        adapter = nullptr;
         emit q->errorOccurred(lastError);
         return;
     }
@@ -148,7 +147,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent
 
     // older BlueZ 5.x versions don't have this function
     // filterReply returns UnknownMethod which we ignore
-    QDBusPendingReply<> filterReply = adapterBluez5->SetDiscoveryFilter(map);
+    QDBusPendingReply<> filterReply = adapter->SetDiscoveryFilter(map);
     filterReply.waitForFinished();
     if (filterReply.isError()) {
         if (filterReply.error().type() == QDBusError::Other
@@ -157,8 +156,8 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent
             lastError = QBluetoothDeviceDiscoveryAgent::UnsupportedDiscoveryMethod;
             errorString = QBluetoothDeviceDiscoveryAgent::tr("One or more device discovery methods "
                                                              "are not supported on this platform");
-            delete adapterBluez5;
-            adapterBluez5 = nullptr;
+            delete adapter;
+            adapter = nullptr;
             emit q->errorOccurred(lastError);
             return;
         } else if (filterReply.error().type() != QDBusError::UnknownMethod) {
@@ -166,7 +165,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent
         }
     }
 
-    QtBluezDiscoveryManager::instance()->registerDiscoveryInterest(adapterBluez5->path());
+    QtBluezDiscoveryManager::instance()->registerDiscoveryInterest(adapter->path());
     QObject::connect(QtBluezDiscoveryManager::instance(), &QtBluezDiscoveryManager::discoveryInterrupted,
                      q, [this](const QString &path){
         this->_q_discoveryInterrupted(path);
@@ -184,7 +183,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent
     propertyMonitors.append(prop);
 
     // collect initial set of information
-    QDBusPendingReply<ManagedObjectList> reply = managerBluez5->GetManagedObjects();
+    QDBusPendingReply<ManagedObjectList> reply = manager->GetManagedObjects();
     reply.waitForFinished();
     if (!reply.isError()) {
         ManagedObjectList managedObjectList = reply.value();
@@ -197,10 +196,10 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent
 
                 if (iface == QStringLiteral("org.bluez.Device1")) {
 
-                    if (path.path().indexOf(adapterBluez5->path()) != 0)
+                    if (path.path().indexOf(adapter->path()) != 0)
                         continue; //devices whose path doesn't start with same path we skip
 
-                    deviceFoundBluez5(path.path(), jt.value());
+                    deviceFound(path.path(), jt.value());
                     if (!isActive()) // Can happen if stop() was called from a slot in user code.
                       return;
                 }
@@ -226,7 +225,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent
 
 void QBluetoothDeviceDiscoveryAgentPrivate::stop()
 {
-    if (!adapterBluez5)
+    if (!adapter)
         return;
 
     qCDebug(QT_BT_BLUEZ) << Q_FUNC_INFO;
@@ -285,8 +284,8 @@ static QBluetoothDeviceInfo createDeviceInfoFromBluez5Device(const QVariantMap&
     return deviceInfo;
 }
 
-void QBluetoothDeviceDiscoveryAgentPrivate::deviceFoundBluez5(const QString &devicePath,
-                                                              const QVariantMap &properties)
+void QBluetoothDeviceDiscoveryAgentPrivate::deviceFound(const QString &devicePath,
+                                                        const QVariantMap &properties)
 {
     Q_Q(QBluetoothDeviceDiscoveryAgent);
 
@@ -294,8 +293,8 @@ void QBluetoothDeviceDiscoveryAgentPrivate::deviceFoundBluez5(const QString &dev
         return;
 
     auto deviceAdapter = qvariant_cast<QDBusObjectPath>(properties[QStringLiteral("Adapter")]);
-     if (deviceAdapter.path() != adapterBluez5->path())
-         return;
+    if (deviceAdapter.path() != adapter->path())
+        return;
 
     // read information
     QBluetoothDeviceInfo deviceInfo = createDeviceInfoFromBluez5Device(properties);
@@ -338,8 +337,9 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_InterfacesAdded(const QDBusObject
 
     if (interfaces_and_properties.contains(QStringLiteral("org.bluez.Device1"))) {
         // device interfaces belonging to different adapter
-        // will be filtered out by deviceFoundBluez5();
-        deviceFoundBluez5(object_path.path(), interfaces_and_properties[QStringLiteral("org.bluez.Device1")]);
+        // will be filtered out by deviceFound();
+        deviceFound(object_path.path(),
+                    interfaces_and_properties[QStringLiteral("org.bluez.Device1")]);
     }
 }
 
@@ -351,13 +351,13 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_discoveryFinished()
         discoveryTimer->stop();
 
     QtBluezDiscoveryManager::instance()->disconnect(q);
-    QtBluezDiscoveryManager::instance()->unregisterDiscoveryInterest(adapterBluez5->path());
+    QtBluezDiscoveryManager::instance()->unregisterDiscoveryInterest(adapter->path());
 
     qDeleteAll(propertyMonitors);
     propertyMonitors.clear();
 
-    delete adapterBluez5;
-    adapterBluez5 = nullptr;
+    delete adapter;
+    adapter = nullptr;
 
     if (pendingCancel && !pendingStart) {
         pendingCancel = false;
@@ -379,7 +379,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_discoveryInterrupted(const QStrin
     if (!q->isActive())
         return;
 
-    if (path == adapterBluez5->path()) {
+    if (path == adapter->path()) {
         qCWarning(QT_BT_BLUEZ) << "Device discovery aborted due to unexpected adapter changes from another process.";
 
         if (discoveryTimer)
@@ -389,8 +389,8 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_discoveryInterrupted(const QStrin
         // no need to call unregisterDiscoveryInterest since QtBluezDiscoveryManager
         // does this automatically when emitting discoveryInterrupted(QString) signal
 
-        delete adapterBluez5;
-        adapterBluez5 = nullptr;
+        delete adapter;
+        adapter = nullptr;
 
         errorString = QBluetoothDeviceDiscoveryAgent::tr("Bluetooth adapter error");
         lastError = QBluetoothDeviceDiscoveryAgent::InputOutputError;
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
index f24ba816..2412e032 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -161,12 +161,12 @@ private:
     QBluetoothAddress m_adapterAddress;
     bool pendingCancel = false;
     bool pendingStart = false;
-    OrgFreedesktopDBusObjectManagerInterface *managerBluez5 = nullptr;
-    OrgBluezAdapter1Interface *adapterBluez5 = nullptr;
+    OrgFreedesktopDBusObjectManagerInterface *manager = nullptr;
+    OrgBluezAdapter1Interface *adapter = nullptr;
     QTimer *discoveryTimer = nullptr;
     QList<OrgFreedesktopDBusPropertiesInterface *> propertyMonitors;
 
-    void deviceFoundBluez5(const QString &devicePath, const QVariantMap &properties);
+    void deviceFound(const QString &devicePath, const QVariantMap &properties);
 
     QMap<QString, QVariantMap> devicesProperties;
 #endif
diff --git a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
index 0a3d36b5..282c3544 100644
--- a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
+++ b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
@@ -76,24 +76,24 @@ QBluetoothLocalDevice::QBluetoothLocalDevice(const QBluetoothAddress &address, Q
 
 QString QBluetoothLocalDevice::name() const
 {
-    if (d_ptr->adapterBluez5)
-        return d_ptr->adapterBluez5->alias();
+    if (d_ptr->adapter)
+        return d_ptr->adapter->alias();
 
     return QString();
 }
 
 QBluetoothAddress QBluetoothLocalDevice::address() const
 {
-    if (d_ptr->adapterBluez5)
-        return QBluetoothAddress(d_ptr->adapterBluez5->address());
+    if (d_ptr->adapter)
+        return QBluetoothAddress(d_ptr->adapter->address());
 
     return QBluetoothAddress();
 }
 
 void QBluetoothLocalDevice::powerOn()
 {
-    if (d_ptr->adapterBluez5)
-        d_ptr->adapterBluez5->setPowered(true);
+    if (d_ptr->adapter)
+        d_ptr->adapter->setPowered(true);
 }
 
 void QBluetoothLocalDevice::setHostMode(QBluetoothLocalDevice::HostMode mode)
@@ -115,33 +115,33 @@ void QBluetoothLocalDevice::setHostMode(QBluetoothLocalDevice::HostMode mode)
             // We first have to wait for BT to be powered on,
             // then we can set the host mode correctly
             d->pendingHostModeChange = static_cast<int>(HostDiscoverable);
-            d->adapterBluez5->setPowered(true);
+            d->adapter->setPowered(true);
         } else {
-            d->adapterBluez5->setDiscoverable(true);
+            d->adapter->setDiscoverable(true);
         }
         break;
     case HostConnectable:
         if (hostMode() == HostPoweredOff) {
             d->pendingHostModeChange = static_cast<int>(HostConnectable);
-            d->adapterBluez5->setPowered(true);
+            d->adapter->setPowered(true);
         } else {
-            d->adapterBluez5->setDiscoverable(false);
+            d->adapter->setDiscoverable(false);
         }
         break;
     case HostPoweredOff:
-        d->adapterBluez5->setPowered(false);
+        d->adapter->setPowered(false);
         break;
     }
 }
 
 QBluetoothLocalDevice::HostMode QBluetoothLocalDevice::hostMode() const
 {
-    if (d_ptr->adapterBluez5) {
-        if (!d_ptr->adapterBluez5->powered())
+    if (d_ptr->adapter) {
+        if (!d_ptr->adapter->powered())
             return HostPoweredOff;
-        else if (d_ptr->adapterBluez5->discoverable())
+        else if (d_ptr->adapter->discoverable())
             return HostDiscoverable;
-        else if (d_ptr->adapterBluez5->powered())
+        else if (d_ptr->adapter->powered())
             return HostConnectable;
     }
 
@@ -201,7 +201,7 @@ void QBluetoothLocalDevice::requestPairing(const QBluetoothAddress &address, Pai
 
     const Pairing current_pairing = pairingStatus(address);
     if (current_pairing == pairing) {
-        if (d_ptr->adapterBluez5) {
+        if (d_ptr->adapter) {
             // A possibly running discovery or pending pairing request should be canceled
             if (d_ptr->pairingDiscoveryTimer && d_ptr->pairingDiscoveryTimer->isActive()) {
                 d_ptr->pairingDiscoveryTimer->stop();
@@ -214,7 +214,6 @@ void QBluetoothLocalDevice::requestPairing(const QBluetoothAddress &address, Pai
                 delete d_ptr->pairingTarget;
                 d_ptr->pairingTarget = nullptr;
             }
-
         }
         QMetaObject::invokeMethod(this, "pairingFinished", Qt::QueuedConnection,
                                   Q_ARG(QBluetoothAddress, address),
@@ -222,11 +221,11 @@ void QBluetoothLocalDevice::requestPairing(const QBluetoothAddress &address, Pai
         return;
     }
 
-    d_ptr->requestPairingBluez5(address, pairing);
+    d_ptr->requestPairing(address, pairing);
 }
 
-void QBluetoothLocalDevicePrivate::requestPairingBluez5(const QBluetoothAddress &targetAddress,
-                                                        QBluetoothLocalDevice::Pairing targetPairing)
+void QBluetoothLocalDevicePrivate::requestPairing(const QBluetoothAddress &targetAddress,
+                                                  QBluetoothLocalDevice::Pairing targetPairing)
 {
     if (!isValid())
         return;
@@ -234,8 +233,7 @@ void QBluetoothLocalDevicePrivate::requestPairingBluez5(const QBluetoothAddress
     //are we already discovering something? -> abort those attempts
     if (pairingDiscoveryTimer && pairingDiscoveryTimer->isActive()) {
         pairingDiscoveryTimer->stop();
-        QtBluezDiscoveryManager::instance()->unregisterDiscoveryInterest(
-                    adapterBluez5->path());
+        QtBluezDiscoveryManager::instance()->unregisterDiscoveryInterest(adapter->path());
     }
 
     if (pairingTarget) {
@@ -247,7 +245,7 @@ void QBluetoothLocalDevicePrivate::requestPairingBluez5(const QBluetoothAddress
     // if we cannot find it we may have to turn on Discovery mode for a limited amount of time
 
     // check device doesn't already exist
-    QDBusPendingReply<ManagedObjectList> reply = managerBluez5->GetManagedObjects();
+    QDBusPendingReply<ManagedObjectList> reply = manager->GetManagedObjects();
     reply.waitForFinished();
     if (reply.isError()) {
         emit q_ptr->errorOccurred(QBluetoothLocalDevice::PairingError);
@@ -270,7 +268,7 @@ void QBluetoothLocalDevicePrivate::requestPairingBluez5(const QBluetoothAddress
                 if (targetAddress == QBluetoothAddress(device.address())) {
                     qCDebug(QT_BT_BLUEZ) << "Initiating direct pair to" << targetAddress.toString();
                     //device exist -> directly work with it
-                    processPairingBluez5(path.path(), targetPairing);
+                    processPairing(path.path(), targetPairing);
                     return;
                 }
             }
@@ -278,7 +276,7 @@ void QBluetoothLocalDevicePrivate::requestPairingBluez5(const QBluetoothAddress
     }
 
     //no device matching -> turn on discovery
-    QtBluezDiscoveryManager::instance()->registerDiscoveryInterest(adapterBluez5->path());
+    QtBluezDiscoveryManager::instance()->registerDiscoveryInterest(adapter->path());
 
     address = targetAddress;
     pairing = targetPairing;
@@ -301,8 +299,8 @@ void QBluetoothLocalDevicePrivate::requestPairingBluez5(const QBluetoothAddress
  * If it has to be paired then we need another roundtrip through the event loop
  * while we wait for the user to accept the pairing dialogs.
  */
-void QBluetoothLocalDevicePrivate::processPairingBluez5(const QString &objectPath,
-                                                        QBluetoothLocalDevice::Pairing target)
+void QBluetoothLocalDevicePrivate::processPairing(const QString &objectPath,
+                                                  QBluetoothLocalDevice::Pairing target)
 {
     if (pairingTarget)
         delete pairingTarget;
@@ -311,8 +309,7 @@ void QBluetoothLocalDevicePrivate::processPairingBluez5(const QString &objectPat
     if (pairingDiscoveryTimer && pairingDiscoveryTimer->isActive()) {
         pairingDiscoveryTimer->stop();
 
-        QtBluezDiscoveryManager::instance()->unregisterDiscoveryInterest(
-                    adapterBluez5->path());
+        QtBluezDiscoveryManager::instance()->unregisterDiscoveryInterest(adapter->path());
     }
 
     pairingTarget = new OrgBluezDevice1Interface(QStringLiteral("org.bluez"), objectPath,
@@ -326,7 +323,7 @@ void QBluetoothLocalDevicePrivate::processPairingBluez5(const QString &objectPat
         delete pairingTarget;
         pairingTarget = nullptr;
 
-        QDBusPendingReply<> removeReply = adapterBluez5->RemoveDevice(QDBusObjectPath(objectPath));
+        QDBusPendingReply<> removeReply = adapter->RemoveDevice(QDBusObjectPath(objectPath));
         auto watcher = new QDBusPendingCallWatcher(removeReply, this);
         connect(watcher, &QDBusPendingCallWatcher::finished,
                 this, [q, targetAddress](QDBusPendingCallWatcher* watcher){
@@ -375,8 +372,7 @@ void QBluetoothLocalDevicePrivate::pairingDiscoveryTimedOut()
 {
     qCWarning(QT_BT_BLUEZ) << "Discovery for pairing purposes failed. Cannot find parable device.";
 
-    QtBluezDiscoveryManager::instance()->unregisterDiscoveryInterest(
-                adapterBluez5->path());
+    QtBluezDiscoveryManager::instance()->unregisterDiscoveryInterest(adapter->path());
 
     emit q_ptr->errorOccurred(QBluetoothLocalDevice::PairingError);
 }
@@ -389,7 +385,7 @@ QBluetoothLocalDevice::Pairing QBluetoothLocalDevice::pairingStatus(
 
     if (isValid())
     {
-        QDBusPendingReply<ManagedObjectList> reply = d_ptr->managerBluez5->GetManagedObjects();
+        QDBusPendingReply<ManagedObjectList> reply = d_ptr->manager->GetManagedObjects();
         reply.waitForFinished();
         if (reply.isError())
             return Unpaired;
@@ -432,7 +428,7 @@ QBluetoothLocalDevicePrivate::QBluetoothLocalDevicePrivate(QBluetoothLocalDevice
 {
     registerQBluetoothLocalDeviceMetaType();
     initializeBluez5();
-    initializeAdapterBluez5();
+    initializeAdapter();
 
     connectDeviceChanges();
 }
@@ -446,7 +442,7 @@ void QBluetoothLocalDevicePrivate::connectDeviceChanges()
 {
     if (isValid()) {
         //setup property change notifications for all existing devices
-        QDBusPendingReply<ManagedObjectList> reply = managerBluez5->GetManagedObjects();
+        QDBusPendingReply<ManagedObjectList> reply = manager->GetManagedObjects();
         reply.waitForFinished();
         if (reply.isError())
             return;
@@ -486,29 +482,29 @@ void QBluetoothLocalDevicePrivate::connectDeviceChanges()
 
 QBluetoothLocalDevicePrivate::~QBluetoothLocalDevicePrivate()
 {
-    delete adapterBluez5;
+    delete adapter;
     delete adapterProperties;
-    delete managerBluez5;
+    delete manager;
     delete pairingTarget;
 
     qDeleteAll(deviceChangeMonitors);
 }
 
-void QBluetoothLocalDevicePrivate::initializeAdapterBluez5()
+void QBluetoothLocalDevicePrivate::initializeAdapter()
 {
-    if (adapterBluez5)
+    if (adapter)
         return;
 
     //get all local adapters
-    if (!managerBluez5)
-        managerBluez5 = new OrgFreedesktopDBusObjectManagerInterface(
+    if (!manager)
+        manager = new OrgFreedesktopDBusObjectManagerInterface(
                                                      QStringLiteral("org.bluez"),
                                                      QStringLiteral("/"),
                                                      QDBusConnection::systemBus(), this);
 
-    connect(managerBluez5, &OrgFreedesktopDBusObjectManagerInterface::InterfacesAdded,
+    connect(manager, &OrgFreedesktopDBusObjectManagerInterface::InterfacesAdded,
             this, &QBluetoothLocalDevicePrivate::InterfacesAdded);
-    connect(managerBluez5, &OrgFreedesktopDBusObjectManagerInterface::InterfacesRemoved,
+    connect(manager, &OrgFreedesktopDBusObjectManagerInterface::InterfacesRemoved,
             this, &QBluetoothLocalDevicePrivate::InterfacesRemoved);
 
     bool ok = true;
@@ -517,15 +513,14 @@ void QBluetoothLocalDevicePrivate::initializeAdapterBluez5()
         return;
 
     deviceAdapterPath = adapterPath;
-    adapterBluez5 = new OrgBluezAdapter1Interface(QStringLiteral("org.bluez"),
-                                                   adapterPath,
-                                                   QDBusConnection::systemBus(), this);
+    adapter = new OrgBluezAdapter1Interface(QStringLiteral("org.bluez"), adapterPath,
+                                            QDBusConnection::systemBus(), this);
 
-    if (adapterBluez5) {
+    if (adapter) {
         //hook up propertiesChanged for current adapter
         adapterProperties = new OrgFreedesktopDBusPropertiesInterface(
-                    QStringLiteral("org.bluez"), adapterBluez5->path(),
-                    QDBusConnection::systemBus(), this);
+                QStringLiteral("org.bluez"), adapter->path(),
+                QDBusConnection::systemBus(), this);
         connect(adapterProperties, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged,
                 this, &QBluetoothLocalDevicePrivate::PropertiesChanged);
     }
@@ -544,10 +539,10 @@ void QBluetoothLocalDevicePrivate::PropertiesChanged(const QString &interface,
 
             QBluetoothLocalDevice::HostMode mode;
 
-            if (!adapterBluez5->powered()) {
+            if (!adapter->powered()) {
                 mode = QBluetoothLocalDevice::HostPoweredOff;
             } else {
-                if (adapterBluez5->discoverable())
+                if (adapter->discoverable())
                     mode = QBluetoothLocalDevice::HostDiscoverable;
                 else
                     mode = QBluetoothLocalDevice::HostConnectable;
@@ -555,9 +550,9 @@ void QBluetoothLocalDevicePrivate::PropertiesChanged(const QString &interface,
                 if (pendingHostModeChange != -1) {
 
                     if (static_cast<int>(mode) != pendingHostModeChange) {
-                        adapterBluez5->setDiscoverable(
-                            pendingHostModeChange
-                            == static_cast<int>(QBluetoothLocalDevice::HostDiscoverable));
+                        adapter->setDiscoverable(
+                                pendingHostModeChange
+                                == static_cast<int>(QBluetoothLocalDevice::HostDiscoverable));
                         pendingHostModeChange = -1;
                         return;
                     }
@@ -624,7 +619,7 @@ void QBluetoothLocalDevicePrivate::InterfacesAdded(const QDBusObjectPath &object
         OrgBluezDevice1Interface device(QStringLiteral("org.bluez"),
                                         object_path.path(), QDBusConnection::systemBus());
         if (!address.isNull() && address == QBluetoothAddress(device.address()))
-            processPairingBluez5(object_path.path(), pairing);
+            processPairing(object_path.path(), pairing);
     }
 }
 
@@ -649,15 +644,14 @@ void QBluetoothLocalDevicePrivate::InterfacesRemoved(const QDBusObjectPath &obje
         }
     }
 
-    if (adapterBluez5
-            && object_path.path() == adapterBluez5->path()
-            && interfaces.contains(QLatin1String("org.bluez.Adapter1"))) {
-        qCDebug(QT_BT_BLUEZ) << "Adapter" << adapterBluez5->path() << "was removed";
+    if (adapter && object_path.path() == adapter->path()
+        && interfaces.contains(QLatin1String("org.bluez.Adapter1"))) {
+        qCDebug(QT_BT_BLUEZ) << "Adapter" << adapter->path() << "was removed";
         // current adapter was removed -> invalidate the instance
-        delete adapterBluez5;
-        adapterBluez5 = nullptr;
-        managerBluez5->deleteLater();
-        managerBluez5 = nullptr;
+        delete adapter;
+        adapter = nullptr;
+        manager->deleteLater();
+        manager = nullptr;
         delete adapterProperties;
         adapterProperties = nullptr;
 
@@ -673,7 +667,7 @@ void QBluetoothLocalDevicePrivate::InterfacesRemoved(const QDBusObjectPath &obje
 
 bool QBluetoothLocalDevicePrivate::isValid() const
 {
-    return adapterBluez5 && managerBluez5;
+    return adapter && manager;
 }
 
 QList<QBluetoothAddress> QBluetoothLocalDevicePrivate::connectedDevices() const
@@ -694,7 +688,7 @@ void QBluetoothLocalDevicePrivate::pairingCompleted(QDBusPendingCallWatcher *wat
         return;
     }
 
-    if (adapterBluez5) {
+    if (adapter) {
         if (!pairingTarget) {
             qCWarning(QT_BT_BLUEZ) << "Pairing target expected but found null pointer.";
             emit q->errorOccurred(QBluetoothLocalDevice::PairingError);
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h
index af97f467..a03dfaf0 100644
--- a/src/bluetooth/qbluetoothlocaldevice_p.h
+++ b/src/bluetooth/qbluetoothlocaldevice_p.h
@@ -149,9 +149,9 @@ public:
     ~QBluetoothLocalDevicePrivate();
 
     QSet<QBluetoothAddress> connectedDevicesSet;
-    OrgBluezAdapter1Interface *adapterBluez5 = nullptr;
+    OrgBluezAdapter1Interface *adapter = nullptr;
     OrgFreedesktopDBusPropertiesInterface *adapterProperties = nullptr;
-    OrgFreedesktopDBusObjectManagerInterface *managerBluez5 = nullptr;
+    OrgFreedesktopDBusObjectManagerInterface *manager = nullptr;
     QMap<QString, OrgFreedesktopDBusPropertiesInterface *> deviceChangeMonitors;
 
     QList<QBluetoothAddress> connectedDevices() const;
@@ -169,8 +169,8 @@ public slots:
 
     bool isValid() const;
 
-    void requestPairingBluez5(const QBluetoothAddress &address,
-                              QBluetoothLocalDevice::Pairing targetPairing);
+    void requestPairing(const QBluetoothAddress &address,
+                        QBluetoothLocalDevice::Pairing targetPairing);
 
 private Q_SLOTS:
     void PropertiesChanged(const QString &interface,
@@ -181,8 +181,7 @@ private Q_SLOTS:
                          InterfaceList interfaces_and_properties);
     void InterfacesRemoved(const QDBusObjectPath &object_path,
                            const QStringList &interfaces);
-    void processPairingBluez5(const QString &objectPath,
-                              QBluetoothLocalDevice::Pairing target);
+    void processPairing(const QString &objectPath, QBluetoothLocalDevice::Pairing target);
     void pairingDiscoveryTimedOut();
 
 private:
@@ -192,7 +191,7 @@ private:
 
     QBluetoothLocalDevice *q_ptr;
 
-    void initializeAdapterBluez5();
+    void initializeAdapter();
 };
 
 #elif defined(QT_WINRT_BLUETOOTH)
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
index 57480ff9..998472f2 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
@@ -61,15 +61,14 @@ QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(
     q_ptr(qp)
 {
     initializeBluez5();
-    managerBluez5 = new OrgFreedesktopDBusObjectManagerInterface(
-                                    QStringLiteral("org.bluez"), QStringLiteral("/"),
-                                    QDBusConnection::systemBus());
+    manager = new OrgFreedesktopDBusObjectManagerInterface(
+            QStringLiteral("org.bluez"), QStringLiteral("/"), QDBusConnection::systemBus());
     qRegisterMetaType<QBluetoothServiceDiscoveryAgent::Error>();
 }
 
 QBluetoothServiceDiscoveryAgentPrivate::~QBluetoothServiceDiscoveryAgentPrivate()
 {
-    delete managerBluez5;
+    delete manager;
 }
 
 void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &address)
@@ -336,7 +335,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::performMinimalServiceDiscovery(cons
 
     Q_Q(QBluetoothServiceDiscoveryAgent);
 
-    QDBusPendingReply<ManagedObjectList> reply = managerBluez5->GetManagedObjects();
+    QDBusPendingReply<ManagedObjectList> reply = manager->GetManagedObjects();
     reply.waitForFinished();
     if (reply.isError()) {
         if (singleDevice) {
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
index 57fed970..aafe2611 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
@@ -183,7 +183,7 @@ private:
     bool singleDevice;
 #if QT_CONFIG(bluez)
     QString foundHostAdapterPath;
-    OrgFreedesktopDBusObjectManagerInterface *managerBluez5 = nullptr;
+    OrgFreedesktopDBusObjectManagerInterface *manager = nullptr;
     QProcess *sdpScannerProcess = nullptr;
 #endif
 
diff --git a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp
index 091676cd..088603b6 100644
--- a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp
+++ b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp
@@ -166,9 +166,9 @@ QBluetoothServiceInfoPrivate::QBluetoothServiceInfoPrivate()
 :   serviceRecord(0), registered(false)
 {
     initializeBluez5();
-    serviceBluez5 = new OrgBluezProfileManager1Interface(QStringLiteral("org.bluez"),
-                                                         QStringLiteral("/org/bluez"),
-                                                         QDBusConnection::systemBus(), this);
+    service = new OrgBluezProfileManager1Interface(QStringLiteral("org.bluez"),
+                                                   QStringLiteral("/org/bluez"),
+                                                   QDBusConnection::systemBus(), this);
 }
 
 QBluetoothServiceInfoPrivate::~QBluetoothServiceInfoPrivate()
@@ -188,7 +188,7 @@ bool QBluetoothServiceInfoPrivate::unregisterService()
     if (profilePath.isEmpty())
         return false;
 
-    QDBusPendingReply<> reply = serviceBluez5->UnregisterProfile(QDBusObjectPath(profilePath));
+    QDBusPendingReply<> reply = service->UnregisterProfile(QDBusObjectPath(profilePath));
     reply.waitForFinished();
     if (reply.isError()) {
         qCWarning(QT_BT_BLUEZ) << "Cannot unregister profile:" << profilePath
@@ -281,7 +281,7 @@ bool QBluetoothServiceInfoPrivate::registerService(const QBluetoothAddress & /*l
     qCDebug(QT_BT_BLUEZ) << "Registering profile under" << profilePath << uuidString;
 
     QDBusPendingReply<> reply =
-            serviceBluez5->RegisterProfile(QDBusObjectPath(profilePath), uuidString, mapping);
+            service->RegisterProfile(QDBusObjectPath(profilePath), uuidString, mapping);
     reply.waitForFinished();
     if (reply.isError()) {
         qCWarning(QT_BT_BLUEZ) << "Cannot register profile" << reply.error().message();
diff --git a/src/bluetooth/qbluetoothserviceinfo_p.h b/src/bluetooth/qbluetoothserviceinfo_p.h
index 0f248198..0621af16 100644
--- a/src/bluetooth/qbluetoothserviceinfo_p.h
+++ b/src/bluetooth/qbluetoothserviceinfo_p.h
@@ -108,7 +108,7 @@ public:
     int serverChannel() const;
 private:
 #if QT_CONFIG(bluez)
-    OrgBluezProfileManager1Interface *serviceBluez5 = nullptr;
+    OrgBluezProfileManager1Interface *service = nullptr;
     quint32 serviceRecord;
     QBluetoothAddress currentLocalAdapter;
     QString profilePath;