summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWolfgang Beck <wolfgang.beck@nokia.com>2012-01-19 10:14:00 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-19 04:30:59 +0100
commitecbca762a7390ee255593f932c90b5abd4318ece (patch)
tree3180aa3660d07041cbdd197884d3821e6dd3a5a0 /src
parenta5e25459c631bad6cd2834a78080b50e429fa261 (diff)
Remove friend class tst_Sesnsors2QMLAPI
Change-Id: I24772c90fc20cd02d6b442b5e80bddc226a736ee Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/imports/sensors2/qsensor2tilt.cpp5
-rw-r--r--src/imports/sensors2/qsensor2tilt.h9
2 files changed, 10 insertions, 4 deletions
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<int>& datarates, int value)
return datarates[m];
}
+QMap<QSensor2Tilt::Speed, int> 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<Speed, int> dataRate();
+
+private:
+ bool filter(QAccelerometerReading* reading);
QSensor *sensor() { return _accel; }
QAccelerometer* _accel;
@@ -113,8 +116,6 @@ private:
qreal _calibratedRoll;
QMap<Speed, int> _dataRate;
Speed _speed;
-
- friend class tst_Sensors2QMLAPI;
};
QT_END_NAMESPACE