diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-08-01 16:07:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-08-06 16:04:06 +0200 |
| commit | 589894c072b941f07062cd9b3ebd34f0c4291fb7 (patch) | |
| tree | 2b6147b182d5259cf8a3d819e0f215637cd726c9 /src/gui/kernel/qpixelformat.h | |
| parent | 28fe4e3a864b799e4e4b9e0c2dc251f03459d85e (diff) | |
| download | qtbase-589894c072b941f07062cd9b3ebd34f0c4291fb7.tar.gz | |
Be consistent in GrayScale vs Grayscale naming
The enum GrayScale was renamed Grayscale without similarly changing the
helper class for the same enum.
Change-Id: Ie1b34a68654f22a843ce4cfc2ddc1bf06af8dea1
Reviewed-by: Axel Rasmussen <axel.rasmussen1@gmail.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/gui/kernel/qpixelformat.h')
| -rw-r--r-- | src/gui/kernel/qpixelformat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qpixelformat.h b/src/gui/kernel/qpixelformat.h index 90b891e0bd..95f36c6a3c 100644 --- a/src/gui/kernel/qpixelformat.h +++ b/src/gui/kernel/qpixelformat.h @@ -198,11 +198,11 @@ public: TypeInterpretation typeInterpretation = UnsignedInteger) Q_DECL_NOTHROW; }; -class QPixelFormatGrayScale : public QPixelFormat +class QPixelFormatGrayscale : public QPixelFormat { public: Q_DECL_CONSTEXPR - inline QPixelFormatGrayScale(uchar bufferSize, + inline QPixelFormatGrayscale(uchar bufferSize, TypeInterpretation typeInterpretation = UnsignedInteger) Q_DECL_NOTHROW; }; @@ -359,7 +359,7 @@ QPixelFormatRgb::QPixelFormatRgb(uchar red, { } Q_DECL_CONSTEXPR -QPixelFormatGrayScale::QPixelFormatGrayScale(uchar channelSize, +QPixelFormatGrayscale::QPixelFormatGrayscale(uchar channelSize, TypeInterpretation typeInt) Q_DECL_NOTHROW : QPixelFormat(Grayscale, channelSize, |