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

--HG--
branch : stable

diff --git a/Externals/crystaledit/editlib/SyntaxColors.h b/Externals/crystaledit/editlib/SyntaxColors.h
index c607f52..51bd5d4 100644 (file)
--- a/Externals/crystaledit/editlib/SyntaxColors.h
+++ b/Externals/crystaledit/editlib/SyntaxColors.h
@@ -68,7 +68,7 @@ class SyntaxColors
 {
 public:
        SyntaxColors();
-       SyntaxColors(const SyntaxColors *pColors);
+       explicit SyntaxColors(const SyntaxColors *pColors);
        void Clone(const SyntaxColors *pColors);
        COLORREF GetColor(UINT index) const { return m_colors[index]; }
        void SetColor(UINT index, COLORREF color);

diff --git a/Src/CCPromptDlg.h b/Src/CCPromptDlg.h
index a767069..38d028c 100644 (file)
--- a/Src/CCPromptDlg.h
+++ b/Src/CCPromptDlg.h
@@ -29,7 +29,7 @@ class CCCPromptDlg : public CDialog
 {
 // Construction
 public:
-       CCCPromptDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit CCCPromptDlg(CWnd* pParent = NULL);   // standard constructor
 
 // Dialog Data
        //{{AFX_DATA(CCCPromptDlg)

diff --git a/Src/Common/ColorButton.h b/Src/Common/ColorButton.h
index 755b0e7..5971f37 100644 (file)
--- a/Src/Common/ColorButton.h
+++ b/Src/Common/ColorButton.h
@@ -18,7 +18,7 @@ private:
 
 public:
        CColorButton();
-       CColorButton(COLORREF clrFill);
+       explicit CColorButton(COLORREF clrFill);
 
        void SetColor(COLORREF clrFill, BOOL bInvalidate = TRUE);
        COLORREF GetColor() const { return m_clrFill; };

diff --git a/Src/Common/LanguageSelect.cpp b/Src/Common/LanguageSelect.cpp
index 7d6d62a..6a90d90 100644 (file)
--- a/Src/Common/LanguageSelect.cpp
+++ b/Src/Common/LanguageSelect.cpp
@@ -43,9 +43,9 @@ public:
         * A constructor taking a language id as parameter.
         * @param [in] id Language ID to use.
         */
-       LangFileInfo(LANGID id): id(id) { };
+       explicit LangFileInfo(LANGID id): id(id) { };
        
-       LangFileInfo(LPCTSTR path);
+       explicit LangFileInfo(LPCTSTR path);
        String GetString(LCTYPE type) const;
 
 private:
@@ -582,11 +582,11 @@ BOOL CLanguageSelect::LoadLanguageFile(LANGID wLangId, BOOL bShowError)
                        AfxMessageBox(_T("Failed to load MergeLang.dll"), MB_ICONSTOP);
                return FALSE;
        }
-       CVersionInfo viInstance = AfxGetInstanceHandle();
+       CVersionInfo viInstance(AfxGetInstanceHandle());
        unsigned instanceVerMS = 0;
        unsigned instanceVerLS = 0;
        viInstance.GetFixedFileVersion(instanceVerMS, instanceVerLS);
-       CVersionInfo viResource = m_hCurrentDll;
+       CVersionInfo viResource(m_hCurrentDll);
        unsigned resourceVerMS = 0;
        unsigned resourceVerLS = 0;
        viResource.GetFixedFileVersion(resourceVerMS, resourceVerLS);
@@ -821,7 +821,7 @@ String CLanguageSelect::GetFileName(LANGID wLangId) const
        while ((h = FindFile(h, pattern.c_str(), &ff)) != INVALID_HANDLE_VALUE)
        {
                filename = paths_ConcatPath(path, ff.cFileName);
-               LangFileInfo lfi = filename.c_str();
+               LangFileInfo lfi(filename.c_str());
                if (lfi.id == wLangId)
                        ff.dwFileAttributes = INVALID_FILE_ATTRIBUTES; // terminate loop
                else

diff --git a/Src/Common/unicoder.h b/Src/Common/unicoder.h
index 7bbfc1a..591c45b 100644 (file)
--- a/Src/Common/unicoder.h
+++ b/Src/Common/unicoder.h
@@ -24,7 +24,7 @@ struct buffer
        size_t capacity; /**< Buffer's size in bytes. */
        size_t size; /**< Size of the data in the buffer, <= capacity. */
 
-       buffer(size_t initialSize);
+       explicit buffer(size_t initialSize);
        ~buffer();
        void resize(size_t newSize);
 };

diff --git a/Src/Common/version.h b/Src/Common/version.h
index de9cdbe..ea6ddee 100644 (file)
--- a/Src/Common/version.h
+++ b/Src/Common/version.h
@@ -43,14 +43,14 @@ private:
        String m_strPrivateBuild;
 
 public:
-       CVersionInfo(BOOL bVersionOnly);
-       CVersionInfo(WORD wLanguage);
+       explicit CVersionInfo(BOOL bVersionOnly);
+       explicit CVersionInfo(WORD wLanguage);
        CVersionInfo(LPCTSTR szFileToVersion,
                                   BOOL bDllVersion);
        CVersionInfo(LPCTSTR szFileToVersion = NULL,
                                   LPCTSTR szLanguage = NULL,
                                   LPCTSTR szCodepage = NULL);
-       CVersionInfo(HINSTANCE hModule);
+       explicit CVersionInfo(HINSTANCE hModule);
        String GetFileVersion() const;
        String GetCompanyName() const;
        String GetFileDescription() const;

diff --git a/Src/CompareEngines/ByteComparator.h b/Src/CompareEngines/ByteComparator.h
index 371c528..e5d5caf 100644 (file)
--- a/Src/CompareEngines/ByteComparator.h
+++ b/Src/CompareEngines/ByteComparator.h
@@ -25,7 +25,7 @@ namespace CompareEngines
 class ByteComparator
 {
 public:
-       ByteComparator(const QuickCompareOptions * options);
+       explicit ByteComparator(const QuickCompareOptions * options);
 
 public:
        /** @brief Return values for CompareBuffers method. */

diff --git a/Src/CompareOptions.h b/Src/CompareOptions.h
index 5a2ce76..4e8f2d0 100644 (file)
--- a/Src/CompareOptions.h
+++ b/Src/CompareOptions.h
@@ -100,7 +100,7 @@ class DiffutilsOptions : public CompareOptions
 {
 public:
        DiffutilsOptions();
-       DiffutilsOptions(const CompareOptions& options);
+       explicit DiffutilsOptions(const CompareOptions& options);
        DiffutilsOptions(const DiffutilsOptions& options);
        void SetToDiffUtils();
        void GetAsDiffOptions(DIFFOPTIONS &options) const;
@@ -120,7 +120,7 @@ class QuickCompareOptions : public CompareOptions
 {
 public:
        QuickCompareOptions();
-       QuickCompareOptions(const CompareOptions& options);
+       explicit QuickCompareOptions(const CompareOptions& options);
 
        bool m_bStopAfterFirstDiff; /**< Optimize compare by stopping after first difference? */
 };

diff --git a/Src/CompareStatisticsDlg.h b/Src/CompareStatisticsDlg.h
index 93c8846..db964ef 100644 (file)
--- a/Src/CompareStatisticsDlg.h
+++ b/Src/CompareStatisticsDlg.h
@@ -33,7 +33,7 @@ class CompareStatisticsDlg : public CDialog
        DECLARE_DYNAMIC(CompareStatisticsDlg)
 
 public:
-       CompareStatisticsDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit CompareStatisticsDlg(CWnd* pParent = NULL);   // standard constructor
        void SetCompareStats(const CompareStats * pStats);
 
 // Dialog Data

diff --git a/Src/CompareStats.h b/Src/CompareStats.h
index dd58498..d81b5b8 100644 (file)
--- a/Src/CompareStats.h
+++ b/Src/CompareStats.h
@@ -67,7 +67,7 @@ public:
                RESULT_COUNT  //THIS MUST BE THE LAST ITEM
        };
 
-       CompareStats(int nDirs);
+       explicit CompareStats(int nDirs);
        ~CompareStats();
        void SetCompareThreadCount(int nCompareThreads)
        {

diff --git a/Src/ConfirmFolderCopyDlg.h b/Src/ConfirmFolderCopyDlg.h
index aee53db..e6375df 100644 (file)
--- a/Src/ConfirmFolderCopyDlg.h
+++ b/Src/ConfirmFolderCopyDlg.h
@@ -31,7 +31,7 @@ class ConfirmFolderCopyDlg : public CDialog
        DECLARE_DYNAMIC(ConfirmFolderCopyDlg)
 
 public:
-       ConfirmFolderCopyDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit ConfirmFolderCopyDlg(CWnd* pParent = NULL);   // standard constructor
        virtual ~ConfirmFolderCopyDlg();
 
 // Dialog Data

diff --git a/Src/DiffList.cpp b/Src/DiffList.cpp
index f6e670d..995d902 100644 (file)
--- a/Src/DiffList.cpp
+++ b/Src/DiffList.cpp
@@ -232,7 +232,7 @@ bool DiffList::SetDiff(int nDiff, const DIFFRANGE & di)
 {
        if (nDiff < (int) m_diffs.size())
        {
-               m_diffs[nDiff] = di;
+               m_diffs[nDiff] = DiffRangeInfo(di);
                return true;
        }
        else

diff --git a/Src/DiffList.h b/Src/DiffList.h
index f2d481a..d1e9e95 100644 (file)
--- a/Src/DiffList.h
+++ b/Src/DiffList.h
@@ -110,7 +110,7 @@ struct DiffRangeInfo: public DIFFRANGE
        size_t prev; /**< link (array index) for doubly-linked chain of non-trivial DIFFRANGEs */
 
        DiffRangeInfo() { InitLinks(); }
-       DiffRangeInfo(const DIFFRANGE & di) : DIFFRANGE(di) { InitLinks(); }
+       explicit DiffRangeInfo(const DIFFRANGE & di) : DIFFRANGE(di) { InitLinks(); }
        void InitLinks() { next = prev = -1; }
 };
 

diff --git a/Src/DirCmpReport.h b/Src/DirCmpReport.h
index 4b5f70f..91b5708 100644 (file)
--- a/Src/DirCmpReport.h
+++ b/Src/DirCmpReport.h
@@ -35,7 +35,7 @@ class DirCmpReport
 {
 public:
 
-       DirCmpReport(const std::vector<String>& colRegKeys);
+       explicit DirCmpReport(const std::vector<String>& colRegKeys);
        void SetList(IListCtrl *pList);
        void SetRootPaths(const PathContext &paths);
        void SetColumns(int columns);

diff --git a/Src/DirCmpReportDlg.h b/Src/DirCmpReportDlg.h
index 60ceb94..f2d43b3 100644 (file)
--- a/Src/DirCmpReportDlg.h
+++ b/Src/DirCmpReportDlg.h
@@ -20,7 +20,7 @@ class DirCmpReportDlg : public CDialog
        DECLARE_DYNAMIC(DirCmpReportDlg)
 
 public:
-       DirCmpReportDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit DirCmpReportDlg(CWnd* pParent = NULL);   // standard constructor
 
 // Dialog Data
        enum { IDD = IDD_DIRCMP_REPORT };

diff --git a/Src/DirColsDlg.h b/Src/DirColsDlg.h
index 77a92db..c5e3470 100644 (file)
--- a/Src/DirColsDlg.h
+++ b/Src/DirColsDlg.h
@@ -43,7 +43,7 @@ public:
 
 // Construction
 public:
-       CDirColsDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit CDirColsDlg(CWnd* pParent = NULL);   // standard constructor
        void AddColumn(const String & name, const String & desc, int log, int phy=-1)
                { column c(name, desc, log, phy); m_cols.push_back(c); }
        void AddDefColumn(const String & name, int log, int phy=-1)

diff --git a/Src/DirFilterDlg.h b/Src/DirFilterDlg.h
index 02378e3..071f9ef 100644 (file)
--- a/Src/DirFilterDlg.h
+++ b/Src/DirFilterDlg.h
@@ -23,7 +23,7 @@ class DirFilterDlg : public CDialog
        DECLARE_DYNAMIC(DirFilterDlg)
 
 public:
-       DirFilterDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit DirFilterDlg(CWnd* pParent = NULL);   // standard constructor
 
 // Dialog Data
        enum { IDD = IDD_DIR_FILTER };

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 3d8ca71..016ffb7 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -4281,7 +4281,7 @@ void CDirView::OnMergeCompareLeft2Right1()
 void CDirView::OnMergeCompareXML()
 {
        CWaitCursor waitstatus;
-       PackingInfo packingInfo = PLUGIN_BUILTIN_XML;
+       PackingInfo packingInfo(PLUGIN_BUILTIN_XML);
        OpenSelection(SELECTIONTYPE_NORMAL, &packingInfo);
 }
 

diff --git a/Src/DropHandler.h b/Src/DropHandler.h
index 492f7e3..519da8c 100644 (file)
--- a/Src/DropHandler.h
+++ b/Src/DropHandler.h
@@ -17,7 +17,7 @@ public:
        HRESULT STDMETHODCALLTYPE DragLeave(void);\r
        HRESULT STDMETHODCALLTYPE Drop(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect);\r
 \r
-       DropHandler(std::function<void(const std::vector<String>&)> callback);\r
+       explicit DropHandler(std::function<void(const std::vector<String>&)> callback);\r
        ~DropHandler();\r
 \r
 private:\r

diff --git a/Src/Exceptions.h b/Src/Exceptions.h
index ce811be..d14ed89 100644 (file)
--- a/Src/Exceptions.h
+++ b/Src/Exceptions.h
@@ -51,7 +51,7 @@ class SE_Exception
 private:
        unsigned long nSE;
 public:
-       SE_Exception(unsigned long n) : nSE(n) {}
+       explicit SE_Exception(unsigned long n) : nSE(n) {}
        ~SE_Exception() {};
 
        unsigned long getSeNumber() { return nSE; }

diff --git a/Src/FileLocation.h b/Src/FileLocation.h
index bc17e65..9b1f23d 100644 (file)
--- a/Src/FileLocation.h
+++ b/Src/FileLocation.h
@@ -27,7 +27,7 @@ struct FileLocation
         * The constructor taking a path as a parameter.
         * @param [in] path Full path for the file.
         */
-       FileLocation(const String& path) : filepath(path)
+       explicit FileLocation(const String& path) : filepath(path)
        {
        }
 

diff --git a/Src/FileTransform.h b/Src/FileTransform.h
index 0078b53..09317e3 100644 (file)
--- a/Src/FileTransform.h
+++ b/Src/FileTransform.h
@@ -74,7 +74,7 @@ public:
                }
                bToBeScanned = bMode;
        };
-       PluginForFile(PLUGIN_MODE bMode) 
+       explicit PluginForFile(PLUGIN_MODE bMode) 
        {
                Initialize(bMode);
        };
@@ -97,7 +97,7 @@ public:
 class PackingInfo : public PluginForFile
 {
 public:
-       PackingInfo(PLUGIN_MODE bMode = (PLUGIN_MODE)g_bUnpackerMode)
+       explicit PackingInfo(PLUGIN_MODE bMode = (PLUGIN_MODE)g_bUnpackerMode)
        : PluginForFile(bMode)
        , subcode(0)
        , pufile(0)
@@ -122,7 +122,7 @@ public:
 class PrediffingInfo : public PluginForFile
 {
 public:
-       PrediffingInfo(PLUGIN_MODE bMode = (PLUGIN_MODE)g_bPredifferMode)
+       explicit PrediffingInfo(PLUGIN_MODE bMode = (PLUGIN_MODE)g_bPredifferMode)
        : PluginForFile(bMode)
        {
        }

diff --git a/Src/FilterCommentsManager.h b/Src/FilterCommentsManager.h
index 17ec85b..7253517 100644 (file)
--- a/Src/FilterCommentsManager.h
+++ b/Src/FilterCommentsManager.h
@@ -61,7 +61,7 @@ created with default values that are assoicated with most commen languages.
 class FilterCommentsManager\r
 {\r
 public:\r
-       FilterCommentsManager(const String &IniFileName = _T(""));\r
+       explicit FilterCommentsManager(const String &IniFileName = _T(""));\r
        FilterCommentsSet GetSetForFileType(const String& FileTypeName);\r
 \r
 private:\r

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 93baca2..67558b9 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1986,7 +1986,7 @@ LRESULT CMainFrame::OnCopyData(WPARAM wParam, LPARAM lParam)
        if (cchData == 0 || pchData[cchData - 1] != _T('\0'))
                return FALSE;
        ReplyMessage(TRUE);
-       MergeCmdLineInfo cmdInfo = pchData;
+       MergeCmdLineInfo cmdInfo(pchData);
        theApp.ParseArgsAndDoOpen(cmdInfo, this);
        return TRUE;
 }

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 65d8ad3..2368db7 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -296,7 +296,7 @@ BOOL CMergeApp::InitInstance()
        CleanupWMtemp();
 
        // Parse command-line arguments.
-       MergeCmdLineInfo cmdInfo = GetCommandLine();
+       MergeCmdLineInfo cmdInfo(GetCommandLine());
 
        // If paths were given to commandline we consider this being an invoke from
        // commandline (from other application, shellextension etc).

diff --git a/Src/Merge7zFormatMergePluginImpl.h b/Src/Merge7zFormatMergePluginImpl.h
index 8367116..f7964e2 100644 (file)
--- a/Src/Merge7zFormatMergePluginImpl.h
+++ b/Src/Merge7zFormatMergePluginImpl.h
@@ -43,7 +43,7 @@ struct Merge7zFormatMergePluginImpl : public Merge7z::Format
 
 struct Merge7zFormatMergePluginScope
 {
-       Merge7zFormatMergePluginScope(const PackingInfo *infoUnpacker) : m_oldPackingInfo(*Merge7zFormatMergePluginImpl::GetPackingInfo())
+       explicit Merge7zFormatMergePluginScope(const PackingInfo *infoUnpacker) : m_oldPackingInfo(*Merge7zFormatMergePluginImpl::GetPackingInfo())
        {
                Merge7zFormatMergePluginImpl::SetPackingInfo(infoUnpacker);
        }

diff --git a/Src/Merge7zFormatRegister.h b/Src/Merge7zFormatRegister.h
index a4d080d..ce0433a 100644 (file)
--- a/Src/Merge7zFormatRegister.h
+++ b/Src/Merge7zFormatRegister.h
@@ -7,7 +7,7 @@
 
 struct Merge7zFormatRegister
 {
-       Merge7zFormatRegister(Merge7z::Format *(*pfnGuessFormat)(const String& path))
+       explicit Merge7zFormatRegister(Merge7z::Format *(*pfnGuessFormat)(const String& path))
        {
                Add(pfnGuessFormat);
        }

diff --git a/Src/MergeCmdLineInfo.h b/Src/MergeCmdLineInfo.h
index c25ca6e..6c563fe 100644 (file)
--- a/Src/MergeCmdLineInfo.h
+++ b/Src/MergeCmdLineInfo.h
@@ -41,7 +41,7 @@
 class MergeCmdLineInfo
 {
 public:
-       MergeCmdLineInfo(const TCHAR *);
+       explicit MergeCmdLineInfo(const TCHAR *);
 
 public:
 

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 06610c8..d2d12da 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -3074,7 +3074,7 @@ void CMergeDoc::OnOK()
 
 void CMergeDoc::OnFileRecompareAsXML()
 {
-       PackingInfo infoUnpacker = PLUGIN_BUILTIN_XML;
+       PackingInfo infoUnpacker(PLUGIN_BUILTIN_XML);
        SetUnpacker(&infoUnpacker);
        OnFileReload();
 }

diff --git a/Src/PatchDlg.h b/Src/PatchDlg.h
index 20cb4a5..937cd94 100644 (file)
--- a/Src/PatchDlg.h
+++ b/Src/PatchDlg.h
@@ -38,7 +38,7 @@ class CPatchDlg : public CDialog
 {
 // Construction
 public:
-       CPatchDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit CPatchDlg(CWnd* pParent = NULL);   // standard constructor
 
        // Functions to add and get selected files (as PATCHFILEs)
        void AddItem(const PATCHFILES& pf);

diff --git a/Src/PathContext.h b/Src/PathContext.h
index 63139ff..4571ebe 100644 (file)
--- a/Src/PathContext.h
+++ b/Src/PathContext.h
@@ -42,11 +42,11 @@ public:
        typedef PathContextIterator const_iterator;
 
        PathContext();
-       PathContext(const String& sLeft);
+       explicit PathContext(const String& sLeft);
        PathContext(const String& sLeft, const String& sRight);
        PathContext(const String& sLeft, const String& sMiddle, const String& sRight);
        PathContext(const PathContext &paths);
-       PathContext(const std::vector<String>& paths);
+       explicit PathContext(const std::vector<String>& paths);
 
        String GetAt(int nIndex) const;
        String& GetElement(int nIndex);
@@ -78,7 +78,7 @@ private:
 class PathContextIterator : public std::iterator<std::forward_iterator_tag, String>
 {
 public:
-       PathContextIterator(const PathContext *pPathContext) : m_pPathContext(pPathContext)
+       explicit PathContextIterator(const PathContext *pPathContext) : m_pPathContext(pPathContext)
        {
                m_sel =  (pPathContext->GetSize() == 0) ? -1 : 0;
        }

diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp
index bd6b11e..da142f0 100644 (file)
--- a/Src/Plugins.cpp
+++ b/Src/Plugins.cpp
@@ -83,7 +83,7 @@ static FastMutex scriptletsSem;
 
 template<class T> struct AutoReleaser
 {
-       AutoReleaser(T *ptr) : p(ptr) {}
+       explicit AutoReleaser(T *ptr) : p(ptr) {}
        ~AutoReleaser() { if (p) p->Release(); }
        T *p;
 };

diff --git a/Src/PluginsListDlg.h b/Src/PluginsListDlg.h
index 5bfcaa1..4cd841c 100644 (file)
--- a/Src/PluginsListDlg.h
+++ b/Src/PluginsListDlg.h
@@ -16,7 +16,7 @@ class PluginsListDlg : public CDialog
        DECLARE_DYNAMIC(PluginsListDlg)
 
 public:
-       PluginsListDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit PluginsListDlg(CWnd* pParent = NULL);   // standard constructor
        virtual ~PluginsListDlg();
 
 // Dialog Data

diff --git a/Src/ProjectFile.cpp b/Src/ProjectFile.cpp
index 1ec2999..f2f879d 100755 (executable)
--- a/Src/ProjectFile.cpp
+++ b/Src/ProjectFile.cpp
@@ -76,7 +76,7 @@ void writeElement(XMLWriter& writer, const std::string& tagname, const std::stri
 class ProjectFileHandler: public ContentHandler
 {
 public:
-       ProjectFileHandler(ProjectFile *pProject) : m_pProject(pProject) {}
+       explicit ProjectFileHandler(ProjectFile *pProject) : m_pProject(pProject) {}
 
        void setDocumentLocator(const Locator* loc) {}
        void startDocument() {}

diff --git a/Src/PropArchive.h b/Src/PropArchive.h
index e8d2ac4..4e71e8c 100644 (file)
--- a/Src/PropArchive.h
+++ b/Src/PropArchive.h
@@ -16,7 +16,7 @@ class COptionsMgr;
 class PropArchive : public OptionsPanel
 {
 public:
-       PropArchive(COptionsMgr *optionsMgr);
+       explicit PropArchive(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
        virtual void ReadOptions();

diff --git a/Src/PropBackups.h b/Src/PropBackups.h
index 0729600..01b6078 100644 (file)
--- a/Src/PropBackups.h
+++ b/Src/PropBackups.h
@@ -16,7 +16,7 @@ class COptionsMgr;
 class PropBackups : public OptionsPanel
 {
 public:
-       PropBackups(COptionsMgr *optionsMgr);
+       explicit PropBackups(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
        virtual void ReadOptions();

diff --git a/Src/PropCodepage.h b/Src/PropCodepage.h
index 845bf72..d9f8015 100644 (file)
--- a/Src/PropCodepage.h
+++ b/Src/PropCodepage.h
@@ -13,7 +13,7 @@ class PropCodepage : public OptionsPanel
 {
 // Construction
 public:
-       PropCodepage(COptionsMgr *optionsMgr);
+       explicit PropCodepage(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
        virtual void ReadOptions();

diff --git a/Src/PropColors.h b/Src/PropColors.h
index aa90630..7af111c 100644 (file)
--- a/Src/PropColors.h
+++ b/Src/PropColors.h
@@ -18,7 +18,7 @@ class PropMergeColors : public OptionsPanel
 {
 // Construction
 public:
-       PropMergeColors(COptionsMgr *optionsMgr);
+       explicit PropMergeColors(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
        virtual void ReadOptions();

diff --git a/Src/PropCompare.h b/Src/PropCompare.h
index f6c0615..91ee993 100644 (file)
--- a/Src/PropCompare.h
+++ b/Src/PropCompare.h
@@ -21,7 +21,7 @@ class PropCompare : public OptionsPanel
 {
 // Construction
 public:
-       PropCompare(COptionsMgr *optionsMgr);
+       explicit PropCompare(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
        virtual void ReadOptions();

diff --git a/Src/PropCompareBinary.cpp b/Src/PropCompareBinary.cpp
index af154c8..f927524 100644 (file)
--- a/Src/PropCompareBinary.cpp
+++ b/Src/PropCompareBinary.cpp
@@ -21,7 +21,7 @@ static char THIS_FILE[] = __FILE__;
 class Heksedit
 {
 public:
-       Heksedit(CWnd *pwndParent)
+       explicit Heksedit(CWnd *pwndParent)
        {
                pv = LoadLibrary(_T("Frhed\\hekseditU.dll"));
                if (!pv)

diff --git a/Src/PropCompareBinary.h b/Src/PropCompareBinary.h
index 923a109..951b445 100644 (file)
--- a/Src/PropCompareBinary.h
+++ b/Src/PropCompareBinary.h
@@ -17,7 +17,7 @@ class PropCompareBinary : public OptionsPanel
 {
 // Construction
 public:
-       PropCompareBinary(COptionsMgr *optionsMgr);
+       explicit PropCompareBinary(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
        virtual void ReadOptions();

diff --git a/Src/PropCompareFolder.h b/Src/PropCompareFolder.h
index 93b7ec1..3f857fd 100644 (file)
--- a/Src/PropCompareFolder.h
+++ b/Src/PropCompareFolder.h
@@ -26,7 +26,7 @@ class PropCompareFolder : public OptionsPanel
 {
 // Construction
 public:
-       PropCompareFolder(COptionsMgr *optionsMgr);
+       explicit PropCompareFolder(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
        virtual void ReadOptions();

diff --git a/Src/PropCompareImage.h b/Src/PropCompareImage.h
index 06d79e3..8111594 100644 (file)
--- a/Src/PropCompareImage.h
+++ b/Src/PropCompareImage.h
@@ -17,7 +17,7 @@ class PropCompareImage : public OptionsPanel
 {
 // Construction
 public:
-       PropCompareImage(COptionsMgr *optionsMgr);
+       explicit PropCompareImage(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
        virtual void ReadOptions();

diff --git a/Src/PropEditor.h b/Src/PropEditor.h
index 1284fab..85dbf01 100644 (file)
--- a/Src/PropEditor.h
+++ b/Src/PropEditor.h
@@ -20,7 +20,7 @@ class PropEditor : public OptionsPanel
 {
 // Construction
 public:
-       PropEditor(COptionsMgr *optionsMgr);
+       explicit PropEditor(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
        virtual void ReadOptions();

diff --git a/Src/PropGeneral.h b/Src/PropGeneral.h
index 417eacd..9672bd9 100644 (file)
--- a/Src/PropGeneral.h
+++ b/Src/PropGeneral.h
@@ -16,7 +16,7 @@ class PropGeneral : public OptionsPanel
 {
 // Construction
 public:
-       PropGeneral(COptionsMgr *optionsMgr);
+       explicit PropGeneral(COptionsMgr *optionsMgr);
        ~PropGeneral();
 
 // Implement IOptionsPanel

diff --git a/Src/PropRegistry.h b/Src/PropRegistry.h
index 8287a8f..06f2d35 100644 (file)
--- a/Src/PropRegistry.h
+++ b/Src/PropRegistry.h
@@ -36,7 +36,7 @@ class PropRegistry : public OptionsPanel
 {
 // Construction
 public:
-       PropRegistry(COptionsMgr *optionsMgr);
+       explicit PropRegistry(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
        virtual void ReadOptions();

diff --git a/Src/PropShell.h b/Src/PropShell.h
index dd781d9..dde3de8 100644 (file)
--- a/Src/PropShell.h
+++ b/Src/PropShell.h
@@ -14,7 +14,7 @@ class PropShell : public OptionsPanel
 {
 // Construction
 public:
-       PropShell(COptionsMgr *optionsMgr);
+       explicit PropShell(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
        virtual void ReadOptions();

diff --git a/Src/PropVss.h b/Src/PropVss.h
index e45f5df..1a73fa9 100644 (file)
--- a/Src/PropVss.h
+++ b/Src/PropVss.h
@@ -15,7 +15,7 @@ class PropVss : public OptionsPanel
 
 // Construction & Destruction
 public:
-       PropVss(COptionsMgr *optionsMgr);
+       explicit PropVss(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
        virtual void ReadOptions();

diff --git a/Src/SaveClosingDlg.h b/Src/SaveClosingDlg.h
index ca3f893..687b72e 100644 (file)
--- a/Src/SaveClosingDlg.h
+++ b/Src/SaveClosingDlg.h
@@ -47,7 +47,7 @@ public:
                SAVECLOSING_DISCARD,  /**< Discard changes */
        };
 
-       SaveClosingDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit SaveClosingDlg(CWnd* pParent = NULL);   // standard constructor
        void DoAskFor(BOOL bLeft = FALSE, BOOL bMiddle = FALSE, BOOL bRight = FALSE);
 
 // Dialog Data

diff --git a/Src/SharedFilterDlg.h b/Src/SharedFilterDlg.h
index 3b4a95d..8b0cd83 100644 (file)
--- a/Src/SharedFilterDlg.h
+++ b/Src/SharedFilterDlg.h
@@ -23,7 +23,7 @@ public:
 
 // Construction
 public:
-       CSharedFilterDlg(CWnd* pParent);   // standard constructor
+       explicit CSharedFilterDlg(CWnd* pParent);   // standard constructor
 
 // Implementation
 protected:

diff --git a/Src/SourceControl.cpp b/Src/SourceControl.cpp
index dc3c8b4..9309ee0 100644 (file)
--- a/Src/SourceControl.cpp
+++ b/Src/SourceControl.cpp
@@ -267,7 +267,7 @@ BOOL CMergeApp::SaveToVersionControl(const String& strSavePath)
                        TRY
                        {
                                //  BSP - ...to get the specific source safe item to be checked out
-                               vssi = vssdb.GetVSSItem( strItem.c_str(), 0 );
+                               vssi = IVSSItem(vssdb.GetVSSItem( strItem.c_str(), 0 ));
                        }
                        CATCH_ALL(e)
                        {

diff --git a/Src/StdAfx.h b/Src/StdAfx.h
index c293547..74cb25e 100644 (file)
--- a/Src/StdAfx.h
+++ b/Src/StdAfx.h
@@ -98,7 +98,7 @@ private:
        LARGE_INTEGER freq;
        TCHAR funcname[256];
 public:
-       CWinMergeProfile(LPCTSTR pFuncName) {
+       explicit CWinMergeProfile(LPCTSTR pFuncName) {
                lstrcpy(funcname, pFuncName);
                QueryPerformanceFrequency(&freq);
                QueryPerformanceCounter(&li[0]);

diff --git a/Src/TFile.h b/Src/TFile.h
index 3b81f38..a33b9dd 100644 (file)
--- a/Src/TFile.h
+++ b/Src/TFile.h
@@ -8,7 +8,7 @@
 class TFile : public Poco::File
 {
 public:
-       TFile(const String& path) : File(ucr::toUTF8(path)) {}
+       explicit TFile(const String& path) : File(ucr::toUTF8(path)) {}
        void copyTo(const String& path) const { File::copyTo(ucr::toUTF8(path)); }
        void moveTo(const String& path) { File::moveTo(ucr::toUTF8(path)); }
        void renameTo(const String& path) { File::renameTo(ucr::toUTF8(path)); }

diff --git a/Src/VssPromptDlg.h b/Src/VssPromptDlg.h
index c16e7c9..605ec29 100644 (file)
--- a/Src/VssPromptDlg.h
+++ b/Src/VssPromptDlg.h
@@ -31,7 +31,7 @@ class CVssPromptDlg : public CDialog
 {
 // Construction
 public:
-       CVssPromptDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit CVssPromptDlg(CWnd* pParent = NULL);   // standard constructor
 
 // Dialog Data
        //{{AFX_DATA(CVssPromptDlg)

diff --git a/Src/WMGotoDlg.h b/Src/WMGotoDlg.h
index 2ebb124..372f242 100644 (file)
--- a/Src/WMGotoDlg.h
+++ b/Src/WMGotoDlg.h
@@ -33,7 +33,7 @@ class WMGotoDlg : public CDialog
 {
 // Construction
 public:
-       WMGotoDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit WMGotoDlg(CWnd* pParent = NULL);   // standard constructor
 
 // Dialog Data
        //{{AFX_DATA(WMGotoDlg)

diff --git a/Src/ssapi.h b/Src/ssapi.h
index 8abd50d..5307c79 100644 (file)
--- a/Src/ssapi.h
+++ b/Src/ssapi.h
@@ -6,7 +6,7 @@ class IVSSItemOld : public COleDispatchDriver
 {
 public:
        IVSSItemOld() {}                // Calls COleDispatchDriver default constructor
-       IVSSItemOld(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
+       explicit IVSSItemOld(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
        IVSSItemOld(const IVSSItemOld& dispatchSrc) : COleDispatchDriver(dispatchSrc) {}
 
 // Attributes
@@ -50,7 +50,7 @@ class IVSSItem : public COleDispatchDriver
 {
 public:
        IVSSItem() {}           // Calls COleDispatchDriver default constructor
-       IVSSItem(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
+       explicit IVSSItem(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
        IVSSItem(const IVSSItem& dispatchSrc) : COleDispatchDriver(dispatchSrc) {}
 
 // Attributes
@@ -96,7 +96,7 @@ class IVSSVersions : public COleDispatchDriver
 {
 public:
        IVSSVersions() {}               // Calls COleDispatchDriver default constructor
-       IVSSVersions(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
+       explicit IVSSVersions(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
        IVSSVersions(const IVSSVersions& dispatchSrc) : COleDispatchDriver(dispatchSrc) {}
 
 // Attributes
@@ -112,7 +112,7 @@ class IVSSVersionOld : public COleDispatchDriver
 {
 public:
        IVSSVersionOld() {}             // Calls COleDispatchDriver default constructor
-       IVSSVersionOld(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
+       explicit IVSSVersionOld(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
        IVSSVersionOld(const IVSSVersionOld& dispatchSrc) : COleDispatchDriver(dispatchSrc) {}
 
 // Attributes
@@ -135,7 +135,7 @@ class IVSSVersion : public COleDispatchDriver
 {
 public:
        IVSSVersion() {}                // Calls COleDispatchDriver default constructor
-       IVSSVersion(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
+       explicit IVSSVersion(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
        IVSSVersion(const IVSSVersion& dispatchSrc) : COleDispatchDriver(dispatchSrc) {}
 
 // Attributes
@@ -159,7 +159,7 @@ class IVSSItems : public COleDispatchDriver
 {
 public:
        IVSSItems() {}          // Calls COleDispatchDriver default constructor
-       IVSSItems(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
+       explicit IVSSItems(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
        IVSSItems(const IVSSItems& dispatchSrc) : COleDispatchDriver(dispatchSrc) {}
 
 // Attributes
@@ -177,7 +177,7 @@ class IVSSCheckouts : public COleDispatchDriver
 {
 public:
        IVSSCheckouts() {}              // Calls COleDispatchDriver default constructor
-       IVSSCheckouts(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
+       explicit IVSSCheckouts(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
        IVSSCheckouts(const IVSSCheckouts& dispatchSrc) : COleDispatchDriver(dispatchSrc) {}
 
 // Attributes
@@ -195,7 +195,7 @@ class IVSSCheckout : public COleDispatchDriver
 {
 public:
        IVSSCheckout() {}               // Calls COleDispatchDriver default constructor
-       IVSSCheckout(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
+       explicit IVSSCheckout(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
        IVSSCheckout(const IVSSCheckout& dispatchSrc) : COleDispatchDriver(dispatchSrc) {}
 
 // Attributes
@@ -218,7 +218,7 @@ class IVSSDatabaseOld : public COleDispatchDriver
 {
 public:
        IVSSDatabaseOld() {}            // Calls COleDispatchDriver default constructor
-       IVSSDatabaseOld(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
+       explicit IVSSDatabaseOld(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
        IVSSDatabaseOld(const IVSSDatabaseOld& dispatchSrc) : COleDispatchDriver(dispatchSrc) {}
 
 // Attributes
@@ -241,7 +241,7 @@ class IVSSDatabase : public COleDispatchDriver
 {
 public:
        IVSSDatabase() {}               // Calls COleDispatchDriver default constructor
-       IVSSDatabase(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
+       explicit IVSSDatabase(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
        IVSSDatabase(const IVSSDatabase& dispatchSrc) : COleDispatchDriver(dispatchSrc) {}
 
 // Attributes
@@ -271,7 +271,7 @@ class IVSSUser : public COleDispatchDriver
 {
 public:
        IVSSUser() {}           // Calls COleDispatchDriver default constructor
-       IVSSUser(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
+       explicit IVSSUser(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
        IVSSUser(const IVSSUser& dispatchSrc) : COleDispatchDriver(dispatchSrc) {}
 
 // Attributes
@@ -314,7 +314,7 @@ class IVSS : public COleDispatchDriver
 {
 public:
        IVSS() {}               // Calls COleDispatchDriver default constructor
-       IVSS(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
+       explicit IVSS(LPDISPATCH pDispatch) : COleDispatchDriver(pDispatch) {}
        IVSS(const IVSS& dispatchSrc) : COleDispatchDriver(dispatchSrc) {}
 
 // Attributes