[Winmerge-svn] SF.net SVN: winmerge:[5761] trunk/Src

[<mar...@us...>]

Revision: 5761
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5761&view=rev
Author:   marcelgosselin
Date:     2008-08-08 04:54:52 +0000 (Fri, 08 Aug 2008)

Log Message:
-----------
Remove some compilation warnings

Modified Paths:
--------------
    trunk/Src/Common/UnicodeString.cpp
    trunk/Src/DiffList.cpp
    trunk/Src/DirDoc.cpp
    trunk/Src/DirScan.cpp
    trunk/Src/DirTravel.cpp
    trunk/Src/LineFiltersList.cpp
    trunk/Src/MergeDocLineDiffs.cpp

Modified: trunk/Src/Common/UnicodeString.cpp
===================================================================
--- trunk/Src/Common/UnicodeString.cpp	2008-08-08 04:24:57 UTC (rev 5760)
+++ trunk/Src/Common/UnicodeString.cpp	2008-08-08 04:54:52 UTC (rev 5761)
@@ -56,7 +56,7 @@
 {
 	String s1(str1);
 	String s2(str2);
-	int i = 0;
+    String::size_type i = 0;
 	for (i = 0; i < s1.length(); i++)
 		s1[i] = _totlower(s1[i]);
 	for (i = 0; i < s2.length(); i++)

Modified: trunk/Src/DiffList.cpp
===================================================================
--- trunk/Src/DiffList.cpp	2008-08-08 04:24:57 UTC (rev 5760)
+++ trunk/Src/DiffList.cpp	2008-08-08 04:54:52 UTC (rev 5761)
@@ -381,7 +381,7 @@
 	m_lastSignificant = -1;
 	int prev = -1;
 	// must be called after diff list is entirely populated
-	for (int i = 0; i < m_diffs.size(); ++i)
+    for (vector<DiffRangeInfo>::size_type i = 0; i < m_diffs.size(); ++i)
 	{
 		if (m_diffs[i].diffrange.op == OP_TRIVIAL)
 		{

Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp	2008-08-08 04:24:57 UTC (rev 5760)
+++ trunk/Src/DirDoc.cpp	2008-08-08 04:54:52 UTC (rev 5761)
@@ -28,8 +28,8 @@
 // $Id$
 //
 
-#include "stdafx.h"
-#include <Shlwapi.h>		// PathFindFileName()
+#include "StdAfx.h"
+#include <shlwapi.h>		// PathFindFileName()
 #include "Merge.h"
 #include "UnicodeString.h"
 #include "CompareStats.h"
@@ -39,7 +39,7 @@
 #include "DirFrame.h"
 #include "MainFrm.h"
 #include "coretools.h"
-#include "logfile.h"
+#include "LogFile.h"
 #include "paths.h"
 #include "WaitStatusCursor.h"
 #include "7zCommon.h"
@@ -216,7 +216,7 @@
 	{
 		LPCTSTR lname = PathFindFileName(left.c_str());
 		LPCTSTR rname = PathFindFileName(right.c_str());
-		int cchLeftRoot = m_pTempPathContext->m_strLeftRoot.length();
+        String::size_type cchLeftRoot = m_pTempPathContext->m_strLeftRoot.length();
 
 		if (left.length() <= cchLeftRoot)
 		{

Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp	2008-08-08 04:24:57 UTC (rev 5760)
+++ trunk/Src/DirScan.cpp	2008-08-08 04:54:52 UTC (rev 5761)
@@ -6,7 +6,7 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "UnicodeString.h"
 #include "Merge.h"
 #include "LogFile.h"
@@ -112,7 +112,7 @@
 		&& (rightFiles.size() == 0)
 		;
 
-	int i = 0, j = 0;
+    DirItemArray::size_type i = 0, j = 0; 
 	while (1)
 	{
 		if (pCtxt->ShouldAbort())

Modified: trunk/Src/DirTravel.cpp
===================================================================
--- trunk/Src/DirTravel.cpp	2008-08-08 04:24:57 UTC (rev 5760)
+++ trunk/Src/DirTravel.cpp	2008-08-08 04:54:52 UTC (rev 5761)
@@ -122,7 +122,7 @@
 {
 	String s1(str1);
 	String s2(str2);
-	int i = 0;
+    String::size_type i = 0;
 	for (i = 0; i < s1.length(); i++)
 		s1[i] = _totlower(s1[i]);
 	for (i = 0; i < s2.length(); i++)

Modified: trunk/Src/LineFiltersList.cpp
===================================================================
--- trunk/Src/LineFiltersList.cpp	2008-08-08 04:24:57 UTC (rev 5760)
+++ trunk/Src/LineFiltersList.cpp	2008-08-08 04:54:52 UTC (rev 5761)
@@ -166,9 +166,9 @@
 
 	m_pOptionsMgr = pOptionsMgr;
 
-	int count = m_items.size();
+    unsigned int count = m_items.size();
 	valuename += _T("/Values");
-	m_pOptionsMgr->InitOption(valuename.c_str(), count);
+	m_pOptionsMgr->InitOption(valuename.c_str(), static_cast<int>(count));
 	count = m_pOptionsMgr->GetInt(valuename.c_str());
 
 	for (unsigned int i = 0; i < count; i++)
@@ -195,7 +195,7 @@
 	assert(m_pOptionsMgr);
 	String valuename(FiltersRegPath);
 
-	int count = m_items.size();
+	unsigned int count = m_items.size();
 	valuename += _T("/Values");
 	m_pOptionsMgr->SetInt(valuename.c_str(), count);
 

Modified: trunk/Src/MergeDocLineDiffs.cpp
===================================================================
--- trunk/Src/MergeDocLineDiffs.cpp	2008-08-08 04:24:57 UTC (rev 5760)
+++ trunk/Src/MergeDocLineDiffs.cpp	2008-08-08 04:54:52 UTC (rev 5761)
@@ -264,7 +264,7 @@
 	{
 		// Find starting locations for both sides
 		// Have to look for first valid starting location for each side
-		int i;
+        vector<wdiff*>::size_type i;
 		for (i=0; i<worddiffs.size(); ++i)
 		{
 			const wdiff * diff = worddiffs[i];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.