From ab629725405df94f56d42d19d9ce9fa8abb9a676 Mon Sep 17 00:00:00 2001 From: nymea Date: Fri, 28 Jun 2019 20:26:18 +0200 Subject: [PATCH] fixed connect overloading --- denon/avrconnection.cpp | 4 ++-- denon/avrconnection.h | 4 ++-- denon/deviceplugindenon.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/denon/avrconnection.cpp b/denon/avrconnection.cpp index 24820976..91440d48 100644 --- a/denon/avrconnection.cpp +++ b/denon/avrconnection.cpp @@ -43,7 +43,7 @@ AvrConnection::~AvrConnection() m_socket->close(); } -void AvrConnection::connect() +void AvrConnection::connectDevice() { if (m_socket->state() == QAbstractSocket::ConnectingState) { return; @@ -51,7 +51,7 @@ void AvrConnection::connect() m_socket->connectToHost(m_hostAddress, m_port); } -void AvrConnection::disconnect() +void AvrConnection::disconnectDevice() { m_socket->close(); } diff --git a/denon/avrconnection.h b/denon/avrconnection.h index 8bf2ab20..c64297f8 100644 --- a/denon/avrconnection.h +++ b/denon/avrconnection.h @@ -35,8 +35,8 @@ public: explicit AvrConnection(const QHostAddress &hostAddress, const int &port = 23, QObject *parent = nullptr); ~AvrConnection(); - void connect(); - void disconnect(); + void connectDevice(); + void disconnectDevice(); QHostAddress hostAddress() const; int port() const; diff --git a/denon/deviceplugindenon.cpp b/denon/deviceplugindenon.cpp index 92e1e99e..e65a4334 100644 --- a/denon/deviceplugindenon.cpp +++ b/denon/deviceplugindenon.cpp @@ -111,7 +111,7 @@ Device::DeviceSetupStatus DevicePluginDenon::setupDevice(Device *device) connect(denonConnection, &AvrConnection::muteChanged, this, &DevicePluginDenon::onAvrMuteChanged); m_asyncSetups.append(denonConnection); - denonConnection->connect(); + denonConnection->connectDevice(); m_avrConnections.insert(device, denonConnection); return Device::DeviceSetupStatusAsync; } @@ -148,7 +148,7 @@ void DevicePluginDenon::deviceRemoved(Device *device) if (device->deviceClassId() == AVRX1000DeviceClassId) { AvrConnection *denonConnection = m_avrConnections.value(device); m_avrConnections.remove(device); - denonConnection->disconnect(); + denonConnection->disconnectDevice(); denonConnection->deleteLater(); } @@ -156,7 +156,7 @@ void DevicePluginDenon::deviceRemoved(Device *device) if (m_avrConnections.contains(device)) { AvrConnection *denonConnection = m_avrConnections.value(device); m_avrConnections.remove(device); - denonConnection->disconnect(); + denonConnection->disconnectDevice(); denonConnection->deleteLater(); } } @@ -317,7 +317,7 @@ void DevicePluginDenon::onPluginTimer() { foreach(AvrConnection *denonConnection, m_avrConnections.values()) { if (!denonConnection->connected()) { - denonConnection->connect(); + denonConnection->connectDevice(); } Device *device = m_avrConnections.key(denonConnection); if (device->deviceClassId() == AVRX1000DeviceClassId) {