whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Allan Sandfeld Jensen 2014-08-01 16:07:48 +02:00
parent 28fe4e3a86
commit 589894c072
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/kernel/qpixelformat.cpp
View File

@ -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

6
src/gui/kernel/qpixelformat.h
View File

@ -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,