From ecbca762a7390ee255593f932c90b5abd4318ece Mon Sep 17 00:00:00 2001 From: Wolfgang Beck Date: Thu, 19 Jan 2012 10:14:00 +1000 Subject: Remove friend class tst_Sesnsors2QMLAPI Change-Id: I24772c90fc20cd02d6b442b5e80bddc226a736ee Sanity-Review: Qt Sanity Bot Reviewed-by: Lincoln Ramsay --- src/imports/sensors2/qsensor2tilt.cpp | 5 +++++ src/imports/sensors2/qsensor2tilt.h | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src/imports') diff --git a/src/imports/sensors2/qsensor2tilt.cpp b/src/imports/sensors2/qsensor2tilt.cpp index 8a6f26d2..a265216c 100644 --- a/src/imports/sensors2/qsensor2tilt.cpp +++ b/src/imports/sensors2/qsensor2tilt.cpp @@ -106,6 +106,11 @@ int searchDataRate(const QList& datarates, int value) return datarates[m]; } +QMap QSensor2Tilt::dataRate() +{ + return _dataRate; +} + void QSensor2Tilt::createRunModeDataRateMap() { _dataRate.clear(); diff --git a/src/imports/sensors2/qsensor2tilt.h b/src/imports/sensors2/qsensor2tilt.h index 79a953f6..f65304f6 100644 --- a/src/imports/sensors2/qsensor2tilt.h +++ b/src/imports/sensors2/qsensor2tilt.h @@ -85,9 +85,8 @@ Q_SIGNALS: void tiltChanged(qreal deltaX, qreal deltaY); void accuracyChanged(); -private: +public: // Override of QAcclerometerFilter::filter(QAccelerometerReading*) - bool filter(QAccelerometerReading* reading); qreal yRotation(); qreal xRotation(); Unit unit(); @@ -100,6 +99,10 @@ private: QByteArray settings() const; void setSettings(const QByteArray val); void createRunModeDataRateMap(); + QMap dataRate(); + +private: + bool filter(QAccelerometerReading* reading); QSensor *sensor() { return _accel; } QAccelerometer* _accel; @@ -113,8 +116,6 @@ private: qreal _calibratedRoll; QMap _dataRate; Speed _speed; - - friend class tst_Sensors2QMLAPI; }; QT_END_NAMESPACE -- cgit v1.2.3