Remove unneeded includes in libs/kopageapp

libs/kopageapp/KoPACanvas.cpp

@@ -19,21 +19,15 @@
 
 #include "KoPACanvas.h"
 
-#include <KoShapeManager.h>
 #include <KoToolProxy.h>
-#include <KoUnit.h>
-#include <KoText.h>
 #include <KoCanvasController.h>
+#include <KoZoomHandler.h>
 
 #include "KoPADocument.h"
 #include "KoPAView.h"
-#include "KoPAViewMode.h"
-#include "KoPAPage.h"
-#include "KoPAPageProvider.h"
 
 #include <kxmlguifactory.h>
 
-#include <kaction.h>
 #include <QMenu>
 #include <QMouseEvent>
 

libs/kopageapp/KoPACanvasBase.cpp

@@ -25,15 +25,10 @@
 #include <KoText.h>
 
 #include "KoPADocument.h"
-#include "KoPAView.h"
-#include "KoPAViewMode.h"
-#include "KoPAPage.h"
+#include "KoPAViewBase.h"
+#include "KoPAPageBase.h"
 #include "KoPAPageProvider.h"
 
-#include <kaction.h>
-#include <QMenu>
-#include <QMouseEvent>
-
 class KoPACanvasBase::Private
 {
 public:

libs/kopageapp/KoPACanvasBase.h

@@ -20,8 +20,6 @@
 #ifndef KOPACANVASBASE_H
 #define KOPACANVASBASE_H
 
-#include <QWidget>
-#include <QList>
 #include <KoCanvasBase.h>
 
 #include "kopageapp_export.h"

libs/kopageapp/KoPACanvasItem.cpp

@@ -22,17 +22,12 @@
 
 #include "KoPADocument.h"
 #include "KoPAView.h"
-#include "KoPAViewMode.h"
-#include "KoPAPage.h"
-#include "KoPAPageProvider.h"
+#include "KoPAPageBase.h"
 
-#include <KoShapeManager.h>
+#include <KoZoomHandler.h>
 #include <KoToolProxy.h>
-#include <KoUnit.h>
-#include <KoText.h>
 
 #include <kxmlguifactory.h>
-#include <kaction.h>
 
 #include <QStyleOptionGraphicsItem>
 #include <QGraphicsSceneResizeEvent>

libs/kopageapp/KoPADocument.cpp

@@ -20,21 +20,16 @@
 
 #include "KoPADocument.h"
 
-#include "KoPACanvas.h"
 #include "KoPAView.h"
 #include "KoPAPage.h"
 #include "KoPAMasterPage.h"
 #include "KoPASavingContext.h"
 #include "KoPALoadingContext.h"
-#include "KoPAViewMode.h"
 #include "KoPAPageProvider.h"
 #include "commands/KoPAPageDeleteCommand.h"
 
 #include <KoStore.h>
-#include <KoDocumentResourceManager.h>
 #include <KoXmlWriter.h>
-#include <KoXmlReader.h>
-#include <KoOdfStylesReader.h>
 #include <KoOdfReadStore.h>
 #include <KoOdfWriteStore.h>
 #include <KoOdfLoadingContext.h>
@@ -42,15 +37,11 @@
 #include <KoStoreDevice.h>
 #include <KoGenStyles.h>
 #include <KoShapeController.h>
-#include <KoShapeManager.h>
-#include <KoShapeLayer.h>
-#include <KoShapeRegistry.h>
-#include <KoTextShapeData.h>
+#include <KoDocumentResourceManager.h>
+#include <KoText.h>
 #include <KoTextSharedLoadingData.h>
-#include <KoTextDocumentLayout.h>
 #include <KoInlineTextObjectManager.h>
 #include <KoStyleManager.h>
-#include <KoPathShape.h>
 #include <KoXmlNS.h>
 #include <KoProgressUpdater.h>
 #include <KoUpdater.h>
@@ -65,8 +56,6 @@
 
 #include <QPainter>
 
-#include <typeinfo>
-
 class KoPADocument::Private
 {
 public:

libs/kopageapp/KoPADocument.h

@@ -20,22 +20,17 @@
 #ifndef KOPADOCUMENT_H
 #define KOPADOCUMENT_H
 
-#include <QObject>
-
 #include <KoOdf.h>
 #include <KoDocument.h>
 #include <KoShapeBasedDocumentBase.h>
 #include "KoPageApp.h"
 #include "kopageapp_export.h"
 
-class KoShapeSavingContext;
-class KoPAPart;
 class KoPAPage;
 class KoPAPageBase;
 class KoPAMasterPage;
 class KoPALoadingContext;
 class KoPASavingContext;
-class KoXmlWriter;
 
 class KoInlineTextObjectManager;
 

libs/kopageapp/KoPADocumentModel.cpp

@@ -22,14 +22,12 @@
 
 #include "KoPADocument.h"
 #include "KoPAPageBase.h"
-#include "KoPAPageProvider.h"
 #include <KoShapePainter.h>
 #include <KoShapeManager.h>
 #include <KoShapeContainer.h>
 #include <KoToolManager.h>
 #include <KoCanvasBase.h>
 #include <KoCanvasController.h>
-#include <KoShapeBasedDocumentBase.h>
 #include <KoSelection.h>
 #include <KoShapeLayer.h>
 #include <KoShapeGroup.h>
@@ -45,7 +43,6 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-#include <QAbstractItemModel>
 #include <QMimeData>
 #include <QApplication>
 #include <QClipboard>

libs/kopageapp/KoPADocumentModel.h

@@ -25,8 +25,6 @@
 class KoPADocument;
 class KoShape;
 class KoShapeContainer;
-class QAbstractItemModel;
-class KoViewConverter;
 class KoPAPageBase;
 
 #include "kopageapp_export.h"

libs/kopageapp/KoPADocumentStructureDocker.cpp

@@ -20,22 +20,17 @@
  */
 
 #include "KoPADocumentStructureDocker.h"
+
 #include "KoPADocumentModel.h"
 #include "KoPADocument.h"
 #include "KoPAPageBase.h"
 #include "KoPACanvas.h"
 #include "KoPAView.h"
-#include "KoPAMasterPage.h"
-#include "KoPAPage.h"
-#include "commands/KoPAPageInsertCommand.h"
-#include "commands/KoPAPageDeleteCommand.h"
 
 #include <KoShapeManager.h>
-#include <KoShapeContainer.h>
 #include <KoToolManager.h>
 #include <KoCanvasBase.h>
 #include <KoCanvasController.h>
-#include <KoShapeBasedDocumentBase.h>
 #include <KoSelection.h>
 #include <KoShapeOdfSaveHelper.h>
 #include <KoPAOdfPageSaveHelper.h>

libs/kopageapp/KoPADocumentStructureDocker.h

@@ -33,7 +33,6 @@ class KoPADocument;
 class KoPADocumentModel;
 class KoPAPageBase;
 class KoViewItemContextBar;
-class QModelIndex;
 class QAction;
 class QButtonGroup;
 

libs/kopageapp/KoPALoadingContext.cpp

@@ -22,10 +22,7 @@
 
 #include <QMap>
 
-#include <kstandarddirs.h>
-#include <kcomponentdata.h>
 #include <kdebug.h>
-#include <KoOdfReadStore.h>
 #include "KoPAMasterPage.h"
 #include "KoPAPage.h"
 

libs/kopageapp/KoPAMasterPage.h

@@ -21,7 +21,7 @@
 #define KOPAMASTERPAGE_H
 
 
-#include "KoPAPage.h"
+#include "KoPAPageBase.h"
 
 #include <KoPageLayout.h>
 

libs/kopageapp/KoPAPage.cpp

@@ -24,7 +24,6 @@
 
 #include <KoShapePainter.h>
 #include <KoShapeSavingContext.h>
-#include <KoShapeLayer.h>
 #include <KoOdfLoadingContext.h>
 #include <KoStyleStack.h>
 #include <KoXmlWriter.h>

libs/kopageapp/KoPAPageBase.cpp

@@ -30,9 +30,6 @@
 #include <KoStyleStack.h>
 #include <KoGenStyle.h>
 #include <KoGenStyles.h>
-#include <KoOdfStylesReader.h>
-#include <KoOdfGraphicStyles.h>
-#include <KoXmlWriter.h>
 #include <KoOdfLoadingContext.h>
 #include <KoViewConverter.h>
 #include <KoShapeLayer.h>

libs/kopageapp/KoPAPageBase.h

@@ -20,12 +20,7 @@
 #ifndef KOPAPAGEBASE_H
 #define KOPAPAGEBASE_H
 
-#include <QList>
-#include <QString>
-#include <QPixmap>
-
 #include <KoShapeContainer.h>
-#include <KoXmlReader.h>
 
 #include "KoPageApp.h"
 #include "kopageapp_export.h"
@@ -33,14 +28,15 @@
 #define CACHE_PAGE_THUMBNAILS
 
 struct KoPageLayout;
-class KoOdfLoadingContext;
 class KoGenStyle;
-class KoShape;
 class KoPALoadingContext;
 class KoShapeManagerPaintingStrategy;
 class KoZoomHandler;
 class KoPASavingContext;
 
+class QPixmap;
+class QString;
+
 /**
  * Base class used for KoPAMasterPage and KoPAPage
  *

libs/kopageapp/KoPAPageThumbnailModel.cpp

@@ -25,7 +25,7 @@
 
 #include "KoPAPageBase.h"
 
-KoPAPageThumbnailModel::KoPAPageThumbnailModel(QList<KoPAPageBase *> pages, QObject *parent)
+KoPAPageThumbnailModel::KoPAPageThumbnailModel(const QList<KoPAPageBase *> &pages, QObject *parent)
     : QAbstractListModel(parent),
     m_pages(pages),
     m_iconSize(512, 512)

libs/kopageapp/KoPAPageThumbnailModel.h

@@ -40,7 +40,7 @@ class KOPAGEAPP_EXPORT KoPAPageThumbnailModel : public QAbstractListModel
     Q_OBJECT
 
 public:
-    explicit KoPAPageThumbnailModel(QList<KoPAPageBase *> pages, QObject *parent = 0);
+    explicit KoPAPageThumbnailModel(const QList<KoPAPageBase *> &pages, QObject *parent = 0);
     ~KoPAPageThumbnailModel();
 
     // from QAbstractItemModel

libs/kopageapp/KoPAPastePage.cpp

@@ -25,10 +25,10 @@
 #include <KoOdfReadStore.h>
 #include <KoXmlWriter.h>
 #include <KoOdfLoadingContext.h>
-#include <KoOdfStylesReader.h>
 #include <KoEmbeddedDocumentSaver.h>
 #include "KoPALoadingContext.h"
 #include "KoPADocument.h"
+#include "KoPAPage.h"
 #include "KoPAMasterPage.h"
 #include "KoPASavingContext.h"
 #include "commands/KoPAPageInsertCommand.h"

libs/kopageapp/KoPAPrintJob.cpp

@@ -25,6 +25,7 @@
 #include "KoPAUtil.h"
 #include "KoPAPageBase.h"
 #include "KoPAPageProvider.h"
+#include <KoZoomHandler.h>
 
 #include <QPainter>
 #include <kdebug.h>

libs/kopageapp/KoPASavingContext.cpp

@@ -19,7 +19,6 @@
 
 #include "KoPASavingContext.h"
 
-#include <QPixmap>
 #include <QRegExp>
 
 #include "KoPAPage.h"

libs/kopageapp/KoPAUtil.h

@@ -20,11 +20,10 @@
 #ifndef KOPAUTIL_H
 #define KOPAUTIL_H
 
-#include <QRect>
-
 #include "kopageapp_export.h"
 
 class QSize;
+class QRect;
 struct KoPageLayout;
 class KoZoomHandler;
 

libs/kopageapp/KoPAView.cpp

@@ -24,9 +24,6 @@
 #include "KoPAView.h"
 
 #include <QGridLayout>
-#include <QToolBar>
-#include <QScrollBar>
-#include <QTimer>
 #include <QApplication>
 #include <QClipboard>
 #include <QLabel>
@@ -38,7 +35,6 @@
 #include <KoProperties.h>
 #include <KoCanvasControllerWidget.h>
 #include <KoCanvasResourceManager.h>
-#include <KoDocumentResourceManager.h>
 #include <KoColorBackground.h>
 #include <KoFind.h>
 #include <KoTextDocumentLayout.h>
@@ -60,10 +56,8 @@
 #include <KoRuler.h>
 #include <KoRulerController.h>
 #include <KoDrag.h>
-#include <KoShapeDeleteCommand.h>
 #include <KoCutController.h>
 #include <KoCopyController.h>
-#include <KoFilterManager.h>
 
 #include "KoPADocumentStructureDocker.h"
 #include "KoShapeTraversal.h"
@@ -77,7 +71,6 @@
 #include "KoPAPrintJob.h"
 #include "commands/KoPAPageInsertCommand.h"
 #include "commands/KoPAChangeMasterPageCommand.h"
-#include "commands/KoPAChangePageLayoutCommand.h"
 #include "dialogs/KoPAMasterPageDialog.h"
 #include "dialogs/KoPAPageLayoutDialog.h"
 #include "dialogs/KoPAConfigureDialog.h"

libs/kopageapp/KoPAView.h

@@ -27,13 +27,8 @@
 #include "kopageapp_export.h"
 
 #include <KoView.h>
-#include <KoZoomHandler.h>
-#include <KoPart.h>
+#include <KoZoomMode.h>
 
-#include <QObject>
-
-class KoCanvasController;
-class KoFind;
 class KoPart;
 class KoPACanvasBase;
 class KoPADocument;
@@ -42,15 +37,10 @@ class KoPAViewMode;
 class KoPADocumentStructureDocker;
 class KoRuler;
 class KoShapeManager;
-class KoZoomAction;
 class KoZoomController;
-class KToggleAction;
 class KUrl;
 
-class QDragEnterEvent;
-class QDropEvent;
 class QTextDocument;
-class QLabel;
 class QTabBar;
 class KoCopyController;
 class KoCutController;

libs/kopageapp/KoPAViewBase.h

@@ -25,9 +25,7 @@
 class KoPACanvasBase;
 class KoViewConverter;
 class KoPAPageBase;
-class KoZoomHandler;
 class KoPADocument;
-class KoRuler;
 class KoZoomHandler;
 class KoZoomController;
 

libs/kopageapp/KoPAViewMode.cpp

@@ -19,11 +19,10 @@
 
 #include "KoPAViewMode.h"
 
-#include "KoPACanvas.h"
+#include "KoPACanvasBase.h"
+#include "KoPAViewBase.h"
 #include "KoPAPageBase.h"
-#include "KoPAView.h"
 #include <KoCanvasController.h>
-#include <KoPageLayout.h>
 
 #include <QCloseEvent>
 

libs/kopageapp/KoPAViewModeNormal.cpp

@@ -19,14 +19,13 @@
 
 #include "KoPAViewModeNormal.h"
 
-#include <QEvent>
 #include <QKeyEvent>
 #include <QPainter>
 
 #include <KoToolProxy.h>
 #include <KoShapeManager.h>
 #include <KoShapePaintingContext.h>
-#include "KoPACanvas.h"
+#include "KoPACanvasBase.h"
 #include "KoPADocument.h"
 #include "KoPAPage.h"
 #include "KoPAMasterPage.h"

libs/kopageapp/dialogs/KoPAPageLayoutDialog.h

@@ -23,7 +23,6 @@
 #include "KoPageLayoutDialog.h"
 
 class KoPADocument;
-class KoPAPageThumbnailModel;
 struct KoPageLayout;
 
 class KoPAPageLayoutDialog : public KoPageLayoutDialog

libs/kopageapp/tools/backgroundTool/KoPABackgroundTool.cpp

@@ -22,8 +22,6 @@
 
 //Qt includes
 #include <QList>
-#include <QLabel>
-#include <QPainter>
 
 //KDE includes
 #include <klocale.h>

libs/kopageapp/tools/backgroundTool/Plugin.cpp

@@ -20,7 +20,6 @@
 #include "Plugin.h"
 #include "KoPABackgroundToolFactory.h"
 
-#include <KoShapeRegistry.h>
 #include <KoToolRegistry.h>
 
 #include <kpluginfactory.h>

libs/kopageapp/widgets/KoPageNavigator.h

@@ -24,9 +24,7 @@
 // Qt
 #include <QStackedWidget>
 
-class KoPageNavigatorButton;
 class KoPAView;
-class KActionCollection;
 
 
 class KoPageNavigator : public QStackedWidget