QFontPrivate cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index fe1bd67..3472cac 100644 (file)
--- 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 1f08801..df11462 100644 (file)
--- 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;