Remove unneeded includes in libs/flake

krita/plugins/extensions/dockers/artisticcolorselector/artisticcolorselector_dock.cpp

@@ -18,6 +18,7 @@
 #include <klocale.h>
 #include <KoCanvasResourceManager.h>
 #include <KoCanvasBase.h>
+#include <KoColor.h>
 
 #include <QWidget>
 #include <QMenu>

krita/plugins/extensions/dockers/imagedocker/imagedocker_dock.cpp

@@ -23,6 +23,7 @@
 #include <KoCanvasResourceManager.h>
 #include <KoCanvasBase.h>
 #include <KoColorSpaceRegistry.h>
+#include <KoColor.h>
 #include <KoIcon.h>
 
 #include <QFileSystemModel>

krita/ui/flake/kis_shape_layer_canvas.cpp

@@ -32,6 +32,7 @@
 #include <flake/kis_shape_layer.h>
 #include <KoCompositeOpRegistry.h>
 #include <KoSelection.h>
+#include <KoUnit.h>
 
 #include <kis_debug.h>
 

krita/ui/flake/kis_shape_layer_canvas.h

@@ -19,6 +19,7 @@
 #define KIS_SHAPE_LAYER_CANVAS_H
 
 #include <QMutex>
+#include <QRegion>
 #include <KoCanvasBase.h>
 
 #include <kis_types.h>

krita/ui/flake/kis_shape_selection_canvas.cpp

@@ -23,6 +23,7 @@
 #include <QPainter>
 
 #include <KoShapeManager.h>
+#include <KoUnit.h>
 
 KisShapeSelectionCanvas::KisShapeSelectionCanvas()
         : KoCanvasBase(0)

krita/ui/input/kis_rotate_canvas_action.cpp

@@ -26,6 +26,8 @@
 #include <kis_canvas2.h>
 #include "kis_input_manager.h"
 
+#include <math.h>
+
 class KisRotateCanvasAction::Private
 {
 public:

libs/basicflakes/tools/KoCreatePathTool.cpp

@@ -32,6 +32,7 @@
 #include "KoShapePaintingContext.h"
 #include "KoStrokeConfigWidget.h"
 #include "KoShapeStroke.h"
+#include <KoColor.h>
 
 #include <knuminput.h>
 #include <klocale.h>

libs/basicflakes/tools/KoCreatePathTool_p.h

@@ -33,6 +33,8 @@
 #include "KoSnapStrategy.h"
 #include "KoToolBase_p.h"
 
+#include "math.h"
+
 /// Small helper to keep track of a path point and its parent path shape
 struct PathConnectionPoint {
     PathConnectionPoint()

libs/flake/KoAnnotationLayoutManager.cpp

@@ -17,7 +17,12 @@
  * Boston, MA 02110-1301, USA.
  */
 #include "KoAnnotationLayoutManager.h"
+
+#include <KoViewConverter.h>
+#include <KoShapeManager.h>
+#include <KoCanvasBase.h>
 #include <KoShape.h>
+#include <QWidget>
 #include <QList>
 #include <QHash>
 #include <QMap>
@@ -128,7 +133,7 @@ bool KoAnnotationLayoutManager::isAnnotationShape(KoShape *shape)
     return false;
 }
 
-void KoAnnotationLayoutManager::registerAnnotationRefPosition(KoShape *annotationShape, QPointF pos)
+void KoAnnotationLayoutManager::registerAnnotationRefPosition(KoShape *annotationShape, const QPointF &pos)
 {
     QList< QPair < QPointF, KoShape * > >::iterator it = d->annotationShapePositions.begin();
     bool yPositionChanged = false;

libs/flake/KoAnnotationLayoutManager.h

@@ -22,13 +22,12 @@
 #include "flake_export.h"
 
 #include <QObject>
-#include <QPointF>
-#include <KoViewConverter.h>
-#include <KoShapeManager.h>
-#include <KoCanvasBase.h>
-#include <KoCanvasController.h>
+
+class KoShapeManager;
+class KoCanvasBase;
 
 class QPainter;
+class QPointF;
 
 class KoShape;
 
@@ -56,7 +55,7 @@ public:
 
 public slots:
     /// register the position of an annotation shape.
-    void registerAnnotationRefPosition(KoShape *annotationShape, QPointF refPosition);
+    void registerAnnotationRefPosition(KoShape *annotationShape, const QPointF& refPosition);
 
     /// Remove annotation shape.
     void removeAnnotationShape(KoShape *annotationShape);

libs/flake/KoCanvasBase.h

@@ -23,21 +23,14 @@
 #ifndef KOCANVASBASE_H
 #define KOCANVASBASE_H
 
-#include <KoUnit.h>
-
-#include <QPointF>
 #include <QPoint>
-#include <QRectF>
-#include <QRect>
-#include <QWidget>
-#include <QCursor>
-#include <QObject>
 
 #include "flake_export.h"
 
 class QGraphicsObject;
 class KUndo2Command;
 
+class KoUnit;
 class KoCanvasResourceManager;
 class KoShapeManager;
 class KoToolProxy;
@@ -49,6 +42,11 @@ class KoShape;
 class KoSnapGuide;
 class KoGuidesData;
 
+class QWidget;
+class QCursor;
+class QObject;
+class QPointF;
+class QRectF;
 
 /**
  * KoCanvasBase is the interface actual application canvas classes

libs/flake/KoCanvasController.h

@@ -36,7 +36,6 @@ class QSize;
 
 class KoShape;
 class KoCanvasBase;
-class KoView;
 class KoCanvasControllerProxyObject;
 
 /**

libs/flake/KoCanvasControllerWidget.cpp

@@ -50,6 +50,7 @@
 #include <QGLWidget>
 #endif
 
+#include <math.h>
 
 void KoCanvasControllerWidget::Private::setDocumentOffset()
 {

libs/flake/KoCanvasControllerWidget.h

@@ -27,16 +27,11 @@
 #include "flake_export.h"
 
 #include <QAbstractScrollArea>
-#include <QMap>
-#include <QString>
 
 #include "KoCanvasController.h"
 
 class KoShape;
 class KoCanvasBase;
-class KoView;
-
-class ZoomAndPanTester;
 
 /**
  * KoCanvasController implementation for QWidget based canvases

libs/flake/KoCanvasResourceManager.h

@@ -22,20 +22,17 @@
 #define KO_CANVASRESOURCEMANAGER_H
 
 #include <QObject>
-#include <QList>
-#include <QVariant>
-#include <QSizeF>
 
 #include "flake_export.h"
 
-#include <KoColor.h>
-#include <KoUnit.h>
-
 class KoShape;
 class KoShapeStroke;
 class KUndo2Stack;
-class KoImageCollection;
-class KoOdfDocument;
+class KoColor;
+class KoUnit;
+
+class QVariant;
+class QSizeF;
 
 /**
  * The KoCanvasResourceManager contains a set of per-canvas

libs/flake/KoConnectionPoint.h

@@ -21,9 +21,9 @@
 #ifndef KOCONNECTIONPOINT_H
 #define KOCONNECTIONPOINT_H
 
-#include "KoFlake.h"
 #include "flake_export.h"
 #include <QPointF>
+#include <QMap>
 
 /// Data of a single connection point
 struct FLAKE_EXPORT KoConnectionPoint

libs/flake/KoConnectionShapeConfigWidget.h

@@ -20,11 +20,12 @@
 #ifndef KOCONNECTIONSHAPECONFIGWIDGET_H
 #define KOCONNECTIONSHAPECONFIGWIDGET_H
 
-#include "KoConnectionShape.h"
 #include "ui_KoConnectionShapeConfigWidget.h"
 
 #include <KoShapeConfigWidgetBase.h>
 
+class KoConnectionShape;
+
 class KoConnectionShapeConfigWidget : public KoShapeConfigWidgetBase
 {
     Q_OBJECT

libs/flake/KoDeferredShapeFactoryBase.h

@@ -20,18 +20,16 @@
 #ifndef KODEFERREDSHAPEFACTORYBASE_H
 #define KODEFERREDSHAPEFACTORYBASE_H
 
-#include <QStringList>
-#include <QString>
-#include <QList>
-
 #include "flake_export.h"
 
-#include <KoShapeFactoryBase.h>
+#include <QObject>
 
 class KoShape;
 class KoDocumentResourceManager;
 class KoProperties;
 
+class QString;
+
 /**
  * A factory for KoShape objects. This factory differs from the public KoShapeFactorBase
  * class that this class really creates the shape; it's the plugin entry point for the

libs/flake/KoDockFactoryBase.h

@@ -20,11 +20,10 @@
 #ifndef KODOCKFACTORY_H
 #define KODOCKFACTORY_H
 
-#include <QString>
-
 #include "flake_export.h"
 
 class QDockWidget;
+class QString;
 
 /**
  * Base class for factories used to create new dock widgets.

libs/flake/KoDockRegistry.h

@@ -24,8 +24,6 @@
 #include "KoDockFactoryBase.h"
 #include "flake_export.h"
 
-#include <QObject>
-
 /**
  * This singleton class keeps a register of all available dockers,
  * or rather, of the factories that can create the QDockWidget instances

libs/flake/KoDocumentResourceManager.h

@@ -22,20 +22,19 @@
 #define KO_DOCUMENTRESOURCEMANAGER_H
 
 #include <QObject>
-#include <QList>
-#include <QVariant>
-#include <QSizeF>
 
 #include "flake_export.h"
 
-#include <KoColor.h>
-#include <KoUnit.h>
-
 class KoShape;
 class KUndo2Stack;
 class KoImageCollection;
 class KoOdfDocument;
 class KoShapeController;
+class KoColor;
+class KoUnit;
+
+class QVariant;
+class QSizeF;
 
 /**
  * The KoResourceManager contains a set of per-canvas <i>or</i> per-document

libs/flake/KoDragOdfSaveHelper.h

@@ -20,11 +20,12 @@
 #ifndef KODRAGODFSAVEHELPER_H
 #define KODRAGODFSAVEHELPER_H
 
-#include <KoShapeSavingContext.h>
-
 #include "flake_export.h"
 
+class KoShapeSavingContext;
 class KoXmlWriter;
+class KoGenStyles;
+class KoEmbeddedDocumentSaver;
 class KoDragOdfSaveHelperPrivate;
 
 class FLAKE_EXPORT KoDragOdfSaveHelper

libs/flake/KoDragOdfSaveHelper_p.h

@@ -20,6 +20,8 @@
 #ifndef KODRAGODFSAVEHELPER_P_H
 #define KODRAGODFSAVEHELPER_P_H
 
+#include <KoShapeSavingContext.h>
+
 class KoDragOdfSaveHelperPrivate
 {
 public:

libs/flake/KoEventAction.h

@@ -24,7 +24,6 @@
 #include "KoXmlReaderForward.h"
 class KoShapeLoadingContext;
 class KoShapeSavingContext;
-class KoToolBase;
 
 /**
  * This is the base class for actions that are executed on events.

libs/flake/KoFilterEffect.cpp

@@ -21,6 +21,7 @@
 #include "KoFilterEffect.h"
 #include "KoXmlWriter.h"
 
+#include <QImage>
 #include <QString>
 #include <QRectF>
 

libs/flake/KoFilterEffect.h

@@ -23,9 +23,7 @@
 
 class QImage;
 class QString;
-class QRect;
 class QRectF;
-class KoViewConverter;
 class KoXmlWriter;
 class KoFilterEffectRenderContext;
 class KoFilterEffectLoadingContext;
@@ -33,7 +31,6 @@ class KoXmlElement;
 
 #include "flake_export.h"
 #include <QList>
-#include <QImage>
 
 /**
  * This is the base for filter effect (blur, invert...) that can be applied on a shape.

libs/flake/KoFilterEffectRegistry.h

@@ -22,7 +22,6 @@
 
 #include <KoGenericRegistry.h>
 #include <KoFilterEffectFactoryBase.h>
-#include <QTransform>
 
 #include "flake_export.h"
 

libs/flake/KoFilterEffectStack.cpp

@@ -21,6 +21,7 @@
 #include "KoFilterEffect.h"
 #include "KoXmlWriter.h"
 
+#include <QRectF>
 #include <QAtomicInt>
 #include <QSet>
 #include <QDebug>

libs/flake/KoFilterEffectStack.h

@@ -23,11 +23,12 @@
 #include "flake_export.h"
 
 #include <QList>
-#include <QRectF>
 
 class KoFilterEffect;
 class KoXmlWriter;
 
+class QRectF;
+
 /// This class manages a stack of filter effects
 class FLAKE_EXPORT KoFilterEffectStack
 {

libs/flake/KoFlake.h

@@ -23,10 +23,9 @@
 
 #include "flake_export.h"
 
-#include <QBrush>
-
-class KoShape;
 class QGradient;
+class QPointF;
+class QSizeF;
 
 /**
  * Flake reference

libs/flake/KoFrameShape.h

@@ -22,8 +22,9 @@
 
 #include "flake_export.h"
 
-#include "KoXmlReaderForward.h"
 class KoShapeLoadingContext;
+class KoXmlElement;
+class QString;
 
 /**
  * @brief Base class for shapes that are saved as a part of a draw:frame.

libs/flake/KoGradientBackground.h

@@ -24,8 +24,8 @@
 #include "flake_export.h"
 
 #include <QTransform>
-#include <QGradient>
 
+class QGradient;
 class KoGradientBackgroundPrivate;
 
 /// A gradient shape background

libs/flake/KoInputDeviceHandlerRegistry.h

@@ -20,8 +20,6 @@
 #ifndef KOINPUTDEVICEHANDLERREGISTRY_H
 #define KOINPUTDEVICEHANDLERREGISTRY_H
 
-#include <QObject>
-
 #include "KoGenericRegistry.h"
 #include <KoInputDeviceHandler.h>
 #include "flake_export.h"

libs/flake/KoShapeOdfSaveHelper.h

@@ -23,6 +23,8 @@
 #include "KoDragOdfSaveHelper.h"
 #include "flake_export.h"
 
+#include <QList>
+
 class KoShape;
 class KoShapeOdfSaveHelperPrivate;
 

libs/flake/tests/MockShapes.h

@@ -28,6 +28,7 @@
 #include "KoShapeManager.h"
 #include "kdebug.h"
 #include "KoSnapData.h"
+#include "KoUnit.h"
 
 class MockShape : public KoShape
 {

libs/flake/tests/TestResourceManager.cpp

@@ -21,6 +21,7 @@
 
 #include "KoCanvasResourceManager.h"
 #include "KoPathShape.h"
+#include "KoUnit.h"
 #include <QSignalSpy>
 
 void TestResourceManager::koShapeResource()

libs/flake/tools/KoPathSegmentChangeStrategy.cpp

@@ -27,6 +27,7 @@
 #include <KoCanvasBase.h>
 #include <klocale.h>
 #include <limits>
+#include <math.h>
 
 KoPathSegmentChangeStrategy::KoPathSegmentChangeStrategy(KoPathTool *tool, const QPointF &pos, const KoPathPointData &segment, qreal segmentParam)
 : KoInteractionStrategy(tool)

libs/flake/tools/KoPathTool.cpp

@@ -59,6 +59,8 @@
 #include <QBitmap>
 #include <QTabWidget>
 
+#include <math.h>
+
 static unsigned char needle_bits[] = {
     0x00, 0x00, 0x10, 0x00, 0x20, 0x00, 0x60, 0x00, 0xc0, 0x00, 0xc0, 0x01,
     0x80, 0x03, 0x80, 0x07, 0x00, 0x0f, 0x00, 0x1f, 0x00, 0x3e, 0x00, 0x7e,

libs/kopageapp/KoPACanvasBase.h

@@ -27,6 +27,9 @@
 class KoPAViewBase;
 class KoPADocument;
 
+class QRect;
+class QPainter;
+
 /// Widget that shows a KoPAPage
 class KOPAGEAPP_EXPORT KoPACanvasBase : public KoCanvasBase
 {

libs/kotext/KoText.cpp

@@ -20,6 +20,8 @@
  */
 #include "KoText.h"
 
+#include <KoUnit.h>
+
 #include <klocale.h>
 
 using namespace KoText;

libs/kotext/KoTextOdfSaveHelper.h

@@ -23,6 +23,7 @@
 #include <KoDragOdfSaveHelper.h>
 #ifdef SHOULD_BUILD_RDF
 #include <Soprano/Soprano>
+#include <QSharedPointer>
 #endif
 #include "kotext_export.h"
 

libs/kotext/ToCBibGeneratorInfo.cpp

@@ -21,6 +21,7 @@
 #include "ToCBibGeneratorInfo.h"
 
 #include <KoXmlWriter.h>
+#include <KoUnit.h>
 
 IndexEntry::IndexEntry(const QString &_styleName, IndexEntry::IndexEntryName _name)
         :   styleName(_styleName),

libs/textlayout/KoTextDocumentLayout.cpp

@@ -45,6 +45,7 @@
 #include <KoAnnotationLayoutManager.h>
 #include <KoAnnotation.h>
 #include <KoTextDocument.h>
+#include <KoUnit.h>
 
 #include <kdebug.h>
 #include <QTextBlock>

libs/textlayout/KoTextShapeData.cpp

@@ -43,6 +43,7 @@
 #include <KoDocumentRdfBase.h>
 #include <KoStyleStack.h>
 #include <KoShape.h>
+#include <KoUnit.h>
 
 #include <KoXmlNS.h>
 

plugins/defaultTools/defaulttool/ShapeResizeStrategy.cpp

@@ -31,6 +31,7 @@
 
 #include <klocale.h>
 #include <limits>
+#include <math.h>
 
 ShapeResizeStrategy::ShapeResizeStrategy(KoToolBase *tool,
         const QPointF &clicked, KoFlake::SelectionHandle direction )

plugins/defaultTools/defaulttool/ShapeResizeStrategy.h

@@ -25,6 +25,7 @@
 
 #include <QPointF>
 #include <QList>
+#include <QTransform>
 
 class KoCanvasBase;
 class KoToolBase;

plugins/pictureshape/filters/GreyscaleFilterEffect.cpp

@@ -22,6 +22,7 @@
 #include "GreyscaleFilterEffect.h"
 #include <KoFilterEffectRenderContext.h>
 
+#include <QImage>
 
 GreyscaleFilterEffect::GreyscaleFilterEffect()
 : KoFilterEffect(GreyscaleFilterEffectId, "Grayscale effect")

plugins/pictureshape/filters/MonoFilterEffect.cpp

@@ -20,6 +20,8 @@
 #include "MonoFilterEffect.h"
 #include <KoFilterEffectRenderContext.h>
 
+#include <QImage>
+
 MonoFilterEffect::MonoFilterEffect()
 : KoFilterEffect(MonoFilterEffectId, "Mono Effect")
 {

plugins/textshape/TextTool.cpp

@@ -50,6 +50,7 @@
 #include <KoSelection.h>
 #include <KoShapeManager.h>
 #include <KoPointerEvent.h>
+#include <KoColor.h>
 #include <KoColorBackground.h>
 #include <KoColorPopupAction.h>
 #include <KoTextDocumentLayout.h>

plugins/textshape/dialogs/ParagraphBulletsNumbers.cpp

@@ -25,6 +25,7 @@
 #include <KoListLevelProperties.h>
 #include <KoImageData.h>
 #include <KoImageCollection.h>
+#include <KoUnit.h>
 
 #include <kdebug.h>