diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2014-08-03 02:14:37 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-08-09 09:04:51 +0200 |
| commit | 184fd8aa6c61d642b99391487e11985478a2cb5b (patch) | |
| tree | f4c70afbf6cbdb97e2adcc61cd0dd37fdf9509b8 | |
| parent | d131abde59190ed5ea8673828bce13fff66c1e3a (diff) | |
QPixelFormat is better taken by-value
Being a better quint64, it can be passed in registers, so take them as value args.
Change-Id: I8eb96a2594d910b538b651fb3ca567c0c124dd3a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | src/gui/image/qimage.cpp | 2 | ||||
| -rw-r--r-- | src/gui/image/qimage.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qpixelformat.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index b8f5871b41..00291fbfed 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -4968,7 +4968,7 @@ QPixelFormat QImage::toPixelFormat(QImage::Format format) Q_DECL_NOTHROW /*! Converts \a format into a QImage::Format */ -QImage::Format QImage::toImageFormat(const QPixelFormat &format) Q_DECL_NOTHROW +QImage::Format QImage::toImageFormat(QPixelFormat format) Q_DECL_NOTHROW { for (int i = 0; i < NImageFormats; i++) { if (format == pixelformats[i]) diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 62f9f5cce2..844bbb2eba 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -312,7 +312,7 @@ public: QPixelFormat pixelFormat() const Q_DECL_NOTHROW; static QPixelFormat toPixelFormat(QImage::Format format) Q_DECL_NOTHROW; - static QImage::Format toImageFormat(const QPixelFormat &format) Q_DECL_NOTHROW; + static QImage::Format toImageFormat(QPixelFormat format) Q_DECL_NOTHROW; #if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED inline QString text(const char* key, const char* lang=0) const; diff --git a/src/gui/kernel/qpixelformat.h b/src/gui/kernel/qpixelformat.h index 5bf64ac043..2b8d23736d 100644 --- a/src/gui/kernel/qpixelformat.h +++ b/src/gui/kernel/qpixelformat.h @@ -221,10 +221,10 @@ private: private: quint64 data; - friend Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline bool operator==(const QPixelFormat &fmt1, const QPixelFormat &fmt2) + friend Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline bool operator==(QPixelFormat fmt1, QPixelFormat fmt2) { return fmt1.data == fmt2.data; } - friend Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline bool operator!=(const QPixelFormat &fmt1, const QPixelFormat &fmt2) + friend Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline bool operator!=(QPixelFormat fmt1, QPixelFormat fmt2) { return !(fmt1 == fmt2); } }; Q_STATIC_ASSERT(sizeof(QPixelFormat) == sizeof(quint64)); |