From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 15 Aug 2016 06:33:20 +0000 (+0900)
Subject: Cppcheck: Struct '...' has a constructor with 1 argument that is not explicit.
X-Git-Tag: 2.16.5~1158
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fcafa3af6a1fbfa3b0233f3da459499c5fc3cf9c;p=winmerge-jp%2Fwinmerge-jp.git

Cppcheck: Struct '...' has a constructor with 1 argument that is not explicit.
---

diff --git a/Src/Common/MyCom.h b/Src/Common/MyCom.h
index e94f5bc92..a8ae7ecfc 100644
--- a/Src/Common/MyCom.h
+++ b/Src/Common/MyCom.h
@@ -17,8 +17,8 @@ class CMyComPtr
 public:
   // typedef T _PtrClass;
   CMyComPtr() { _p = NULL;}
-  CMyComPtr(T* p) {if ((_p = p) != NULL) p->AddRef(); }
-  CMyComPtr(const CMyComPtr<T>& lp)
+  explicit CMyComPtr(T* p) {if ((_p = p) != NULL) p->AddRef(); }
+  explicit CMyComPtr(const CMyComPtr<T>& lp)
   {
     if ((_p = lp._p) != NULL)
       _p->AddRef();
@@ -89,7 +89,7 @@ class CMyComBSTR
 public:
   BSTR m_str;
   CMyComBSTR(): m_str(NULL) {}
-  CMyComBSTR(LPCOLESTR src) { m_str = ::SysAllocString(src); }
+  explicit CMyComBSTR(LPCOLESTR src) { m_str = ::SysAllocString(src); }
   // Move constructor
   explicit CMyComBSTR(BSTR *bstr): m_str(*bstr) { *bstr = NULL; }
   // CMyComBSTR(int nSize) { m_str = ::SysAllocStringLen(NULL, nSize); }
@@ -173,8 +173,8 @@ private:
 	const CLIPFORMAT cf;
 public:
 	operator CLIPFORMAT() const { return cf; }
-	CMyClipFormat(CLIPFORMAT cf) : cf(cf) { }
-	CMyClipFormat(LPCTSTR cfstr) : cf(RegisterClipboardFormat(cfstr)) { }
+	explicit CMyClipFormat(CLIPFORMAT cf) : cf(cf) { }
+	explicit CMyClipFormat(LPCTSTR cfstr) : cf(RegisterClipboardFormat(cfstr)) { }
 };
 
 class CMyFormatEtc : public FORMATETC
@@ -216,39 +216,39 @@ class CMyVariant : public VARIANT
 public:
 	CMyVariant() { VariantInit(this); }
 	~CMyVariant() { VariantClear(this); }
-	CMyVariant(short value)
+	explicit CMyVariant(short value)
 	{
 		V_VT(this) = VT_I2;
 		V_I2(this) = value;
 	}
-	CMyVariant(long value)
+	explicit CMyVariant(long value)
 	{
 		V_VT(this) = VT_I4;
 		V_I4(this) = value;
 	}
-	CMyVariant(bool value)
+	explicit CMyVariant(bool value)
 	{
 		V_VT(this) = VT_BOOL;
 		V_BOOL(this) = value ? VARIANT_TRUE : VARIANT_FALSE;
 	}
-	CMyVariant(LPCOLESTR value)
+	explicit CMyVariant(LPCOLESTR value)
 	{
 		V_VT(this) = VT_BSTR;
 		V_BSTR(this) = SysAllocString(value);
 	}
-	CMyVariant(LPCOLESTR value, UINT len)
+	explicit CMyVariant(LPCOLESTR value, UINT len)
 	{
 		V_VT(this) = VT_BSTR;
 		V_BSTR(this) = SysAllocStringLen(value, len);
 	}
-	CMyVariant(IDispatch *value)
+	explicit CMyVariant(IDispatch *value)
 	{
 		V_VT(this) = VT_DISPATCH;
 		V_DISPATCH(this) = value;
 		if (value)
 			value->AddRef();
 	}
-	CMyVariant(const CMyVariant &src)
+	explicit CMyVariant(const CMyVariant &src)
 	{
 		VariantInit(this);
 #if _MSC_VER < 1500 
diff --git a/Src/Common/sizecbar.h b/Src/Common/sizecbar.h
index 1b8bf013d..639a9cdbe 100644
--- a/Src/Common/sizecbar.h
+++ b/Src/Common/sizecbar.h
@@ -198,7 +198,7 @@ class CSCBDockContext : public CDockContext
 {
 public:
 // Construction
-    CSCBDockContext(CControlBar* pBar) : CDockContext(pBar) {}
+    explicit CSCBDockContext(CControlBar* pBar) : CDockContext(pBar) {}
 
 // Drag Operations
     virtual void StartDrag(CPoint pt);
diff --git a/Src/CompareStats.cpp b/Src/CompareStats.cpp
index 3af903fb3..90e4b003c 100644
--- a/Src/CompareStats.cpp
+++ b/Src/CompareStats.cpp
@@ -143,7 +143,7 @@ CompareStats::CMP_STATE CompareStats::GetCompareState() const
  */
 CompareStats::RESULT CompareStats::GetResultFromCode(unsigned diffcode) const
 {
-	DIFFCODE di = diffcode;
+	DIFFCODE di(diffcode);
 	
 	// Test first for skipped so we pick all skipped items as such 
 	if (di.isResultFiltered())
diff --git a/Src/DiffItem.h b/Src/DiffItem.h
index 483a256f8..348f89ca9 100644
--- a/Src/DiffItem.h
+++ b/Src/DiffItem.h
@@ -59,7 +59,7 @@ struct DIFFCODE
 
 	unsigned diffcode;
 
-	DIFFCODE(unsigned diffcode = 0) : diffcode(diffcode) { }
+	explicit DIFFCODE(unsigned diffcode = 0) : diffcode(diffcode) { }
 
 protected:
 	/// Worker function, to check one area (mask) of code for a particular value (result)
diff --git a/Src/DirActions.h b/Src/DirActions.h
index c01287928..9980c07cb 100644
--- a/Src/DirActions.h
+++ b/Src/DirActions.h
@@ -99,7 +99,7 @@ struct AllowUpwardDirectory
 struct DirViewFilterSettings
 {
 	template<class GetOptionBool>
-	DirViewFilterSettings(GetOptionBool getoptbool)
+	explicit DirViewFilterSettings(GetOptionBool getoptbool)
 	{
 		show_skipped = getoptbool(OPT_SHOW_SKIPPED);
 		show_unique_left = getoptbool(OPT_SHOW_UNIQUE_LEFT);
@@ -202,7 +202,7 @@ struct ConfirmationNeededException
 
 struct ContentsChangedException
 {
-	ContentsChangedException(const String& failpath);
+	explicit ContentsChangedException(const String& failpath);
 	String m_msg;
 };
 
diff --git a/Src/DirScan.cpp b/Src/DirScan.cpp
index 95744ecb1..09bc2eebe 100644
--- a/Src/DirScan.cpp
+++ b/Src/DirScan.cpp
@@ -886,7 +886,7 @@ static DIFFITEM *AddToList(const String& sLeftDir, const String& sMiddleDir, con
 			di->diffFileInfo[2].filename = ment->filename;
 	}
 
-	di->diffcode = code;
+	di->diffcode.diffcode = code;
 
 	myStruct->context->m_pCompareStats->IncreaseTotalItems();
 	myStruct->pSemaphore->set();