From 5ac9aebf83bc7cc4025004232c32dbd62cf25ba3 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sun, 2 Mar 2014 11:22:48 +0100 Subject: Prefer to use normalised signal/slot signatures Change-Id: Idd8127e577be7381e170dab296d8f0564c478020 Reviewed-by: Marc Mutz Reviewed-by: Alex Blasche --- examples/bluetooth/btfiletransfer/remoteselector.cpp | 2 +- examples/bluetooth/btscanner/device.cpp | 8 ++++---- examples/bluetooth/btscanner/service.cpp | 4 ++-- examples/bluetooth/bttennis/tennis.cpp | 4 ++-- .../tst_qbluetoothdevicediscoveryagent.cpp | 6 +++--- tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp | 2 +- .../tst_qbluetoothservicediscoveryagent.cpp | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/bluetooth/btfiletransfer/remoteselector.cpp b/examples/bluetooth/btfiletransfer/remoteselector.cpp index 8b197bf0..53bf47f3 100644 --- a/examples/bluetooth/btfiletransfer/remoteselector.cpp +++ b/examples/bluetooth/btfiletransfer/remoteselector.cpp @@ -85,7 +85,7 @@ RemoteSelector::RemoteSelector(QWidget *parent) ui->remoteDevices->setColumnWidth(3, 75); ui->remoteDevices->setColumnWidth(4, 100); - connect(m_localDevice, SIGNAL(pairingDisplayPinCode(const QBluetoothAddress &,QString)), this, SLOT(displayPin(const QBluetoothAddress &, QString))); + connect(m_localDevice, SIGNAL(pairingDisplayPinCode(QBluetoothAddress,QString)), this, SLOT(displayPin(QBluetoothAddress,QString))); connect(m_localDevice, SIGNAL(pairingDisplayConfirmation(QBluetoothAddress,QString)), this, SLOT(displayConfirmation(QBluetoothAddress,QString))); connect(m_localDevice, SIGNAL(pairingFinished(QBluetoothAddress,QBluetoothLocalDevice::Pairing)), this, SLOT(pairingFinished(QBluetoothAddress,QBluetoothLocalDevice::Pairing))); diff --git a/examples/bluetooth/btscanner/device.cpp b/examples/bluetooth/btscanner/device.cpp index 732eb371..016d1107 100644 --- a/examples/bluetooth/btscanner/device.cpp +++ b/examples/bluetooth/btscanner/device.cpp @@ -67,8 +67,8 @@ DeviceDiscoveryDialog::DeviceDiscoveryDialog(QWidget *parent) connect(ui->inquiryType, SIGNAL(toggled(bool)), this, SLOT(setGeneralUnlimited(bool))); connect(ui->scan, SIGNAL(clicked()), this, SLOT(startScan())); - connect(discoveryAgent, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo&)), - this, SLOT(addDevice(const QBluetoothDeviceInfo&))); + connect(discoveryAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo)), + this, SLOT(addDevice(QBluetoothDeviceInfo))); connect(discoveryAgent, SIGNAL(finished()), this, SLOT(scanFinished())); connect(ui->list, SIGNAL(itemActivated(QListWidgetItem*)), @@ -81,8 +81,8 @@ DeviceDiscoveryDialog::DeviceDiscoveryDialog(QWidget *parent) // add context menu for devices to be able to pair device ui->list->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->list, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(displayPairingMenu(QPoint))); - connect(localDevice, SIGNAL(pairingFinished(const QBluetoothAddress&, QBluetoothLocalDevice::Pairing)) - , this, SLOT(pairingDone(const QBluetoothAddress&, QBluetoothLocalDevice::Pairing))); + connect(localDevice, SIGNAL(pairingFinished(QBluetoothAddress,QBluetoothLocalDevice::Pairing)) + , this, SLOT(pairingDone(QBluetoothAddress,QBluetoothLocalDevice::Pairing))); } diff --git a/examples/bluetooth/btscanner/service.cpp b/examples/bluetooth/btscanner/service.cpp index dedd3770..d9172d69 100644 --- a/examples/bluetooth/btscanner/service.cpp +++ b/examples/bluetooth/btscanner/service.cpp @@ -71,8 +71,8 @@ ServiceDiscoveryDialog::ServiceDiscoveryDialog(const QString &name, setWindowTitle(name); - connect(discoveryAgent, SIGNAL(serviceDiscovered(const QBluetoothServiceInfo&)), - this, SLOT(addService(const QBluetoothServiceInfo&))); + connect(discoveryAgent, SIGNAL(serviceDiscovered(QBluetoothServiceInfo)), + this, SLOT(addService(QBluetoothServiceInfo))); connect(discoveryAgent, SIGNAL(finished()), ui->status, SLOT(hide())); discoveryAgent->start(); diff --git a/examples/bluetooth/bttennis/tennis.cpp b/examples/bluetooth/bttennis/tennis.cpp index 32c6cf44..acb58938 100644 --- a/examples/bluetooth/bttennis/tennis.cpp +++ b/examples/bluetooth/bttennis/tennis.cpp @@ -99,7 +99,7 @@ Tennis::Tennis(QWidget *parent) ui->pongView->setScene(board->getScene()); - connect(ui->pongView, SIGNAL(mouseMove(int, int)), this, SLOT(mouseMove(int, int))); + connect(ui->pongView, SIGNAL(mouseMove(int,int)), this, SLOT(mouseMove(int,int))); ui->pongView->setMouseTracking(false); connect(board, SIGNAL(ballCollision(Board::Edge)), controller, SLOT(ballCollision(Board::Edge))); @@ -108,7 +108,7 @@ Tennis::Tennis(QWidget *parent) connect(this, SIGNAL(moveLeftPaddle(int)), board, SLOT(setLeftPaddle(int))); connect(this, SIGNAL(moveRightPaddle(int)), board, SLOT(setRightPaddle(int))); connect(controller, SIGNAL(score(int,int)), board, SLOT(setScore(int,int))); - connect(controller, SIGNAL(fps(const QString&)), this, SLOT(fps(const QString&))); + connect(controller, SIGNAL(fps(QString)), this, SLOT(fps(QString))); setFocusPolicy(Qt::WheelFocus); diff --git a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp index d20458fd..2da1a8a9 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp +++ b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp @@ -347,10 +347,10 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_deviceDiscovery() QSignalSpy finishedSpy(&discoveryAgent, SIGNAL(finished())); QSignalSpy errorSpy(&discoveryAgent, SIGNAL(error(QBluetoothDeviceDiscoveryAgent::Error))); - QSignalSpy discoveredSpy(&discoveryAgent, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo&))); + QSignalSpy discoveredSpy(&discoveryAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo))); // connect(&discoveryAgent, SIGNAL(finished()), this, SLOT(finished())); -// connect(&discoveryAgent, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo&)), -// this, SLOT(deviceDiscoveryDebug(const QBluetoothDeviceInfo&))); +// connect(&discoveryAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo)), +// this, SLOT(deviceDiscoveryDebug(QBluetoothDeviceInfo))); discoveryAgent.setInquiryType(inquiryType); discoveryAgent.start(); diff --git a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp index abe19c0b..3285592e 100644 --- a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp +++ b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp @@ -337,7 +337,7 @@ void tst_QBluetoothLocalDevice::tst_pairDevice() localDevice.powerOn(); QVERIFY(localDevice.hostMode() != QBluetoothLocalDevice::HostPoweredOff); - QSignalSpy pairingSpy(&localDevice, SIGNAL(pairingFinished(const QBluetoothAddress &,QBluetoothLocalDevice::Pairing)) ); + QSignalSpy pairingSpy(&localDevice, SIGNAL(pairingFinished(QBluetoothAddress,QBluetoothLocalDevice::Pairing)) ); QSignalSpy errorSpy(&localDevice, SIGNAL(error(QBluetoothLocalDevice::Error))); // there should be no signals yet QVERIFY(pairingSpy.isValid()); diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index a55ba0c3..791bff8d 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp @@ -128,9 +128,9 @@ void tst_QBluetoothServiceDiscoveryAgent::initTestCase() QSignalSpy finishedSpy(&discoveryAgent, SIGNAL(finished())); QSignalSpy errorSpy(&discoveryAgent, SIGNAL(error(QBluetoothDeviceDiscoveryAgent::Error))); - QSignalSpy discoveredSpy(&discoveryAgent, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo&))); - // connect(&discoveryAgent, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo&)), - // this, SLOT(deviceDiscoveryDebug(const QBluetoothDeviceInfo&))); + QSignalSpy discoveredSpy(&discoveryAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo))); + // connect(&discoveryAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo)), + // this, SLOT(deviceDiscoveryDebug(QBluetoothDeviceInfo))); discoveryAgent.start(); -- cgit v1.2.3