From 589894c072b941f07062cd9b3ebd34f0c4291fb7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 1 Aug 2014 16:07:48 +0200 Subject: [PATCH] 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 Reviewed-by: Gunnar Sletta --- src/gui/kernel/qpixelformat.cpp | 10 +++++----- src/gui/kernel/qpixelformat.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gui/kernel/qpixelformat.cpp b/src/gui/kernel/qpixelformat.cpp index 1e3345ee7a..6368e9c83e 100644 --- a/src/gui/kernel/qpixelformat.cpp +++ b/src/gui/kernel/qpixelformat.cpp @@ -287,19 +287,19 @@ Q_STATIC_ASSERT(sizeof(QPixelFormatRgb) == sizeof(QPixelFormat)); \sa TypeInterpretation */ -Q_STATIC_ASSERT(sizeof(QPixelFormatGrayScale) == sizeof(QPixelFormat)); +Q_STATIC_ASSERT(sizeof(QPixelFormatGrayscale) == sizeof(QPixelFormat)); /*! - \class QPixelFormatGrayScale + \class QPixelFormatGrayscale \inmodule QtGui \since 5.4 - \brief QPixelFormatGrayScale is a helper class for creating pixel formats with + \brief QPixelFormatGrayscale is a helper class for creating pixel formats with the gray scale color model. - The size of QPixelFormatGrayScale is guaranteed to be the size of QPixelFormat. + The size of QPixelFormatGrayscale is guaranteed to be the size of QPixelFormat. */ /*! - \fn QPixelFormatGrayScale::QPixelFormatGrayScale(uchar channelSize, + \fn QPixelFormatGrayscale::QPixelFormatGrayscale(uchar channelSize, TypeInterpretation typeInterpretation = UnsignedInteger) Constructor for creating a Grayscale format. Monochrome formats can be 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,