diff options
| author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2013-04-22 11:34:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-06 09:16:24 +0200 |
| commit | 5b11584bfede4e0787532ec3c9ba763100a8898f (patch) | |
| tree | a4028959e15d2887a2a4c370a5662c4dddfc055b /src/sensors/make_sensor.pl | |
| parent | e533f476239ea25edaf8fbfc6e8a76ccfd0ab330 (diff) | |
Fix some potential binary compatibility issues
Mostly de-inlining methods, and in addition providing
a virtual destructor.
Change-Id: I0aef91e7a896e8a16fc023a11bd35a5ef3048ee6
Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Diffstat (limited to 'src/sensors/make_sensor.pl')
| -rwxr-xr-x | src/sensors/make_sensor.pl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/sensors/make_sensor.pl b/src/sensors/make_sensor.pl index 27322517..00afa724 100755 --- a/src/sensors/make_sensor.pl +++ b/src/sensors/make_sensor.pl @@ -315,8 +315,7 @@ class Q_SENSORS_EXPORT '.$filter.' : public QSensorFilter public: virtual bool filter('.$reading.' *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE - { return filter(static_cast<'.$reading.'*>(reading)); } + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; }; class Q_SENSORS_EXPORT '.$sensor.' : public QSensor @@ -325,7 +324,7 @@ class Q_SENSORS_EXPORT '.$sensor.' : public QSensor public: explicit '.$sensor.'(QObject *parent = 0); ~'.$sensor.'(); - '.$reading.' *reading() const { return static_cast<'.$reading.'*>(QSensor::reading()); } + '.$reading.' *reading() const; static char const * const type; private: @@ -408,6 +407,11 @@ void '.$reading.'::setMyprop(qreal myprop) \sa QSensorFilter::filter() */ +bool '.$filter.'::filter(QSensorReading *reading) +{ + return filter(static_cast<'.$reading.'*>(reading)); +} + char const * const '.$sensor.'::type("'.$sensor.'"); /*! @@ -450,6 +454,11 @@ char const * const '.$sensor.'::type("'.$sensor.'"); \sa QSensor::reading() */ +'.$reading.' *'.$sensor.'::reading() const +{ + return static_cast<'.$reading.'*>(QSensor::reading()); +} + #include "moc_'.$source.'" QT_END_NAMESPACE '; |