From 2f53e38ad74beeb3b0f2dd95b0adf1327cb70b7b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 21 Feb 2024 11:59:52 +0200 Subject: [PATCH] Add a using-declaration to derived class to inherit the constructors, and remove the ones manually duplicated. --- src/libs/vdxf/libdxfrw/intern/dxfwriter.h | 26 +++++++++++-------- .../drawTools/operation/vabstractoperation.h | 5 +--- .../toolsinglepoint/toolcut/vtoolcut.h | 5 +--- .../toollinepoint/vtoollinepoint.h | 5 +--- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/libs/vdxf/libdxfrw/intern/dxfwriter.h b/src/libs/vdxf/libdxfrw/intern/dxfwriter.h index 2724667e5..8bbd4b5ac 100644 --- a/src/libs/vdxf/libdxfrw/intern/dxfwriter.h +++ b/src/libs/vdxf/libdxfrw/intern/dxfwriter.h @@ -15,12 +15,14 @@ #include "drw_textcodec.h" -class dxfWriter { +class dxfWriter +{ public: explicit dxfWriter(std::ofstream *stream) - : filestr(stream), - encoder() - {} + : filestr(stream), + encoder() + { + } virtual ~dxfWriter() = default; virtual auto writeString(int code, std::string text) -> bool = 0; @@ -32,22 +34,23 @@ public: virtual auto writeInt64(int code, unsigned long long int data) -> bool = 0; virtual auto writeDouble(int code, double data) -> bool = 0; virtual auto writeBool(int code, bool data) -> bool = 0; - void setVersion(const std::string &v, bool dxfFormat){encoder.setVersion(v, dxfFormat);} - void setCodePage(const std::string &c){encoder.setCodePage(c, true);} + void setVersion(const std::string &v, bool dxfFormat) { encoder.setVersion(v, dxfFormat); } + void setCodePage(const std::string &c) { encoder.setCodePage(c, true); } auto getCodePage() const -> std::string { return encoder.getCodePage(); } protected: std::ofstream *filestr; + private: Q_DISABLE_COPY_MOVE(dxfWriter) // NOLINT DRW_TextCodec encoder; }; -class dxfWriterBinary : public dxfWriter { +class dxfWriterBinary : public dxfWriter +{ public: - explicit dxfWriterBinary(std::ofstream *stream) - : dxfWriter(stream) - {} + using dxfWriter::dxfWriter; + virtual ~dxfWriterBinary() = default; virtual auto writeString(int code, std::string text) -> bool override; virtual auto writeInt16(int code, int data) -> bool override; @@ -57,7 +60,8 @@ public: virtual auto writeBool(int code, bool data) -> bool override; }; -class dxfWriterAscii final : public dxfWriter { +class dxfWriterAscii final : public dxfWriter +{ public: explicit dxfWriterAscii(std::ofstream *stream); virtual ~dxfWriterAscii() = default; diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h index b33886df5..b95e2a800 100644 --- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h +++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h @@ -52,10 +52,7 @@ struct DestinationItem struct VAbstractOperationInitData : VDrawToolInitData { - VAbstractOperationInitData() - : VDrawToolInitData() - { - } + using VDrawToolInitData::VDrawToolInitData; QString suffix{}; QVector source{}; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h index 556c89c36..8dcc15ba0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h @@ -46,10 +46,7 @@ class VFormula; struct VToolCutInitData : VToolSinglePointInitData { - VToolCutInitData() - : VToolSinglePointInitData() - { - } + using VToolSinglePointInitData::VToolSinglePointInitData; quint32 baseCurveId{NULL_ID}; // NOLINT(misc-non-private-member-variables-in-classes) QString formula{}; // NOLINT(misc-non-private-member-variables-in-classes) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h index 664c6f19f..934f5e9c1 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h @@ -43,10 +43,7 @@ template class QSharedPointer; struct VToolLinePointInitData : VToolSinglePointInitData { - VToolLinePointInitData() - : VToolSinglePointInitData() - { - } + using VToolSinglePointInitData::VToolSinglePointInitData; QString typeLine{TypeLineLine}; QString lineColor{ColorBlack};