various cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

src/gui/painting/qimagescale.cpp

@@ -1005,8 +1005,7 @@ QImage qSmoothScaleImage(const QImage &src, int dw, int dh)
 
     int w = src.width();
     int h = src.height();
-    QImageScaleInfo *scaleinfo =
-        qimageCalcScaleInfo(src, w, h, dw, dh, true);
+    QImageScaleInfo *scaleinfo = qimageCalcScaleInfo(src, w, h, dw, dh, true);
     if (!scaleinfo)
         return buffer;
 

src/gui/painting/qpaintbuffer_p.h

@@ -414,8 +414,7 @@ public:
 
     mutable bool m_begin_detected : 1;
     mutable bool m_save_detected : 1;
-    mutable int m_stream_raw_text_items : 1;
-    mutable int m_unused : 29;
+    mutable bool m_stream_raw_text_items : 1;
 
     mutable QPainterState *m_created_state;
 };

src/gui/painting/qpaintengine_raster.cpp

@@ -59,21 +59,16 @@
 #  include <qfontengine_ft_p.h>
 #endif
 
-//   #include <qdatabuffer_p.h>
-//   #include <qpainter_p.h>
 #include <qmath_p.h>
 #include <qtextengine_p.h>
 #include <qfontengine_p.h>
 #include <qpixmap_raster_p.h>
-//   #include <qpolygonclipper_p.h>
-//   #include <qrasterizer_p.h>
 #include <qimage_p.h>
 #include <qstatictext_p.h>
 #include <qcosmeticstroker_p.h>
 #include "qmemrotate_p.h"
 
 #include "qpaintengine_raster_p.h"
-//   #include "qbezier_p.h"
 #include "qoutlinemapper_p.h"
 
 #if defined(Q_WS_WIN)

src/gui/painting/qpaintengineex.cpp

@@ -42,7 +42,6 @@
 #include "qpaintengineex_p.h"
 #include "qpainter_p.h"
 #include "qstroker_p.h"
-#include "qbezier_p.h"
 #include <qpainterpath_p.h>
 #include <qfontengine_p.h>
 #include <qstatictext_p.h>

src/gui/painting/qpolygon.cpp

@@ -47,7 +47,6 @@
 #include "qpainterpath.h"
 #include "qvariant.h"
 #include "qpainterpath_p.h"
-#include "qbezier_p.h"
 
 #include <stdarg.h>
 

src/gui/painting/qvectorpath_p.h

@@ -56,7 +56,6 @@
 #include <QtGui/qpaintengine.h>
 
 #include <qpaintengine_p.h>
-#include <qstroker_p.h>
 #include <qpainter_p.h>