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

[<ki...@us...>]

Revision: 6457
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6457&view=rev
Author:   kimmov
Date:     2009-02-15 14:08:50 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
Move some string/char functions from StdAfx.cpp to new string_utils.cpp file. This allows using those functions from non-MFC code.

Modified Paths:
--------------
    trunk/Src/Merge.vcproj
    trunk/Src/StdAfx.cpp
    trunk/Src/StdAfx.h
    trunk/Src/editlib/asp.cpp
    trunk/Src/editlib/basic.cpp
    trunk/Src/editlib/batch.cpp
    trunk/Src/editlib/ccrystaleditview.cpp
    trunk/Src/editlib/ccrystaltextview.cpp
    trunk/Src/editlib/ccrystaltextview2.cpp
    trunk/Src/editlib/cplusplus.cpp
    trunk/Src/editlib/csharp.cpp
    trunk/Src/editlib/css.cpp
    trunk/Src/editlib/dcl.cpp
    trunk/Src/editlib/fortran.cpp
    trunk/Src/editlib/html.cpp
    trunk/Src/editlib/ini.cpp
    trunk/Src/editlib/innosetup.cpp
    trunk/Src/editlib/is.cpp
    trunk/Src/editlib/java.cpp
    trunk/Src/editlib/lisp.cpp
    trunk/Src/editlib/nsis.cpp
    trunk/Src/editlib/pascal.cpp
    trunk/Src/editlib/perl.cpp
    trunk/Src/editlib/php.cpp
    trunk/Src/editlib/po.cpp
    trunk/Src/editlib/powershell.cpp
    trunk/Src/editlib/python.cpp
    trunk/Src/editlib/rexx.cpp
    trunk/Src/editlib/rsrc.cpp
    trunk/Src/editlib/ruby.cpp
    trunk/Src/editlib/sgml.cpp
    trunk/Src/editlib/sh.cpp
    trunk/Src/editlib/siod.cpp
    trunk/Src/editlib/sql.cpp
    trunk/Src/editlib/tcl.cpp
    trunk/Src/editlib/tex.cpp
    trunk/Src/editlib/verilog.cpp
    trunk/Src/editlib/xml.cpp
    trunk/Src/stringdiffs.cpp

Added Paths:
-----------
    trunk/Src/Common/string_util.cpp
    trunk/Src/Common/string_util.h

Added: trunk/Src/Common/string_util.cpp
===================================================================
--- trunk/Src/Common/string_util.cpp	                        (rev 0)
+++ trunk/Src/Common/string_util.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -0,0 +1,61 @@
+/** 
+ * @file  string_util.cpp
+ *
+ * @brief Char classification routines implementations.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include <windows.h>
+#include <tchar.h>
+#include "string_util.h"
+
+static wint_t normch(wint_t c);
+
+// Convert any negative inputs to negative char equivalents
+// This is aimed at correcting any chars mistakenly 
+// sign-extended to negative ints.
+// This is ok for the UNICODE build because UCS-2LE code bytes
+// do not extend as high as 2Gig (actually even full Unicode
+// codepoints don't extend that high).
+static wint_t normch(wint_t c)
+{
+#ifdef _UNICODE
+	return (unsigned short)(short)c;
+#else
+	return (unsigned char)(char)c;
+#endif
+}
+
+/** @brief Return nonzero if input is outside ASCII or is underline. */
+int xisspecial(wint_t c)
+{
+  return normch(c) > (unsigned) _T('\x7f') || c == _T('_');
+}
+
+/**
+ * @brief Return non-zero if input is alphabetic or "special" (see xisspecial).
+ * Also converts any negative inputs to negative char equivalents (see normch).
+ */
+int xisalpha(wint_t c)
+{
+  return _istalpha(normch(c)) || xisspecial(normch(c));
+}
+
+/**
+ * @brief Return non-zero if input is alphanumeric or "special" (see xisspecial).
+ * Also converts any negative inputs to negative char equivalents (see normch).
+ */
+int xisalnum(wint_t c)
+{
+  return _istalnum(normch(c)) || xisspecial(normch(c));
+}
+
+/**
+ * @brief Return non-zero if input character is a space.
+ * Also converts any negative inputs to negative char equivalents (see normch).
+ */
+int xisspace(wint_t c)
+{
+  return _istspace(normch(c));
+}


Property changes on: trunk/Src/Common/string_util.cpp
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/Src/Common/string_util.h
===================================================================
--- trunk/Src/Common/string_util.h	                        (rev 0)
+++ trunk/Src/Common/string_util.h	2009-02-15 14:08:50 UTC (rev 6457)
@@ -0,0 +1,18 @@
+/** 
+ * @file  string_util.h
+ *
+ * @brief Char classification routines declarations.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#ifndef _STRING_UTIL_H_
+#define _STRING_UTIL_H_
+
+int xisalnum(wint_t c);
+int xisspecial(wint_t c);
+int xisalpha(wint_t c);
+int xisalnum(wint_t c);
+int xisspace(wint_t c);
+
+#endif // _STRING_UTIL_H_


Property changes on: trunk/Src/Common/string_util.h
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/Merge.vcproj	2009-02-15 14:08:50 UTC (rev 6457)
@@ -5282,6 +5282,41 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="Common\string_util.cpp">
+				<FileConfiguration
+					Name="UnicodeRelease|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="UnicodeDebug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="stringdiffs.cpp">
 				<FileConfiguration
 					Name="UnicodeRelease|Win32">
@@ -6485,6 +6520,9 @@
 				RelativePath="StdAfx.h">
 			</File>
 			<File
+				RelativePath="Common\string_util.h">
+			</File>
+			<File
 				RelativePath="stringdiffs.h">
 			</File>
 			<File

Modified: trunk/Src/StdAfx.cpp
===================================================================
--- trunk/Src/StdAfx.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/StdAfx.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -29,55 +29,8 @@
 #include "LogFile.h"
 #include "Merge.h"
 
-// Convert any negative inputs to negative char equivalents
-// This is aimed at correcting any chars mistakenly 
-// sign-extended to negative ints.
-// This is ok for the UNICODE build because UCS-2LE code bytes
-// do not extend as high as 2Gig (actually even full Unicode
-// codepoints don't extend that high).
-static wint_t normch(wint_t c)
-{
-#ifdef _UNICODE
-	return (unsigned short)(short)c;
-#else
-	return (unsigned char)(char)c;
-#endif
-}
 
-/** @brief Return nonzero if input is outside ASCII or is underline. */
-int xisspecial (wint_t c)
-{
-  return normch(c) > (unsigned) _T ('\x7f') || c == _T ('_');
-}
-
 /**
- * @brief Return non-zero if input is alphabetic or "special" (see xisspecial).
- * Also converts any negative inputs to negative char equivalents (see normch).
- */
-int xisalpha (wint_t c)
-{
-  return _istalpha (normch(c)) || xisspecial (normch(c));
-}
-
-/**
- * @brief Return non-zero if input is alphanumeric or "special" (see xisspecial).
- * Also converts any negative inputs to negative char equivalents (see normch).
- */
-int xisalnum (wint_t c)
-{
-  return _istalnum (normch(c)) || xisspecial (normch(c));
-}
-
-/**
- * @brief Return non-zero if input character is a space.
- * Also converts any negative inputs to negative char equivalents (see normch).
- */
-int xisspace (wint_t c)
-{
-  return _istspace (normch(c));
-}
-
-/**
  * @brief Load string resource and return as CString.
  * @param [in] id Resource string ID.
  * @return Resource string as CString.

Modified: trunk/Src/StdAfx.h
===================================================================
--- trunk/Src/StdAfx.h	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/StdAfx.h	2009-02-15 14:08:50 UTC (rev 6457)
@@ -107,13 +107,6 @@
 /// Seconds ignored in filetime differences if option enabled
 static const UINT SmallTimeDiff = 2;
 
-// Miscellaneous functions defined in StdAfx.cpp
-
-int xisspecial (wint_t c);
-int xisalpha (wint_t c);
-int xisalnum (wint_t c);
-int xisspace (wint_t c);
-
 #include "UnicodeString.h"
 
 	/** @brief Load string from string resources; shortcut for CString::LoadString */

Modified: trunk/Src/editlib/asp.cpp
===================================================================
--- trunk/Src/editlib/asp.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/asp.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -17,6 +17,7 @@
 #include "StdAfx.h"
 #include "ccrystaltextview.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/basic.cpp
===================================================================
--- trunk/Src/editlib/basic.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/basic.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/batch.cpp
===================================================================
--- trunk/Src/editlib/batch.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/batch.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -17,6 +17,7 @@
 #include "StdAfx.h"
 #include "ccrystaltextview.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/ccrystaleditview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaleditview.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/ccrystaleditview.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -76,6 +76,7 @@
 #include "registry.h"
 #include "cs2cs.h"
 #include "chcondlg.h"
+#include "string_util.h"
 
 #ifndef __AFXPRIV_H__
 #pragma message("Include <afxpriv.h> in your stdafx.h to avoid this message")

Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/ccrystaltextview.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -105,6 +105,7 @@
 #include "SyntaxColors.h"
 #include "Ucs2Utf8.h"
 #include "unicoder.h"
+#include "string_util.h"
 #include "pcre.h"
 
 // Escaped character constants in range 0x80-0xFF are interpreted in current codepage

Modified: trunk/Src/editlib/ccrystaltextview2.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview2.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/ccrystaltextview2.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -49,6 +49,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include <malloc.h>
+#include "string_util.h"
 
 #ifndef __AFXPRIV_H__
 #pragma message("Include <afxpriv.h> in your stdafx.h to avoid this message")

Modified: trunk/Src/editlib/cplusplus.cpp
===================================================================
--- trunk/Src/editlib/cplusplus.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/cplusplus.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -29,6 +29,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/csharp.cpp
===================================================================
--- trunk/Src/editlib/csharp.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/csharp.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -29,6 +29,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/css.cpp
===================================================================
--- trunk/Src/editlib/css.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/css.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/dcl.cpp
===================================================================
--- trunk/Src/editlib/dcl.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/dcl.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -17,6 +17,7 @@
 #include "StdAfx.h"
 #include "ccrystaltextview.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/fortran.cpp
===================================================================
--- trunk/Src/editlib/fortran.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/fortran.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/html.cpp
===================================================================
--- trunk/Src/editlib/html.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/html.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -17,6 +17,7 @@
 #include "StdAfx.h"
 #include "ccrystaltextview.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/ini.cpp
===================================================================
--- trunk/Src/editlib/ini.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/ini.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -19,6 +19,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/innosetup.cpp
===================================================================
--- trunk/Src/editlib/innosetup.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/innosetup.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/is.cpp
===================================================================
--- trunk/Src/editlib/is.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/is.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -29,6 +29,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/java.cpp
===================================================================
--- trunk/Src/editlib/java.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/java.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/lisp.cpp
===================================================================
--- trunk/Src/editlib/lisp.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/lisp.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -17,6 +17,7 @@
 #include "StdAfx.h"
 #include "ccrystaltextview.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/nsis.cpp
===================================================================
--- trunk/Src/editlib/nsis.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/nsis.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -29,6 +29,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/pascal.cpp
===================================================================
--- trunk/Src/editlib/pascal.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/pascal.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/perl.cpp
===================================================================
--- trunk/Src/editlib/perl.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/perl.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/php.cpp
===================================================================
--- trunk/Src/editlib/php.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/php.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -17,6 +17,7 @@
 #include "StdAfx.h"
 #include "ccrystaltextview.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/po.cpp
===================================================================
--- trunk/Src/editlib/po.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/po.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -19,6 +19,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/powershell.cpp
===================================================================
--- trunk/Src/editlib/powershell.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/powershell.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/python.cpp
===================================================================
--- trunk/Src/editlib/python.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/python.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/rexx.cpp
===================================================================
--- trunk/Src/editlib/rexx.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/rexx.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/rsrc.cpp
===================================================================
--- trunk/Src/editlib/rsrc.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/rsrc.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/ruby.cpp
===================================================================
--- trunk/Src/editlib/ruby.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/ruby.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/sgml.cpp
===================================================================
--- trunk/Src/editlib/sgml.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/sgml.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -17,6 +17,7 @@
 #include "StdAfx.h"
 #include "ccrystaltextview.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/sh.cpp
===================================================================
--- trunk/Src/editlib/sh.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/sh.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/siod.cpp
===================================================================
--- trunk/Src/editlib/siod.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/siod.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -17,6 +17,7 @@
 #include "StdAfx.h"
 #include "ccrystaltextview.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/sql.cpp
===================================================================
--- trunk/Src/editlib/sql.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/sql.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/tcl.cpp
===================================================================
--- trunk/Src/editlib/tcl.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/tcl.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/tex.cpp
===================================================================
--- trunk/Src/editlib/tex.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/tex.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -17,6 +17,7 @@
 #include "StdAfx.h"
 #include "ccrystaltextview.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/verilog.cpp
===================================================================
--- trunk/Src/editlib/verilog.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/verilog.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -18,6 +18,7 @@
 #include "ccrystaltextview.h"
 #include "ccrystaltextbuffer.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/editlib/xml.cpp
===================================================================
--- trunk/Src/editlib/xml.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/editlib/xml.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -17,6 +17,7 @@
 #include "StdAfx.h"
 #include "ccrystaltextview.h"
 #include "SyntaxColors.h"
+#include "string_util.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/stringdiffs.cpp
===================================================================
--- trunk/Src/stringdiffs.cpp	2009-02-15 13:08:28 UTC (rev 6456)
+++ trunk/Src/stringdiffs.cpp	2009-02-15 14:08:50 UTC (rev 6457)
@@ -9,7 +9,7 @@
 
 #include "StdAfx.h"
 #include <mbctype.h>
-
+#include "string_util.h"
 #include "stringdiffs.h"
 #include "CompareOptions.h"
 #include "stringdiffsi.h"


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