diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 13:41:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 13:41:11 +0100 |
| commit | e3de1d31fe05455f1f22085bb3607047d8ba718d (patch) | |
| tree | ef7ea9ac0cdab88d953af7796e52c22a0e49b4c5 /src/sensors/qsensorbackend.h | |
| parent | 5809a8b0ec112ced99d34c9670d097f1f0dc3171 (diff) | |
| parent | 97cf3d27e6e9771690b1ea29e09f06d4376ffcab (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/sensors/generic/generictiltsensor.cpp
src/sensors/qtapsensor.h
sync.profile
Change-Id: I017a5fa8dffb69b41727495175c0fca9b76962e1
Diffstat (limited to 'src/sensors/qsensorbackend.h')
| -rw-r--r-- | src/sensors/qsensorbackend.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sensors/qsensorbackend.h b/src/sensors/qsensorbackend.h index feb05f07..4c6ce8b5 100644 --- a/src/sensors/qsensorbackend.h +++ b/src/sensors/qsensorbackend.h @@ -66,12 +66,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; |