diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-12-22 14:23:57 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-23 10:32:34 +0100 |
| commit | 6323be3e2fc1b69145f37cda1d0214ec5fa3cb44 (patch) | |
| tree | 5f78cb5f76c4d66e91fcf59dbf28d50e0dc3fb4b /src | |
| parent | 56c26ba5de5e8cb5999d6892d3c87d41e66f6e56 (diff) | |
Fix pedantic errors and warnings (found by headers clean test)
qorientationsensor.h:68:17: error: comma at end of enumerator list [-pedantic]
qsensorgestureplugininterface.h:68:99: error: extra ';' [-pedantic]
qsensorbackend.h:73:5: error: declaration of 'reading' shadows a member of 'this' [-Werror=shadow]
Change-Id: I50a9fc993a3a3c3391f6231ccd2c1976c636045b
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sensors/gestures/qsensorgestureplugininterface.h | 2 | ||||
| -rw-r--r-- | src/sensors/qorientationsensor.h | 2 | ||||
| -rw-r--r-- | src/sensors/qsensorbackend.h | 10 | ||||
| -rw-r--r-- | src/sensors/qsensorplugin.h | 4 | ||||
| -rw-r--r-- | src/sensors/qtapsensor.h | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/sensors/gestures/qsensorgestureplugininterface.h b/src/sensors/gestures/qsensorgestureplugininterface.h index 6b6a683d..da933c92 100644 --- a/src/sensors/gestures/qsensorgestureplugininterface.h +++ b/src/sensors/gestures/qsensorgestureplugininterface.h @@ -65,7 +65,7 @@ public: virtual QString name() const = 0; }; -Q_DECLARE_INTERFACE(QSensorGesturePluginInterface, "org.qt-project.QSensorGesturePluginInterface"); +Q_DECLARE_INTERFACE(QSensorGesturePluginInterface, "org.qt-project.QSensorGesturePluginInterface") QT_END_NAMESPACE QT_END_HEADER diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h index 641f355c..f577df7a 100644 --- a/src/sensors/qorientationsensor.h +++ b/src/sensors/qorientationsensor.h @@ -65,7 +65,7 @@ public: LeftUp, RightUp, FaceUp, - FaceDown, + FaceDown }; Orientation orientation() const; diff --git a/src/sensors/qsensorbackend.h b/src/sensors/qsensorbackend.h index fcf36244..92dc9e91 100644 --- a/src/sensors/qsensorbackend.h +++ b/src/sensors/qsensorbackend.h @@ -69,12 +69,12 @@ public: void setDescription(const QString &description); template <typename T> - T *setReading(T *reading) + T *setReading(T *readingClass) { - if (!reading) - reading = new T(this); - setReadings(reading, new T(this), new T(this)); - return reading; + if (!readingClass) + readingClass = new T(this); + setReadings(readingClass, new T(this), new T(this)); + return readingClass; } QSensorReading *reading() const; diff --git a/src/sensors/qsensorplugin.h b/src/sensors/qsensorplugin.h index bac35b82..b7de54fe 100644 --- a/src/sensors/qsensorplugin.h +++ b/src/sensors/qsensorplugin.h @@ -67,8 +67,8 @@ protected: ~QSensorChangesInterface() {} }; -Q_DECLARE_INTERFACE(QSensorPluginInterface, "com.nokia.Qt.QSensorPluginInterface/1.0"); -Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.nokia.Qt.QSensorChangesInterface/5.0"); +Q_DECLARE_INTERFACE(QSensorPluginInterface, "com.nokia.Qt.QSensorPluginInterface/1.0") +Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.nokia.Qt.QSensorChangesInterface/5.0") QT_END_NAMESPACE QT_END_HEADER diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h index e8a450c6..da71e965 100644 --- a/src/sensors/qtapsensor.h +++ b/src/sensors/qtapsensor.h @@ -103,7 +103,7 @@ public: static char const * const type; private: - Q_DISABLE_COPY(QTapSensor); + Q_DISABLE_COPY(QTapSensor) }; QT_END_NAMESPACE |