summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas McGuire <thomas.mcguire.qnx@kdab.com>2012-06-29 13:08:48 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-02 09:27:58 +0200
commit1555985b5693a836ad87c464844db4a2722f5d1b (patch)
tree0ca25279dd8eb126100aa4ca405046916f7cd0bc
parent863353e0aad4d3f51860287f727d4b4f58a57e2d (diff)
Update make_sensors.pl
Add: - Q_DECL_OVERRIDE - QT_BEGIN/END_HEADER - QT_MODULE Change-Id: I89da05d84612aaa804298cbdd8575d2135a125fd Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
-rwxr-xr-xsrc/sensors/make_sensor.pl9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/sensors/make_sensor.pl b/src/sensors/make_sensor.pl
index 5ab85002..417c6953 100755
--- a/src/sensors/make_sensor.pl
+++ b/src/sensors/make_sensor.pl
@@ -89,6 +89,7 @@ if (! -e $pheader) {
// We mean it.
//
+QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class '.$reading_private.'
@@ -109,6 +110,7 @@ public:
};
QT_END_NAMESPACE
+QT_END_HEADER
#endif
';
@@ -124,8 +126,11 @@ if (! -e $header) {
#include <qsensor.h>
+QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
+QT_MODULE(QtSensors)
+
class '.$reading_private.';
class Q_SENSORS_EXPORT '.$reading.' : public QSensorReading
@@ -143,7 +148,8 @@ class Q_SENSORS_EXPORT '.$filter.' : public QSensorFilter
public:
virtual bool filter('.$reading.' *reading) = 0;
private:
- bool filter(QSensorReading *reading) { return filter(static_cast<'.$reading.'*>(reading)); }
+ bool filter(QSensorReading *reading) Q_DECL_OVERRIDE
+ { return filter(static_cast<'.$reading.'*>(reading)); }
};
class Q_SENSORS_EXPORT '.$sensor.' : public QSensor
@@ -157,6 +163,7 @@ public:
};
QT_END_NAMESPACE
+QT_END_HEADER
#endif
';