From 47d86413d0053688ff02a557c5f7f65442b87684 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 23 Mar 2018 15:40:36 +0200 Subject: [PATCH] Minore cleaning. --HG-- branch : develop --- src/libs/vgeometry/vsplinepath.cpp | 2 +- src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp | 4 ++-- src/libs/vtools/undocommands/movesplinepath.cpp | 4 ---- src/libs/vtools/undocommands/movesplinepath.h | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/libs/vgeometry/vsplinepath.cpp b/src/libs/vgeometry/vsplinepath.cpp index 7d0272541..4dd5ae029 100644 --- a/src/libs/vgeometry/vsplinepath.cpp +++ b/src/libs/vgeometry/vsplinepath.cpp @@ -296,7 +296,7 @@ VSplinePath &VSplinePath::operator =(const VSplinePath &path) { return *this; } - VAbstractCurve::operator=(path); + VAbstractCubicBezierPath::operator=(path); d = path.d; return *this; } diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index c55ba4926..115b415d4 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -316,8 +316,8 @@ void VToolSplinePath::ShowContextMenu(QGraphicsSceneContextMenuEvent *event, qui //--------------------------------------------------------------------------------------------------------------------- /** - * @brief UpdateControlPoints update position points control points in file. - * @param spl spline what was changed. + * @brief UpdateControlPoints update position control points in file. + * @param spl spline that was changed. * @param splPath spline path. * @param indexSpline index spline in spline path. */ diff --git a/src/libs/vtools/undocommands/movesplinepath.cpp b/src/libs/vtools/undocommands/movesplinepath.cpp index c60da8478..18c5f1b0d 100644 --- a/src/libs/vtools/undocommands/movesplinepath.cpp +++ b/src/libs/vtools/undocommands/movesplinepath.cpp @@ -53,10 +53,6 @@ MoveSplinePath::MoveSplinePath(VAbstractPattern *doc, const VSplinePath &oldSplP SCASSERT(scene != nullptr) } -//--------------------------------------------------------------------------------------------------------------------- -MoveSplinePath::~MoveSplinePath() -{} - //--------------------------------------------------------------------------------------------------------------------- void MoveSplinePath::undo() { diff --git a/src/libs/vtools/undocommands/movesplinepath.h b/src/libs/vtools/undocommands/movesplinepath.h index 40d00674e..49fdd3074 100644 --- a/src/libs/vtools/undocommands/movesplinepath.h +++ b/src/libs/vtools/undocommands/movesplinepath.h @@ -46,7 +46,7 @@ class MoveSplinePath : public VUndoCommand public: MoveSplinePath(VAbstractPattern *doc, const VSplinePath &oldSplPath, const VSplinePath &newSplPath, const quint32 &id, QUndoCommand *parent = nullptr); - virtual ~MoveSplinePath() Q_DECL_OVERRIDE; + virtual ~MoveSplinePath() =default; virtual void undo() Q_DECL_OVERRIDE; virtual void redo() Q_DECL_OVERRIDE; virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE;