From 6e244934b389950f984c5addbfcd63d4ba08254e Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 17 Sep 2019 23:06:18 +0200 Subject: [PATCH] Make some constructors explicit Spotted by cppcheck. --- src/insets/ExternalTemplate.cpp | 6 +++--- src/insets/ExternalTransforms.h | 22 +++++++++++----------- src/insets/InsetBox.h | 2 +- src/insets/InsetExternal.h | 2 +- src/insets/InsetFloatList.h | 2 +- src/insets/InsetFoot.h | 2 +- src/insets/InsetFootlike.h | 2 +- src/insets/InsetGraphics.h | 2 +- src/insets/InsetIPA.h | 2 +- src/insets/InsetMarginal.h | 2 +- src/insets/InsetNewline.h | 2 +- src/insets/InsetPreview.h | 2 +- src/insets/InsetSpace.h | 2 +- src/insets/InsetTabular.h | 4 ++-- src/insets/InsetVSpace.h | 2 +- src/insets/RenderGraphic.h | 2 +- src/insets/RenderPreview.h | 4 ++-- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/insets/ExternalTemplate.cpp b/src/insets/ExternalTemplate.cpp index ae9148b4e8..ba6922d123 100644 --- a/src/insets/ExternalTemplate.cpp +++ b/src/insets/ExternalTemplate.cpp @@ -74,7 +74,7 @@ class DumpPreambleDef { public: typedef TemplateManager::PreambleDefs::value_type value_type; - DumpPreambleDef(ostream & os) : os_(os) {} + explicit DumpPreambleDef(ostream & os) : os_(os) {} void operator()(value_type const & vt) { os_ << "PreambleDef " << vt.first << '\n' @@ -91,7 +91,7 @@ class DumpTemplate { public: typedef TemplateManager::Templates::value_type value_type; - DumpTemplate(ostream & os) : os_(os) {} + explicit DumpTemplate(ostream & os) : os_(os) {} void operator()(value_type const & vt) { Template const & et = vt.second; @@ -137,7 +137,7 @@ class DumpFormat { public: typedef Template::Formats::value_type value_type; - DumpFormat(ostream & o) : os_(o) {} + explicit DumpFormat(ostream & o) : os_(o) {} void operator()(value_type const & vt) const { Template::Format const & ft = vt.second; diff --git a/src/insets/ExternalTransforms.h b/src/insets/ExternalTransforms.h index cd3e5e226a..d6735b60b5 100644 --- a/src/insets/ExternalTransforms.h +++ b/src/insets/ExternalTransforms.h @@ -149,7 +149,7 @@ private: class ResizeCommand : public TransformCommand { protected: ResizeData data; - ResizeCommand(ResizeData const & data_) : data(data_) {} + explicit ResizeCommand(ResizeData const & data_) : data(data_) {} private: virtual std::string const front_placeholder_impl() const @@ -165,7 +165,7 @@ public: { return ptr_type(new ResizeLatexCommand(data)); } private: - ResizeLatexCommand(ResizeData const & data_) + explicit ResizeLatexCommand(ResizeData const & data_) : ResizeCommand(data_) {} virtual std::string const front_impl() const; virtual std::string const back_impl() const; @@ -175,7 +175,7 @@ private: class RotationCommand : public TransformCommand { protected: RotationData data; - RotationCommand(RotationData const & data_) : data(data_) {} + explicit RotationCommand(RotationData const & data_) : data(data_) {} private: virtual std::string const front_placeholder_impl() const @@ -191,7 +191,7 @@ public: { return ptr_type(new RotationLatexCommand(data)); } private: - RotationLatexCommand(RotationData const & data_) + explicit RotationLatexCommand(RotationData const & data_) : RotationCommand(data_) {} virtual std::string const front_impl() const; virtual std::string const back_impl() const; @@ -221,7 +221,7 @@ private: class ClipOption : public TransformOption { protected: ClipData data; - ClipOption(ClipData const & data_) : data(data_) {} + explicit ClipOption(ClipData const & data_) : data(data_) {} private: virtual std::string const placeholder_impl() const @@ -235,7 +235,7 @@ public: { return ptr_type(new ClipLatexOption(data)); } private: - ClipLatexOption(ClipData const & data_) + explicit ClipLatexOption(ClipData const & data_) : ClipOption(data_) {} virtual std::string const option_impl() const; }; @@ -247,7 +247,7 @@ public: { return ptr_type(new ExtraOption(data)); } private: - ExtraOption(std::string const & data_) : data(data_) {} + explicit ExtraOption(std::string const & data_) : data(data_) {} virtual std::string const placeholder_impl() const { return "$$Extra"; } @@ -260,7 +260,7 @@ private: class ResizeOption : public TransformOption { protected: ResizeData data; - ResizeOption(ResizeData const & data_) : data(data_) {} + explicit ResizeOption(ResizeData const & data_) : data(data_) {} private: virtual std::string const placeholder_impl() const @@ -274,7 +274,7 @@ public: { return ptr_type(new ResizeLatexOption(data)); } private: - ResizeLatexOption(ResizeData const & data_) + explicit ResizeLatexOption(ResizeData const & data_) : ResizeOption(data_) {} virtual std::string const option_impl() const; }; @@ -283,7 +283,7 @@ private: class RotationOption : public TransformOption { protected: RotationData data; - RotationOption(RotationData const & data_) : data(data_) {} + explicit RotationOption(RotationData const & data_) : data(data_) {} private: virtual std::string const placeholder_impl() const @@ -297,7 +297,7 @@ public: { return ptr_type(new RotationLatexOption(data)); } private: - RotationLatexOption(RotationData const & data_) + explicit RotationLatexOption(RotationData const & data_) : RotationOption(data_) {} virtual std::string const option_impl() const; }; diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h index e181bd738a..6dd671c9a4 100644 --- a/src/insets/InsetBox.h +++ b/src/insets/InsetBox.h @@ -24,7 +24,7 @@ class InsetBoxParams { public: /// - InsetBoxParams(std::string const &); + explicit InsetBoxParams(std::string const &); /// void write(std::ostream & os) const; /// diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h index 032b3a2f8c..20ccfededf 100644 --- a/src/insets/InsetExternal.h +++ b/src/insets/InsetExternal.h @@ -94,7 +94,7 @@ class InsetExternal : public Inset // complicated to implement it consistently with the copy constructor InsetExternal & operator=(InsetExternal const &); public: - InsetExternal(Buffer *); + explicit InsetExternal(Buffer *); /// ~InsetExternal(); /// diff --git a/src/insets/InsetFloatList.h b/src/insets/InsetFloatList.h index 3d6a7a3569..7d1df4765a 100644 --- a/src/insets/InsetFloatList.h +++ b/src/insets/InsetFloatList.h @@ -23,7 +23,7 @@ namespace lyx { class InsetFloatList : public InsetCommand { public: /// - InsetFloatList(Buffer *); + explicit InsetFloatList(Buffer *); /// InsetFloatList(Buffer *, std::string const & type); diff --git a/src/insets/InsetFoot.h b/src/insets/InsetFoot.h index d032e04848..04e03fde7b 100644 --- a/src/insets/InsetFoot.h +++ b/src/insets/InsetFoot.h @@ -25,7 +25,7 @@ class InsetFoot : public InsetFootlike { public: /// - InsetFoot(Buffer *); + explicit InsetFoot(Buffer *); private: /// InsetCode lyxCode() const { return FOOT_CODE; } diff --git a/src/insets/InsetFootlike.h b/src/insets/InsetFootlike.h index f4bcbdef19..ce6f5045ce 100644 --- a/src/insets/InsetFootlike.h +++ b/src/insets/InsetFootlike.h @@ -23,7 +23,7 @@ namespace lyx { class InsetFootlike : public InsetCollapsible { public: /// - InsetFootlike(Buffer *); + explicit InsetFootlike(Buffer *); /// bool hasSettings() const { return false; } private: diff --git a/src/insets/InsetGraphics.h b/src/insets/InsetGraphics.h index 2cba4f05fa..b5fc5c830d 100644 --- a/src/insets/InsetGraphics.h +++ b/src/insets/InsetGraphics.h @@ -34,7 +34,7 @@ class InsetGraphics : public Inset { public: /// - InsetGraphics(Buffer * buf); + explicit InsetGraphics(Buffer * buf); /// ~InsetGraphics(); diff --git a/src/insets/InsetIPA.h b/src/insets/InsetIPA.h index fe8cd99252..d499edfdc8 100644 --- a/src/insets/InsetIPA.h +++ b/src/insets/InsetIPA.h @@ -32,7 +32,7 @@ class InsetIPA : public InsetText { public: /// - InsetIPA(Buffer *); + explicit InsetIPA(Buffer *); /// ~InsetIPA(); /// diff --git a/src/insets/InsetMarginal.h b/src/insets/InsetMarginal.h index 008a3dd039..db0f6db023 100644 --- a/src/insets/InsetMarginal.h +++ b/src/insets/InsetMarginal.h @@ -25,7 +25,7 @@ namespace lyx { class InsetMarginal : public InsetFootlike { public: /// - InsetMarginal(Buffer *); + explicit InsetMarginal(Buffer *); /// InsetCode lyxCode() const { return MARGIN_CODE; } /// diff --git a/src/insets/InsetNewline.h b/src/insets/InsetNewline.h index 53389d2370..e0a13f38d4 100644 --- a/src/insets/InsetNewline.h +++ b/src/insets/InsetNewline.h @@ -44,7 +44,7 @@ public: /// InsetNewline(); /// - InsetNewline(InsetNewlineParams par) : Inset(0) + explicit InsetNewline(InsetNewlineParams par) : Inset(0) { params_.kind = par.kind; } /// static void string2params(std::string const &, InsetNewlineParams &); diff --git a/src/insets/InsetPreview.h b/src/insets/InsetPreview.h index f0808d7246..6a9d29043c 100644 --- a/src/insets/InsetPreview.h +++ b/src/insets/InsetPreview.h @@ -32,7 +32,7 @@ class InsetPreview : public InsetText { public: /// - InsetPreview(Buffer *); + explicit InsetPreview(Buffer *); /// ~InsetPreview(); /// diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h index a4fd6151f9..2784022955 100644 --- a/src/insets/InsetSpace.h +++ b/src/insets/InsetSpace.h @@ -74,7 +74,7 @@ struct InsetSpaceParams { CUSTOM_PROTECTED }; /// - InsetSpaceParams(bool m = false) : kind(NORMAL), math(m) {} + explicit InsetSpaceParams(bool m = false) : kind(NORMAL), math(m) {} /// void write(std::ostream & os) const; /// diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h index 17e05d75dd..65cc2ae2e1 100644 --- a/src/insets/InsetTabular.h +++ b/src/insets/InsetTabular.h @@ -52,7 +52,7 @@ class InsetTableCell : public InsetText { public: /// - InsetTableCell(Buffer * buf); + explicit InsetTableCell(Buffer * buf); /// InsetCode lyxCode() const { return CELL_CODE; } /// @@ -690,7 +690,7 @@ public: class CellData { public: /// - CellData(Buffer *); + explicit CellData(Buffer *); /// CellData(CellData const &); /// diff --git a/src/insets/InsetVSpace.h b/src/insets/InsetVSpace.h index 21afbcd036..b2c8ac9780 100644 --- a/src/insets/InsetVSpace.h +++ b/src/insets/InsetVSpace.h @@ -24,7 +24,7 @@ public: /// InsetVSpace() : Inset(0) {} /// - InsetVSpace(VSpace const &); + explicit InsetVSpace(VSpace const &); /// How much? VSpace const & space() const { return space_; } /// diff --git a/src/insets/RenderGraphic.h b/src/insets/RenderGraphic.h index b41b82e61a..da09c4cc0f 100644 --- a/src/insets/RenderGraphic.h +++ b/src/insets/RenderGraphic.h @@ -24,7 +24,7 @@ namespace lyx { class RenderGraphic : public RenderBase { public: - RenderGraphic(Inset const *); + explicit RenderGraphic(Inset const *); RenderGraphic(RenderGraphic const &, Inset const *); RenderBase * clone(Inset const *) const; diff --git a/src/insets/RenderPreview.h b/src/insets/RenderPreview.h index 2f83aff5dc..c6eee309d0 100644 --- a/src/insets/RenderPreview.h +++ b/src/insets/RenderPreview.h @@ -45,7 +45,7 @@ public: /// Return true if preview is enabled in mathed (from LyXRC::preview) static bool previewMath(); - RenderPreview(Inset const *); + explicit RenderPreview(Inset const *); RenderPreview(RenderPreview const &, Inset const *); RenderBase * clone(Inset const *) const; @@ -110,7 +110,7 @@ private: class RenderMonitoredPreview : public RenderPreview { public: - RenderMonitoredPreview(Inset const *); + explicit RenderMonitoredPreview(Inset const *); /// void draw(PainterInfo & pi, int x, int y) const; /// -- 2.39.5