diff --git a/backends/merge/Merge.cpp b/backends/merge/Merge.cpp index 2b096b6..993c0d1 100644 --- a/backends/merge/Merge.cpp +++ b/backends/merge/Merge.cpp @@ -28,14 +28,6 @@ namespace glabels namespace merge { - /// - /// Constructor - /// - Merge::Merge() - { - } - - /// /// Constructor /// diff --git a/backends/merge/Merge.h b/backends/merge/Merge.h index ea1f6e1..13c96df 100644 --- a/backends/merge/Merge.h +++ b/backends/merge/Merge.h @@ -49,7 +49,7 @@ namespace glabels // Life Cycle ///////////////////////////////// protected: - Merge(); + Merge() = default; Merge( const Merge* merge ); public: ~Merge() override; diff --git a/backends/merge/None.cpp b/backends/merge/None.cpp index 73c4a9c..93c0b5f 100644 --- a/backends/merge/None.cpp +++ b/backends/merge/None.cpp @@ -43,14 +43,6 @@ namespace glabels } - /// - /// Destructor - /// - None::~None() - { - } - - /// /// Clone /// diff --git a/backends/merge/None.h b/backends/merge/None.h index 3650cdc..5115591 100644 --- a/backends/merge/None.h +++ b/backends/merge/None.h @@ -41,7 +41,7 @@ namespace glabels public: None(); None( const None* merge ); - ~None() override; + ~None() override = default; ///////////////////////////////// diff --git a/backends/merge/Text.cpp b/backends/merge/Text.cpp index c7ffce2..6ae1d8f 100644 --- a/backends/merge/Text.cpp +++ b/backends/merge/Text.cpp @@ -50,14 +50,6 @@ namespace glabels } - /// - /// Destructor - /// - Text::~Text() - { - } - - /// /// Get key list /// diff --git a/backends/merge/Text.h b/backends/merge/Text.h index 7ef602a..5a72ab9 100644 --- a/backends/merge/Text.h +++ b/backends/merge/Text.h @@ -43,7 +43,7 @@ namespace glabels protected: Text( QChar delimiter, bool line1HasKeys ); Text( const Text* merge ); - ~Text() override; + ~Text() override = default; ///////////////////////////////// diff --git a/backends/merge/TextColon.cpp b/backends/merge/TextColon.cpp index 1de151d..a1473af 100644 --- a/backends/merge/TextColon.cpp +++ b/backends/merge/TextColon.cpp @@ -46,14 +46,6 @@ namespace glabels } - /// - /// Destructor - /// - TextColon::~TextColon() - { - } - - /// /// Clone /// diff --git a/backends/merge/TextColon.h b/backends/merge/TextColon.h index 2f6af22..8bbc200 100644 --- a/backends/merge/TextColon.h +++ b/backends/merge/TextColon.h @@ -42,7 +42,7 @@ namespace glabels private: TextColon(); TextColon( const TextColon* merge ); - ~TextColon() override; + ~TextColon() override = default; ///////////////////////////////// diff --git a/backends/merge/TextColonKeys.cpp b/backends/merge/TextColonKeys.cpp index f97883b..5dfd5a6 100644 --- a/backends/merge/TextColonKeys.cpp +++ b/backends/merge/TextColonKeys.cpp @@ -46,14 +46,6 @@ namespace glabels } - /// - /// Destructor - /// - TextColonKeys::~TextColonKeys() - { - } - - /// /// Clone /// diff --git a/backends/merge/TextColonKeys.h b/backends/merge/TextColonKeys.h index cd2fe09..f166d1d 100644 --- a/backends/merge/TextColonKeys.h +++ b/backends/merge/TextColonKeys.h @@ -42,7 +42,7 @@ namespace glabels private: TextColonKeys(); TextColonKeys( const TextColonKeys* merge ); - ~TextColonKeys() override; + ~TextColonKeys() override = default; ///////////////////////////////// diff --git a/backends/merge/TextCsv.cpp b/backends/merge/TextCsv.cpp index 1b68f86..f65b9de 100644 --- a/backends/merge/TextCsv.cpp +++ b/backends/merge/TextCsv.cpp @@ -46,14 +46,6 @@ namespace glabels } - /// - /// Destructor - /// - TextCsv::~TextCsv() - { - } - - /// /// Clone /// diff --git a/backends/merge/TextCsv.h b/backends/merge/TextCsv.h index c3c635b..69c6f41 100644 --- a/backends/merge/TextCsv.h +++ b/backends/merge/TextCsv.h @@ -42,7 +42,7 @@ namespace glabels private: TextCsv(); TextCsv( const TextCsv* merge ); - ~TextCsv() override; + ~TextCsv() override = default; ///////////////////////////////// diff --git a/backends/merge/TextCsvKeys.cpp b/backends/merge/TextCsvKeys.cpp index 3093b40..fc11847 100644 --- a/backends/merge/TextCsvKeys.cpp +++ b/backends/merge/TextCsvKeys.cpp @@ -46,14 +46,6 @@ namespace glabels } - /// - /// Destructor - /// - TextCsvKeys::~TextCsvKeys() - { - } - - /// /// Clone /// diff --git a/backends/merge/TextCsvKeys.h b/backends/merge/TextCsvKeys.h index eb79385..ebd73a5 100644 --- a/backends/merge/TextCsvKeys.h +++ b/backends/merge/TextCsvKeys.h @@ -42,7 +42,7 @@ namespace glabels private: TextCsvKeys(); TextCsvKeys( const TextCsvKeys* merge ); - ~TextCsvKeys() override; + ~TextCsvKeys() override = default; ///////////////////////////////// diff --git a/backends/merge/TextSemicolon.cpp b/backends/merge/TextSemicolon.cpp index 270132b..d09fe52 100644 --- a/backends/merge/TextSemicolon.cpp +++ b/backends/merge/TextSemicolon.cpp @@ -46,14 +46,6 @@ namespace glabels } - /// - /// Destructor - /// - TextSemicolon::~TextSemicolon() - { - } - - /// /// Clone /// diff --git a/backends/merge/TextSemicolon.h b/backends/merge/TextSemicolon.h index 01c5d08..9ee3d80 100644 --- a/backends/merge/TextSemicolon.h +++ b/backends/merge/TextSemicolon.h @@ -42,7 +42,7 @@ namespace glabels private: TextSemicolon(); TextSemicolon( const TextSemicolon* merge ); - ~TextSemicolon() override; + ~TextSemicolon() override = default; ///////////////////////////////// diff --git a/backends/merge/TextSemicolonKeys.cpp b/backends/merge/TextSemicolonKeys.cpp index 56ed24b..30fa853 100644 --- a/backends/merge/TextSemicolonKeys.cpp +++ b/backends/merge/TextSemicolonKeys.cpp @@ -46,14 +46,6 @@ namespace glabels } - /// - /// Destructor - /// - TextSemicolonKeys::~TextSemicolonKeys() - { - } - - /// /// Clone /// diff --git a/backends/merge/TextSemicolonKeys.h b/backends/merge/TextSemicolonKeys.h index 8e30009..39478fc 100644 --- a/backends/merge/TextSemicolonKeys.h +++ b/backends/merge/TextSemicolonKeys.h @@ -42,7 +42,7 @@ namespace glabels private: TextSemicolonKeys(); TextSemicolonKeys( const TextSemicolonKeys* merge ); - ~TextSemicolonKeys() override; + ~TextSemicolonKeys() override = default; ///////////////////////////////// diff --git a/backends/merge/TextTsv.cpp b/backends/merge/TextTsv.cpp index 52006ea..1d75d1e 100644 --- a/backends/merge/TextTsv.cpp +++ b/backends/merge/TextTsv.cpp @@ -46,14 +46,6 @@ namespace glabels } - /// - /// Destructor - /// - TextTsv::~TextTsv() - { - } - - /// /// Clone /// diff --git a/backends/merge/TextTsv.h b/backends/merge/TextTsv.h index 5fde026..d85ac26 100644 --- a/backends/merge/TextTsv.h +++ b/backends/merge/TextTsv.h @@ -42,7 +42,7 @@ namespace glabels private: TextTsv(); TextTsv( const TextTsv* merge ); - ~TextTsv() override; + ~TextTsv() override = default; ///////////////////////////////// diff --git a/backends/merge/TextTsvKeys.cpp b/backends/merge/TextTsvKeys.cpp index 771be1d..6c60f2e 100644 --- a/backends/merge/TextTsvKeys.cpp +++ b/backends/merge/TextTsvKeys.cpp @@ -46,14 +46,6 @@ namespace glabels } - /// - /// Destructor - /// - TextTsvKeys::~TextTsvKeys() - { - } - - /// /// Clone /// diff --git a/backends/merge/TextTsvKeys.h b/backends/merge/TextTsvKeys.h index 550ae1d..2645d47 100644 --- a/backends/merge/TextTsvKeys.h +++ b/backends/merge/TextTsvKeys.h @@ -42,7 +42,7 @@ namespace glabels private: TextTsvKeys(); TextTsvKeys( const TextTsvKeys* merge ); - ~TextTsvKeys() override; + ~TextTsvKeys() override = default; ///////////////////////////////// diff --git a/glbarcode/DrawingPrimitives.cpp b/glbarcode/DrawingPrimitives.cpp index 463de23..fce6613 100644 --- a/glbarcode/DrawingPrimitives.cpp +++ b/glbarcode/DrawingPrimitives.cpp @@ -30,11 +30,6 @@ namespace glbarcode } - DrawingPrimitive::~DrawingPrimitive() - { - } - - double DrawingPrimitive::x() const { return mX; diff --git a/glbarcode/DrawingPrimitives.h b/glbarcode/DrawingPrimitives.h index b510e95..fc1632d 100644 --- a/glbarcode/DrawingPrimitives.h +++ b/glbarcode/DrawingPrimitives.h @@ -48,7 +48,7 @@ namespace glbarcode /** * Destructor */ - virtual ~DrawingPrimitive(); + virtual ~DrawingPrimitive() = default; /** * Get X coordinate of primitive's origin (points). diff --git a/glbarcode/Renderer.cpp b/glbarcode/Renderer.cpp index cd85266..8fd10aa 100644 --- a/glbarcode/Renderer.cpp +++ b/glbarcode/Renderer.cpp @@ -23,11 +23,6 @@ #include "DrawingPrimitives.h" -glbarcode::Renderer::~Renderer() -{ -} - - void glbarcode::Renderer::render( double w, double h, const std::list& primitives ) { drawBegin( w, h ); diff --git a/glbarcode/Renderer.h b/glbarcode/Renderer.h index 36326be..47c37a7 100644 --- a/glbarcode/Renderer.h +++ b/glbarcode/Renderer.h @@ -50,7 +50,7 @@ namespace glbarcode /** * Destructor. */ - virtual ~Renderer(); + virtual ~Renderer() = default; /** diff --git a/model/Model.h b/model/Model.h index 44f7aeb..c16454c 100644 --- a/model/Model.h +++ b/model/Model.h @@ -57,7 +57,7 @@ namespace glabels ///////////////////////////////// public: Model(); - ~Model() override {} + ~Model() override = default; ///////////////////////////////// diff --git a/model/XmlCategoryParser.h b/model/XmlCategoryParser.h index d4d251d..3c697fe 100644 --- a/model/XmlCategoryParser.h +++ b/model/XmlCategoryParser.h @@ -34,7 +34,7 @@ namespace glabels class XmlCategoryParser { public: - XmlCategoryParser() {} + XmlCategoryParser() = default; bool readFile( const QString &fileName ); diff --git a/model/XmlPaperParser.h b/model/XmlPaperParser.h index 3502453..62bb504 100644 --- a/model/XmlPaperParser.h +++ b/model/XmlPaperParser.h @@ -34,7 +34,7 @@ namespace glabels class XmlPaperParser { public: - XmlPaperParser() {} + XmlPaperParser() = default; bool readFile( const QString &fileName ); diff --git a/model/XmlTemplateCreator.h b/model/XmlTemplateCreator.h index e921f96..1b88eb0 100644 --- a/model/XmlTemplateCreator.h +++ b/model/XmlTemplateCreator.h @@ -42,7 +42,7 @@ namespace glabels class XmlTemplateCreator { public: - XmlTemplateCreator() {} + XmlTemplateCreator() = default; bool writeTemplates( const QList tmplates, const QString& fileName ); bool writeTemplate( const Template* tmplate, const QString& fileName ); diff --git a/model/XmlTemplateParser.h b/model/XmlTemplateParser.h index 3762eb5..a64413d 100644 --- a/model/XmlTemplateParser.h +++ b/model/XmlTemplateParser.h @@ -36,7 +36,7 @@ namespace glabels class XmlTemplateParser { public: - XmlTemplateParser() {} + XmlTemplateParser() = default; bool readFile( const QString &fileName ); Template *parseTemplateNode( const QDomElement &node ); diff --git a/model/XmlVendorParser.h b/model/XmlVendorParser.h index 3fd7c8a..6af672e 100644 --- a/model/XmlVendorParser.h +++ b/model/XmlVendorParser.h @@ -34,7 +34,7 @@ namespace glabels class XmlVendorParser { public: - XmlVendorParser() {} + XmlVendorParser() = default; bool readFile( const QString &fileName );