From 6323be3e2fc1b69145f37cda1d0214ec5fa3cb44 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 22 Dec 2012 14:23:57 -0800 Subject: 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 --- src/sensors/gestures/qsensorgestureplugininterface.h | 2 +- src/sensors/qorientationsensor.h | 2 +- src/sensors/qsensorbackend.h | 10 +++++----- src/sensors/qsensorplugin.h | 4 ++-- src/sensors/qtapsensor.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/sensors') 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 - 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 -- cgit v1.2.3 From f7f1d56c1626f5b8eab5b4d5cac9fa06ee886e59 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Sun, 20 Jan 2013 19:40:59 +1000 Subject: remove nokia and replace with qt-project in plugins Change-Id: I63fa985991653e4b8465a7fb88acab647d8546e8 Reviewed-by: Thomas McGuire --- src/sensors/doc/snippets/sensors/plugin.cpp | 2 +- src/sensors/qsensormanager.cpp | 2 +- src/sensors/qsensorplugin.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/sensors') diff --git a/src/sensors/doc/snippets/sensors/plugin.cpp b/src/sensors/doc/snippets/sensors/plugin.cpp index e467128f..cad6378f 100644 --- a/src/sensors/doc/snippets/sensors/plugin.cpp +++ b/src/sensors/doc/snippets/sensors/plugin.cpp @@ -48,7 +48,7 @@ const char *MyBackend::id = "mybackend"; class MyPluginClass : public QObject, public QSensorPluginInterface, public QSensorBackendFactory { Q_OBJECT - //Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + //Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") Q_INTERFACES(QSensorPluginInterface) public: void registerSensors() diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp index b1b2e780..dbaf1ebb 100644 --- a/src/sensors/qsensormanager.cpp +++ b/src/sensors/qsensormanager.cpp @@ -68,7 +68,7 @@ public: QSensorManagerPrivate() : loadExternalPlugins(true) , pluginLoadingState(NotLoaded) - , loader(new QFactoryLoader("com.nokia.Qt.QSensorPluginInterface/1.0", QLatin1String("/sensors"))) + , loader(new QFactoryLoader("com.qt-project.Qt.QSensorPluginInterface/1.0", QLatin1String("/sensors"))) , defaultIdentifierForTypeLoaded(false) , sensorsChanged(false) { diff --git a/src/sensors/qsensorplugin.h b/src/sensors/qsensorplugin.h index b7de54fe..5caef6f1 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.qt-project.Qt.QSensorPluginInterface/1.0") +Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.qt-project.Qt.QSensorChangesInterface/5.0") QT_END_NAMESPACE QT_END_HEADER -- cgit v1.2.3 From 97cf3d27e6e9771690b1ea29e09f06d4376ffcab Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Sun, 24 Feb 2013 18:08:37 +0000 Subject: Eliminate a warning for "make docs" due to the improper style usage Change-Id: I7901d1527ea02738f37de50ab2c0addcf6d5c927 Reviewed-by: Thomas McGuire --- src/sensors/gestures/qsensorgesture.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sensors') diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h index 65d204c6..2d7e9018 100644 --- a/src/sensors/gestures/qsensorgesture.h +++ b/src/sensors/gestures/qsensorgesture.h @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include -- cgit v1.2.3