From f753aae405dcbb8d0fd10d831cc5e0759ec168fb Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 15 Dec 2020 18:30:48 +0000
Subject: Pass a cppcheck

---
 Jamroot.jam                                     | 3 +++
 icetray/icetray/abstractCachingDatabaseClient.h | 2 +-
 icetray/icetray/abstractDatabaseClient.h        | 2 +-
 icetray/icetray/mimeImpl.cpp                    | 2 +-
 icetray/icetray/mimeImpl.h                      | 2 +-
 icetray/icetray/options.h                       | 4 ++--
 icetray/icetray/staticSqlSource.h               | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Jamroot.jam b/Jamroot.jam
index 14cdfec..5bc5f61 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -19,6 +19,8 @@ project
 		<variant>debug:<warnings-as-errors>on
 		<variant>coverage:<coverage>on
 		<variant>coverage:<define>COVERAGE
+		<toolset>tidy:<exclude>bin/mail.h
+		<toolset>tidy:<exclude>bin/logWriter.h
 		<toolset>tidy:<checkxx>boost-*
 		<toolset>tidy:<checkxx>bugprone-*
 		<toolset>tidy:<checkxx>clang-*
@@ -28,6 +30,7 @@ project
 		<toolset>tidy:<checkxx>hicpp-*
 		<toolset>tidy:<xcheckxx>hicpp-signed-bitwise
 		<toolset>tidy:<checkxx>performance-*
+		<toolset>tidy:<define>ICE_IGNORE_VERSION
 		;
 
 build-project icetray ;
diff --git a/icetray/icetray/abstractCachingDatabaseClient.h b/icetray/icetray/abstractCachingDatabaseClient.h
index 78205b8..8f2e55c 100644
--- a/icetray/icetray/abstractCachingDatabaseClient.h
+++ b/icetray/icetray/abstractCachingDatabaseClient.h
@@ -13,7 +13,7 @@ namespace IceTray {
 		typedef std::any CacheItem;
 
 	protected:
-		AbstractCachingDatabaseClient(const DB::ConnectionPoolPtr & d);
+		explicit AbstractCachingDatabaseClient(const DB::ConnectionPoolPtr & d);
 
 		template<typename Domain, typename... Params>
 		inline Domain
diff --git a/icetray/icetray/abstractDatabaseClient.h b/icetray/icetray/abstractDatabaseClient.h
index a930f90..2a5040b 100644
--- a/icetray/icetray/abstractDatabaseClient.h
+++ b/icetray/icetray/abstractDatabaseClient.h
@@ -11,7 +11,7 @@
 namespace IceTray {
 	class DLL_PUBLIC AbstractDatabaseClient {
 	protected:
-		AbstractDatabaseClient(DB::ConnectionPoolPtr d);
+		explicit AbstractDatabaseClient(DB::ConnectionPoolPtr d);
 
 		template<typename Domain, typename... Params>
 		inline Domain
diff --git a/icetray/icetray/mimeImpl.cpp b/icetray/icetray/mimeImpl.cpp
index ebe2292..5f20891 100644
--- a/icetray/icetray/mimeImpl.cpp
+++ b/icetray/icetray/mimeImpl.cpp
@@ -129,7 +129,7 @@ namespace IceTray::Mime {
 	}
 
 	BinaryCopyPart::BinaryCopyPart(const Headers & h, const std::string & m, bytes v) :
-		BinaryViewPart(h, m, {v.data(), v.size()}), payload(std::move(v))
+		BinaryViewPart(h, m, {v.data(), v.size()}), payload_data(std::move(v))
 	{
 	}
 
diff --git a/icetray/icetray/mimeImpl.h b/icetray/icetray/mimeImpl.h
index c87dea0..7056755 100644
--- a/icetray/icetray/mimeImpl.h
+++ b/icetray/icetray/mimeImpl.h
@@ -41,7 +41,7 @@ namespace IceTray::Mime {
 
 		BinaryCopyPart(const Headers &, const std::string &, bytes);
 
-		const bytes payload;
+		const bytes payload_data;
 	};
 
 	class DLL_PUBLIC MultiPart : public BasicMultiPart, PartHelper {
diff --git a/icetray/icetray/options.h b/icetray/icetray/options.h
index 037c4e2..c8cbba2 100644
--- a/icetray/icetray/options.h
+++ b/icetray/icetray/options.h
@@ -56,8 +56,8 @@ namespace IceTray {
 	{ \
 		optDesc OptsDef; \
 	}
-#define ICETRAY_OPTIONS_DECLARE void ICETRAY_OPTIONS_FUNC;
-#define ICETRAY_OPTIONS_INLINE(OptsDef) void ICETRAY_OPTIONS_FUNC ICETRAY_OPTIONS_BODY(OptsDef)
+#define ICETRAY_OPTIONS_DECLARE void ICETRAY_OPTIONS_FUNC override;
+#define ICETRAY_OPTIONS_INLINE(OptsDef) void ICETRAY_OPTIONS_FUNC override ICETRAY_OPTIONS_BODY(OptsDef)
 #define ICETRAY_OPTIONS(Class, OptsDef) \
 	FACTORY(Class, IceTray::OptionsFactory); \
 	void Class::ICETRAY_OPTIONS_FUNC ICETRAY_OPTIONS_BODY(OptsDef)
diff --git a/icetray/icetray/staticSqlSource.h b/icetray/icetray/staticSqlSource.h
index c598012..fc5fe76 100644
--- a/icetray/icetray/staticSqlSource.h
+++ b/icetray/icetray/staticSqlSource.h
@@ -6,7 +6,7 @@
 namespace IceTray {
 	class DLL_PUBLIC StaticSqlSource : public SqlSource {
 	public:
-		StaticSqlSource(std::string sql);
+		explicit StaticSqlSource(std::string sql);
 		StaticSqlSource(std::string sql, const std::string & optsName, const DB::CommandOptionsMap &);
 
 		const std::string & getSql() const override;
-- 
cgit v1.2.3