diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-11 13:55:43 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-12 11:09:16 +0000 |
| commit | 99bda08cb1ea14a29deefe9dabe276c38648c899 (patch) | |
| tree | c40f0ea9a64c4e9c977373d828b96d4fe9cb99c6 /src/multimedia/camera/qcameraviewfindersettings.h | |
| parent | c34cf6131221dac2ea8745a5c93b57c13dd8533c (diff) | |
QCameraViewFinderSettings: make op== non-member
...and inline op!=. Mark them as nothrow.
More idiomatic C++ (symmetry between lhs and rhs).
Change-Id: I65ecbef961383897e4e17325ad62d45e1772fbb0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/multimedia/camera/qcameraviewfindersettings.h')
| -rw-r--r-- | src/multimedia/camera/qcameraviewfindersettings.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/multimedia/camera/qcameraviewfindersettings.h b/src/multimedia/camera/qcameraviewfindersettings.h index db9d3d8eb..dcdf025fc 100644 --- a/src/multimedia/camera/qcameraviewfindersettings.h +++ b/src/multimedia/camera/qcameraviewfindersettings.h @@ -52,9 +52,8 @@ public: ~QCameraViewfinderSettings(); QCameraViewfinderSettings& operator=(const QCameraViewfinderSettings &other); - bool operator==(const QCameraViewfinderSettings &other) const; - bool operator!=(const QCameraViewfinderSettings &other) const; + friend Q_MULTIMEDIA_EXPORT bool operator==(const QCameraViewfinderSettings &lhs, const QCameraViewfinderSettings &rhs) Q_DECL_NOTHROW; bool isNull() const; QSize resolution() const; @@ -80,6 +79,10 @@ private: QSharedDataPointer<QCameraViewfinderSettingsPrivate> d; }; +inline bool operator!=(const QCameraViewfinderSettings &lhs, const QCameraViewfinderSettings &rhs) Q_DECL_NOTHROW +{ return !operator==(lhs, rhs); } + + QT_END_NAMESPACE Q_DECLARE_METATYPE(QCameraViewfinderSettings) |