Commit 32c883b5 authored by Thomas Zander's avatar Thomas Zander

Cleanup includes

svn path=/trunk/koffice/; revision=741177
parent ba2f3bcf
......@@ -22,49 +22,25 @@
#include "DefaultTool.h"
#include "DefaultToolWidget.h"
#include "SelectionDecorator.h"
#include "ShapeMoveStrategy.h"
#include "ShapeRotateStrategy.h"
#include "ShapeShearStrategy.h"
#include "ShapeResizeStrategy.h"
#include <KoPointerEvent.h>
#include <KoToolManager.h>
#include <KoShape.h>
#include <KoSelection.h>
#include <KoShapeManager.h>
#include <KoInteractionStrategy.h>
#include <KoCanvasBase.h>
#include <KoPanTool.h>
#include <KoCanvasResourceProvider.h>
#include <KoShapeRubberSelectStrategy.h>
#include <commands/KoShapeMoveCommand.h>
#include <QMouseEvent>
#include <QPainter>
#include <QPainterPath>
#include <QBitmap>
#include <QTransform>
#include <QUndoCommand>
#include <kaction.h>
#include <kicon.h>
#include <kcursor.h>
#include <QAction>
#include <QKeyEvent>
#include <kstandarddirs.h>
#include <k3staticdeleter.h>
#include <kdebug.h>
#include "KoInteractionStrategy.h"
#include "KoSelection.h"
#include "KoShapeManager.h"
#include "KoPointerEvent.h"
#include "KoShapeRubberSelectStrategy.h"
#include "ShapeMoveStrategy.h"
#include "ShapeRotateStrategy.h"
#include "ShapeShearStrategy.h"
#include "ShapeResizeStrategy.h"
#include "KoCreateShapesTool.h"
#include "KoInteractionTool.h"
#include "KoCanvasBase.h"
#include "KoTool.h"
#include "KoShapeContainer.h"
#include <QUndoCommand>
#include <QMouseEvent>
#include <math.h>
#define HANDLE_DISTANCE 10
......@@ -128,53 +104,53 @@ bool DefaultTool::wantsAutoScroll()
void DefaultTool::setupActions()
{
KAction* actionBringToFront = new KAction( KIcon( "bring_forward" ),
QAction* actionBringToFront = new QAction( KIcon( "bring_forward" ),
i18n( "Bring to &Front" ), this );
addAction( "object_move_totop", actionBringToFront );
actionBringToFront->setShortcut( QKeySequence( "Ctrl+Shift+]" ) );
// connect(actionBringToFront, SIGNAL(triggered()), this, SLOT(selectionBringToFront()));
KAction* actionRaise = new KAction( KIcon( "raise" ), i18n( "&Raise" ), this );
QAction* actionRaise = new QAction( KIcon( "raise" ), i18n( "&Raise" ), this );
addAction( "object_move_up", actionRaise );
actionRaise->setShortcut( QKeySequence( "Ctrl+]" ) );
// connect(actionRaise, SIGNAL(triggered()), this, SLOT(selectionMoveUp()));
KAction* actionLower = new KAction( KIcon( "lower" ), i18n( "&Lower" ), this );
QAction* actionLower = new QAction( KIcon( "lower" ), i18n( "&Lower" ), this );
addAction( "object_move_down", actionLower );
actionLower->setShortcut( QKeySequence( "Ctrl+[" ) );
// connect(actionLower, SIGNAL(triggered()), this, SLOT(selectionMoveDown()));
KAction* actionSendToBack = new KAction( KIcon( "send_backward" ),
QAction* actionSendToBack = new QAction( KIcon( "send_backward" ),
i18n( "Send to &Back" ), this );
addAction( "object_move_tobottom", actionSendToBack );
actionSendToBack->setShortcut( QKeySequence( "Ctrl+Shift+[" ) );
// connect(actionSendToBack, SIGNAL(triggered()), this, SLOT(selectionSendToBack()));
KAction* actionAlignLeft = new KAction( KIcon( "aoleft" ),
QAction* actionAlignLeft = new QAction( KIcon( "aoleft" ),
i18n( "Align Left" ), this );
addAction( "object_align_horizontal_left", actionAlignLeft );
connect(actionAlignLeft, SIGNAL(triggered()), this, SLOT(selectionAlignHorizontalLeft()));
KAction* actionAlignCenter = new KAction( KIcon( "aocenterh" ),
QAction* actionAlignCenter = new QAction( KIcon( "aocenterh" ),
i18n( "Horizontally Center" ), this );
addAction( "object_align_horizontal_center", actionAlignCenter );
connect(actionAlignCenter, SIGNAL(triggered()), this, SLOT(selectionAlignHorizontalCenter()));
KAction* actionAlignRight = new KAction( KIcon( "aoright" ),
QAction* actionAlignRight = new QAction( KIcon( "aoright" ),
i18n( "Align Right" ), this );
addAction( "object_align_horizontal_right", actionAlignRight );
connect(actionAlignRight, SIGNAL(triggered()), this, SLOT(selectionAlignHorizontalRight()));
KAction* actionAlignTop = new KAction( KIcon( "aotop" ), i18n( "Align Top" ), this );
QAction* actionAlignTop = new QAction( KIcon( "aotop" ), i18n( "Align Top" ), this );
addAction( "object_align_vertical_top", actionAlignTop );
connect(actionAlignTop, SIGNAL(triggered()), this, SLOT(selectionAlignVerticalTop()));
KAction* actionAlignMiddle = new KAction( KIcon( "aocenterv" ),
QAction* actionAlignMiddle = new QAction( KIcon( "aocenterv" ),
i18n( "Vertically Center" ), this );
addAction( "object_align_vertical_center", actionAlignMiddle );
connect(actionAlignMiddle, SIGNAL(triggered()), this, SLOT(selectionAlignVerticalCenter()));
KAction* actionAlignBottom = new KAction( KIcon( "aobottom" ),
QAction* actionAlignBottom = new QAction( KIcon( "aobottom" ),
i18n( "Align Bottom" ), this );
addAction( "object_align_vertical_bottom", actionAlignBottom );
connect(actionAlignBottom, SIGNAL(triggered()), this, SLOT(selectionAlignVerticalBottom()));
......
......@@ -23,16 +23,15 @@
#define DEFAULTTOOL_H
#include <KoInteractionTool.h>
#include <KoSelection.h>
#include <KoFlake.h>
#include <commands/KoShapeAlignCommand.h>
//#include <k3staticdeleter.h>
#include <QImage>
#include <QPolygonF>
#include <QTime>
class KoInteractionStrategy;
class KoShapeMoveCommand;
class KoSelection;
/**
* The default tool (associated with the arrow icon) implements the default
......
/* This file is part of the KDE project
*
* Copyright (C) 2006 Thomas Zander <zander@kde.org>
* Copyright (C) 2006-2007 Thomas Zander <zander@kde.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
......
/* This file is part of the KDE project
*
* Copyright (C) 2006 Thomas Zander <zander@kde.org>
* Copyright (C) 2006-2007 Thomas Zander <zander@kde.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
......@@ -21,7 +21,7 @@
#ifndef DEFAULTTOOLFACTORY_H
#define DEFAULTTOOLFACTORY_H
#include "KoToolFactory.h"
#include <KoToolFactory.h>
/// Factory for the KoInteractionTool
class DefaultToolFactory : public KoToolFactory {
......
......@@ -18,13 +18,14 @@
*/
#include "DefaultToolWidget.h"
#include "KoInteractionTool.h"
#include "KoCanvasBase.h"
#include "KoShapeManager.h"
#include "KoSelection.h"
#include "commands/KoShapeMoveCommand.h"
#include "commands/KoShapeSizeCommand.h"
#include "commands/KoShapeTransformCommand.h"
#include <KoInteractionTool.h>
#include <KoCanvasBase.h>
#include <KoShapeManager.h>
#include <KoSelection.h>
#include <commands/KoShapeMoveCommand.h>
#include <commands/KoShapeSizeCommand.h>
#include <commands/KoShapeTransformCommand.h>
#include <QPainter>
#include <QSize>
......
......@@ -21,31 +21,10 @@
#include "SelectionDecorator.h"
#include <QMouseEvent>
#include <QPainter>
#include <QPainterPath>
#include <QBitmap>
#include <QTransform>
#include "KoPointerEvent.h"
#include "KoToolManager.h"
#include "KoShape.h"
#include "KoSelection.h"
#include "KoShapeManager.h"
#include "KoInteractionStrategy.h"
//#include "KoInteractionToolWidget.h"
#include "KoCanvasBase.h"
#include "KoPanTool.h"
#include "KoCanvasResourceProvider.h"
#include "commands/KoShapeMoveCommand.h"
#include <QUndoCommand>
#include <kaction.h>
#include <kicon.h>
#include <kcursor.h>
#include <KoShape.h>
#include <KoSelection.h>
#include <kstandarddirs.h>
#include <k3staticdeleter.h>
#include <kdebug.h>
#define HANDLE_DISTANCE 10
......@@ -238,5 +217,3 @@ void SelectionDecorator::paint(QPainter &painter, const KoViewConverter &convert
#endif
}
#include "SelectionDecorator.moc"
......@@ -22,19 +22,12 @@
#ifndef SELECTIONDECORATOR_H
#define SELECTIONDECORATOR_H
#include "KoTool.h"
#include "KoSelection.h"
#include "commands/KoShapeAlignCommand.h"
#include <flake_export.h>
//#include <k3staticdeleter.h>
#include <QImage>
#include <QTime>
#include <KoViewConverter.h>
#include <KoFlake.h>
#include <QPainter>
class KoInteractionStrategy;
class KoSelection;
/**
* The SelectionDecorator is used to paint extra user-interface items on top of a selection.
......
/* This file is part of the KDE project
Copyright (C) 2006 Thorsten Zachmann <zachmann@kde.org>
Copyright (C) 2006 Thomas Zander <zander@kde.org>
Copyright (C) 2006-2007 Thomas Zander <zander@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
......@@ -22,20 +22,12 @@
#include "ShapeMoveStrategy.h"
#include "SelectionDecorator.h"
#include "KoCanvasBase.h"
#include "KoShapeManager.h"
#include "KoShapeContainer.h"
#include "KoShapeContainerModel.h"
#include "KoSelection.h"
#include "KoPointerEvent.h"
#include "KoCanvasResourceProvider.h"
#include "KoInteractionTool.h"
#include "commands/KoShapeMoveCommand.h"
#include <kdebug.h>
#include <QPainter>
#include <QMouseEvent>
#include <QPainterPath>
#include <KoCanvasBase.h>
#include <KoShapeManager.h>
#include <KoShapeContainer.h>
#include <KoShapeContainerModel.h>
#include <KoCanvasResourceProvider.h>
#include <commands/KoShapeMoveCommand.h>
ShapeMoveStrategy::ShapeMoveStrategy( KoTool *tool, KoCanvasBase *canvas, const QPointF &clicked)
: KoInteractionStrategy(tool, canvas)
......
......@@ -22,7 +22,7 @@
#ifndef SHAPEMOVESTRATEGY_H
#define SHAPEMOVESTRATEGY_H
#include "KoInteractionStrategy.h"
#include <KoInteractionStrategy.h>
#include <QPointF>
......
/* This file is part of the KDE project
* Copyright (C) 2006 Thomas Zander <zander@kde.org>
* Copyright (C) 2006-2007 Thomas Zander <zander@kde.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
......@@ -20,8 +20,7 @@
#ifndef SHAPERESIZESTRATEGY_H
#define SHAPERESIZESTRATEGY_H
#include "KoInteractionStrategy.h"
#include "KoInteractionTool.h"
#include <KoInteractionStrategy.h>
#include <QPointF>
......
/* This file is part of the KDE project
* Copyright (C) 2006 Thomas Zander <zander@kde.org>
* Copyright (C) 2006-2007 Thomas Zander <zander@kde.org>
* Copyright (C) 2007 Jan Hambrecht <jaham@gmx.net>
*
* This library is free software; you can redistribute it and/or
......
/* This file is part of the KDE project
* Copyright (C) 2006 Thomas Zander <zander@kde.org>
* Copyright (C) 2006-2007 Thomas Zander <zander@kde.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
......@@ -20,7 +20,7 @@
#ifndef SHAPEROTATESTRATEGY_H
#define SHAPEROTATESTRATEGY_H
#include "KoInteractionStrategy.h"
#include <KoInteractionStrategy.h>
#include <QPointF>
......
/* This file is part of the KDE project
* Copyright (C) 2006 Thomas Zander <zander@kde.org>
* Copyright (C) 2006-2007 Thomas Zander <zander@kde.org>
* Copyright (C) 2006 casper Boemann <cbr@boemann.dk>
* Copyright (C) 2007 Jan Hambrecht <jaham@gmx.net>
*
......
/* This file is part of the KDE project
* Copyright (C) 2006 Thomas Zander <zander@kde.org>
* Copyright (C) 2006-2007 Thomas Zander <zander@kde.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
......@@ -20,7 +20,7 @@
#ifndef SHAPESHEARSTRATEGY_H
#define SHAPESHEARSTRATEGY_H
#include "KoInteractionStrategy.h"
#include <KoInteractionStrategy.h>
#include <QPointF>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment