Commit 091f60d9 authored by Inge Wallin's avatar Inge Wallin

Rename class KoLineBorder -> KoShapeStroke

This is the logical conclusion to the last 3 commits.

REVIEW: 104421
parent 12b0f745
......@@ -77,7 +77,7 @@ set(flake_SRCS
KoPathShapeLoader.cpp
ShapeDeleter_p.cpp
KoShapeStrokeModel.cpp
KoLineBorder.cpp
KoShapeStroke.cpp
KoShapeBackground.cpp
KoColorBackground.cpp
KoGradientBackground.cpp
......
......@@ -26,7 +26,7 @@
#include <KDebug>
#include "KoShape.h"
#include "KoLineBorder.h"
#include "KoShapeStroke.h"
#include "KoResourceManager_p.h"
class KoCanvasResourceManager::Private
......@@ -114,20 +114,20 @@ KoUnit KoCanvasResourceManager::unitResource(int key) const
}
void KoCanvasResourceManager::setActiveStroke(const KoLineBorder &stroke)
void KoCanvasResourceManager::setActiveStroke(const KoShapeStroke &stroke)
{
QVariant v;
v.setValue(stroke);
setResource(ActiveStroke, v);
}
KoLineBorder KoCanvasResourceManager::activeStroke() const
KoShapeStroke KoCanvasResourceManager::activeStroke() const
{
if (!d->manager.hasResource(ActiveStroke)) {
KoLineBorder empty;
KoShapeStroke empty;
return empty;
}
return resource(ActiveStroke).value<KoLineBorder>();
return resource(ActiveStroke).value<KoShapeStroke>();
}
bool KoCanvasResourceManager::boolResource(int key) const
......
......@@ -32,7 +32,7 @@
#include <KoUnit.h>
class KoShape;
class KoLineBorder;
class KoShapeStroke;
class KUndo2Stack;
class KoImageCollection;
class KoOdfDocument;
......@@ -159,10 +159,10 @@ public:
KoColor backgroundColor() const;
/// Sets the stroke resource
void setActiveStroke(const KoLineBorder &stroke);
void setActiveStroke(const KoShapeStroke &stroke);
/// Returns the stroke resource
KoLineBorder activeStroke() const;
KoShapeStroke activeStroke() const;
/**
* Return the resource determined by param key as a boolean.
......
......@@ -27,7 +27,7 @@
#include <KoXmlNS.h>
#include <klocale.h>
#include <KoLineBorder.h>
#include <KoShapeStroke.h>
#include <KoShapeLoadingContext.h>
KoConnectionShapeFactory::KoConnectionShapeFactory()
......@@ -42,7 +42,7 @@ KoConnectionShapeFactory::KoConnectionShapeFactory()
KoShape* KoConnectionShapeFactory::createDefaultShape(KoDocumentResourceManager *) const
{
KoConnectionShape * shape = new KoConnectionShape();
shape->setStroke(new KoLineBorder());
shape->setStroke(new KoShapeStroke());
shape->setShapeId(KoPathShapeId);
return shape;
}
......
......@@ -32,7 +32,6 @@
#include <KoUnit.h>
class KoShape;
class KoLineBorder;
class KUndo2Stack;
class KoImageCollection;
class KoOdfDocument;
......
......@@ -19,9 +19,9 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#include "KoFlake.h"
#include "KoShape.h"
#include "KoLineBorder.h"
#include <QGradient>
#include <math.h>
......
......@@ -35,7 +35,7 @@
#include "KoFilterEffectStack.h"
#include "KoMarker.h"
#include "KoMarkerSharedLoadingData.h"
#include "KoLineBorder.h"
#include "KoShapeStroke.h"
#include <KoXmlReader.h>
#include <KoXmlWriter.h>
......@@ -199,7 +199,7 @@ QString KoPathShape::saveStyle(KoGenStyle &style, KoShapeSavingContext &context)
style.addProperty("svg:fill-rule", d->fillRule == Qt::OddEvenFill ? "evenodd" : "nonzero");
KoLineBorder *lineBorder = dynamic_cast<KoLineBorder*>(stroke());
KoShapeStroke *lineBorder = dynamic_cast<KoShapeStroke*>(stroke());
qreal lineWidth = 0;
if (lineBorder) {
lineWidth = lineBorder->lineWidth();
......@@ -228,7 +228,7 @@ void KoPathShape::loadStyle(const KoXmlElement & element, KoShapeLoadingContext
#endif
}
KoLineBorder *lineBorder = dynamic_cast<KoLineBorder*>(stroke());
KoShapeStroke *lineBorder = dynamic_cast<KoShapeStroke*>(stroke());
qreal lineWidth = 0;
if (lineBorder) {
lineWidth = lineBorder->lineWidth();
......@@ -411,7 +411,7 @@ QRectF KoPathShape::boundingRect() const
// calculate the bounding rect of the transformed outline
QRectF bb;
if (d->startMarker.marker() || d->endMarker.marker()) {
KoLineBorder *lineBorder = dynamic_cast<KoLineBorder*>(stroke());
KoShapeStroke *lineBorder = dynamic_cast<KoShapeStroke*>(stroke());
QPen pen;
if (lineBorder) {
pen.setWidthF(lineBorder->lineWidth());
......
......@@ -19,7 +19,7 @@
*/
#include "KoPathShapeFactory.h"
#include "KoPathShape.h"
#include "KoLineBorder.h"
#include "KoShapeStroke.h"
#include "KoImageCollection.h"
#include "KoMarkerCollection.h"
#include "KoDocumentResourceManager.h"
......@@ -48,7 +48,7 @@ KoShape *KoPathShapeFactory::createDefaultShape(KoDocumentResourceManager *) con
path->curveTo(QPointF(0, 120), QPointF(50, 120), QPointF(50, 50));
path->curveTo(QPointF(50, -20), QPointF(100, -20), QPointF(100, 50));
path->normalize();
path->setStroke(new KoLineBorder(1.0));
path->setStroke(new KoShapeStroke(1.0));
return path;
}
......
......@@ -26,7 +26,6 @@
#include <KDebug>
#include "KoShape.h"
#include "KoLineBorder.h"
void KoResourceManager::setResource(int key, const QVariant &value)
{
......
......@@ -40,7 +40,7 @@
#include "KoShapeSavingContext.h"
#include "KoShapeLoadingContext.h"
#include "KoViewConverter.h"
#include "KoLineBorder.h"
#include "KoShapeStroke.h"
#include "ShapeDeleter_p.h"
#include "KoShapeShadow.h"
#include "KoClipPath.h"
......@@ -1494,7 +1494,7 @@ KoShapeStrokeModel *KoShape::loadOdfStroke(const KoXmlElement &element, KoShapeL
if (stroke == "solid" || stroke == "dash") {
QPen pen = KoOdfGraphicStyles::loadOdfStrokeStyle(styleStack, stroke, stylesReader);
KoLineBorder *stroke = new KoLineBorder();
KoShapeStroke *stroke = new KoShapeStroke();
if (styleStack.hasProperty(KoXmlNS::calligra, "stroke-gradient")) {
QString gradientName = styleStack.property(KoXmlNS::calligra, "stroke-gradient");
......@@ -1517,7 +1517,7 @@ KoShapeStrokeModel *KoShape::loadOdfStroke(const KoXmlElement &element, KoShapeL
} else if (stroke.isEmpty()) {
QPen pen = KoOdfGraphicStyles::loadOdfStrokeStyle(styleStack, "solid", stylesReader);
if (KoOdfWorkaround::fixMissingStroke(pen, element, context, this)) {
KoLineBorder *stroke = new KoLineBorder();
KoShapeStroke *stroke = new KoShapeStroke();
#ifndef NWORKAROUND_ODF_BUGS
KoOdfWorkaround::fixPenWidth(pen, context);
......
/* This file is part of the KDE project
*
* Copyright (C) 2006-2007 Thomas Zander <zander@kde.org>
* Copyright (C) 2006-2008 Jan Hambrecht <jaham@gmx.net>
* Copyright (C) 2007,2009 Thorsten Zachmann <zachmann@kde.org>
* Copyright (C) 2012 Inge Wallin <inge@lysator.liu.se>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
......@@ -19,23 +21,29 @@
* Boston, MA 02110-1301, USA.
*/
#include "KoLineBorder.h"
#include "KoViewConverter.h"
#include "KoShape.h"
#include "KoShapeSavingContext.h"
// Own
#include "KoShapeStroke.h"
#include "KoPathShape.h"
#include "KoMarkerData.h"
// Posix
#include <math.h>
// Qt
#include <QPainterPath>
// Calligra
#include <KoGenStyle.h>
#include <KoGenStyles.h>
#include <KoOdfGraphicStyles.h>
#include <math.h>
// Flake
#include "KoViewConverter.h"
#include "KoShape.h"
#include "KoShapeSavingContext.h"
#include "KoPathShape.h"
#include "KoMarkerData.h"
class KoLineBorder::Private
class KoShapeStroke::Private
{
public:
void paintBorder(KoShape *shape, QPainter &painter, const QPen &pen) const;
......@@ -44,7 +52,7 @@ public:
QBrush brush;
};
void KoLineBorder::Private::paintBorder(KoShape *shape, QPainter &painter, const QPen &pen) const
void KoShapeStroke::Private::paintBorder(KoShape *shape, QPainter &painter, const QPen &pen) const
{
if (!pen.isCosmetic()) {
KoPathShape *pathShape = dynamic_cast<KoPathShape *>(shape);
......@@ -58,7 +66,7 @@ void KoLineBorder::Private::paintBorder(KoShape *shape, QPainter &painter, const
}
KoLineBorder::KoLineBorder()
KoShapeStroke::KoShapeStroke()
: d(new Private())
{
d->color = QColor(Qt::black);
......@@ -67,7 +75,7 @@ KoLineBorder::KoLineBorder()
d->pen.setWidthF(1.0);
}
KoLineBorder::KoLineBorder(const KoLineBorder &other)
KoShapeStroke::KoShapeStroke(const KoShapeStroke &other)
: KoShapeStrokeModel(), d(new Private())
{
d->color = other.d->color;
......@@ -75,7 +83,7 @@ KoLineBorder::KoLineBorder(const KoLineBorder &other)
d->brush = other.d->brush;
}
KoLineBorder::KoLineBorder(qreal lineWidth, const QColor &color)
KoShapeStroke::KoShapeStroke(qreal lineWidth, const QColor &color)
: d(new Private())
{
d->pen.setWidthF(qMax(qreal(0.0), lineWidth));
......@@ -83,12 +91,12 @@ KoLineBorder::KoLineBorder(qreal lineWidth, const QColor &color)
d->color = color;
}
KoLineBorder::~KoLineBorder()
KoShapeStroke::~KoShapeStroke()
{
delete d;
}
KoLineBorder &KoLineBorder::operator = (const KoLineBorder &rhs)
KoShapeStroke &KoShapeStroke::operator = (const KoShapeStroke &rhs)
{
if (this == &rhs)
return *this;
......@@ -100,7 +108,7 @@ KoLineBorder &KoLineBorder::operator = (const KoLineBorder &rhs)
return *this;
}
void KoLineBorder::fillStyle(KoGenStyle &style, KoShapeSavingContext &context) const
void KoShapeStroke::fillStyle(KoGenStyle &style, KoShapeSavingContext &context) const
{
QPen pen = d->pen;
if (d->brush.gradient())
......@@ -110,7 +118,7 @@ void KoLineBorder::fillStyle(KoGenStyle &style, KoShapeSavingContext &context) c
KoOdfGraphicStyles::saveOdfStrokeStyle(style, context.mainStyles(), pen);
}
void KoLineBorder::strokeInsets(const KoShape *shape, KoInsets &insets) const
void KoShapeStroke::strokeInsets(const KoShape *shape, KoInsets &insets) const
{
Q_UNUSED(shape);
qreal lineWidth = d->pen.widthF();
......@@ -129,12 +137,12 @@ void KoLineBorder::strokeInsets(const KoShape *shape, KoInsets &insets) const
insets.right = lineWidth;
}
bool KoLineBorder::hasTransparency() const
bool KoShapeStroke::hasTransparency() const
{
return d->color.alpha() > 0;
}
void KoLineBorder::paint(KoShape *shape, QPainter &painter, const KoViewConverter &converter)
void KoShapeStroke::paint(KoShape *shape, QPainter &painter, const KoViewConverter &converter)
{
KoShape::applyConversion(painter, converter);
......@@ -148,7 +156,7 @@ void KoLineBorder::paint(KoShape *shape, QPainter &painter, const KoViewConverte
d->paintBorder(shape, painter, pen);
}
void KoLineBorder::paint(KoShape *shape, QPainter &painter, const KoViewConverter &converter, const QColor &color)
void KoShapeStroke::paint(KoShape *shape, QPainter &painter, const KoViewConverter &converter, const QColor &color)
{
KoShape::applyConversion(painter, converter);
......@@ -158,57 +166,57 @@ void KoLineBorder::paint(KoShape *shape, QPainter &painter, const KoViewConverte
d->paintBorder(shape, painter, pen);
}
void KoLineBorder::setCapStyle(Qt::PenCapStyle style)
void KoShapeStroke::setCapStyle(Qt::PenCapStyle style)
{
d->pen.setCapStyle(style);
}
Qt::PenCapStyle KoLineBorder::capStyle() const
Qt::PenCapStyle KoShapeStroke::capStyle() const
{
return d->pen.capStyle();
}
void KoLineBorder::setJoinStyle(Qt::PenJoinStyle style)
void KoShapeStroke::setJoinStyle(Qt::PenJoinStyle style)
{
d->pen.setJoinStyle(style);
}
Qt::PenJoinStyle KoLineBorder::joinStyle() const
Qt::PenJoinStyle KoShapeStroke::joinStyle() const
{
return d->pen.joinStyle();
}
void KoLineBorder::setLineWidth(qreal lineWidth)
void KoShapeStroke::setLineWidth(qreal lineWidth)
{
d->pen.setWidthF(qMax(qreal(0.0), lineWidth));
}
qreal KoLineBorder::lineWidth() const
qreal KoShapeStroke::lineWidth() const
{
return d->pen.widthF();
}
void KoLineBorder::setMiterLimit(qreal miterLimit)
void KoShapeStroke::setMiterLimit(qreal miterLimit)
{
d->pen.setMiterLimit(miterLimit);
}
qreal KoLineBorder::miterLimit() const
qreal KoShapeStroke::miterLimit() const
{
return d->pen.miterLimit();
}
QColor KoLineBorder::color() const
QColor KoShapeStroke::color() const
{
return d->color;
}
void KoLineBorder::setColor(const QColor &color)
void KoShapeStroke::setColor(const QColor &color)
{
d->color = color;
}
void KoLineBorder::setLineStyle(Qt::PenStyle style, const QVector<qreal> &dashes)
void KoShapeStroke::setLineStyle(Qt::PenStyle style, const QVector<qreal> &dashes)
{
if (style < Qt::CustomDashLine)
d->pen.setStyle(style);
......@@ -216,32 +224,32 @@ void KoLineBorder::setLineStyle(Qt::PenStyle style, const QVector<qreal> &dashes
d->pen.setDashPattern(dashes);
}
Qt::PenStyle KoLineBorder::lineStyle() const
Qt::PenStyle KoShapeStroke::lineStyle() const
{
return d->pen.style();
}
QVector<qreal> KoLineBorder::lineDashes() const
QVector<qreal> KoShapeStroke::lineDashes() const
{
return d->pen.dashPattern();
}
void KoLineBorder::setDashOffset(qreal dashOffset)
void KoShapeStroke::setDashOffset(qreal dashOffset)
{
d->pen.setDashOffset(dashOffset);
}
qreal KoLineBorder::dashOffset() const
qreal KoShapeStroke::dashOffset() const
{
return d->pen.dashOffset();
}
void KoLineBorder::setLineBrush(const QBrush &brush)
void KoShapeStroke::setLineBrush(const QBrush &brush)
{
d->brush = brush;
}
QBrush KoLineBorder::lineBrush() const
QBrush KoShapeStroke::lineBrush() const
{
return d->brush;
}
/* This file is part of the KDE project
*
* Copyright (C) 2006-2007 Thomas Zander <zander@kde.org>
* Copyright (C) 2006-2008 Jan Hambrecht <jaham@gmx.net>
* Copyright (C) 2007,2009 Thorsten Zachmann <zachmann@kde.org>
* Copyright (C) 2012 Inge Wallin <inge@lysator.liu.se>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
......@@ -35,25 +37,25 @@ class KoViewConverter;
/**
* A border for shapes that draws a single line around the object.
*/
class FLAKE_EXPORT KoLineBorder : public KoShapeStrokeModel
class FLAKE_EXPORT KoShapeStroke : public KoShapeStrokeModel
{
public:
/// Constructor for a thin line in black
KoLineBorder();
KoShapeStroke();
/// Copy constructor
KoLineBorder(const KoLineBorder &other);
KoShapeStroke(const KoShapeStroke &other);
/**
* Constructor for a lineBorder
* Constructor for a Stroke
* @param lineWidth the width, in pt
* @param color the color we draw the outline in.
*/
explicit KoLineBorder(qreal lineWidth, const QColor &color = Qt::black);
virtual ~KoLineBorder();
explicit KoShapeStroke(qreal lineWidth, const QColor &color = Qt::black);
virtual ~KoShapeStroke();
/// Assignment operator
KoLineBorder& operator = (const KoLineBorder &rhs);
KoShapeStroke& operator = (const KoShapeStroke &rhs);
/// Sets the lines cap style
void setCapStyle(Qt::PenCapStyle style);
......@@ -104,6 +106,6 @@ private:
Private * const d;
};
Q_DECLARE_METATYPE( KoLineBorder )
Q_DECLARE_METATYPE( KoShapeStroke )
#endif
......@@ -22,7 +22,7 @@
#define SVGGRAPHICCONTEXT_H
#include "flake_export.h"
#include <KoLineBorder.h>
#include <KoShapeStroke.h>
class FLAKE_EXPORT SvgGraphicsContext
{
......@@ -36,14 +36,14 @@ public:
SvgGraphicsContext();
StyleType fillType; ///< the current fill type
Qt::FillRule fillRule; ///< the current fill rule
QColor fillColor; ///< the current fill color
QString fillId; ///< the current fill id (used for gradient/pattern fills)
StyleType fillType; ///< the current fill type
Qt::FillRule fillRule; ///< the current fill rule
QColor fillColor; ///< the current fill color
QString fillId; ///< the current fill id (used for gradient/pattern fills)
StyleType strokeType;///< the current stroke type
QString strokeId; ///< the current stroke id (used for gradient strokes)
KoLineBorder stroke; ///< the current stroke
StyleType strokeType;///< the current stroke type
QString strokeId; ///< the current stroke id (used for gradient strokes)
KoShapeStroke stroke; ///< the current stroke
QString filterId; ///< the current filter id
QString clipPathId; ///< the current clip path id
......
......@@ -650,7 +650,7 @@ void SvgParser::applyStrokeStyle(KoShape *shape)
double lineWidth = gc->stroke.lineWidth();
QVector<qreal> dashes = gc->stroke.lineDashes();
KoLineBorder *stroke = new KoLineBorder(gc->stroke);
KoShapeStroke *stroke = new KoShapeStroke(gc->stroke);
// apply line width to dashes and dash offset
if (dashes.count() && lineWidth > 0.0) {
......@@ -679,13 +679,13 @@ void SvgParser::applyStrokeStyle(KoShape *shape)
delete convertedGradient;
brush.setTransform(gradient->transform() * gc->matrix * shape->transformation().inverted());
}
KoLineBorder *stroke = new KoLineBorder(gc->stroke);
KoShapeStroke *stroke = new KoShapeStroke(gc->stroke);
stroke->setLineBrush(brush);
stroke->setLineStyle(Qt::SolidLine, QVector<qreal>());
shape->setStroke(stroke);
} else {
// no referenced stroke found, use fallback color
KoLineBorder *stroke = new KoLineBorder(gc->stroke);
KoShapeStroke *stroke = new KoShapeStroke(gc->stroke);
stroke->setLineStyle(Qt::SolidLine, QVector<qreal>());
shape->setStroke(stroke);
}
......
......@@ -44,7 +44,7 @@
#include <KoColorBackground.h>
#include <KoGradientBackground.h>
#include <KoPatternBackground.h>
#include <KoLineBorder.h>
#include <KoShapeStroke.h>
#include <KoClipPath.h>
#include <KoXmlWriter.h>
......@@ -101,7 +101,7 @@ void SvgStyleWriter::saveSvgFill(KoShape *shape, SvgSavingContext &context)
void SvgStyleWriter::saveSvgStroke(KoShape *shape, SvgSavingContext &context)
{
const KoLineBorder * line = dynamic_cast<const KoLineBorder*>(shape->stroke());
const KoShapeStroke * line = dynamic_cast<const KoShapeStroke*>(shape->stroke());
if (! line)
return;
......
......@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <KoShapeManager.h>
#include <KoSelection.h>
#include <KoLineBorder.h>
#include <KoShapeStroke.h>
#include <KoShapeShadow.h>
#include <kcomponentdata.h>
......@@ -114,7 +114,7 @@ void TestShapeAt::testShadow()
shape.setSize(bbox.size());
QCOMPARE(shape.boundingRect(), bbox);
KoLineBorder *stroke = new KoLineBorder();
KoShapeStroke *stroke = new KoShapeStroke();
stroke->setLineWidth(20); // which means the shape grows 10 in all directions.
shape.setStroke(stroke);
KoInsets strokeInsets;
......
......@@ -21,7 +21,7 @@
#include "MockShapes.h"
#include <KoShapeGroup.h>
#include <KoShapeGroupCommand.h>
#include <KoLineBorder.h>
#include <KoShapeStroke.h>
#include <KoShapeShadow.h>
#include <kundo2command.h>
......@@ -77,7 +77,7 @@ void TestShapeGroupCommand::init()
strokeShape2->setPosition( QPointF(25,25) );
strokeGroup = new KoShapeGroup();
strokeGroup->setStroke( new KoLineBorder( 2.0f ) );
strokeGroup->setStroke( new KoShapeStroke( 2.0f ) );
strokeGroup->setShadow( new KoShapeShadow() );
}
......
......@@ -20,15 +20,15 @@
#include <MockShapes.h>
#include "KoShapeStrokeModel.h"
#include "KoLineBorder.h"
#include "KoShapeStroke.h"
#include "KoShapeStrokeCommand.h"
void TestShapeStrokeCommand::refCounting()
{
MockShape * shape1 = new MockShape();
KoShapeStrokeModel * whiteStroke = new KoLineBorder(1.0, QColor(Qt::white));
KoShapeStrokeModel * blackStroke = new KoLineBorder(1.0, QColor(Qt::black));
KoShapeStrokeModel * redStroke = new KoLineBorder(1.0, QColor(Qt::red));
KoShapeStrokeModel *whiteStroke = new KoShapeStroke(1.0, QColor(Qt::white));
KoShapeStrokeModel *blackStroke = new KoShapeStroke(1.0, QColor(Qt::black));
KoShapeStrokeModel *redStroke = new KoShapeStroke(1.0, QColor(Qt::red));
shape1->setStroke(whiteStroke);
QVERIFY(shape1->stroke() == whiteStroke);
......
......@@ -24,7 +24,7 @@
#include "KoShapeController.h"
#include "KoPointerEvent.h"
#include "KoPathShape.h"
#include "KoLineBorder.h"
#include "KoShapeStroke.h"
#include "KoSelection.h"
#include "commands/KoPathPointMergeCommand.h"
#include "SnapGuideConfigWidget.h"
......@@ -167,7 +167,7 @@ void KoCreatePathTool::mousePressEvent(KoPointerEvent *event)
d->shape=pathShape;
pathShape->setShapeId(KoPathShapeId);
KoLineBorder *stroke = new KoLineBorder(canvas()->resourceManager()->activeStroke());
KoShapeStroke *stroke = new KoShapeStroke(canvas()->resourceManager()->activeStroke());
stroke->setColor(canvas()->resourceManager()->foregroundColor().toQColor());
pathShape->setStroke(stroke);
......
......@@ -28,7 +28,6 @@
class KoPathShape;
class KoPathPoint;
class KoLineBorder;
class KoCreatePathToolPrivate;
......
......@@ -20,6 +20,8 @@
#include "KoPADocument.h"
#include <QPainter>
#include <KoStore.h>
#include <KoDocumentResourceManager.h>
#include <KoXmlWriter.h>
......@@ -39,7 +41,6 @@
#include <KoInlineTextObjectManager.h>
#include <KoStyleManager.h>
#include <KoPathShape.h>
#include <KoLineBorder.h>
#include <KoXmlNS.h>
#include <KoProgressUpdater.h>
#include <KoUpdater.h>
......
......@@ -48,7 +48,7 @@
// Calligra
#include <KoUnit.h>
#include <KoLineBorder.h>
#include <KoShapeStroke.h>
#include <KoLineStyleSelector.h>
#include <KoUnitDoubleSpinBox.h>
#include "KoMarkerSelector.h"
......@@ -243,16 +243,16 @@ KoMarker *KoStrokeConfigWidget::endMarker() const
// ----------------------------------------------------------------
// Other public functions
void KoStrokeConfigWidget::updateControls(KoLineBorder &border, KoMarker *startMarker, KoMarker *endMarker)
void KoStrokeConfigWidget