PATCH: [ 791263 ] Remove CStringEx from OpenDlg (and from WinMerge?)

diff --git a/Src/Merge.dsp b/Src/Merge.dsp
index 4713e13..e5596cf 100644 (file)
--- a/Src/Merge.dsp
+++ b/Src/Merge.dsp
@@ -579,10 +579,6 @@ SOURCE=.\StdAfx.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\common\StringEx.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\common\SuperComboBox.cpp
 # End Source File
 # Begin Source File
@@ -844,10 +840,6 @@ SOURCE=.\StdAfx.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\common\StringEx.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\common\SuperComboBox.h
 # End Source File
 # Begin Source File

diff --git a/Src/OpenDlg.cpp b/Src/OpenDlg.cpp
index f8fdce6..da931f0 100644 (file)
--- a/Src/OpenDlg.cpp
+++ b/Src/OpenDlg.cpp
@@ -20,12 +20,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // OpenDlg.cpp : implementation file
 //
+// $Id$
 
 #include "stdafx.h"
 #include "Merge.h"
 #include "OpenDlg.h"
 #include "coretools.h"
-#include "StringEx.h"
 #include "paths.h"
 
 #ifdef _DEBUG
@@ -162,14 +162,12 @@ void COpenDlg::OnOK()
 
        // parse the extensions
        // replace all *. with .*\\.
-       int idx=0;
-       LPCTSTR pszSeps = _T("; |*%^&.,\\/<>:\"'`?\t\r\n");
-       CStringEx strExt(m_strExt);
-       strExt.TrimLeft();
-       strExt.TrimRight();
+
+       static const TCHAR pszSeps[] = _T("; |*%^&.,\\/<>:\"'`?\t\r\n");
 
        TCHAR ext[2048];
-       _tcscpy(ext, strExt);
+       // no need to trim before tokenizing
+       _tcscpy(ext, m_strExt);
        LPTSTR p;
        CString strPattern(_T("^.*\\.("));
 

diff --git a/Src/readme.txt b/Src/readme.txt
index ab44862..a0b2bc9 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,8 @@
+2003-08-20 Kimmo
+ PATCH: [ 791263 ] Remove CStringEx from OpenDlg (and from WinMerge?)
+  WinMerge: Merge.dsp OpenDlg.cpp
+  Common: removed StringEx.h StringEx.cpp
+
 2003-08-20 Perry
  Added Norwegian to batch build file
   Languages: BuildAll.bat