Remove even more unneeded includes in libs/flake

libs/flake/KoPathShape.cpp

@@ -38,6 +38,7 @@
 #include "KoMarker.h"
 #include "KoMarkerSharedLoadingData.h"
 #include "KoShapeStroke.h"
+#include "KoInsets.h"
 
 #include <KoXmlReader.h>
 #include <KoXmlWriter.h>

libs/flake/KoPathShape.h

@@ -26,6 +26,7 @@
 #include "flake_export.h"
 
 #include <QMetaType>
+#include <QTransform>
 
 #include "KoTosContainer.h"
 #include "KoMarkerData.h"

libs/flake/KoSnapGuide.h

@@ -22,11 +22,8 @@
 
 #include "flake_export.h"
 
-#include <KoPathSegment.h>
-#include <QPointF>
 #include <QList>
-#include <QRectF>
-#include <QPainterPath>
+#include <Qt>
 
 class KoSnapStrategy;
 class KoShape;
@@ -34,7 +31,9 @@ class KoPathPoint;
 class KoViewConverter;
 class KoCanvasBase;
 class QPainter;
-class KoCanvasBase;
+class QPointF;
+class QRectF;
+class QLineF;
 
 /**
  * This class is the place where all the snapping (i.e. snap to grid) is handled.

libs/flake/KoSnapProxy.h

@@ -24,11 +24,11 @@ class KoSnapGuide;
 class KoShape;
 class KoPathSegment;
 class KoCanvasBase;
-
 #include <QList>
-#include <QPointF>
-#include <QRectF>
 #include "flake_export.h"
+
+class QPointF;
+class QRectF;
 /**
  * This class provides access to different shape related snap targets to snap strategies.
  */

libs/flake/KoSnapStrategy.cpp

@@ -22,6 +22,7 @@
 #include "KoSnapGuide.h"
 #include <KoPathShape.h>
 #include <KoPathPoint.h>
+#include <KoPathSegment.h>
 #include <KoCanvasBase.h>
 #include <KoViewConverter.h>
 #include <KoGuidesData.h>

libs/flake/KoSnapStrategy.h

@@ -22,14 +22,16 @@
 
 #include "KoSnapGuide.h"
 
-#include <QPointF>
-#include <QPainterPath>
+#include <QLineF>
 
 class TestSnapStrategy;
 class KoPathPoint;
 class KoSnapProxy;
 class KoViewConverter;
 
+class QTransform;
+class QPainterPath;
+
 class FLAKE_TEST_EXPORT KoSnapStrategy
 {
 public:

libs/flake/KoTextShapeDataBase.h

@@ -23,14 +23,15 @@
 #include "flake_export.h"
 
 #include "KoShapeUserData.h"
-#include "KoInsets.h"
-#include <QTextDocument>
 
 class KoTextShapeDataBasePrivate;
 class KoXmlElement;
 class KoShapeLoadingContext;
 class KoShapeSavingContext;
 class KoGenStyle;
+struct KoInsets;
+
+class QTextDocument;
 
 /**
  * \internal

libs/flake/KoToolBase.h

@@ -17,15 +17,13 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef KOTOOL_H
-#define KOTOOL_H
+#ifndef KOTOOLBASE_H
+#define KOTOOLBASE_H
 
-#include <QString>
-#include <QList>
 #include <QObject>
-#include <QCursor>
-#include <QStringList>
-#include <QRectF>
+#include <QSet>
+#include <QList>
+#include <QHash>
 
 #include "flake_export.h"
 
@@ -41,7 +39,12 @@ class KAction;
 class QAction;
 class QKeyEvent;
 class QWidget;
+class QCursor;
 class QPainter;
+class QString;
+class QStringList;
+class QRectF;
+class QPointF;
 class QInputMethodEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;

libs/flake/KoTosContainer.cpp

@@ -33,6 +33,7 @@
 #include "KoGenStyle.h"
 
 #include <QTextCursor>
+#include <QTextDocument>
 
 KoTosContainerPrivate::KoTosContainerPrivate(KoShapeContainer *q)
     : KoShapeContainerPrivate(q)

libs/flake/KoTosContainerModel.cpp

@@ -23,6 +23,7 @@
 #include "KoTosContainer.h"
 
 #include <kdebug.h>
+#include <QSizeF>
 
 KoTosContainerModel::KoTosContainerModel()
 : m_textShape(0)

libs/flake/svg/SvgGraphicContext.h

@@ -23,6 +23,8 @@
 
 #include "flake_export.h"
 #include <KoShapeStroke.h>
+#include <QFont>
+#include <QTransform>
 
 class FLAKE_EXPORT SvgGraphicsContext
 {

libs/flake/svg/SvgStyleParser.cpp

@@ -30,6 +30,7 @@
 
 #include <QStringList>
 #include <QColor>
+#include <QGradientStops>
 
 class SvgStyleParser::Private
 {

libs/flake/svg/SvgUtil.cpp

@@ -25,6 +25,7 @@
 #include <QString>
 #include <QRectF>
 #include <QStringList>
+#include <QFontMetrics>
 
 #include <math.h>
 

libs/flake/tests/TestShapeShadowCommand.cpp

@@ -21,6 +21,7 @@
 #include <MockShapes.h>
 #include "KoShapeShadow.h"
 #include "KoShapeShadowCommand.h"
+#include "KoInsets.h"
 
 void TestShapeShadowCommand::refCounting()
 {

libs/flake/tools/KoPathTool.h

@@ -27,6 +27,7 @@
 #include "KoToolBase.h"
 #include "KoPathToolSelection.h"
 #include <QList>
+#include <QCursor>
 
 class QButtonGroup;
 class KoCanvasBase;

libs/kopageapp/KoPAPageBase.h

@@ -25,6 +25,8 @@
 #include "KoPageApp.h"
 #include "kopageapp_export.h"
 
+#include <QSize>
+
 #define CACHE_PAGE_THUMBNAILS
 
 struct KoPageLayout;

libs/kotext/KoAnnotation.cpp

@@ -30,6 +30,7 @@
 #include <KoShape.h>
 
 #include <QTextDocument>
+#include <QTextBlock>
 #include <QTextCursor>
 #include <kdebug.h>
 

libs/kotext/KoBookmark.cpp

@@ -29,6 +29,7 @@
 #include <KoXmlNS.h>
 
 #include <QTextDocument>
+#include <QTextBlock>
 #include <QTextCursor>
 #include <kdebug.h>
 

libs/kotext/KoSection.cpp

@@ -32,6 +32,8 @@
 #include <KoSectionEnd.h>
 #include <KoTextDocument.h>
 
+#include <QTextBlock>
+
 class KoSectionPrivate
 {
 public:

libs/textlayout/InlineAnchorStrategy.cpp

@@ -25,6 +25,7 @@
 
 #include <QTextLayout>
 #include <QTextBlock>
+#include <QTextDocument>
 #include <kdebug.h>
 
 InlineAnchorStrategy::InlineAnchorStrategy(KoAnchorInlineObject *anchorObject, KoTextLayoutRootArea *rootArea)

libs/textlayout/KoTextLayoutObstruction.cpp

@@ -24,6 +24,7 @@
 #include <KoShapeShadow.h>
 #include <KoShapeGroup.h>
 #include <KoClipPath.h>
+#include <KoInsets.h>
 
 #include <QTransform>
 #include <QPainterPath>

plugins/defaultTools/connectionTool/ConnectionTool.cpp

@@ -43,6 +43,7 @@
 #include <KoShapeLayer.h>
 #include <KoShapeRegistry.h>
 #include <KoSelection.h>
+#include <KoPathSegment.h>
 #include <KoDocumentResourceManager.h>
 #include <KoInteractionStrategy.h>
 #include <KoShapeConfigWidgetBase.h>

plugins/defaultTools/connectionTool/ConnectionTool.h

@@ -28,6 +28,7 @@
 #include <KoCanvasBase.h>
 #include <KoSnapGuide.h>
 #include <KoConnectionShape.h>
+#include <QCursor>
 
 class KAction;
 class QActionGroup;