Fix code scanning alerts: Inconsistent definition of copy constructor and assignment...

diff --git a/Src/CompareOptions.cpp b/Src/CompareOptions.cpp
index 94f2bcc..39b5e61 100644 (file)
--- a/Src/CompareOptions.cpp
+++ b/Src/CompareOptions.cpp
@@ -24,33 +24,6 @@ CompareOptions::CompareOptions()
 }
 
 /**
- * @brief Copy constructor.
- */
-CompareOptions::CompareOptions(const CompareOptions & options)
-: m_ignoreWhitespace(options.m_ignoreWhitespace)
-, m_bIgnoreBlankLines(options.m_bIgnoreBlankLines)
-, m_bIgnoreCase(options.m_bIgnoreCase)
-, m_bIgnoreEOLDifference(options.m_bIgnoreEOLDifference)
-, m_bIgnoreNumbers(options.m_bIgnoreNumbers)
-{
-}
-
-/**
- * @brief Sets options from DiffutilsOptions structure.
- * @param [in] options Diffutils options.
- */
-DiffutilsOptions::DiffutilsOptions(const DiffutilsOptions& options)
-: CompareOptions(options)
-, m_contextLines(options.m_contextLines)
-, m_filterCommentsLines(options.m_filterCommentsLines)
-, m_diffAlgorithm(options.m_diffAlgorithm)
-, m_bIndentHeuristic(options.m_bIndentHeuristic)
-, m_bCompletelyBlankOutIgnoredDiffereneces(options.m_bCompletelyBlankOutIgnoredDiffereneces)
-, m_outputStyle(options.m_outputStyle)
-{
-}
-
-/**
  * @brief Sets options from DIFFOPTIONS structure.
  * @param [in] options Diffutils options.
  */

diff --git a/Src/CompareOptions.h b/Src/CompareOptions.h
index dfadd21..b0810a3 100644 (file)
--- a/Src/CompareOptions.h
+++ b/Src/CompareOptions.h
@@ -97,7 +97,6 @@ class CompareOptions
 {
 public:
        CompareOptions();
-       CompareOptions(const CompareOptions & options);
        virtual void SetFromDiffOptions(const DIFFOPTIONS & options);
 
        enum WhitespaceIgnoreChoices m_ignoreWhitespace; /**< Ignore whitespace characters */
@@ -118,7 +117,6 @@ class DiffutilsOptions : public CompareOptions
 public:
        DiffutilsOptions();
        explicit DiffutilsOptions(const CompareOptions& options);
-       DiffutilsOptions(const DiffutilsOptions& options);
        void SetToDiffUtils();
        void GetAsDiffOptions(DIFFOPTIONS &options) const;
        virtual void SetFromDiffOptions(const DIFFOPTIONS & options) override;

diff --git a/Src/DiffList.h b/Src/DiffList.h
index 116e48b..5e9f7ab 100644 (file)
--- a/Src/DiffList.h
+++ b/Src/DiffList.h
@@ -75,9 +75,7 @@ public:
 
        std::vector<int> m_map;
 
-       // boilerplate ctr, copy ctr
        DiffMap() { }
-       DiffMap(const DiffMap & src) : m_map(src.m_map) {}
        void InitDiffMap(int nlines);
 };
 

diff --git a/Src/DirItemIterator.h b/Src/DirItemIterator.h
index 0a8f237..581631b 100644 (file)
--- a/Src/DirItemIterator.h
+++ b/Src/DirItemIterator.h
@@ -134,6 +134,15 @@ public:
 
        ~DirItemIterator() {}
 
+       DirItemIterator::DirItemIterator(const DirItemIterator& it)
+       {
+               m_sel = it.m_sel;
+               m_pList = it.m_pList;
+               m_pdi = it.m_pdi;
+               m_selected = it.m_selected;
+               m_reverse = it.m_reverse;
+       }
+
        DirItemIterator& operator=(const DirItemIterator& it)
        {
                m_sel = it.m_sel;

diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
index 0a923e8..56a7d2b 100644 (file)
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -43,7 +43,7 @@
     <ProjectGuid>{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}</ProjectGuid>\r
     <RootNamespace>Merge</RootNamespace>\r
     <Keyword>MFCProj</Keyword>\r
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' >= '16'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' &gt;= '16'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
@@ -1212,6 +1212,7 @@
     <ClInclude Include="Common\Bitmap.h" />\r
     <ClInclude Include="charsets.h" />\r
     <ClInclude Include="DirAdditionalPropertiesDlg.h" />\r
+    <ClInclude Include="DirItemIterator.h" />\r
     <ClInclude Include="DirSelectFilesDlg.h" />\r
     <ClInclude Include="HashCalc.h" />\r
     <ClInclude Include="PropertySystem.h" />\r
@@ -1459,4 +1460,4 @@
       <UserProperties RESOURCE_FILE="Merge.rc" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
index 62c74f1..b5e5015 100644 (file)
--- a/Src/Merge.vcxproj.filters
+++ b/Src/Merge.vcxproj.filters
@@ -1307,6 +1307,9 @@
     <ClInclude Include="DirAdditionalPropertiesDlg.h">\r
       <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="DirItemIterator.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="res\binarydiff.ico">\r
@@ -1414,4 +1417,4 @@
       <Filter>Resource Files</Filter>\r
     </ResourceCompile>\r
   </ItemGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/Src/MergeDoc.h b/Src/MergeDoc.h
index afa8134..4af8d38 100644 (file)
--- a/Src/MergeDoc.h
+++ b/Src/MergeDoc.h
@@ -94,14 +94,6 @@ struct WordDiff {
                end[1] = e2;
                end[2] = e3;
        }
-       WordDiff(const WordDiff & src)
-               : begin{src.begin}
-               , end{src.end}
-               , beginline{src.beginline}
-               , endline{src.endline}
-               , op(src.op)
-       {
-       }
 };
 
 struct CurrentWordDiff

diff --git a/Src/PathContext.cpp b/Src/PathContext.cpp
index c47ce86..6b9667b 100644 (file)
--- a/Src/PathContext.cpp
+++ b/Src/PathContext.cpp
@@ -11,14 +11,6 @@
 #include "paths.h"
 
 /**
- * @brief Copy constructor.
- */
-PathInfo::PathInfo(const PathInfo &pi)
-: m_sPath(pi.m_sPath)
-{
-}
-
-/**
  * @brief Get path.
  * @param [in] sbNormalized true if path is wanted in normalized format.
  */
@@ -64,12 +56,6 @@ PathContext::PathContext(const String& sLeft, const String& sMiddle, const Strin
        m_path[2].SetPath(sRight);
 }
 
-PathContext::PathContext(const PathContext &paths)
-{
-       m_nFiles = paths.m_nFiles;
-       std::copy_n(paths.m_path, m_nFiles, m_path);
-}
-
 PathContext::PathContext(const std::vector<String> &paths)
 {
        m_nFiles = static_cast<int>(paths.size());

diff --git a/Src/PathContext.h b/Src/PathContext.h
index b7b4388..133a97a 100644 (file)
--- a/Src/PathContext.h
+++ b/Src/PathContext.h
@@ -21,7 +21,6 @@ class PathInfo
        friend class PathContext;
 public:
        PathInfo() {}
-       PathInfo(const PathInfo &pi);
 
        String GetPath(bool bNormalized = true) const;
        String& GetRef() { return m_sPath; }
@@ -59,7 +58,6 @@ public:
        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);
        explicit PathContext(const std::vector<String>& paths);
 
        String GetAt(int nIndex) const;

diff --git a/Src/stringdiffs.cpp b/Src/stringdiffs.cpp
index e54cd4d..5b2bfda 100644 (file)
--- a/Src/stringdiffs.cpp
+++ b/Src/stringdiffs.cpp
@@ -323,7 +323,7 @@ stringdiffs::BuildWordDiffList_DP()
                        e1 = m_words1[i].end;
                        s2 = m_words2[j-1].end+1;
                        e2 = s2-1;
-                       m_wdiffs.push_back(wdiff(s1, e1, s2, e2));
+                       m_wdiffs.emplace_back(s1, e1, s2, e2);
                        i++;
                }
                else if (edscript[k] == '+')
@@ -347,7 +347,7 @@ stringdiffs::BuildWordDiffList_DP()
                        e1 = s1-1;
                        s2 = m_words2[j].start;
                        e2 = m_words2[j].end;
-                       m_wdiffs.push_back(wdiff(s1, e1, s2, e2));
+                       m_wdiffs.emplace_back(s1, e1, s2, e2);
                        j++;
                }
                else if (edscript[k] == '!')
@@ -370,7 +370,7 @@ stringdiffs::BuildWordDiffList_DP()
                        e1 =  m_words1[i].end;
                        s2 =  m_words2[j].start;
                        e2 =  m_words2[j].end ;
-                       m_wdiffs.push_back(wdiff(s1, e1, s2, e2));
+                       m_wdiffs.emplace_back(s1, e1, s2, e2);
                        i++; j++;
                }
                else
@@ -408,7 +408,7 @@ stringdiffs::BuildWordDiffList()
                int e1 = m_words1[m_words1.size() - 1].end;
                int s2 = m_words2[0].start;
                int e2 = m_words2[m_words2.size() - 1].end;
-               m_wdiffs.push_back(wdiff(s1, e1, s2, e2));              
+               m_wdiffs.emplace_back(s1, e1, s2, e2);
                return;
        }
 
@@ -537,7 +537,7 @@ stringdiffs::PopulateDiffs()
                        assert(m_wdiffs[i].begin[0]>=0 || m_wdiffs[i].begin[1]>=0);
 
                        // Store the diff[i] in the caller list (m_pDiffs)
-                       m_pDiffs->push_back(wdiff(m_wdiffs[i]));
+                       m_pDiffs->emplace_back(m_wdiffs[i]);
                }
        }
 }

diff --git a/Src/stringdiffs.h b/Src/stringdiffs.h
index 6c32ca8..b177217 100644 (file)
--- a/Src/stringdiffs.h
+++ b/Src/stringdiffs.h
@@ -28,12 +28,6 @@ struct wdiff {
                end[1] = e2;
                end[2] = e3;
        }
-       wdiff(const wdiff & src)
-               : begin{src.begin}
-               , end{src.end}
-               , op(src.op)
-       {
-       }
 };
 
 void Init();