diff options
author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2012-07-02 13:39:00 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 02:10:06 +0200 |
commit | f7c3a6686ef77e95128f1dc4a03c7a8184a18231 (patch) | |
tree | 150ec0f8bac4e701cb913aed8cb2b27e43e7ad79 /src/sensors/make_sensor.pl | |
parent | 1908f86c6d8cb28a81d02272dfd3443e827cf37c (diff) |
QSensor: Use standard Qt dpointer pattern
Now it is possible to extend QSensor subclasses without breaking
binary compatibility.
In addition, de-inline the constructors and destructors of
subclasses to make it possible to replace them without
compatibility problems.
Change-Id: I69de97002ade3e75f090761f852a5aca39c0f555
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
Diffstat (limited to 'src/sensors/make_sensor.pl')
-rwxr-xr-x | src/sensors/make_sensor.pl | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/sensors/make_sensor.pl b/src/sensors/make_sensor.pl index 325a04b1..b554f629 100755 --- a/src/sensors/make_sensor.pl +++ b/src/sensors/make_sensor.pl @@ -156,10 +156,13 @@ class Q_SENSORS_EXPORT '.$sensor.' : public QSensor { Q_OBJECT public: - explicit '.$sensor.'(QObject *parent = 0) : QSensor('.$sensor.'::type, parent) {} - virtual ~'.$sensor.'() {} + explicit '.$sensor.'(QObject *parent = 0); + ~'.$sensor.'(); '.$reading.' *reading() const { return static_cast<'.$reading.'*>(QSensor::reading()); } static char const * const type; + +private: + Q_DISABLE_COPY('.$sensor.') }; QT_END_NAMESPACE @@ -259,16 +262,19 @@ char const * const '.$sensor.'::type("'.$sensor.'"); */ /*! - \fn '.$sensor.'::'.$sensor.'(QObject *parent) - Construct the sensor as a child of \a parent. */ +'.$sensor.'::'.$sensor.'(QObject *parent) + : QSensor('.$sensor.'::type, parent) +{ +} /*! - \fn '.$sensor.'::~'.$sensor.'() - Destroy the sensor. Stops the sensor if it has not already been stopped. */ +'.$sensor.'::~'.$sensor.'() +{ +} /*! \fn '.$sensor.'::reading() const |