various cleanups

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

diff --git a/src/core/thread/qmutex.h b/src/core/thread/qmutex.h
index 5e5e4a8..dcfaa8f 100644 (file)
--- a/src/core/thread/qmutex.h
+++ b/src/core/thread/qmutex.h
@@ -42,7 +42,6 @@
 #ifndef QMUTEX_H
 #define QMUTEX_H
 
-#include <QtCore/qglobal.h>
 #include <QtCore/qatomic.h>
 #include <new>
 
@@ -53,7 +52,6 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_THREAD
 
-class QAtomicInt;
 class QMutexData;
 
 class Q_CORE_EXPORT QMutex

diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index 5b5bb18..d1eda6d 100644 (file)
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -382,8 +382,6 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const
     return new QPainterState(orig);
 }
 
-Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp
-
 void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen)
 {
 #ifdef QT_DEBUG_DRAW

diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 04fa3bc..e72d973 100644 (file)
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -80,8 +80,6 @@ class QTransform;
 class QStaticText;
 class QGlyphRun;
 
-class QPainterPrivateDeleter;
-
 class Q_GUI_EXPORT QPainter
 {
     Q_DECLARE_PRIVATE(QPainter)

diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h
index 3654cf1..6bf8c7b 100644 (file)
--- a/src/gui/painting/qpainter_p.h
+++ b/src/gui/painting/qpainter_p.h
@@ -68,7 +68,6 @@
 QT_BEGIN_NAMESPACE
 
 class QPaintEngine;
-class QEmulationPaintEngine;
 class QPaintEngineEx;
 struct QFixedPoint;