From 06b5371b87528e92cff015ee0465677840e65120 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 2 Feb 2014 14:09:51 -0800 Subject: Normalize signal & slot signatures in connection Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: I462d0e0b603ab644e57c5b804015508abeebdc6e Reviewed-by: Lorn Potter --- .../qtsensors/qcoversensorgesturerecognizer.cpp | 16 ++++++++-------- .../qtsensors/qdoubletapsensorgesturerecognizer.cpp | 8 ++++---- .../qtsensors/qfreefallsensorgesturerecognizer.cpp | 6 +++--- .../qtsensors/qhoversensorgesturerecognizer.cpp | 16 ++++++++-------- .../qtsensors/qpickupsensorgesturerecognizer.cpp | 6 +++--- .../sensorgestures/qtsensors/qshake2recognizer.cpp | 8 ++++---- .../sensorgestures/qtsensors/qslamgesturerecognizer.cpp | 16 ++++++++-------- .../qtsensors/qturnoversensorgesturerecognizer.cpp | 16 ++++++++-------- .../qtsensors/qtwistsensorgesturerecognizer.cpp | 16 ++++++++-------- .../qtsensors/qwhipsensorgesturerecognizer.cpp | 16 ++++++++-------- src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp | 4 ++-- src/plugins/sensors/sensorfw/sensorfwals.cpp | 4 ++-- src/plugins/sensors/sensorfw/sensorfwcompass.cpp | 4 ++-- src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp | 4 ++-- .../sensors/sensorfw/sensorfwirproximitysensor.cpp | 4 ++-- src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp | 4 ++-- src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp | 8 ++++---- .../sensors/sensorfw/sensorfworientationsensor.cpp | 4 ++-- src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp | 4 ++-- src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp | 4 ++-- src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp | 4 ++-- 21 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp index 068c6528..ce6e1ab5 100644 --- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp @@ -72,11 +72,11 @@ bool QCoverSensorGestureRecognizer::start() if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Proximity)) { if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Orientation)) { active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(proximityReadingChanged(QProximityReading *)), - this,SLOT(proximityChanged(QProximityReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(proximityReadingChanged(QProximityReading*)), + this,SLOT(proximityChanged(QProximityReading*))); - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading *)), - this,SLOT(orientationReadingChanged(QOrientationReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), + this,SLOT(orientationReadingChanged(QOrientationReading*))); } else { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Proximity); active = false; @@ -92,10 +92,10 @@ bool QCoverSensorGestureRecognizer::stop() QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Proximity); QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Orientation); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(proximityReadingChanged(QProximityReading *)), - this,SLOT(proximityChanged(QProximityReading *))); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading *)), - this,SLOT(orientationReadingChanged(QOrientationReading *))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(proximityReadingChanged(QProximityReading*)), + this,SLOT(proximityChanged(QProximityReading*))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), + this,SLOT(orientationReadingChanged(QOrientationReading*))); active = false; timer->stop(); diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp index 08b58487..444a8e68 100644 --- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp @@ -67,8 +67,8 @@ bool QDoubleTapSensorGestureRecognizer::start() { if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Tap)) { active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(dTabReadingChanged(QTapReading *)), - this,SLOT(tapChanged(QTapReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(dTabReadingChanged(QTapReading*)), + this,SLOT(tapChanged(QTapReading*))); } else { active = false; } @@ -78,8 +78,8 @@ bool QDoubleTapSensorGestureRecognizer::start() bool QDoubleTapSensorGestureRecognizer::stop() { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Tap); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(dTabReadingChanged(QTapReading *)), - this,SLOT(tapChanged(QTapReading *))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(dTabReadingChanged(QTapReading*)), + this,SLOT(tapChanged(QTapReading*))); active = false; return active; } diff --git a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp index 7ea843a2..3c84b3a2 100644 --- a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp @@ -68,8 +68,8 @@ bool QFreefallSensorGestureRecognizer::start() { if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Accel)) { active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), - this,SLOT(accelChanged(QAccelerometerReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), + this,SLOT(accelChanged(QAccelerometerReading*))); } else { active = false; } @@ -81,7 +81,7 @@ bool QFreefallSensorGestureRecognizer::stop() { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading *))); + this,SLOT(accelChanged(QAccelerometerReading*))); active = false; return active; diff --git a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.cpp index 13923f80..9787d523 100644 --- a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.cpp @@ -74,10 +74,10 @@ bool QHoverSensorGestureRecognizer::start() if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::IrProximity)) { if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Orientation)) { active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(irProximityReadingChanged(QIRProximityReading *)), - this,SLOT(irProximityReadingChanged(QIRProximityReading *))); - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading *)), - this,SLOT(orientationReadingChanged(QOrientationReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(irProximityReadingChanged(QIRProximityReading*)), + this,SLOT(irProximityReadingChanged(QIRProximityReading*))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), + this,SLOT(orientationReadingChanged(QOrientationReading*))); } else { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::IrProximity); active = false; @@ -99,10 +99,10 @@ bool QHoverSensorGestureRecognizer::stop() { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::IrProximity); QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Orientation); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(irProximityReadingChanged(QIRProximityReading *)), - this,SLOT(irProximityReadingChanged(QIRProximityReading *))); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading *)), - this,SLOT(orientationReadingChanged(QOrientationReading *))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(irProximityReadingChanged(QIRProximityReading*)), + this,SLOT(irProximityReadingChanged(QIRProximityReading*))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), + this,SLOT(orientationReadingChanged(QOrientationReading*))); active = false; timer2Active = false; initialReflectance = 0; diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp index 3fd0b2a2..f45e1e44 100644 --- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp @@ -77,8 +77,8 @@ bool QPickupSensorGestureRecognizer::start() { if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Accel)) { active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), - this,SLOT(accelChanged(QAccelerometerReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), + this,SLOT(accelChanged(QAccelerometerReading*))); } else { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); active = false; @@ -93,7 +93,7 @@ bool QPickupSensorGestureRecognizer::stop() { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading *))); + this,SLOT(accelChanged(QAccelerometerReading*))); active = false; return active; diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp index 98f381f0..7f6092b7 100644 --- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp @@ -72,8 +72,8 @@ bool QShake2SensorGestureRecognizer::start() { if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Accel)) { active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), - this,SLOT(accelChanged(QAccelerometerReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), + this,SLOT(accelChanged(QAccelerometerReading*))); } else { active = false; } @@ -90,8 +90,8 @@ bool QShake2SensorGestureRecognizer::start() bool QShake2SensorGestureRecognizer::stop() { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), - this,SLOT(accelChanged(QAccelerometerReading *))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), + this,SLOT(accelChanged(QAccelerometerReading*))); active = false; return active; } diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp index a6e8339a..c9f58ddd 100644 --- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp @@ -85,11 +85,11 @@ bool QSlamSensorGestureRecognizer::start() if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Orientation)) { active = true; accelRange = QtSensorGestureSensorHandler::instance()->accelRange; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading *)), - this,SLOT(orientationReadingChanged(QOrientationReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), + this,SLOT(orientationReadingChanged(QOrientationReading*))); - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), - this,SLOT(accelChanged(QAccelerometerReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), + this,SLOT(accelChanged(QAccelerometerReading*))); } else { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); active = false; @@ -104,11 +104,11 @@ bool QSlamSensorGestureRecognizer::stop() { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Orientation); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading *)), - this,SLOT(orientationReadingChanged(QOrientationReading *))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), + this,SLOT(orientationReadingChanged(QOrientationReading*))); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), - this,SLOT(accelChanged(QAccelerometerReading *))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), + this,SLOT(accelChanged(QAccelerometerReading*))); detecting = false; restingList.clear(); active = false; diff --git a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.cpp index 8e30d3e8..b3511caa 100644 --- a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.cpp @@ -68,11 +68,11 @@ bool QTurnoverSensorGestureRecognizer::start() if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Proximity)) { if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Orientation)) { active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(proximityReadingChanged(QProximityReading *)), - this,SLOT(proximityChanged(QProximityReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(proximityReadingChanged(QProximityReading*)), + this,SLOT(proximityChanged(QProximityReading*))); - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading *)), - this,SLOT(orientationReadingChanged(QOrientationReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), + this,SLOT(orientationReadingChanged(QOrientationReading*))); } else { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Proximity); active = false; @@ -88,10 +88,10 @@ bool QTurnoverSensorGestureRecognizer::stop() QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Proximity); QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Orientation); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(proximityReadingChanged(QProximityReading *)), - this,SLOT(proximityChanged(QProximityReading *))); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading *)), - this,SLOT(orientationReadingChanged(QOrientationReading *))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(proximityReadingChanged(QProximityReading*)), + this,SLOT(proximityChanged(QProximityReading*))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), + this,SLOT(orientationReadingChanged(QOrientationReading*))); active = false; diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp index 074746ef..0695aed5 100644 --- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp @@ -79,11 +79,11 @@ bool QTwistSensorGestureRecognizer::start() if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Accel)) { if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Orientation)) { active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading *)), - this,SLOT(orientationReadingChanged(QOrientationReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), + this,SLOT(orientationReadingChanged(QOrientationReading*))); - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), - this,SLOT(accelChanged(QAccelerometerReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), + this,SLOT(accelChanged(QAccelerometerReading*))); } else { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); active = false; @@ -100,11 +100,11 @@ bool QTwistSensorGestureRecognizer::stop() { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Orientation); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading *)), - this,SLOT(orientationReadingChanged(QOrientationReading *))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), + this,SLOT(orientationReadingChanged(QOrientationReading*))); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), - this,SLOT(accelChanged(QAccelerometerReading *))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), + this,SLOT(accelChanged(QAccelerometerReading*))); reset(); orientationList.clear(); diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp index d07a2eaa..a8e1be0b 100644 --- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp @@ -84,11 +84,11 @@ bool QWhipSensorGestureRecognizer::start() if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Orientation)) { accelRange = QtSensorGestureSensorHandler::instance()->accelRange; active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading *)), - this,SLOT(orientationReadingChanged(QOrientationReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), + this,SLOT(orientationReadingChanged(QOrientationReading*))); - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), - this,SLOT(accelChanged(QAccelerometerReading *))); + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), + this,SLOT(accelChanged(QAccelerometerReading*))); } else { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); active = false; @@ -106,11 +106,11 @@ bool QWhipSensorGestureRecognizer::stop() { QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Orientation); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading *)), - this,SLOT(orientationReadingChanged(QOrientationReading *))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), + this,SLOT(orientationReadingChanged(QOrientationReading*))); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), - this,SLOT(accelChanged(QAccelerometerReading *))); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), + this,SLOT(accelChanged(QAccelerometerReading*))); active = false; return active; } diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp index 5f1efb2e..d38f1a0d 100644 --- a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp @@ -75,8 +75,8 @@ void sensorfwaccelerometer::slotFrameAvailable(const QVector& frame) bool sensorfwaccelerometer::doConnect() { if (m_bufferSize==1) - return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const XYZ&)), this, SLOT(slotDataAvailable(const XYZ&))); - return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector& )),this, SLOT(slotFrameAvailable(const QVector& ))); + return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(XYZ)), this, SLOT(slotDataAvailable(XYZ))); + return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QVector)),this, SLOT(slotFrameAvailable(QVector))); } diff --git a/src/plugins/sensors/sensorfw/sensorfwals.cpp b/src/plugins/sensors/sensorfw/sensorfwals.cpp index 43bab0a1..0de7e716 100644 --- a/src/plugins/sensors/sensorfw/sensorfwals.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwals.cpp @@ -81,8 +81,8 @@ void Sensorfwals::slotDataAvailable(const Unsigned& data) bool Sensorfwals::doConnect() { - return QObject::connect(m_sensorInterface, SIGNAL(ALSChanged(const Unsigned&)), - this, SLOT(slotDataAvailable(const Unsigned&))); + return QObject::connect(m_sensorInterface, SIGNAL(ALSChanged(Unsigned)), + this, SLOT(slotDataAvailable(Unsigned))); } diff --git a/src/plugins/sensors/sensorfw/sensorfwcompass.cpp b/src/plugins/sensors/sensorfw/sensorfwcompass.cpp index 2cce4898..ad41cfeb 100644 --- a/src/plugins/sensors/sensorfw/sensorfwcompass.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwcompass.cpp @@ -70,8 +70,8 @@ void SensorfwCompass::slotDataAvailable(const Compass& data) bool SensorfwCompass::doConnect() { - return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const Compass&)), - this, SLOT(slotDataAvailable(const Compass&))); + return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(Compass)), + this, SLOT(slotDataAvailable(Compass))); } QString SensorfwCompass::sensorName() const diff --git a/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp b/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp index 66720401..deca190f 100644 --- a/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp @@ -76,8 +76,8 @@ void SensorfwGyroscope::slotFrameAvailable(const QVector& frame) bool SensorfwGyroscope::doConnect() { if (m_bufferSize==1) - return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const XYZ&)), this, SLOT(slotDataAvailable(const XYZ&))); - return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector& )),this, SLOT(slotFrameAvailable(const QVector& ))); + return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(XYZ)), this, SLOT(slotDataAvailable(XYZ))); + return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QVector)),this, SLOT(slotFrameAvailable(QVector))); } QString SensorfwGyroscope::sensorName() const diff --git a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp index 0714e5f0..4207735b 100644 --- a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp @@ -67,8 +67,8 @@ void SensorfwIrProximitySensor::slotDataAvailable(const Proximity& proximity) bool SensorfwIrProximitySensor::doConnect() { - return QObject::connect(m_sensorInterface, SIGNAL(reflectanceDataAvailable(const Proximity&)), - this, SLOT(slotDataAvailable(const Proximity&))); + return QObject::connect(m_sensorInterface, SIGNAL(reflectanceDataAvailable(Proximity)), + this, SLOT(slotDataAvailable(Proximity))); } diff --git a/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp b/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp index 5f2a0da0..6607433e 100644 --- a/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp @@ -61,8 +61,8 @@ void SensorfwLightSensor::slotDataAvailable(const Unsigned& data) bool SensorfwLightSensor::doConnect() { - return QObject::connect(m_sensorInterface, SIGNAL(ALSChanged(const Unsigned&)), - this, SLOT(slotDataAvailable(const Unsigned&))); + return QObject::connect(m_sensorInterface, SIGNAL(ALSChanged(Unsigned)), + this, SLOT(slotDataAvailable(Unsigned))); } diff --git a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp index cc496756..10b1afe5 100644 --- a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp @@ -87,10 +87,10 @@ void SensorfwMagnetometer::slotFrameAvailable(const QVector& fram bool SensorfwMagnetometer::doConnect() { if (m_bufferSize==1) - return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const MagneticField&)), - this, SLOT(slotDataAvailable(const MagneticField&))); - return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector& )), - this, SLOT(slotFrameAvailable(const QVector& ))); + return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(MagneticField)), + this, SLOT(slotDataAvailable(MagneticField))); + return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QVector)), + this, SLOT(slotFrameAvailable(QVector))); } QString SensorfwMagnetometer::sensorName() const diff --git a/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp b/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp index 149f6935..b45b7310 100644 --- a/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp @@ -76,8 +76,8 @@ void SensorfwOrientationSensor::slotDataAvailable(const Unsigned& data) bool SensorfwOrientationSensor::doConnect() { - return QObject::connect(m_sensorInterface, SIGNAL(orientationChanged(const Unsigned&)), - this, SLOT(slotDataAvailable(const Unsigned&))); + return QObject::connect(m_sensorInterface, SIGNAL(orientationChanged(Unsigned)), + this, SLOT(slotDataAvailable(Unsigned))); } QString SensorfwOrientationSensor::sensorName() const diff --git a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp index eaf7232b..d98dfd1a 100644 --- a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp @@ -79,8 +79,8 @@ void SensorfwProximitySensor::slotDataAvailable(const Unsigned& data) bool SensorfwProximitySensor::doConnect() { - return (QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const Unsigned&)), - this, SLOT(slotDataAvailable(const Unsigned&)))); + return (QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(Unsigned)), + this, SLOT(slotDataAvailable(Unsigned)))); } diff --git a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp index dbeb3b65..c0ba0696 100644 --- a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp @@ -72,8 +72,8 @@ void SensorfwRotationSensor::slotFrameAvailable(const QVector& frame) bool SensorfwRotationSensor::doConnect() { if (m_bufferSize==1) - return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const XYZ&)), this, SLOT(slotDataAvailable(const XYZ&))); - return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector& )),this, SLOT(slotFrameAvailable(const QVector& ))); + return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(XYZ)), this, SLOT(slotDataAvailable(XYZ))); + return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QVector)),this, SLOT(slotFrameAvailable(QVector))); } QString SensorfwRotationSensor::sensorName() const diff --git a/src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp b/src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp index f02dbe5d..1d7e950c 100644 --- a/src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp @@ -103,8 +103,8 @@ void SensorfwTapSensor::slotDataAvailable(const Tap& data) bool SensorfwTapSensor::doConnect() { - return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const Tap&)), - this, SLOT(slotDataAvailable(const Tap&))); + return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(Tap)), + this, SLOT(slotDataAvailable(Tap))); } -- cgit v1.2.3