Update ChangeLog&ReleaseNotes (3)

[winmerge-jp/winmerge-jp.git] / Src / MovedLines.cpp

diff --git a/Src/MovedLines.cpp b/Src/MovedLines.cpp
index aef5148..57e6f49 100644 (file)
--- a/Src/MovedLines.cpp
+++ b/Src/MovedLines.cpp
@@ -4,15 +4,9 @@
  * @brief Implementation of MovedLines class.
  */
 
-// Disable VC6's "identifier was truncated..." warning. It is meaningless.
-#if _MSC_VER == 1200
-       #pragma warning(disable: 4786)
-#endif
-#include <map>
+#include "pch.h"
 #include "MovedLines.h"
 
-using std::map;
-
 /**
  * @brief clear the lists of moved blocks.
  */
@@ -28,10 +22,10 @@ void MovedLines::Clear()
  * @param [in] line1 Linenumber in side first side.
  * @param [in] line2 Linenumber in second side.
  */
-void MovedLines::Add(ML_SIDE side1, unsigned int line1,        unsigned int line2)
+void MovedLines::Add(SIDE side1, unsigned line1,       unsigned line2)
 {
-       map<int, int> * list;
-       if (side1 == SIDE_LEFT)
+       MovedLinesMap *list;
+       if (side1 == SIDE::LEFT)
                list = &m_moved0;
        else
                list = &m_moved1;
@@ -44,9 +38,9 @@ void MovedLines::Add(ML_SIDE side1, unsigned int line1,       unsigned int line2)
  * @param [in] line Linenumber to check.
  * @param [in] side Side of the linenumber.
  */
-int MovedLines::LineInBlock(unsigned int line, ML_SIDE side)
+int MovedLines::LineInBlock(unsigned line, SIDE side) const
 {
-       if (side == SIDE_LEFT)
+       if (side == SIDE::LEFT)
                return SecondSideInMovedBlock(line);
        else
                return FirstSideInMovedBlock(line);
@@ -55,9 +49,9 @@ int MovedLines::LineInBlock(unsigned int line, ML_SIDE side)
 /**
  * @brief Get right->left info for a moved line (real line number)
  */
-int MovedLines::FirstSideInMovedBlock(unsigned int secondSideLine)
+int MovedLines::FirstSideInMovedBlock(unsigned secondSideLine) const
 {
-       map<int, int>::const_iterator iter;
+       MovedLinesMap::const_iterator iter;
        iter = m_moved1.find(secondSideLine);
        if (iter != m_moved1.end())
                return iter->second;
@@ -68,9 +62,9 @@ int MovedLines::FirstSideInMovedBlock(unsigned int secondSideLine)
 /**
  * @brief Get left->right info for a moved line (real line number)
  */
-int MovedLines::SecondSideInMovedBlock(unsigned int firstSideLine)
+int MovedLines::SecondSideInMovedBlock(unsigned firstSideLine) const
 {
-       map<int, int>::const_iterator iter;
+       MovedLinesMap::const_iterator iter;
        iter = m_moved0.find(firstSideLine);
        if (iter != m_moved0.end())
                return iter->second;