Clean up unneeded includes of libs/odf

parent 02c9e3d5
......@@ -44,7 +44,7 @@
#include <KoDataCenterBase.h>
#include <KoDocument.h>
#include <KoEmbeddedDocumentSaver.h>
#include <KoGenStyle.h>
#include <KoGenStyles.h>
#include <KoImageCollection.h>
#include <KoOdf.h>
#include <KoOdfReadStore.h>
......
......@@ -34,7 +34,7 @@
#include <KoShapeManager.h>
#include <KoDocument.h>
#include <KoEmbeddedDocumentSaver.h>
#include <KoGenStyle.h>
#include <KoGenStyles.h>
#include <KoOdfLoadingContext.h>
#include <KoOdfReadStore.h>
#include <KoOdfStylesReader.h>
......
......@@ -23,6 +23,7 @@
#include <KoOdfGraphicStyles.h>
#include <KoOdfLoadingContext.h>
#include <KoXmlNS.h>
#include <KoStyleStack.h>
#include <QColor>
#include <QPainter>
......
......@@ -28,6 +28,7 @@
#include <KoXmlReader.h>
#include <KoGenStyles.h>
#include <KoOdfLoadingContext.h>
#include <KoStyleStack.h>
#include <QPainter>
#include <QColor>
......
......@@ -61,6 +61,7 @@
#include <KoOdfStylesReader.h>
#include <KoOdfGraphicStyles.h>
#include <KoOdfLoadingContext.h>
#include <KoStyleStack.h>
#include <KoBorder.h>
#include <QPainter>
......
......@@ -29,6 +29,7 @@
#include <KoOdfLoadingContext.h>
#include <KoProperties.h>
#include <KoStyleStack.h>
#include <kservice.h>
#include <KoServiceLocator.h>
......
......@@ -40,6 +40,7 @@
#include <KoOdfLoadingContext.h>
#include <KoOasisSettings.h>
#include <KoStoreDevice.h>
#include <KoGenStyles.h>
#include <KoShapeController.h>
#include <KoShapeManager.h>
#include <KoShapeLayer.h>
......
......@@ -24,6 +24,7 @@
#include <KoShapePainter.h>
#include <KoGenStyle.h>
#include <KoGenStyles.h>
#include <KoXmlWriter.h>
#include <KoXmlNS.h>
#include <KoOdfStylesReader.h>
......
......@@ -27,6 +27,7 @@
#include <KoXmlNS.h>
#include <KoPageLayout.h>
#include <KoStyleStack.h>
#include <KoGenStyle.h>
#include <KoGenStyles.h>
#include <KoOdfStylesReader.h>
......
......@@ -21,6 +21,7 @@
#include <QBuffer>
#include <QString>
#include <KoGenStyles.h>
#include <KoOdfReadStore.h>
#include <KoXmlWriter.h>
#include <KoOdfLoadingContext.h>
......
......@@ -23,6 +23,7 @@
#include <KoXmlWriter.h>
#include <KoXmlNS.h>
#include <KoShapeSavingContext.h>
#include <KoOdfNumberDefinition.h>
#include <KoTextLoader.h>
#include <KoTextWriter.h>
#include <KoTextDocument.h>
......
......@@ -44,6 +44,7 @@
#include "KoList.h"
#include <KoOdfLoadingContext.h>
#include <KoOdfStylesReader.h>
#include <KoOdfLineNumberingConfiguration.h>
#include <KoProperties.h>
#include <KoShapeContainer.h>
#include <KoShapeFactoryBase.h>
......
......@@ -43,6 +43,7 @@
#include <KoGenStyle.h>
#include <KoShadowStyle.h>
#include <KoShapeLoadingContext.h>
#include <KoStyleStack.h>
#include "KoTextSharedLoadingData.h"
#include "KoInlineTextObjectManager.h"
#include "KoTextDocument.h"
......
......@@ -40,6 +40,8 @@
#include <KoGenStyles.h>
#include <KoShapeSavingContext.h>
#include <KoTextSharedSavingData.h>
#include <KoXmlWriter.h>
#include <KoOdfNumberDefinition.h>
#include <kundo2stack.h>
......
......@@ -24,8 +24,6 @@
// Qt
#include <QColor>
#include <QVector3D>
#include <QString>
#include <QList>
class KoXmlWriter;
class KoXmlElement;
......
......@@ -28,7 +28,6 @@
#include <KoUnit.h>
#include <KoXmlNS.h>
#include <KoXmlWriter.h>
#include <KoXmlReader.h>
#include <KoStyleStack.h>
......
......@@ -26,7 +26,6 @@
#include "koodf_export.h"
#include <QColor>
#include <QPen>
#include <QSharedData>
#include <QMetaType>
......@@ -38,6 +37,7 @@ class QPainter;
class KoStyleStack;
class KoBorderPrivate;
class QColor;
/**
* A container for all properties of a generic border as defined by ODF.
......
......@@ -23,14 +23,13 @@
#include <QSharedDataPointer>
#include <QSharedData>
#include <QUuid>
#include <QWeakPointer>
#include <QMap>
#include <QSet>
#include <KoXmlWriter.h>
#include <KoXmlReader.h>
#include "KoXmlReaderForward.h"
#include "koodf_export.h"
class KoXmlWriter;
class KoElementReferenceData : public QSharedData
{
public:
......
......@@ -20,13 +20,10 @@
#ifndef KOGENCHANGE_H
#define KOGENCHANGE_H
#include <QList>
#include <QMap>
#include <QString>
#include "koodf_export.h"
#include <QByteArray>
#include <kdebug.h>
class KoGenChanges;
......
......@@ -24,8 +24,6 @@
#include <QList>
#include <QMap>
#include <QMultiMap>
#include <QSet>
#include <QString>
#include <kdebug.h>
......
......@@ -22,10 +22,11 @@
#define KOGENCHANGES_H
#include "koodf_export.h"
#include "KoGenStyle.h"
#include <KoGenChange.h>
class KoXmlWriter;
/**
* @brief Repository of changes used during saving of OASIS/OOo file.
*
......
......@@ -28,7 +28,6 @@
#include <QList>
#include <QMap>
#include <QString>
#include <iostream>
#include "koodf_export.h"
class QTextLength;
......
......@@ -24,12 +24,10 @@
#define KOGENSTYLES_H
#include <QList>
#include <QMap>
#include <QMultiMap>
#include <QSet>
#include <QString>
#include <QFlags>
#include <KoGenStyle.h>
#include "KoGenStyle.h"
class KoStore;
class KoFontFace;
......
......@@ -24,7 +24,7 @@
#include <QDomDocument>
#include "koodf_export.h"
#include <KoXmlReader.h>
#include "KoXmlReader.h"
/**
* @brief Parse settings.xml file.
......
......@@ -17,12 +17,12 @@
* Boston, MA 02110-1301, USA.
*/
#include "KoOdfBibliographyConfiguration.h"
#include <kdebug.h>
#include <KoXmlNS.h>
#include "KoUnit.h"
#include "KoXmlNS.h"
#include "KoXmlWriter.h"
#include <QList>
#include <QPair>
const QList<QString> KoOdfBibliographyConfiguration::bibTypes = QList<QString>() << "article" << "book" << "booklet" << "conference"
<< "email" << "inbook" << "incollection"
......
......@@ -24,10 +24,10 @@
#include <QObject>
#include "KoXmlReader.h"
#include "KoXmlWriter.h"
#include "koodf_export.h"
class KoBibliographyInfo;
class KoXmlWriter;
typedef QPair<QString, Qt::SortOrder> SortKeyPair;
......
......@@ -28,7 +28,6 @@
#include <kdebug.h>
#include <KoGenStyle.h>
#include <KoGenStyles.h>
#include <KoStore.h>
#include <KoStoreDevice.h>
......@@ -37,7 +36,6 @@
#include <KoXmlNS.h>
#include <KoXmlWriter.h>
#include "KoOdfLoadingContext.h"
#include "KoOdfStylesReader.h"
void KoOdfGraphicStyles::saveOdfFillStyle(KoGenStyle &styleFill, KoGenStyles& mainStyles, const QBrush & brush)
......
......@@ -17,9 +17,12 @@
Boston, MA 02110-1301, USA.
*/
#include "KoOdfLineNumberingConfiguration.h"
#include <kdebug.h>
#include <KoXmlNS.h>
#include "KoXmlNS.h"
#include "KoUnit.h"
#include "KoXmlWriter.h"
#include "KoOdfNumberDefinition.h"
class KoOdfLineNumberingConfiguration::Private
{
......
......@@ -19,16 +19,15 @@
#ifndef KOODFLINENUMBERINGCONFIGURATION_H
#define KOODFLINENUMBERINGCONFIGURATION_H
#include <QString>
#include <QPair>
#include <QMetaType>
#include <QObject>
#include "KoXmlReader.h"
#include "KoXmlWriter.h"
#include "KoOdfNumberDefinition.h"
#include "koodf_export.h"
class KoXmlWriter;
class KoOdfNumberDefinition;
/**
* Implement section 14.9.1: Line Numbering Configuration.
*
......
......@@ -33,6 +33,7 @@
#include <KoStoreDevice.h>
#include <KoXmlNS.h>
#include <KoOdfManifestEntry.h>
#include "KoStyleStack.h"
......
......@@ -21,17 +21,15 @@
#ifndef KOODFLOADINGCONTEXT_H
#define KOODFLOADINGCONTEXT_H
#include <QString>
#include <kcomponentdata.h>
#include "koodf_export.h"
#include "KoStyleStack.h"
#include "KoOdfStylesReader.h"
class KoStore;
class KoOdfManifestEntry;
class KoStyleStack;
/**
......
......@@ -21,6 +21,7 @@
// Own
#include "KoOdfManifestEntry.h"
#include <QString>
class KoOdfManifestEntry::Private
{
......
......@@ -20,13 +20,11 @@
#ifndef KOODFMANIFEST_H
#define KOODFMANIFEST_H
#include <QString>
#include "koodf_export.h"
class KoStore;
class QString;
// A class that holds a manifest:file-entry.
......
......@@ -17,9 +17,11 @@
Boston, MA 02110-1301, USA.
*/
#include "KoOdfNotesConfiguration.h"
#include <kdebug.h>
#include <KoXmlNS.h>
#include "KoUnit.h"
#include "KoXmlNS.h"
#include "KoXmlWriter.h"
#include "KoOdfNumberDefinition.h"
class KoOdfNotesConfiguration::Private
{
......
......@@ -19,15 +19,15 @@
#ifndef KOODFNOTESCONFIGURATION_H
#define KOODFNOTESCONFIGURATION_H
#include <QString>
#include <QPair>
#include <QMetaType>
#include <QObject>
#include "KoXmlReader.h"
#include "KoXmlWriter.h"
#include "KoOdfNumberDefinition.h"
#include "koodf_export.h"
class KoXmlWriter;
class KoOdfNumberDefinition;
/**
* load and save the notes-configuration element from the text: namespace.
*
......
......@@ -18,7 +18,9 @@
Boston, MA 02110-1301, USA.
*/
#include "KoOdfNumberDefinition.h"
#include "KoXmlNS.h"
#include "KoXmlWriter.h"
class KoOdfNumberDefinition::Private {
public:
......
......@@ -20,12 +20,11 @@
#ifndef KOODFNUMBERDEFINITION_H
#define KOODFNUMBERDEFINITION_H
#include <QString>
#include "KoXmlReader.h"
#include "KoXmlWriter.h"
#include "koodf_export.h"
class KoXmlWriter;
/**
* Load and save the ODF numbering scheme according to section 12.
*
......
......@@ -22,7 +22,7 @@
#define KOODFNUMBERSTYLES_H
#include "koodf_export.h"
#include <KoXmlReader.h>
#include "KoXmlReaderForward.h"
#include <QPair>
......
......@@ -27,7 +27,6 @@
#include <KoXmlReader.h>
#include "KoOdfStylesReader.h"
#include "KoXmlNS.h"
#include <QXmlStreamReader>
......
......@@ -20,17 +20,13 @@
#include "KoOdfStylesReader.h"
#include "KoGenStyles.h"
#include "KoXmlNS.h"
#include <QBuffer>
#include "KoOdfNotesConfiguration.h"
#include "KoOdfNumberDefinition.h"
#include "KoOdfLineNumberingConfiguration.h"
#include "KoOdfBibliographyConfiguration.h"
#include <kdebug.h>
#include <kglobal.h>
#include <KoXmlReader.h>
#include <KoOdfNotesConfiguration.h>
#include <KoOdfBibliographyConfiguration.h>
class KoOdfStylesReader::Private
{
......
......@@ -29,8 +29,9 @@
#include "koodf_export.h"
#include "KoOdfNumberStyles.h"
#include "KoOdfNotesConfiguration.h"
#include "KoOdfLineNumberingConfiguration.h"
#include "KoOdfBibliographyConfiguration.h"
class KoOdfLineNumberingConfiguration;
class KoOdfBibliographyConfiguration;
/**
* Repository of styles used during loading of OASIS/OOo file
......
......@@ -27,6 +27,7 @@
#include "KoXmlNS.h"
#include "KoUnit.h"
#include "KoXmlReader.h"
KoGenStyle KoPageLayout::saveOdf() const
{
......
......@@ -23,14 +23,14 @@
#ifndef KOPAGELAYOUT_H
#define KOPAGELAYOUT_H
#include "KoColumns.h"
#include "KoGenStyles.h"
#include "KoPageFormat.h"
#include "KoXmlReader.h"
#include "KoXmlReaderForward.h"
#include "KoBorder.h"
#include "koodf_export.h"
class KoGenStyle;
/**
* This structure defines the page layout, including
* its size in points, its format (e.g. A4), orientation, unit, margins etc.
......
......@@ -32,7 +32,6 @@
#include <QBuffer>
#include <QFileInfo>
#include <QFile>
#include <QDir>
#include <kurl.h>
#include <kdebug.h>
......
......@@ -21,16 +21,12 @@
#ifndef __koStore_h_
#define __koStore_h_
#include <QString>
#include <QStringList>
#include <QIODevice>
#include <QStack>
#include <QByteArray>
#include <QIODevice>
#include "koodf_export.h"
#include <kurl.h>
class QWidget;
class KUrl;
class KoStorePrivate;
/**
......
......@@ -20,7 +20,7 @@
#ifndef koStoreDevice_h
#define koStoreDevice_h
#include <KoStore.h>
#include "KoStore.h"
/**
* This class implements a QIODevice around KoStore, so that
......
......@@ -23,7 +23,8 @@
#include "KoStore.h"
#include <QString>
#include <QStringList>
#include <QStack>
#include <kurl.h>
......
......@@ -26,8 +26,6 @@
#include <kglobal.h>
#include <kdebug.h>
#include <QRegExp>
// ensure the same order as in KoUnit::Unit
static const char* const unitNameList[KoUnit::TypeCount] =
{
......
......@@ -27,7 +27,6 @@
// Calligra
#include "koodf_export.h"
// Qt
#include <QFlags>
#include <QString>
#include <QDebug>
#include <QMetaType>
......
......@@ -23,6 +23,7 @@
#include <kdebug.h>
#include <QIODevice>
#include <QByteArray>
#include <QStack>
#include <float.h>
static const int s_indentBufferLength = 100;
......
......@@ -22,13 +22,10 @@
#ifndef XMLWRITER_H
#define XMLWRITER_H
#include <QString>
#include <QStack>
#include <QMap>
#include <QIODevice>
#include "koodf_export.h"
/**
* A class for writing out XML (to any QIODevice), with a special attention on performance.
* The XML is being written out along the way, which avoids requiring the entire
......
......@@ -21,7 +21,6 @@
#define koZipStore_h
#include "KoStore.h"
#include <QByteArray>
class KZip;
class KArchiveDirectory;
......
......@@ -22,6 +22,7 @@
#include "KoStyleManager.h"
#include "KoParagraphStyle.h"
#include "KoTextLayoutObstruction.h"
#include <KoOdfNumberDefinition.h>
#include <QPainter>
......
......@@ -43,6 +43,7 @@
#include <KoShapeLoadingContext.h>
#include <KoShapeSavingContext.h>
#include <KoDocumentRdfBase.h>
#include <KoStyleStack.h>
#include <KoXmlWriter.h>
#include <KoXmlNS.h>
......
......@@ -22,6 +22,8 @@
#include <KoDpi.h>
#include <KoUnit.h>
#include <KoPageLayout.h>
#include <KoColumns.h>
#include <QPainter>
#include <kdebug.h>
......
......@@ -23,10 +23,11 @@
#include "kowidgets_export.h"