diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-11 13:59:19 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-12 11:09:20 +0000 |
commit | 12893e382600bf9defaa79e3b22a2f880e2f5a0a (patch) | |
tree | f42662cd5a7077d14292c47882f09774e14e3135 /src | |
parent | 99bda08cb1ea14a29deefe9dabe276c38648c899 (diff) |
QCameraViewFinderSettings: declare shared
Requires implementing member-swap.
Also implemented move assignment operator.
Change-Id: I077ee85346a8c542cd344720e45a0795a6947e4c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/multimedia/camera/qcameraviewfindersettings.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/multimedia/camera/qcameraviewfindersettings.h b/src/multimedia/camera/qcameraviewfindersettings.h index dcdf025fc..31c7329c2 100644 --- a/src/multimedia/camera/qcameraviewfindersettings.h +++ b/src/multimedia/camera/qcameraviewfindersettings.h @@ -52,6 +52,12 @@ public: ~QCameraViewfinderSettings(); QCameraViewfinderSettings& operator=(const QCameraViewfinderSettings &other); +#ifdef Q_COMPILER_RVALUE_REFS + QCameraViewfinderSettings &operator=(QCameraViewfinderSettings &&other) Q_DECL_NOTHROW + { swap(other); return *this; } +#endif + + void swap(QCameraViewfinderSettings &other) Q_DECL_NOTHROW { d.swap(other.d); } friend Q_MULTIMEDIA_EXPORT bool operator==(const QCameraViewfinderSettings &lhs, const QCameraViewfinderSettings &rhs) Q_DECL_NOTHROW; bool isNull() const; @@ -78,6 +84,7 @@ public: private: QSharedDataPointer<QCameraViewfinderSettingsPrivate> d; }; +Q_DECLARE_SHARED(QCameraViewfinderSettings) inline bool operator!=(const QCameraViewfinderSettings &lhs, const QCameraViewfinderSettings &rhs) Q_DECL_NOTHROW { return !operator==(lhs, rhs); } |