From 701dd53fd39b55d90743ec5f1b19bd9a4c9c99c2 Mon Sep 17 00:00:00 2001 From: Jochen Becher Date: Tue, 24 Nov 2015 20:00:24 +0100 Subject: [PATCH] ModelEditor: Use default constructor Change-Id: I2b08e68eddbbf6bb589fd8f2ada77deabdcc6649 Reviewed-by: Tobias Hunger --- .../3rdparty/modeling/qmt/config/textsource.h | 4 ++-- .../modeling/qmt/controller/container.h | 2 +- .../modeling/qmt/controller/references.h | 4 ++-- .../modeling/qmt/diagram/dconstvisitor.h | 2 +- .../3rdparty/modeling/qmt/diagram/dvisitor.h | 2 +- .../diagram_scene/capabilities/alignable.h | 2 +- .../diagram_scene/capabilities/latchable.h | 6 ++--- .../qmt/infrastructure/geometryutilities.cpp | 6 +---- .../qmt/infrastructure/geometryutilities.h | 3 +-- .../modeling/qmt/infrastructure/handle.h | 2 +- .../qmt/model_controller/mchildrenvisitor.cpp | 4 ---- .../qmt/model_controller/mchildrenvisitor.h | 2 -- .../qmt/model_controller/mvoidvisitor.cpp | 8 ------- .../qmt/model_controller/mvoidvisitor.h | 4 ---- .../3rdparty/modeling/qmt/stereotype/shapes.h | 24 +++++-------------- .../modeling/qmt/stereotype/shapevalue.h | 8 ++----- .../modeling/qmt/style/defaultstyleengine.cpp | 9 ++----- .../qtserialization/inc/qark/archivebasics.h | 2 -- .../qtserialization/inc/qark/parameters.h | 4 +--- .../inc/qark/serialize_container.h | 4 ++-- 20 files changed, 26 insertions(+), 76 deletions(-) diff --git a/src/libs/3rdparty/modeling/qmt/config/textsource.h b/src/libs/3rdparty/modeling/qmt/config/textsource.h index 56c3c9903e9..71265139434 100644 --- a/src/libs/3rdparty/modeling/qmt/config/textsource.h +++ b/src/libs/3rdparty/modeling/qmt/config/textsource.h @@ -40,7 +40,7 @@ namespace qmt { class SourceChar { public: - SourceChar() { } + SourceChar() = default; SourceChar(QChar chr, const SourcePos &sourcePos) : ch(chr), pos(sourcePos) @@ -54,7 +54,7 @@ public: class ITextSource { public: - virtual ~ITextSource() { } + virtual ~ITextSource() = default; virtual SourceChar readNextChar() = 0; }; diff --git a/src/libs/3rdparty/modeling/qmt/controller/container.h b/src/libs/3rdparty/modeling/qmt/controller/container.h index fba12502e9d..56587af9cc3 100644 --- a/src/libs/3rdparty/modeling/qmt/controller/container.h +++ b/src/libs/3rdparty/modeling/qmt/controller/container.h @@ -39,7 +39,7 @@ template class Container { protected: - Container() { } + Container() = default; Container(const Container &rhs) : m_elements(rhs.m_elements) { diff --git a/src/libs/3rdparty/modeling/qmt/controller/references.h b/src/libs/3rdparty/modeling/qmt/controller/references.h index cf18e4933b5..d61493a9ee0 100644 --- a/src/libs/3rdparty/modeling/qmt/controller/references.h +++ b/src/libs/3rdparty/modeling/qmt/controller/references.h @@ -39,10 +39,10 @@ template class References { protected: - References() { } + References() = default; public: - ~References() { } + ~References() = default; bool isEmpty() const { return m_elements.empty(); } int size() const { return m_elements.size(); } diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dconstvisitor.h b/src/libs/3rdparty/modeling/qmt/diagram/dconstvisitor.h index 2a1c396f623..85630099441 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram/dconstvisitor.h +++ b/src/libs/3rdparty/modeling/qmt/diagram/dconstvisitor.h @@ -50,7 +50,7 @@ class DBoundary; class DConstVisitor { public: - virtual ~DConstVisitor() { } + virtual ~DConstVisitor() = default; virtual void visitDElement(const DElement *element) = 0; virtual void visitDObject(const DObject *object) = 0; diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dvisitor.h b/src/libs/3rdparty/modeling/qmt/diagram/dvisitor.h index 8e90f1546bd..e397d21a5f6 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram/dvisitor.h +++ b/src/libs/3rdparty/modeling/qmt/diagram/dvisitor.h @@ -50,7 +50,7 @@ class DBoundary; class DVisitor { public: - virtual ~DVisitor() { } + virtual ~DVisitor() = default; virtual void visitDElement(DElement *element) = 0; virtual void visitDObject(DObject *object) = 0; diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/alignable.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/alignable.h index c95a9e2329a..87c588ae11d 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/alignable.h +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/alignable.h @@ -50,7 +50,7 @@ public: AlignSize }; - virtual ~IAlignable() { } + virtual ~IAlignable() = default; virtual void align(AlignType alignType, const QString &identifier) = 0; }; diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h index 18e1029b6c8..b6f78954872 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h @@ -59,9 +59,7 @@ public: class Latch { public: - Latch() - { - } + Latch() = default; Latch(LatchType latchType, qreal pos, qreal otherPos1, qreal otherPos2, const QString &identifier) @@ -80,7 +78,7 @@ public: QString m_identifier; }; - virtual ~ILatchable() { } + virtual ~ILatchable() = default; virtual QList horizontalLatches(Action action, bool grabbedItem) const = 0; virtual QList verticalLatches(Action action, bool grabbedItem) const = 0; diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp b/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp index 7f340f3ca34..92bd16351f7 100644 --- a/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp +++ b/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp @@ -50,10 +50,6 @@ inline int sgn(T val) namespace qmt { -GeometryUtilities::GeometryUtilities() -{ -} - QLineF GeometryUtilities::stretch(const QLineF &line, double p1Extension, double p2Extension) { QLineF direction = line.unitVector(); @@ -82,7 +78,7 @@ namespace { class Candidate { public: - Candidate() { } + Candidate() = default; Candidate(const QVector2D &f, const QPointF &s, GeometryUtilities::Side t) : first(f), second(s), third(t) { } QVector2D first; diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.h b/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.h index d75e3e2e7c4..40d5ffe5180 100644 --- a/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.h +++ b/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.h @@ -45,8 +45,7 @@ namespace qmt { class GeometryUtilities { -private: - GeometryUtilities(); + GeometryUtilities() = delete; public: enum Side { diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/handle.h b/src/libs/3rdparty/modeling/qmt/infrastructure/handle.h index 089c1b06dd5..d5f10b64265 100644 --- a/src/libs/3rdparty/modeling/qmt/infrastructure/handle.h +++ b/src/libs/3rdparty/modeling/qmt/infrastructure/handle.h @@ -40,7 +40,7 @@ template class Handle { public: - Handle() { } + Handle() = default; explicit Handle(const Uid &uid) : m_uid(uid) { } explicit Handle(T *t) : m_uid(t ? t->uid() : Uid()), m_target(t) { } Handle(const Handle &rhs) : m_uid(rhs.m_uid), m_target(rhs.m_target) { } diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mchildrenvisitor.cpp b/src/libs/3rdparty/modeling/qmt/model_controller/mchildrenvisitor.cpp index 1529f25996a..9933b07952c 100644 --- a/src/libs/3rdparty/modeling/qmt/model_controller/mchildrenvisitor.cpp +++ b/src/libs/3rdparty/modeling/qmt/model_controller/mchildrenvisitor.cpp @@ -42,10 +42,6 @@ namespace qmt { -MChildrenVisitor::MChildrenVisitor() -{ -} - void MChildrenVisitor::visitMElement(MElement *element) { Q_UNUSED(element); diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mchildrenvisitor.h b/src/libs/3rdparty/modeling/qmt/model_controller/mchildrenvisitor.h index 45e0887e0dc..6bb649f4820 100644 --- a/src/libs/3rdparty/modeling/qmt/model_controller/mchildrenvisitor.h +++ b/src/libs/3rdparty/modeling/qmt/model_controller/mchildrenvisitor.h @@ -39,8 +39,6 @@ namespace qmt { class QMT_EXPORT MChildrenVisitor : public MVisitor { public: - MChildrenVisitor(); - void visitMElement(MElement *element) override; void visitMObject(MObject *object) override; void visitMPackage(MPackage *package) override; diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mvoidvisitor.cpp b/src/libs/3rdparty/modeling/qmt/model_controller/mvoidvisitor.cpp index 7f27c045a19..08ded61fac2 100644 --- a/src/libs/3rdparty/modeling/qmt/model_controller/mvoidvisitor.cpp +++ b/src/libs/3rdparty/modeling/qmt/model_controller/mvoidvisitor.cpp @@ -47,10 +47,6 @@ namespace qmt { -MVoidVisitor::MVoidVisitor() -{ -} - void MVoidVisitor::visitMElement(MElement *element) { Q_UNUSED(element); @@ -111,10 +107,6 @@ void MVoidVisitor::visitMAssociation(MAssociation *association) visitMRelation(association); } -MVoidConstVisitor::MVoidConstVisitor() -{ -} - void MVoidConstVisitor::visitMElement(const MElement *element) { Q_UNUSED(element); diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mvoidvisitor.h b/src/libs/3rdparty/modeling/qmt/model_controller/mvoidvisitor.h index 50ab4eead76..e04b39b4319 100644 --- a/src/libs/3rdparty/modeling/qmt/model_controller/mvoidvisitor.h +++ b/src/libs/3rdparty/modeling/qmt/model_controller/mvoidvisitor.h @@ -40,8 +40,6 @@ namespace qmt { class QMT_EXPORT MVoidVisitor : public MVisitor { public: - MVoidVisitor(); - void visitMElement(MElement *element) override; void visitMObject(MObject *object) override; void visitMPackage(MPackage *package) override; @@ -59,8 +57,6 @@ public: class QMT_EXPORT MVoidConstVisitor : public MConstVisitor { public: - MVoidConstVisitor(); - void visitMElement(const MElement *element) override; void visitMObject(const MObject *object) override; void visitMPackage(const MPackage *package) override; diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h b/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h index f343434c242..9e7bd6c998a 100644 --- a/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h +++ b/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h @@ -44,9 +44,7 @@ namespace qmt { class QMT_EXPORT LineShape : public IShape { public: - LineShape() - { - } + LineShape() = default; LineShape(const ShapePointF &pos1, const ShapePointF &pos2) : m_pos1(pos1), @@ -69,9 +67,7 @@ private: class QMT_EXPORT RectShape : public IShape { public: - RectShape() - { - } + RectShape() = default; RectShape(const ShapePointF &pos, const ShapeSizeF &size) : m_pos(pos), @@ -94,9 +90,7 @@ private: class QMT_EXPORT RoundedRectShape : public IShape { public: - RoundedRectShape() - { - } + RoundedRectShape() = default; RoundedRectShape(const ShapePointF &pos, const ShapeSizeF &size, const ShapeValueF &radius) : m_pos(pos), @@ -122,9 +116,7 @@ private: class QMT_EXPORT CircleShape : public IShape { public: - CircleShape() - { - } + CircleShape() = default; CircleShape(const ShapePointF ¢er, const ShapeValueF &radius) : m_center(center), @@ -147,9 +139,7 @@ private: class QMT_EXPORT EllipseShape : public IShape { public: - EllipseShape() - { - } + EllipseShape() = default; EllipseShape(const ShapePointF ¢er, const ShapeSizeF &radius) : m_center(center), @@ -172,9 +162,7 @@ private: class QMT_EXPORT ArcShape : public IShape { public: - ArcShape() - { - } + ArcShape() = default; ArcShape(const ShapePointF ¢er, const ShapeSizeF &radius, qreal startAngle, qreal spanAngle) : m_center(center), diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.h b/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.h index f4710662cb8..f0e74deb1f8 100644 --- a/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.h +++ b/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.h @@ -94,9 +94,7 @@ private: class QMT_EXPORT ShapePointF { public: - ShapePointF() - { - } + ShapePointF() = default; ShapePointF(const ShapeValueF &x, const ShapeValueF &y) : m_x(x), @@ -123,9 +121,7 @@ private: class QMT_EXPORT ShapeSizeF { public: - ShapeSizeF() - { - } + ShapeSizeF() = default; ShapeSizeF(const ShapeValueF &width, const ShapeValueF &height) : m_width(width), diff --git a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp b/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp index a58fe58de83..0971dc1ffba 100644 --- a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp +++ b/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp @@ -74,9 +74,7 @@ namespace qmt { class ObjectStyleKey { public: - ObjectStyleKey() - { - } + ObjectStyleKey() = default; ObjectStyleKey(StyleEngine::ElementType elementType, const ObjectVisuals &objectVisuals) : m_elementType(elementType), @@ -143,12 +141,9 @@ bool operator==(const AnnotationStyleKey &lhs, const AnnotationStyleKey &rhs) return lhs.m_visualRole == rhs.m_visualRole; } +// TODO remove class if no attributes needed even with future extensions class BoundaryStyleKey { -public: - BoundaryStyleKey() - { - } }; uint qHash(const BoundaryStyleKey &styleKey) diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h index 8522e428b23..b8cc9efcffd 100644 --- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h +++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h @@ -42,8 +42,6 @@ namespace qark { class ArchiveBasics { public: - ArchiveBasics() { } - void setFlag(const Flag &flag) { m_flags |= flag.mask(); } void clearFlag(const Flag &flag) { m_flags &= ~flag.mask(); } bool hasFlag(const Flag &flag) const { return (m_flags & flag.mask()) != 0; } diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h index 142e25122f6..3717409ae46 100644 --- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h +++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h @@ -38,9 +38,7 @@ namespace qark { class Parameters { public: - Parameters() - { - } + Parameters() = default; explicit Parameters(const Flag &flag) : m_flags(flag.mask()) diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_container.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_container.h index 14fbec44559..6dc81e1fd4c 100644 --- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_container.h +++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_container.h @@ -149,8 +149,8 @@ template class KeyValuePair { public: - KeyValuePair() { } - explicit KeyValuePair(const KEY &key, const VALUE &value) : m_key(key), m_value(value) { } + KeyValuePair() = default; + KeyValuePair(const KEY &key, const VALUE &value) : m_key(key), m_value(value) { } KEY m_key; VALUE m_value;