[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra] libs: Some little #include cleanup in libs/
From: Friedrich W. H. Kossebau <kossebau () kde ! org>
Date: 2013-02-28 21:11:53
Message-ID: 20130228211153.76ACFA604F () git ! kde ! org
[Download RAW message or body]
Git commit c2c92b75d1918dabe0786c265b8e4267e60d46d4 by Friedrich W. H. Koss=
ebau.
Committed on 28/02/2013 at 22:11.
Pushed by kossebau into branch 'master'.
Some little #include cleanup in libs/
M +9 -7 libs/flake/KoOdfGradientBackground.cpp
M +2 -3 libs/flake/KoOdfWorkaround.cpp
M +2 -1 libs/flake/KoPathShape.cpp
M +11 -6 libs/flake/KoShapeFactoryBase.cpp
M +6 -7 libs/flake/KoUnavailShape.cpp
M +10 -12 libs/kopageapp/KoPACanvasItem.cpp
M +8 -9 libs/kopageapp/KoPAPageBase.cpp
M +6 -6 libs/koproperty/editors/symbolcombo.cpp
M +5 -6 libs/main/KoAutoSaveRecoveryDialog.cpp
M +0 -1 libs/main/KoFilterManager_p.cpp
M +6 -4 libs/main/KoFilterManager_p.h
M +5 -5 libs/main/KoPart.cpp
M +1 -1 libs/main/KoToolDocker.cpp
M +2 -2 libs/odf/KoGenChange.cpp
M +3 -1 libs/odf/KoShadowStyle.cpp
M +2 -0 libs/odf/KoShadowStyle.h
M +5 -5 libs/pigment/KoColorSpace.cpp
M +8 -9 libs/widgets/KoColorPopupAction.cpp
M +0 -1 libs/widgets/KoPositionSelector.cpp
M +0 -1 libs/widgets/KoResourceSelector.cpp
M +2 -1 libs/widgets/KoUniColorDialog.cpp
http://commits.kde.org/calligra/c2c92b75d1918dabe0786c265b8e4267e60d46d4
diff --git a/libs/flake/KoOdfGradientBackground.cpp b/libs/flake/KoOdfGradi=
entBackground.cpp
index 1098652..e5f6ccd 100644
--- a/libs/flake/KoOdfGradientBackground.cpp
+++ b/libs/flake/KoOdfGradientBackground.cpp
@@ -18,20 +18,22 @@
* Boston, MA 02110-1301, USA.
*/
=
-#include <QColor>
-#include <QImage>
-#include <qmath.h>
+#include "KoOdfGradientBackground.h"
=
-#include <KoOdfGradientBackground.h>
+#include "KoShapeBackground_p.h"
+#include "KoShapeSavingContext.h"
=
#include <KoUnit.h>
#include <KoXmlNS.h>
#include <KoXmlReader.h>
#include <KoGenStyles.h>
-#include <QPainter>
-#include "KoShapeSavingContext.h"
#include <KoOdfLoadingContext.h>
-#include "KoShapeBackground_p.h"
+
+#include <QPainter>
+#include <QColor>
+#include <QImage>
+#include <qmath.h>
+
=
class KoOdfGradientBackgroundPrivate : public KoShapeBackgroundPrivate
{
diff --git a/libs/flake/KoOdfWorkaround.cpp b/libs/flake/KoOdfWorkaround.cpp
index a2a81bc..8a5b593 100644
--- a/libs/flake/KoOdfWorkaround.cpp
+++ b/libs/flake/KoOdfWorkaround.cpp
@@ -24,12 +24,11 @@
=
#include "KoShapeLoadingContext.h"
#include "KoShape.h"
-#include <KoPathShape.h>
+#include "KoPathShape.h"
+#include "KoColorBackground.h"
#include <KoOdfLoadingContext.h>
-#include <KoOdfWorkaround.h>
#include <KoXmlReader.h>
#include <KoXmlNS.h>
-#include <KoColorBackground.h>
#include <KoStyleStack.h>
#include <KoUnit.h>
=
diff --git a/libs/flake/KoPathShape.cpp b/libs/flake/KoPathShape.cpp
index f30af8a..548abcb 100644
--- a/libs/flake/KoPathShape.cpp
+++ b/libs/flake/KoPathShape.cpp
@@ -20,9 +20,10 @@
* Boston, MA 02110-1301, USA.
*/
=
-#include "KoOdfWorkaround.h"
#include "KoPathShape.h"
#include "KoPathShape_p.h"
+
+#include "KoOdfWorkaround.h"
#include "KoPathPoint.h"
#include "KoShapeStrokeModel.h"
#include "KoViewConverter.h"
diff --git a/libs/flake/KoShapeFactoryBase.cpp b/libs/flake/KoShapeFactoryB=
ase.cpp
index fa4737c..1fb57fb 100644
--- a/libs/flake/KoShapeFactoryBase.cpp
+++ b/libs/flake/KoShapeFactoryBase.cpp
@@ -19,20 +19,25 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-#include <QMutexLocker>
-#include <QMutex>
-
-#include <kservice.h>
-#include <kservicetypetrader.h>
=
-#include <KoDocumentResourceManager.h>
#include "KoShapeFactoryBase.h"
+
+#include "KoDocumentResourceManager.h"
#include "KoDeferredShapeFactoryBase.h"
#include "KoShape.h"
#include "KoShapeLoadingContext.h"
+
#include <KoOdfLoadingContext.h>
#include <KoProperties.h>
=
+#include <kservice.h>
+#include <kservicetypetrader.h>
+
+#include <QMutexLocker>
+#include <QMutex>
+
+
+
#include <kdebug.h>
=
class KoShapeFactoryBase::Private
diff --git a/libs/flake/KoUnavailShape.cpp b/libs/flake/KoUnavailShape.cpp
index d0c9a09..ecc771f 100644
--- a/libs/flake/KoUnavailShape.cpp
+++ b/libs/flake/KoUnavailShape.cpp
@@ -37,20 +37,19 @@
#include <KDebug>
=
// Calligra
-#include "KoUnit.h"
-#include "KoStore.h"
-#include "KoXmlNS.h"
-#include "KoXmlReader.h"
+#include <KoUnit.h>
+#include <KoStore.h>
+#include <KoXmlReader.h>
#include <KoXmlWriter.h>
#include <KoXmlNS.h>
#include <KoOdfManifestEntry.h>
#include <KoOdfLoadingContext.h>
-#include <KoShapeLoadingContext.h>
-#include <KoShapeSavingContext.h>
#include <KoEmbeddedDocumentSaver.h>
+#include "KoShapeLoadingContext.h"
+#include "KoShapeSavingContext.h"
#include "KoShapeContainerDefaultModel.h"
#include "KoShapeRegistry.h"
-#include <KoShapeBackground.h>
+#include "KoShapeBackground.h"
=
=
// The XML of a frame looks something like this:
diff --git a/libs/kopageapp/KoPACanvasItem.cpp b/libs/kopageapp/KoPACanvasI=
tem.cpp
index 166867a..40ed201 100644
--- a/libs/kopageapp/KoPACanvasItem.cpp
+++ b/libs/kopageapp/KoPACanvasItem.cpp
@@ -20,27 +20,25 @@
=
#include "KoPACanvasItem.h"
=
-#include <QStyleOptionGraphicsItem>
-#include <QGraphicsSceneResizeEvent>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneWheelEvent>
-
-#include <KoShapeManager.h>
-#include <KoToolProxy.h>
-#include <KoUnit.h>
-#include <KoText.h>
-
#include "KoPADocument.h"
#include "KoPAView.h"
#include "KoPAViewMode.h"
#include "KoPAPage.h"
#include "KoPAPageProvider.h"
=
-#include <kxmlguifactory.h>
+#include <KoShapeManager.h>
+#include <KoToolProxy.h>
+#include <KoUnit.h>
+#include <KoText.h>
=
+#include <kxmlguifactory.h>
#include <KAction>
-#include <QMenu>
+
+#include <QStyleOptionGraphicsItem>
+#include <QGraphicsSceneResizeEvent>
#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsSceneWheelEvent>
+#include <QMenu>
=
KoPACanvasItem::KoPACanvasItem( KoPADocument * doc)
: QGraphicsWidget()
diff --git a/libs/kopageapp/KoPAPageBase.cpp b/libs/kopageapp/KoPAPageBase.=
cpp
index 09f76e4..d56c7fe 100644
--- a/libs/kopageapp/KoPAPageBase.cpp
+++ b/libs/kopageapp/KoPAPageBase.cpp
@@ -18,32 +18,31 @@
*/
=
#include "KoPAPageBase.h"
+
#include "KoPASavingContext.h"
#include "KoPALoadingContext.h"
#include "KoPAPixmapCache.h"
#include "KoPAPageContainerModel.h"
-#include "KoPASavingContext.h"
#include "KoPAUtil.h"
=
-#include <QPainter>
-
-#include <kdebug.h>
-
#include <KoXmlNS.h>
#include <KoPageLayout.h>
-#include <KoShapeSavingContext.h>
-#include <KoOdfLoadingContext.h>
-#include <KoShapeLayer.h>
-#include <KoShapeRegistry.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>
+#include <KoShapeRegistry.h>
#include <KoShapeBackground.h>
#include <KoZoomHandler.h>
=
+#include <kdebug.h>
+
+#include <QPainter>
+
=
KoPAPageBase::KoPAPageBase()
: KoShapeContainer( new KoPAPageContainerModel() )
diff --git a/libs/koproperty/editors/symbolcombo.cpp b/libs/koproperty/edit=
ors/symbolcombo.cpp
index 58ae776..592cb9b 100644
--- a/libs/koproperty/editors/symbolcombo.cpp
+++ b/libs/koproperty/editors/symbolcombo.cpp
@@ -18,6 +18,12 @@
* Boston, MA 02110-1301, USA.
*/
=
+#include "symbolcombo.h"
+
+#include <KCharSelect>
+#include <KLocale>
+#include <KDialog>
+
#include <QLineEdit>
#include <QPushButton>
#include <QLayout>
@@ -25,12 +31,6 @@
#include <QVariant>
#include <QHBoxLayout>
=
-#include <kcharselect.h>
-#include <klocale.h>
-#include <kdialog.h>
-
-#include "symbolcombo.h"
-
using namespace KoProperty;
=
SymbolCombo::SymbolCombo(Property *property, QWidget *parent)
diff --git a/libs/main/KoAutoSaveRecoveryDialog.cpp b/libs/main/KoAutoSaveR=
ecoveryDialog.cpp
index 15fbdea..170ac4e 100644
--- a/libs/main/KoAutoSaveRecoveryDialog.cpp
+++ b/libs/main/KoAutoSaveRecoveryDialog.cpp
@@ -19,6 +19,11 @@
=
#include "KoAutoSaveRecoveryDialog.h"
=
+#include <KoStore.h>
+
+#include <kwidgetitemdelegate.h>
+#include <klocale.h>
+
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QListView>
@@ -33,14 +38,8 @@
#include <QStyledItemDelegate>
#include <QPainter>
#include <QCheckBox>
-#include <QLabel>
#include <QDebug>
=
-#include <KoStore.h>
-
-#include <kwidgetitemdelegate.h>
-#include <klocale.h>
-
=
struct FileItem {
=
diff --git a/libs/main/KoFilterManager_p.cpp b/libs/main/KoFilterManager_p.=
cpp
index 175caac..aba5c02 100644
--- a/libs/main/KoFilterManager_p.cpp
+++ b/libs/main/KoFilterManager_p.cpp
@@ -20,7 +20,6 @@ the Free Software Foundation, Inc., 51 Franklin Street, F=
ifth Floor,
Boston, MA 02110-1301, USA.
*/
=
-#include "KoFilterManager.h"
#include "KoFilterManager_p.h"
=
#include <QVBoxLayout>
diff --git a/libs/main/KoFilterManager_p.h b/libs/main/KoFilterManager_p.h
index f7a4485..07e5785 100644
--- a/libs/main/KoFilterManager_p.h
+++ b/libs/main/KoFilterManager_p.h
@@ -21,14 +21,16 @@ Boston, MA 02110-1301, USA.
#ifndef __koFilterManager_p_h__
#define __koFilterManager_p_h__
=
-#include <QString>
-#include <QStringList>
-#include <QWeakPointer>
+#include "KoFilterManager.h"
+
#include <KUrl>
#include <KDialog>
-
#include <KoProgressUpdater.h>
=
+#include <QString>
+#include <QStringList>
+#include <QWeakPointer>
+
class QListWidget;
=
class KoFilterManager::Private
diff --git a/libs/main/KoPart.cpp b/libs/main/KoPart.cpp
index abf3c19..d1e86e5 100644
--- a/libs/main/KoPart.cpp
+++ b/libs/main/KoPart.cpp
@@ -21,27 +21,27 @@
* Boston, MA 02110-1301, USA.
*/
=
-#include "KoApplication.h"
#include "KoPart.h"
+
+#include "KoApplication.h"
#include "KoMainWindow.h"
#include "KoDocument.h"
#include "KoView.h"
-#include "KoCanvasController.h"
-#include "KoCanvasControllerWidget.h"
#include "KoOpenPane.h"
-#include "KoMainWindow.h"
#include "KoProgressProxy.h"
#include "KoFilterManager.h"
#include "KoServiceProvider.h"
#include <KoDocumentInfoDlg.h>
=
+#include <KoCanvasController.h>
+#include <KoCanvasControllerWidget.h>
+
#include <kdebug.h>
#include <kstandarddirs.h>
#include <kxmlguifactory.h>
#include <kdeprintdialog.h>
#include <knotification.h>
#include <kdialog.h>
-#include <kmessagebox.h>
#include <kdesktopfile.h>
#include <kmessagebox.h>
#include <kmimetype.h>
diff --git a/libs/main/KoToolDocker.cpp b/libs/main/KoToolDocker.cpp
index 60617a9..e4407a1 100644
--- a/libs/main/KoToolDocker.cpp
+++ b/libs/main/KoToolDocker.cpp
@@ -41,7 +41,7 @@
#include <QStyleOptionFrame>
#include <QToolButton>
#include <QTabWidget>
-#include <QToolButton>
+
=
class KoToolDocker::Private {
public:
diff --git a/libs/odf/KoGenChange.cpp b/libs/odf/KoGenChange.cpp
index f69473b..301fb47 100644
--- a/libs/odf/KoGenChange.cpp
+++ b/libs/odf/KoGenChange.cpp
@@ -17,10 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
=
-#include <QDateTime>
-
#include "KoGenChange.h"
+
#include <KoXmlWriter.h>
+#include <QDateTime>
=
#include <kdebug.h>
=
diff --git a/libs/odf/KoShadowStyle.cpp b/libs/odf/KoShadowStyle.cpp
index 97eaa70..04801bb 100644
--- a/libs/odf/KoShadowStyle.cpp
+++ b/libs/odf/KoShadowStyle.cpp
@@ -18,9 +18,11 @@
* Boston, MA 02110-1301, USA.
*/
=
-#include <KoUnit.h>
#include "KoShadowStyle.h"
=
+#include <KoUnit.h>
+
+
// KoShadowStyle private class
class KoShadowStylePrivate: public QSharedData
{
diff --git a/libs/odf/KoShadowStyle.h b/libs/odf/KoShadowStyle.h
index 5fa3af7..5b63f55 100644
--- a/libs/odf/KoShadowStyle.h
+++ b/libs/odf/KoShadowStyle.h
@@ -21,6 +21,8 @@
#ifndef KOSHADOWSTYLE_H
#define KOSHADOWSTYLE_H
=
+#include "koodf_export.h"
+
#include <QColor>
#include <QMetaType>
#include <QPointF>
diff --git a/libs/pigment/KoColorSpace.cpp b/libs/pigment/KoColorSpace.cpp
index 17bb92a..930432a 100644
--- a/libs/pigment/KoColorSpace.cpp
+++ b/libs/pigment/KoColorSpace.cpp
@@ -18,10 +18,7 @@
*/
=
#include "KoColorSpace.h"
-
-#include <QThreadStorage>
-#include <QByteArray>
-#include <QBitArray>
+#include "KoColorSpace_p.h"
=
#include "KoChannelInfo.h"
#include "DebugPigment.h"
@@ -37,7 +34,10 @@
#include "KoFallBackColorTransformation.h"
#include "KoUniqueNumberForIdServer.h"
=
-#include "KoColorSpace_p.h"
+#include <QThreadStorage>
+#include <QByteArray>
+#include <QBitArray>
+
=
KoColorSpace::KoColorSpace()
: d(new Private())
diff --git a/libs/widgets/KoColorPopupAction.cpp b/libs/widgets/KoColorPopu=
pAction.cpp
index dc67c64..e5d2a6f 100644
--- a/libs/widgets/KoColorPopupAction.cpp
+++ b/libs/widgets/KoColorPopupAction.cpp
@@ -24,9 +24,14 @@
#include "KoTriangleColorSelector.h"
#include "KoColorSlider.h"
#include "KoCheckerBoardPainter.h"
-#include "KoColorSpaceRegistry.h"
-#include <KoResourceServer.h>
-#include <KoResourceServerProvider.h>
+#include "KoResourceServer.h"
+#include "KoResourceServerProvider.h"
+#include <KoColorSpaceRegistry.h>
+#include <KoColor.h>
+
+#include <KColorDialog>
+#include <KDebug>
+#include <KLocale>
=
#include <QPainter>
#include <QWidgetAction>
@@ -35,12 +40,6 @@
#include <QGridLayout>
#include <QToolButton>
=
-#include <KColorDialog>
-#include <KDebug>
-#include <klocale.h>
-
-#include <KoColor.h>
-#include <KoColorSpaceRegistry.h>
=
class KoColorPopupAction::KoColorPopupActionPrivate
{
diff --git a/libs/widgets/KoPositionSelector.cpp b/libs/widgets/KoPositionS=
elector.cpp
index 6f4af59..416d676 100644
--- a/libs/widgets/KoPositionSelector.cpp
+++ b/libs/widgets/KoPositionSelector.cpp
@@ -23,7 +23,6 @@
#include <QRadioButton>
#include <QGridLayout>
#include <QButtonGroup>
-#include <QButtonGroup>
#include <QPainter>
#include <kdebug.h>
#include <QStyleOption>
diff --git a/libs/widgets/KoResourceSelector.cpp b/libs/widgets/KoResourceS=
elector.cpp
index 9d4666d..d1af109 100644
--- a/libs/widgets/KoResourceSelector.cpp
+++ b/libs/widgets/KoResourceSelector.cpp
@@ -26,7 +26,6 @@
#include <QTableView>
#include <QListView>
#include <QHeaderView>
-#include <QHeaderView>
#include <QMouseEvent>
#include <QStyledItemDelegate>
=
diff --git a/libs/widgets/KoUniColorDialog.cpp b/libs/widgets/KoUniColorDia=
log.cpp
index 19f6205..dcee80e 100644
--- a/libs/widgets/KoUniColorDialog.cpp
+++ b/libs/widgets/KoUniColorDialog.cpp
@@ -17,9 +17,10 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
#include "KoUniColorDialog.h"
+
#include "KoUniColorChooser.h"
+#include <KLocale>
=
class KoUniColorDialogPrivate
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic