From 3f28ef686d72c2d1a334c14d65d4685288c9908e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 9 Jul 2019 19:22:40 +0000 Subject: [PATCH] QFontPrivate cleanup Signed-off-by: Ivailo Monev --- src/gui/text/qfont.cpp | 2 +- src/gui/text/qfont_p.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index fe1bd674c..3472cac4e 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -167,7 +167,7 @@ Q_GUI_EXPORT int qt_defaultDpi() QFontPrivate::QFontPrivate() : engineData(0), dpi(qt_defaultDpi()), screen(0), underline(false), overline(false), strikeOut(false), kerning(true), - capital(0), letterSpacingIsAbsolute(false), scFont(0) + capital(QFont::MixedCase), letterSpacingIsAbsolute(false), scFont(0) { #ifdef Q_WS_X11 if (QX11Info::display()) diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h index 1f08801f6..df1146227 100644 --- a/src/gui/text/qfont_p.h +++ b/src/gui/text/qfont_p.h @@ -163,12 +163,12 @@ public: int dpi; int screen; - uint underline : 1; - uint overline : 1; - uint strikeOut : 1; - uint kerning : 1; - uint capital : 3; - bool letterSpacingIsAbsolute : 1; + bool underline; + bool overline; + bool strikeOut; + bool kerning; + QFont::Capitalization capital; + bool letterSpacingIsAbsolute; QFixed letterSpacing; QFixed wordSpacing; -- 2.11.0