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

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

Revision: 5758
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5758&view=rev
Author:   marcelgosselin
Date:     2008-08-08 03:18:09 +0000 (Fri, 08 Aug 2008)

Log Message:
-----------
Replace CArray by std::vector in DirView code

Modified Paths:
--------------
    trunk/Src/DirView.cpp
    trunk/Src/DirView.h
    trunk/Src/DirViewColHandler.cpp

Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp	2008-08-08 03:01:00 UTC (rev 5757)
+++ trunk/Src/DirView.cpp	2008-08-08 03:18:09 UTC (rev 5758)
@@ -26,7 +26,7 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "Merge.h"
 #include "ClipBoard.h"
 #include "DirView.h"

Modified: trunk/Src/DirView.h
===================================================================
--- trunk/Src/DirView.h	2008-08-08 03:01:00 UTC (rev 5757)
+++ trunk/Src/DirView.h	2008-08-08 03:18:09 UTC (rev 5758)
@@ -262,8 +262,8 @@
 	CListCtrl * m_pList;
 	int m_numcols;
 	int m_dispcols;
-	CArray<int, int> m_colorder; /**< colorder[logical#]=physical# */
-	CArray<int, int> m_invcolorder; /**< invcolorder[physical]=logical# */
+    std::vector<int> m_colorder; /**< colorder[logical#]=physical# */
+	std::vector<int> m_invcolorder; /**< invcolorder[physical]=logical# */
 	BOOL m_bEscCloses; /**< Cached value for option for ESC closing window */
 	CFont m_font; /**< User-selected font */
 	UINT m_nHiddenItems; /**< Count of items we have hidden */

Modified: trunk/Src/DirViewColHandler.cpp
===================================================================
--- trunk/Src/DirViewColHandler.cpp	2008-08-08 03:01:00 UTC (rev 5757)
+++ trunk/Src/DirViewColHandler.cpp	2008-08-08 03:18:09 UTC (rev 5758)
@@ -9,7 +9,7 @@
 // $Id$
 
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "Merge.h"
 #include "DirView.h"
 #include "DirDoc.h"
@@ -284,9 +284,9 @@
 /// store current column orders into registry
 void CDirView::SaveColumnOrders()
 {
-	ASSERT(m_colorder.GetSize() == m_numcols);
-	ASSERT(m_invcolorder.GetSize() == m_numcols);
-	for (int i=0; i < m_numcols; i++)
+	ASSERT(m_colorder.size() == m_numcols);
+	ASSERT(m_invcolorder.size() == m_numcols);
+    for (int i=0; i < m_numcols; i++)
 	{
 		CString RegName = GetColRegValueNameBase(i) + _T("_Order");
 		int ord = m_colorder[i];
@@ -398,8 +398,8 @@
  */
 void CDirView::ClearColumnOrders()
 {
-	m_colorder.SetSize(m_numcols);
-	m_invcolorder.SetSize(m_numcols);
+	m_colorder.resize(m_numcols);
+	m_invcolorder.resize(m_numcols);
 	for (int i=0; i<m_numcols; ++i)
 	{
 		m_colorder[i] = -1;


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