various cleanups

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

diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h
index 1501a9f..3b5484b 100644 (file)
--- a/src/gui/painting/qdrawhelper_p.h
+++ b/src/gui/painting/qdrawhelper_p.h
@@ -62,7 +62,8 @@
 #define QT_FT_END_HEADER
 #endif
 #include "qrasterdefs_p.h"
-#include <qmath_p.h>
+#include "qmath.h"
+#include "qmath_p.h"
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/gui/painting/qmath_p.h b/src/gui/painting/qmath_p.h
index 1f34c4f..e1cf342 100644 (file)
--- a/src/gui/painting/qmath_p.h
+++ b/src/gui/painting/qmath_p.h
@@ -53,8 +53,7 @@
 // We mean it.
 //
 
-#include <math.h>
-#include <qmath.h>
+#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -62,11 +61,6 @@ static const qreal Q_PI   = qreal(3.14159265358979323846);   // pi
 static const qreal Q_2PI  = qreal(6.28318530717958647693);   // 2*pi
 static const qreal Q_PI2  = qreal(1.57079632679489661923);   // pi/2
 
-inline int qIntSqrtInt(int v)
-{
-    return static_cast<int>(qSqrt(static_cast<qreal>(v)));
-}
-
 QT_END_NAMESPACE
 
 #endif // QMATH_P_H

diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 1555ae2..61e0b9c 100644 (file)
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -473,7 +473,6 @@ QRasterPaintEngineState::QRasterPaintEngineState()
 
     fillFlags = 0;
     strokeFlags = 0;
-    pixmapFlags = 0;
 
     intOpacity = 256;
 
@@ -500,7 +499,6 @@ QRasterPaintEngineState::QRasterPaintEngineState(QRasterPaintEngineState &s)
     , lastBrush(s.lastBrush)
     , brushData(s.brushData)
     , fillFlags(s.fillFlags)
-    , pixmapFlags(s.pixmapFlags)
     , intOpacity(s.intOpacity)
     , txscale(s.txscale)
     , clip(s.clip)
@@ -713,7 +711,6 @@ void QRasterPaintEngine::opacityChanged()
 
     s->fillFlags |= DirtyOpacity;
     s->strokeFlags |= DirtyOpacity;
-    s->pixmapFlags |= DirtyOpacity;
     s->dirty |= DirtyOpacity;
     s->intOpacity = (int) (s->opacity * 256);
 }
@@ -795,7 +792,6 @@ void QRasterPaintEngine::clipEnabledChanged()
         s->clip->enabled = s->clipEnabled;
         s->fillFlags |= DirtyClipEnabled;
         s->strokeFlags |= DirtyClipEnabled;
-        s->pixmapFlags |= DirtyClipEnabled;
     }
 }
 
@@ -891,7 +887,6 @@ void QRasterPaintEnginePrivate::systemStateChanged()
     Q_Q(QRasterPaintEngine);
     q->state()->strokeFlags |= QPaintEngine::DirtyClipRegion;
     q->state()->fillFlags |= QPaintEngine::DirtyClipRegion;
-    q->state()->pixmapFlags |= QPaintEngine::DirtyClipRegion;
 }
 
 void QRasterPaintEnginePrivate::updateMatrixData(QSpanData *spanData, const QBrush &b, const QTransform &m)
@@ -965,7 +960,6 @@ static void qrasterpaintengine_dirty_clip(QRasterPaintEnginePrivate *d, QRasterP
 {
     s->fillFlags |= QPaintEngine::DirtyClipPath;
     s->strokeFlags |= QPaintEngine::DirtyClipPath;
-    s->pixmapFlags |= QPaintEngine::DirtyClipPath;
 
     d->solid_color_filler.clip = d->clip();
     d->solid_color_filler.adjustSpanMethods();

diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index f736716..ab78486 100644 (file)
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -88,7 +88,6 @@ public:
     QSpanData brushData;
     uint fillFlags;
 
-    uint pixmapFlags;
     int intOpacity;
 
     qreal txscale;

diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h
index 5dbd82f..964de6f 100644 (file)
--- a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h
+++ b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h
@@ -47,6 +47,7 @@
 #include <qvectorpath_p.h>
 #include <qbezier_p.h>
 #include <qnumeric_p.h>
+#include <qmath.h>
 #include <qmath_p.h>
 #include <qstroker_p.h>