Thread: [Winmerge-svn] SF.net SVN: winmerge:[5729] trunk/Src/editlib
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-08-04 11:41:41
|
Revision: 5729 http://winmerge.svn.sourceforge.net/winmerge/?rev=5729&view=rev Author: kimmov Date: 2008-08-04 11:41:36 +0000 (Mon, 04 Aug 2008) Log Message: ----------- Move static char width tables to member variables and add method to reset the tables. Modified Paths: -------------- trunk/Src/editlib/ccrystaltextview.cpp trunk/Src/editlib/ccrystaltextview.h Modified: trunk/Src/editlib/ccrystaltextview.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview.cpp 2008-08-04 10:53:30 UTC (rev 5728) +++ trunk/Src/editlib/ccrystaltextview.cpp 2008-08-04 11:41:36 UTC (rev 5729) @@ -2153,6 +2153,7 @@ void CCrystalTextView:: ResetView () { + ResetCharWidths(); // m_bWordWrap = FALSE; m_nTopLine = 0; m_nTopSubLine = 0; @@ -6027,17 +6028,14 @@ #ifdef _UNICODE int CCrystalTextView::GetCharWidthUnicodeChar(wchar_t ch) { - static BOOL bCalculated[65536/256]; - static int iDoubleWidthFlags[65536/32]; - - if (!bCalculated[ch/256]) + if (!m_bChWidthsCalculated[ch/256]) { if (ch >= 0x4e00 && ch < 0xe000) { // CJK Unified Ideograph + Hangul - memset(&iDoubleWidthFlags[0x4e00/32], 0xff, ((0xe000-0x4e00)/32)*4); + memset(&m_iChDoubleWidthFlags[0x4e00/32], 0xff, ((0xe000-0x4e00)/32)*4); for (int i = 0x4e00; i < 0xe000; i+=256) - bCalculated[i / 256] = TRUE; + m_bChWidthsCalculated[i / 256] = TRUE; } else { @@ -6052,18 +6050,27 @@ for (int i = 0; i < 256; i++) { if (nCharWidth * 15 < nWidthArray[i] * 10) - iDoubleWidthFlags[(nStart+i)/32] |= 1 << (i % 32); + m_iChDoubleWidthFlags[(nStart+i)/32] |= 1 << (i % 32); } - bCalculated[ch / 256] = TRUE; + m_bChWidthsCalculated[ch / 256] = TRUE; } } - if (iDoubleWidthFlags[ch / 32] & (1 << (ch % 32))) + if (m_iChDoubleWidthFlags[ch / 32] & (1 << (ch % 32))) return GetCharWidth() * 2; else return GetCharWidth(); } #endif +/** @brief Reset computed unicode character widths. */ +void CCrystalTextView::ResetCharWidths () +{ +#ifdef _UNICODE + ZeroMemory(m_bChWidthsCalculated, sizeof(m_bChWidthsCalculated)); + ZeroMemory(m_iChDoubleWidthFlags, sizeof(m_iChDoubleWidthFlags)); +#endif +} + // This function assumes selection is in one line void CCrystalTextView::EnsureVisible (CPoint ptStart, CPoint ptEnd) { Modified: trunk/Src/editlib/ccrystaltextview.h =================================================================== --- trunk/Src/editlib/ccrystaltextview.h 2008-08-04 10:53:30 UTC (rev 5728) +++ trunk/Src/editlib/ccrystaltextview.h 2008-08-04 11:41:36 UTC (rev 5729) @@ -461,12 +461,15 @@ virtual void DrawMargin (CDC * pdc, const CRect & rect, int nLineIndex, int nLineNumber); int GetCharWidthFromChar(TCHAR ch); - int GetCharWidthFromString(LPCTSTR lpsz); - int GetCharWidthFromDisplayableChar(const ViewableWhitespaceChars * lpspc, TCHAR ch); + int GetCharWidthFromString(LPCTSTR lpsz); + int GetCharWidthFromDisplayableChar(const ViewableWhitespaceChars * lpspc, TCHAR ch); #ifdef _UNICODE + BOOL m_bChWidthsCalculated[65536/256]; + int m_iChDoubleWidthFlags[65536/32]; int GetCharWidthUnicodeChar(wchar_t ch); #endif + void ResetCharWidths(); //BEGIN SW // word wrapping This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2008-09-07 03:27:34
|
Revision: 5910 http://winmerge.svn.sourceforge.net/winmerge/?rev=5910&view=rev Author: marcelgosselin Date: 2008-09-07 03:27:29 +0000 (Sun, 07 Sep 2008) Log Message: ----------- Use the right case in file names in #include statements Modified Paths: -------------- trunk/Src/editlib/asp.cpp trunk/Src/editlib/basic.cpp trunk/Src/editlib/batch.cpp trunk/Src/editlib/ccrystaleditview.cpp trunk/Src/editlib/ccrystaleditview.inl trunk/Src/editlib/ccrystaltextbuffer.inl trunk/Src/editlib/ccrystaltextview.cpp trunk/Src/editlib/ccrystaltextview.inl trunk/Src/editlib/ccrystaltextview2.cpp trunk/Src/editlib/ceditreplacedlg.cpp trunk/Src/editlib/cfindtextdlg.cpp trunk/Src/editlib/chcondlg.cpp trunk/Src/editlib/cplusplus.cpp trunk/Src/editlib/cregexp.cpp trunk/Src/editlib/crystaleditviewex.cpp trunk/Src/editlib/crystaleditviewex.h trunk/Src/editlib/crystalparser.cpp trunk/Src/editlib/crystalparser.h trunk/Src/editlib/crystaltextblock.cpp trunk/Src/editlib/cs2cs.cpp trunk/Src/editlib/csharp.cpp trunk/Src/editlib/css.cpp trunk/Src/editlib/dcl.cpp trunk/Src/editlib/edtlib.cpp trunk/Src/editlib/filesup.cpp trunk/Src/editlib/fortran.cpp trunk/Src/editlib/fpattern.cpp trunk/Src/editlib/gotodlg.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/registry.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/splash.cpp trunk/Src/editlib/sql.cpp trunk/Src/editlib/statbar.cpp trunk/Src/editlib/tcl.cpp trunk/Src/editlib/tex.cpp trunk/Src/editlib/xml.cpp Modified: trunk/Src/editlib/asp.cpp =================================================================== --- trunk/Src/editlib/asp.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/asp.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/basic.cpp =================================================================== --- trunk/Src/editlib/basic.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/basic.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/batch.cpp =================================================================== --- trunk/Src/editlib/batch.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/batch.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/ccrystaleditview.cpp =================================================================== --- trunk/Src/editlib/ccrystaleditview.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/ccrystaleditview.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -67,7 +67,7 @@ // $Id$ -#include "stdafx.h" +#include "StdAfx.h" #include "editcmd.h" #include "editreg.h" #include "ccrystaleditview.h" Modified: trunk/Src/editlib/ccrystaleditview.inl =================================================================== --- trunk/Src/editlib/ccrystaleditview.inl 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/ccrystaleditview.inl 2008-09-07 03:27:29 UTC (rev 5910) @@ -26,7 +26,7 @@ #ifndef __CCrystalEditView_INL_INCLUDED #define __CCrystalEditView_INL_INCLUDED -#include "CCrystalEditView.h" +#include "ccrystaleditview.h" #include "ccrystaltextbuffer.h" inline BOOL CCrystalEditView:: Modified: trunk/Src/editlib/ccrystaltextbuffer.inl =================================================================== --- trunk/Src/editlib/ccrystaltextbuffer.inl 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/ccrystaltextbuffer.inl 2008-09-07 03:27:29 UTC (rev 5910) @@ -26,7 +26,7 @@ #ifndef __CCrystalTextBuffer_INL_INCLUDED #define __CCrystalTextBuffer_INL_INCLUDED -#include "CCrystalTextBuffer.h" +#include "ccrystaltextbuffer.h" inline BOOL CCrystalTextBuffer:: IsModified () Modified: trunk/Src/editlib/ccrystaltextview.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/ccrystaltextview.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -87,7 +87,7 @@ // ID line follows -- this is updated by SVN // $Id$ -#include "stdafx.h" +#include "StdAfx.h" #include <malloc.h> #include <imm.h> /* IME */ #include <mbctype.h> Modified: trunk/Src/editlib/ccrystaltextview.inl =================================================================== --- trunk/Src/editlib/ccrystaltextview.inl 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/ccrystaltextview.inl 2008-09-07 03:27:29 UTC (rev 5910) @@ -26,7 +26,7 @@ #ifndef __CCrystalTextView_INL_INCLUDED #define __CCrystalTextView_INL_INCLUDED -#include "CCrystalTextView.h" +#include "ccrystaltextview.h" inline BOOL CCrystalTextView:: IsDraggingText () Modified: trunk/Src/editlib/ccrystaltextview2.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview2.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/ccrystaltextview2.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -44,7 +44,7 @@ // ID line follows -- this is updated by SVN // $Id$ -#include "stdafx.h" +#include "StdAfx.h" #include "editcmd.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" Modified: trunk/Src/editlib/ceditreplacedlg.cpp =================================================================== --- trunk/Src/editlib/ceditreplacedlg.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/ceditreplacedlg.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -32,7 +32,7 @@ // RCS ID line follows -- this is updated by CVS // $Id$ -#include "stdafx.h" +#include "StdAfx.h" #include "resource.h" #include "ceditreplacedlg.h" #include "ccrystaleditview.h" Modified: trunk/Src/editlib/cfindtextdlg.cpp =================================================================== --- trunk/Src/editlib/cfindtextdlg.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/cfindtextdlg.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -25,7 +25,7 @@ // and maybe "ugly" code ... //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "cfindtextdlg.h" #include "ccrystaltextview.h" Modified: trunk/Src/editlib/chcondlg.cpp =================================================================== --- trunk/Src/editlib/chcondlg.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/chcondlg.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "chcondlg.h" #include "ccrystaltextview.h" #include "cs2cs.h" Modified: trunk/Src/editlib/cplusplus.cpp =================================================================== --- trunk/Src/editlib/cplusplus.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/cplusplus.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -25,7 +25,7 @@ // and maybe "ugly" code ... //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/cregexp.cpp =================================================================== --- trunk/Src/editlib/cregexp.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/cregexp.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include <assert.h> #include <stdio.h> #include <stdlib.h> Modified: trunk/Src/editlib/crystaleditviewex.cpp =================================================================== --- trunk/Src/editlib/crystaleditviewex.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/crystaleditviewex.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -2,9 +2,9 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" -#include "CrystalParser.h" -#include "CrystalEditViewEx.h" +#include "StdAfx.h" +#include "crystalparser.h" +#include "crystaleditviewex.h" ////////////////////////////////////////////////////////////////////// Modified: trunk/Src/editlib/crystaleditviewex.h =================================================================== --- trunk/Src/editlib/crystaleditviewex.h 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/crystaleditviewex.h 2008-09-07 03:27:29 UTC (rev 5910) @@ -10,7 +10,7 @@ #endif // _MSC_VER > 1000 #include "ccrystaleditview.h" -#include "CrystalParser.h" +#include "crystalparser.h" class EDITPADC_CLASS CCrystalEditViewEx : public CCrystalEditView Modified: trunk/Src/editlib/crystalparser.cpp =================================================================== --- trunk/Src/editlib/crystalparser.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/crystalparser.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -13,8 +13,8 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" -#include "CrystalParser.h" +#include "StdAfx.h" +#include "crystalparser.h" #include "ccrystaltextview.h" #ifdef _DEBUG Modified: trunk/Src/editlib/crystalparser.h =================================================================== --- trunk/Src/editlib/crystalparser.h 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/crystalparser.h 2008-09-07 03:27:29 UTC (rev 5910) @@ -20,7 +20,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "CrystalTextBlock.h" +#include "crystaltextblock.h" /** Objects of this class are used to describe language properties. At this time Modified: trunk/Src/editlib/crystaltextblock.cpp =================================================================== --- trunk/Src/editlib/crystaltextblock.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/crystaltextblock.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -13,8 +13,8 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" -#include "CrystalTextBlock.h" +#include "StdAfx.h" +#include "crystaltextblock.h" #ifdef _DEBUG #undef THIS_FILE Modified: trunk/Src/editlib/cs2cs.cpp =================================================================== --- trunk/Src/editlib/cs2cs.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/cs2cs.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -1,6 +1,6 @@ /* Ferda Prantl - character coding conversion engine */ -#include "stdafx.h" +#include "StdAfx.h" #include "cs2cs.h" #include <string.h> #include <malloc.h> Modified: trunk/Src/editlib/csharp.cpp =================================================================== --- trunk/Src/editlib/csharp.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/csharp.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -25,7 +25,7 @@ // and maybe "ugly" code ... //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/css.cpp =================================================================== --- trunk/Src/editlib/css.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/css.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/dcl.cpp =================================================================== --- trunk/Src/editlib/dcl.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/dcl.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/edtlib.cpp =================================================================== --- trunk/Src/editlib/edtlib.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/edtlib.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -1,7 +1,7 @@ // edtlib.cpp : Defines the initialization routines for the DLL. // -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include <afxdllx.h> Modified: trunk/Src/editlib/filesup.cpp =================================================================== --- trunk/Src/editlib/filesup.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/filesup.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "filesup.h" #ifdef _DEBUG Modified: trunk/Src/editlib/fortran.cpp =================================================================== --- trunk/Src/editlib/fortran.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/fortran.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/fpattern.cpp =================================================================== --- trunk/Src/editlib/fpattern.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/fpattern.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "fpattern.h" #if TEST Modified: trunk/Src/editlib/gotodlg.cpp =================================================================== --- trunk/Src/editlib/gotodlg.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/gotodlg.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "gotodlg.h" #include "ccrystaltextview.h" Modified: trunk/Src/editlib/html.cpp =================================================================== --- trunk/Src/editlib/html.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/html.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/ini.cpp =================================================================== --- trunk/Src/editlib/ini.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/ini.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -15,7 +15,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/innosetup.cpp =================================================================== --- trunk/Src/editlib/innosetup.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/innosetup.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/is.cpp =================================================================== --- trunk/Src/editlib/is.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/is.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -25,7 +25,7 @@ // and maybe "ugly" code ... //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/java.cpp =================================================================== --- trunk/Src/editlib/java.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/java.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/lisp.cpp =================================================================== --- trunk/Src/editlib/lisp.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/lisp.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/nsis.cpp =================================================================== --- trunk/Src/editlib/nsis.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/nsis.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -25,7 +25,7 @@ // and maybe "ugly" code ... //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/pascal.cpp =================================================================== --- trunk/Src/editlib/pascal.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/pascal.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/perl.cpp =================================================================== --- trunk/Src/editlib/perl.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/perl.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/php.cpp =================================================================== --- trunk/Src/editlib/php.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/php.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/po.cpp =================================================================== --- trunk/Src/editlib/po.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/po.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -15,7 +15,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/powershell.cpp =================================================================== --- trunk/Src/editlib/powershell.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/powershell.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/python.cpp =================================================================== --- trunk/Src/editlib/python.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/python.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/registry.cpp =================================================================== --- trunk/Src/editlib/registry.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/registry.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -19,7 +19,7 @@ // + FIX: closing null handle (Michael A. Barnhart) //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "registry.h" #ifdef _DEBUG Modified: trunk/Src/editlib/rexx.cpp =================================================================== --- trunk/Src/editlib/rexx.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/rexx.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/rsrc.cpp =================================================================== --- trunk/Src/editlib/rsrc.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/rsrc.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/ruby.cpp =================================================================== --- trunk/Src/editlib/ruby.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/ruby.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/sgml.cpp =================================================================== --- trunk/Src/editlib/sgml.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/sgml.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/sh.cpp =================================================================== --- trunk/Src/editlib/sh.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/sh.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/siod.cpp =================================================================== --- trunk/Src/editlib/siod.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/siod.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/splash.cpp =================================================================== --- trunk/Src/editlib/splash.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/splash.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "editcmd.h" #include "splash.h" Modified: trunk/Src/editlib/sql.cpp =================================================================== --- trunk/Src/editlib/sql.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/sql.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/statbar.cpp =================================================================== --- trunk/Src/editlib/statbar.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/statbar.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "editcmd.h" #include "statbar.h" Modified: trunk/Src/editlib/tcl.cpp =================================================================== --- trunk/Src/editlib/tcl.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/tcl.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/tex.cpp =================================================================== --- trunk/Src/editlib/tex.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/tex.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" Modified: trunk/Src/editlib/xml.cpp =================================================================== --- trunk/Src/editlib/xml.cpp 2008-09-07 03:19:44 UTC (rev 5909) +++ trunk/Src/editlib/xml.cpp 2008-09-07 03:27:29 UTC (rev 5910) @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-06-29 15:41:03
|
Revision: 6880 http://winmerge.svn.sourceforge.net/winmerge/?rev=6880&view=rev Author: kimmov Date: 2009-06-29 15:41:00 +0000 (Mon, 29 Jun 2009) Log Message: ----------- Convert editor's parse cookie array to use std::vector. Modified Paths: -------------- trunk/Src/editlib/ccrystaltextview.cpp trunk/Src/editlib/ccrystaltextview.h Modified: trunk/Src/editlib/ccrystaltextview.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview.cpp 2009-06-29 10:00:33 UTC (rev 6879) +++ trunk/Src/editlib/ccrystaltextview.cpp 2009-06-29 15:41:00 UTC (rev 6880) @@ -88,6 +88,7 @@ // $Id$ #include "StdAfx.h" +#include <vector> #include <malloc.h> #include <imm.h> /* IME */ #include <mbctype.h> @@ -108,6 +109,8 @@ #include "string_util.h" #include "pcre.h" +using std::vector; + // Escaped character constants in range 0x80-0xFF are interpreted in current codepage // Using C locale gets us direct mapping to Unicode codepoints #pragma setlocale("C") @@ -522,7 +525,7 @@ m_pstrIncrementalSearchStringOld = new CString; ASSERT( m_pstrIncrementalSearchStringOld ); //END SW - m_ParseCookies = new CArray<DWORD, DWORD>; + m_ParseCookies = new vector<DWORD>; m_pnActualLineLength = new CArray<int, int>; ResetView (); SetTextType (SRC_PLAIN); @@ -1209,21 +1212,21 @@ GetParseCookie (int nLineIndex) { int nLineCount = GetLineCount (); - if (!m_ParseCookies->GetSize()) + if (!m_ParseCookies->size()) { - m_ParseCookies->SetSize(nLineCount); + m_ParseCookies->resize(nLineCount); // must be initialized to invalid value (DWORD) -1 for (int i=0; i<nLineCount; ++i) - m_ParseCookies->SetAt(i, -1); + (*m_ParseCookies)[i] = -1; } if (nLineIndex < 0) return 0; - if (m_ParseCookies->GetAt(nLineIndex) != - 1) - return m_ParseCookies->GetAt(nLineIndex); + if ((*m_ParseCookies)[nLineIndex] != - 1) + return (*m_ParseCookies)[nLineIndex]; int L = nLineIndex; - while (L >= 0 && m_ParseCookies->GetAt(L) == - 1) + while (L >= 0 && (*m_ParseCookies)[L] == - 1) L--; L++; @@ -1232,14 +1235,14 @@ { DWORD dwCookie = 0; if (L > 0) - dwCookie = m_ParseCookies->GetAt(L - 1); + dwCookie = (*m_ParseCookies)[L - 1]; ASSERT (dwCookie != - 1); - m_ParseCookies->SetAt(L, ParseLine (dwCookie, L, NULL, nBlocks)); - ASSERT (m_ParseCookies->GetAt(L) != - 1); + (*m_ParseCookies)[L] = ParseLine (dwCookie, L, NULL, nBlocks); + ASSERT ((*m_ParseCookies)[L] != - 1); L++; } - return m_ParseCookies->GetAt(nLineIndex); + return (*m_ParseCookies)[nLineIndex]; } int CCrystalTextView:: @@ -1527,8 +1530,8 @@ pBuf[0].m_nBgColorIndex = COLORINDEX_BKGND; nBlocks++; - m_ParseCookies->SetAt(nLineIndex, ParseLine (dwCookie, nLineIndex, pBuf, nBlocks)); - ASSERT (m_ParseCookies->GetAt(nLineIndex) != - 1); + (*m_ParseCookies)[nLineIndex] = ParseLine (dwCookie, nLineIndex, pBuf, nBlocks); + ASSERT ((*m_ParseCookies)[nLineIndex] != - 1); // Allocate table for max possible diff count: // every char might be a diff (empty line has one char) and every diff @@ -1807,8 +1810,8 @@ pBuf[0].m_nColorIndex = COLORINDEX_NORMALTEXT; pBuf[0].m_nBgColorIndex = COLORINDEX_BKGND; nBlocks++; - m_ParseCookies->SetAt(nLineIndex, ParseLine (dwCookie, nLineIndex, pBuf, nBlocks)); - ASSERT (m_ParseCookies->GetAt(nLineIndex) != - 1); + (*m_ParseCookies)[nLineIndex] = ParseLine (dwCookie, nLineIndex, pBuf, nBlocks); + ASSERT ((*m_ParseCookies)[nLineIndex] != - 1); //////// // Allocate table for max possible diff count: @@ -2074,8 +2077,8 @@ // if the private arrays (m_ParseCookies and m_pnActualLineLength) // are defined, check they are in phase with the text buffer - if (m_ParseCookies->GetSize()) - ASSERT(m_ParseCookies->GetSize() == nLineCount); + if (m_ParseCookies->size()) + ASSERT(m_ParseCookies->size() == nLineCount); if (m_pnActualLineLength->GetSize()) ASSERT(m_pnActualLineLength->GetSize() == nLineCount); @@ -2182,7 +2185,7 @@ } } InvalidateLineCache( 0, -1 ); - m_ParseCookies->RemoveAll(); + m_ParseCookies->clear(); m_pnActualLineLength->RemoveAll(); m_ptCursorPos.x = 0; m_ptCursorPos.y = 0; @@ -4068,12 +4071,12 @@ { ASSERT (nLineIndex != -1); // All text below this line should be reparsed - if (m_ParseCookies->GetSize()) + if (m_ParseCookies->size()) { - ASSERT (m_ParseCookies->GetSize() == nLineCount); + ASSERT (m_ParseCookies->size() == nLineCount); // must be reinitialized to invalid value (DWORD) - 1 - for (int i=nLineIndex; i<m_ParseCookies->GetSize(); ++i) - m_ParseCookies->SetAt(i, -1); + for (int i = nLineIndex; i < m_ParseCookies->size(); ++i) + (*m_ParseCookies)[i] = -1; } // This line'th actual length must be recalculated if (m_pnActualLineLength->GetSize()) @@ -4098,18 +4101,18 @@ nLineIndex = 0; // Refresh all text // All text below this line should be reparsed - if (m_ParseCookies->GetSize()) + if (m_ParseCookies->size()) { - if (m_ParseCookies->GetSize() != nLineCount) + if (m_ParseCookies->size() != nLineCount) { - int oldsize = m_ParseCookies->GetSize(); - m_ParseCookies->SetSize(nLineCount); + int oldsize = m_ParseCookies->size(); + m_ParseCookies->resize(nLineCount); // must be initialized to invalid value (DWORD) - 1 - for (int i=oldsize; i<m_ParseCookies->GetSize(); ++i) - m_ParseCookies->SetAt(i, -1); + for (int i = oldsize; i < m_ParseCookies->size(); ++i) + (*m_ParseCookies)[i] = -1; } - for (int i=nLineIndex; i<m_ParseCookies->GetSize(); ++i) - m_ParseCookies->SetAt(i, -1); + for (int i = nLineIndex; i < m_ParseCookies->size(); ++i) + (*m_ParseCookies)[i] = -1; } // Recalculate actual length for all lines below this Modified: trunk/Src/editlib/ccrystaltextview.h =================================================================== --- trunk/Src/editlib/ccrystaltextview.h 2009-06-29 10:00:33 UTC (rev 6879) +++ trunk/Src/editlib/ccrystaltextview.h 2009-06-29 15:41:00 UTC (rev 6880) @@ -38,6 +38,7 @@ #pragma once #endif // _MSC_VER >= 1000 +#include <vector> #include "crystalparser.h" //////////////////////////////////////////////////////////////////////////// @@ -156,7 +157,7 @@ It would be a loss of time to recompute all these values after each action. So we just set all these values to invalid code (DWORD) - 1. */ - CArray<DWORD, DWORD> *m_ParseCookies; + std::vector<DWORD> *m_ParseCookies; DWORD GetParseCookie (int nLineIndex); /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-06-30 16:47:51
|
Revision: 6888 http://winmerge.svn.sourceforge.net/winmerge/?rev=6888&view=rev Author: kimmov Date: 2009-06-30 10:36:28 +0000 (Tue, 30 Jun 2009) Log Message: ----------- Convert editor's line length array to use stl vector. Modified Paths: -------------- trunk/Src/editlib/ccrystaltextview.cpp trunk/Src/editlib/ccrystaltextview.h Modified: trunk/Src/editlib/ccrystaltextview.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview.cpp 2009-06-30 09:08:47 UTC (rev 6887) +++ trunk/Src/editlib/ccrystaltextview.cpp 2009-06-30 10:36:28 UTC (rev 6888) @@ -526,7 +526,7 @@ ASSERT( m_pstrIncrementalSearchStringOld ); //END SW m_ParseCookies = new vector<DWORD>; - m_pnActualLineLength = new CArray<int, int>; + m_pnActualLineLength = new vector<int>; ResetView (); SetTextType (SRC_PLAIN); m_bSingle = false; // needed to be set in descendat classes @@ -662,16 +662,16 @@ const int nLineCount = GetLineCount (); ASSERT (nLineCount > 0); ASSERT (nLineIndex >= 0 && nLineIndex < nLineCount); - if (!m_pnActualLineLength->GetSize()) + if (!m_pnActualLineLength->size()) { - m_pnActualLineLength->SetSize(nLineCount); + m_pnActualLineLength->resize(nLineCount); // must be initialized to invalid code -1 for (int i=0; i<nLineCount; ++i) - m_pnActualLineLength->SetAt(i, - 1); + (*m_pnActualLineLength)[i] = -1; } - if (m_pnActualLineLength->GetAt(nLineIndex) != - 1) - return m_pnActualLineLength->GetAt(nLineIndex); + if ((*m_pnActualLineLength)[nLineIndex] != - 1) + return (*m_pnActualLineLength)[nLineIndex]; // Actual line length is not determined yet, let's calculate a little int nActualLength = 0; @@ -693,7 +693,7 @@ } } - m_pnActualLineLength->SetAt(nLineIndex, nActualLength); + (*m_pnActualLineLength)[nLineIndex] = nActualLength; return nActualLength; } @@ -2077,8 +2077,8 @@ // are defined, check they are in phase with the text buffer if (m_ParseCookies->size()) ASSERT(m_ParseCookies->size() == nLineCount); - if (m_pnActualLineLength->GetSize()) - ASSERT(m_pnActualLineLength->GetSize() == nLineCount); + if (m_pnActualLineLength->size()) + ASSERT(m_pnActualLineLength->size() == nLineCount); CDC cacheDC; VERIFY (cacheDC.CreateCompatibleDC (pdc)); @@ -2184,7 +2184,7 @@ } InvalidateLineCache( 0, -1 ); m_ParseCookies->clear(); - m_pnActualLineLength->RemoveAll(); + m_pnActualLineLength->clear(); m_ptCursorPos.x = 0; m_ptCursorPos.y = 0; m_ptSelStart = m_ptSelEnd = m_ptCursorPos; @@ -2274,7 +2274,7 @@ { m_pTextBuffer->SetTabSize( nTabSize ); - m_pnActualLineLength->RemoveAll(); + m_pnActualLineLength->clear(); m_nMaxLineLength = -1; RecalcHorzScrollBar (); Invalidate (); @@ -4078,11 +4078,11 @@ (*m_ParseCookies)[i] = -1; } // This line'th actual length must be recalculated - if (m_pnActualLineLength->GetSize()) + if (m_pnActualLineLength->size()) { - ASSERT (m_pnActualLineLength->GetSize() == nLineCount); + ASSERT (m_pnActualLineLength->size() == nLineCount); // must be initialized to invalid code -1 - m_pnActualLineLength->SetAt(nLineIndex, - 1); + (*m_pnActualLineLength)[nLineIndex] = -1; //BEGIN SW InvalidateLineCache( nLineIndex, nLineIndex ); //END SW @@ -4117,19 +4117,19 @@ } // Recalculate actual length for all lines below this - if (m_pnActualLineLength->GetSize()) + if (m_pnActualLineLength->size()) { - if (m_pnActualLineLength->GetSize() != nLineCount) + if (m_pnActualLineLength->size() != nLineCount) { // Reallocate actual length array - int oldsize = m_pnActualLineLength->GetSize(); - m_pnActualLineLength->SetSize(nLineCount); + int oldsize = m_pnActualLineLength->size(); + m_pnActualLineLength->resize(nLineCount); // must be initialized to invalid code -1 - for (int i=oldsize; i<m_pnActualLineLength->GetSize(); ++i) - m_pnActualLineLength->SetAt(i, -1); + for (int i = oldsize; i < m_pnActualLineLength->size(); ++i) + (*m_pnActualLineLength)[i] = -1; } - for (int i=nLineIndex; i<m_pnActualLineLength->GetSize(); ++i) - m_pnActualLineLength->SetAt(i, -1); + for (int i = nLineIndex; i < m_pnActualLineLength->size(); ++i) + (*m_pnActualLineLength)[i] = -1; } //BEGIN SW InvalidateLineCache( nLineIndex, -1 ); Modified: trunk/Src/editlib/ccrystaltextview.h =================================================================== --- trunk/Src/editlib/ccrystaltextview.h 2009-06-30 09:08:47 UTC (rev 6887) +++ trunk/Src/editlib/ccrystaltextview.h 2009-06-30 10:36:28 UTC (rev 6888) @@ -166,7 +166,7 @@ and must be initialized to - 1, code for invalid values (not yet computed). for the same reason. */ - CArray<int, int> *m_pnActualLineLength; + std::vector<int> *m_pnActualLineLength; protected: BOOL m_bPreparingToDrag; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-07-01 14:54:58
|
Revision: 7217 http://winmerge.svn.sourceforge.net/winmerge/?rev=7217&view=rev Author: kimmov Date: 2010-07-01 14:54:51 +0000 (Thu, 01 Jul 2010) Log Message: ----------- Fixing 64-bit build warnings. Modified Paths: -------------- trunk/Src/editlib/ccrystaleditview.cpp trunk/Src/editlib/ccrystaltextbuffer.cpp trunk/Src/editlib/ccrystaltextview.cpp trunk/Src/editlib/ccrystaltextview.h trunk/Src/editlib/ccrystaltextview2.cpp Modified: trunk/Src/editlib/ccrystaleditview.cpp =================================================================== --- trunk/Src/editlib/ccrystaleditview.cpp 2010-07-01 13:30:43 UTC (rev 7216) +++ trunk/Src/editlib/ccrystaleditview.cpp 2010-07-01 14:54:51 UTC (rev 7217) @@ -495,7 +495,7 @@ ptCursorPos = GetCursorPos (); ASSERT_VALIDTEXTPOS (ptCursorPos); LPCTSTR pszText = m_pTextBuffer->GetDefaultEol(); - int cchText = _tcslen(pszText); + int cchText = (int) _tcslen(pszText); int x, y; m_pTextBuffer->InsertText (this, ptCursorPos.y, ptCursorPos.x, pszText, cchText, y, x, CE_ACTION_TYPING); // [JRT] @@ -521,7 +521,7 @@ if (QueryEditable () && m_pTextBuffer != NULL) { m_pTextBuffer->BeginUndoGroup (m_bMergeUndo); - m_bMergeUndo = true; + m_bMergeUndo = true; CPoint ptSelStart, ptSelEnd; GetSelection (ptSelStart, ptSelEnd); @@ -729,7 +729,7 @@ for (int L = nStartLine; L <= nEndLine; L++) { int x, y; - m_pTextBuffer->InsertText (this, L, 0, pszText, _tcslen(pszText), y, x, CE_ACTION_INDENT); // [JRT] + m_pTextBuffer->InsertText (this, L, 0, pszText, (int) _tcslen(pszText), y, x, CE_ACTION_INDENT); // [JRT] } m_bHorzScrollBarLocked = FALSE; @@ -796,12 +796,12 @@ // [JRT]: m_pTextBuffer->DeleteText (this, ptSelStart.y, ptSelStart.x, ptSelEnd.y, ptSelEnd.x, CE_ACTION_TYPING); - m_pTextBuffer->InsertText( this, ptSelStart.y, ptSelStart.x, pszText, _tcslen(pszText), y, x, CE_ACTION_TYPING ); + m_pTextBuffer->InsertText( this, ptSelStart.y, ptSelStart.x, pszText, (int) _tcslen(pszText), y, x, CE_ACTION_TYPING ); } // No selection, add tab else { - m_pTextBuffer->InsertText (this, ptCursorPos.y, ptCursorPos.x, pszText, _tcslen(pszText), y, x, CE_ACTION_TYPING); // [JRT] + m_pTextBuffer->InsertText (this, ptCursorPos.y, ptCursorPos.x, pszText, (int) _tcslen(pszText), y, x, CE_ACTION_TYPING); // [JRT] } ptCursorPos.x = x; @@ -1134,8 +1134,8 @@ return FALSE; } - SIZE_T cbData = ::GlobalSize (hData); - int cchText = cbData / sizeof(TCHAR) - 1; + UINT cbData = (UINT) ::GlobalSize (hData); + UINT cchText = cbData / sizeof(TCHAR) - 1; if (cchText < 0) return FALSE; LPTSTR pszText = (LPTSTR)::GlobalLock (hData); @@ -1577,7 +1577,7 @@ { static LPCTSTR braces = _T("{}()[]<>"); LPCTSTR pos = _tcschr (braces, c); - return pos ? pos - braces + 1 : 0; + return pos ? (int) (pos - braces) + 1 : 0; } int Modified: trunk/Src/editlib/ccrystaltextbuffer.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextbuffer.cpp 2010-07-01 13:30:43 UTC (rev 7216) +++ trunk/Src/editlib/ccrystaltextbuffer.cpp 2010-07-01 14:54:51 UTC (rev 7217) @@ -659,7 +659,7 @@ { LPCTSTR lpEOLtoApply = GetDefaultEol(); BOOL bChanged = FALSE; - const int size = m_aLines.size(); + const size_t size = m_aLines.size(); for (int i = 0 ; i < size; i++) { // the last real line has no EOL @@ -935,7 +935,7 @@ memcpy (pszBuf, startLine.GetLine(nStartChar), sizeof (TCHAR) * nCount); pszBuf += nCount; } - text.ReleaseBuffer (pszBuf - text); + text.ReleaseBuffer ((int) (pszBuf - text)); text.FreeExtra (); } @@ -1834,7 +1834,7 @@ // Start from the end of text bWrapIt = FALSE; - nCurrentLine = nSize - 1; + nCurrentLine = (int) (nSize - 1); } return -1; } Modified: trunk/Src/editlib/ccrystaltextview.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview.cpp 2010-07-01 13:30:43 UTC (rev 7216) +++ trunk/Src/editlib/ccrystaltextview.cpp 2010-07-01 14:54:51 UTC (rev 7217) @@ -809,7 +809,7 @@ static void AppendStringAdv(CString & str, int & curpos, LPCTSTR szadd) { str += szadd; - curpos += _tcslen(szadd); + curpos += (int) _tcslen(szadd); } /** Append escaped control char to string str, and advance position curpos */ @@ -1309,7 +1309,7 @@ return; if( nLineIndex2 >= m_panSubLines->GetSize() ) - nLineIndex2 = m_panSubLines->GetUpperBound(); + nLineIndex2 = (int) m_panSubLines->GetUpperBound(); for( int i = nLineIndex1; i <= nLineIndex2; i++ ) if( i >= 0 && i < m_panSubLines->GetSize() ) @@ -4068,7 +4068,7 @@ { ASSERT (nLineIndex != -1); // All text below this line should be reparsed - const int cookiesSize = m_ParseCookies->size(); + const int cookiesSize = (int) m_ParseCookies->size(); if (cookiesSize > 0) { ASSERT (cookiesSize == nLineCount); @@ -4581,7 +4581,7 @@ ASSERT (pszFindWhere != NULL); ASSERT (pszFindWhat != NULL); int nCur = 0; - int nLength = _tcslen (pszFindWhat); + int nLength = (int) _tcslen (pszFindWhat); nLen = nLength; for (;;) { @@ -4589,20 +4589,20 @@ if (pszPos == NULL) return -1; if ((dwFlags & FIND_WHOLE_WORD) == 0) - return nCur + (pszPos - pszFindWhere); + return nCur + (int) (pszPos - pszFindWhere); if (pszPos > pszFindWhere && xisalnum (pszPos[-1])) { - nCur += (pszPos - pszFindWhere + 1); + nCur += (int) (pszPos - pszFindWhere + 1); pszFindWhere = pszPos + 1; continue; } if (xisalnum (pszPos[nLength])) { - nCur += (pszPos - pszFindWhere + 1); + nCur += (int) (pszPos - pszFindWhere + 1); pszFindWhere = pszPos + 1; continue; } - return nCur + (pszPos - pszFindWhere); + return nCur + (int) (pszPos - pszFindWhere); } } ASSERT (FALSE); // Unreachable @@ -4671,7 +4671,8 @@ int HowManyStr (LPCTSTR s, LPCTSTR m) { LPCTSTR p = s; - int n = 0, l = _tcslen (m); + int n = 0; + const int l = (int) _tcslen (m); while ((p = _tcsstr (p, m)) != NULL) { n++; @@ -5457,9 +5458,9 @@ LPCTSTR pszOpenComment = m_CurSourceDef->opencomment, pszCloseComment = m_CurSourceDef->closecomment, pszCommentLine = m_CurSourceDef->commentline, pszTest; - int nOpenComment = _tcslen (pszOpenComment), - nCloseComment = _tcslen (pszCloseComment), - nCommentLine = _tcslen (pszCommentLine); + int nOpenComment = (int) _tcslen (pszOpenComment), + nCloseComment = (int) _tcslen (pszCloseComment), + nCommentLine = (int) _tcslen (pszCommentLine); if (nOther & 1) { for (;;) @@ -5501,7 +5502,7 @@ { if (!nCount--) { - ptCursorPos.x = pszEnd - pszText; + ptCursorPos.x = (LONG) (pszEnd - pszText); if (bAfter) ptCursorPos.x++; SetCursorPos (ptCursorPos); @@ -5568,7 +5569,7 @@ { if (!nCount--) { - ptCursorPos.x = pszText - pszBegin; + ptCursorPos.x = (LONG) (pszText - pszBegin); if (bAfter) ptCursorPos.x++; SetCursorPos (ptCursorPos); Modified: trunk/Src/editlib/ccrystaltextview.h =================================================================== --- trunk/Src/editlib/ccrystaltextview.h 2010-07-01 13:30:43 UTC (rev 7216) +++ trunk/Src/editlib/ccrystaltextview.h 2010-07-01 14:54:51 UTC (rev 7217) @@ -172,7 +172,7 @@ BOOL m_bPreparingToDrag; BOOL m_bDraggingText; BOOL m_bDragSelection, m_bWordSelection, m_bLineSelection; - UINT m_nDragSelTimer; + UINT_PTR m_nDragSelTimer; CPoint m_ptDrawSelStart, m_ptDrawSelEnd; Modified: trunk/Src/editlib/ccrystaltextview2.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview2.cpp 2010-07-01 13:30:43 UTC (rev 7216) +++ trunk/Src/editlib/ccrystaltextview2.cpp 2010-07-01 14:54:51 UTC (rev 7217) @@ -62,7 +62,7 @@ static char THIS_FILE[] = __FILE__; #endif -#define CRYSTAL_TIMER_DRAGSEL 1001 +static const UINT_PTR CRYSTAL_TIMER_DRAGSEL = 1001; static LPTSTR NTAPI EnsureCharNext(LPCTSTR current) { @@ -170,21 +170,21 @@ LPCTSTR pszChars = GetLineChars (m_ptCursorPos.y); int nPos = m_ptCursorPos.x; int nPrevPos; - while (nPos > 0 && xisspace (pszChars[nPrevPos = ::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars])) + while (nPos > 0 && xisspace (pszChars[nPrevPos = (int) (::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars)])) nPos = nPrevPos; if (nPos > 0) { - int nPrevPos = ::CharPrev(pszChars, pszChars + nPos) - pszChars; + int nPrevPos = (int) (::CharPrev(pszChars, pszChars + nPos) - pszChars); nPos = nPrevPos; if (xisalnum (pszChars[nPos])) { - while (nPos > 0 && (xisalnum (pszChars[nPrevPos = ::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars]))) + while (nPos > 0 && (xisalnum (pszChars[nPrevPos = (int) (::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars)]))) nPos = nPrevPos; } else { - while (nPos > 0 && !xisalnum (pszChars[nPrevPos = ::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars]) + while (nPos > 0 && !xisalnum (pszChars[nPrevPos = (int) (::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars)]) && !xisspace (pszChars[nPrevPos])) nPos = nPrevPos; } @@ -229,17 +229,17 @@ if (xisalnum (pszChars[nPos])) { while (nPos < nLength && xisalnum (pszChars[nPos])) - nPos = ::EnsureCharNext(pszChars + nPos) - pszChars; + nPos = (int) (::EnsureCharNext(pszChars + nPos) - pszChars); } else { while (nPos < nLength && !xisalnum (pszChars[nPos]) && !xisspace (pszChars[nPos])) - nPos = ::EnsureCharNext(pszChars + nPos) - pszChars; + nPos = (int) (::EnsureCharNext(pszChars + nPos) - pszChars); } while (nPos < nLength && xisspace (pszChars[nPos])) - nPos = ::EnsureCharNext(pszChars + nPos) - pszChars; + nPos = (int) (::EnsureCharNext(pszChars + nPos) - pszChars); m_ptCursorPos.x = nPos; m_nIdealCharPos = CalculateActualOffset (m_ptCursorPos.y, m_ptCursorPos.x); @@ -532,7 +532,7 @@ { if (!xisalnum (pszChars[pt.x])) break; - pt.x += ::CharNext (&pszChars[pt.x]) - &pszChars[pt.x]; + pt.x += (int) (::CharNext (&pszChars[pt.x]) - &pszChars[pt.x]); } ASSERT_VALIDTEXTPOS (pt); return pt; @@ -546,7 +546,7 @@ int nPrevX = pt.x; while (pt.x > 0) { - nPrevX -= &pszChars[pt.x] - ::CharPrev (pszChars, &pszChars[pt.x]); + nPrevX -= (int) (&pszChars[pt.x] - ::CharPrev (pszChars, &pszChars[pt.x])); if (!xisalnum (pszChars[nPrevX])) break; pt.x = nPrevX; @@ -1165,7 +1165,7 @@ LPTSTR pszData = (LPTSTR) GlobalLock (hData); if (pszData != NULL) { - SIZE_T cbData = GlobalSize (hData); + UINT cbData = (UINT) GlobalSize (hData); int cchText = cbData / sizeof(TCHAR) - 1; if (cchText >= 0) memcpy(text.GetBufferSetLength(cchText), pszData, cbData); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2013-03-28 20:41:46
|
Revision: 7616 http://sourceforge.net/p/winmerge/code/7616 Author: gerundt Date: 2013-03-28 20:41:42 +0000 (Thu, 28 Mar 2013) Log Message: ----------- Replace BOOL with bool Modified Paths: -------------- trunk/Src/editlib/asp.cpp trunk/Src/editlib/basic.cpp trunk/Src/editlib/batch.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 Modified: trunk/Src/editlib/asp.cpp =================================================================== --- trunk/Src/editlib/asp.cpp 2013-03-27 18:41:57 UTC (rev 7615) +++ trunk/Src/editlib/asp.cpp 2013-03-28 20:41:42 UTC (rev 7616) @@ -533,43 +533,43 @@ NULL }; -static BOOL +static bool IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength) { for (int L = 0; apszKeywords[L] != NULL; L++) { if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0 && apszKeywords[L][nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsHtmlKeyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszHtmlKeywordList, pszChars, nLength); } -static BOOL +static bool IsUser1Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszUser1KeywordList, pszChars, nLength); } -static BOOL +static bool IsUser2Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszUser2KeywordList, pszChars, nLength); } -static BOOL +static bool IsAspKeyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszAspKeywordList, pszChars, nLength); } -static BOOL +static bool IsAspNumber (LPCTSTR pszChars, int nLength) { if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x') @@ -579,20 +579,20 @@ if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') || (pszChars[I] >= 'a' && pszChars[I] <= 'f')) continue; - return FALSE; + return false; } - return TRUE; + return true; } if (!_istdigit (pszChars[0])) - return FALSE; + return false; for (int I = 1; I < nLength; I++) { if (!_istdigit (pszChars[I]) && pszChars[I] != '+' && pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' && pszChars[I] != 'E') - return FALSE; + return false; } - return TRUE; + return true; } #define DEFINE_BLOCK(pos, colorindex) \ @@ -622,9 +622,9 @@ return dwCookie & (COOKIE_EXT_COMMENT|COOKIE_EXT_USER1); LPCTSTR pszChars = GetLineChars (nLineIndex); - BOOL bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_USER1)) == 0; - BOOL bRedefineBlock = TRUE; - BOOL bDecIndex = FALSE; + bool bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_USER1)) == 0; + bool bRedefineBlock = true; + bool bDecIndex = false; int nIdentBegin = -1; int nPrevI = -1; int I=0; @@ -667,13 +667,13 @@ else { DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR); - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; goto out; } } - bRedefineBlock = FALSE; - bDecIndex = FALSE; + bRedefineBlock = false; + bDecIndex = false; } out: @@ -695,7 +695,7 @@ if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_STRING; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -706,7 +706,7 @@ if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_CHAR; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -719,7 +719,7 @@ if (I > 1 && pszChars[I] == '>' && pszChars[nPrevI] == '-' && *::CharPrev(pszChars, pszChars + nPrevI) == '-') { dwCookie &= ~COOKIE_EXT_COMMENT; - bRedefineBlock = TRUE; + bRedefineBlock = true; } } continue; @@ -738,7 +738,7 @@ if (I > 0 && pszChars[I] == '>' && (pszChars[nPrevI] == '?' || pszChars[nPrevI] == '%')) { dwCookie &= ~COOKIE_EXT_USER1; - bRedefineBlock = TRUE; + bRedefineBlock = true; continue; } } @@ -777,7 +777,7 @@ if (bFirstChar) { if (!xisspace (pszChars[I])) - bFirstChar = FALSE; + bFirstChar = false; } // User1 start: <? @@ -833,7 +833,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -841,7 +841,7 @@ { if (pszChars[j] == '(') { - bFunction = TRUE; + bFunction = true; } break; } @@ -867,8 +867,8 @@ goto next; } } - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; nIdentBegin = -1; next: ; @@ -891,8 +891,8 @@ { dwCookie &= ~COOKIE_EXT_USER1; nIdentBegin = -1; - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; continue; } } @@ -904,8 +904,8 @@ { dwCookie &= ~COOKIE_PREPROCESSOR; nIdentBegin = -1; - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; continue; } } @@ -952,7 +952,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -960,7 +960,7 @@ { if (pszChars[j] == '(') { - bFunction = TRUE; + bFunction = true; } break; } @@ -983,7 +983,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -991,7 +991,7 @@ { if (pszChars[j] == '(') { - bFunction = TRUE; + bFunction = true; } break; } Modified: trunk/Src/editlib/basic.cpp =================================================================== --- trunk/Src/editlib/basic.cpp 2013-03-27 18:41:57 UTC (rev 7615) +++ trunk/Src/editlib/basic.cpp 2013-03-28 20:41:42 UTC (rev 7616) @@ -311,25 +311,25 @@ NULL }; -static BOOL +static bool IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength) { for (int L = 0; apszKeywords[L] != NULL; L++) { if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0 && apszKeywords[L][nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsBasicKeyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszBasicKeywordList, pszChars, nLength); } -static BOOL +static bool IsBasicNumber (LPCTSTR pszChars, int nLength) { if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x') @@ -339,20 +339,20 @@ if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') || (pszChars[I] >= 'a' && pszChars[I] <= 'f')) continue; - return FALSE; + return false; } - return TRUE; + return true; } if (!_istdigit (pszChars[0])) - return FALSE; + return false; for (int I = 1; I < nLength; I++) { if (!_istdigit (pszChars[I]) && pszChars[I] != '+' && pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' && pszChars[I] != 'E') - return FALSE; + return false; } - return TRUE; + return true; } #define DEFINE_BLOCK(pos, colorindex) \ @@ -380,9 +380,9 @@ return dwCookie & COOKIE_EXT_COMMENT; LPCTSTR pszChars = GetLineChars (nLineIndex); - BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; - BOOL bRedefineBlock = TRUE; - BOOL bDecIndex = FALSE; + bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; + bool bRedefineBlock = true; + bool bDecIndex = false; int nIdentBegin = -1; int nPrevI = -1; int I=0; @@ -417,13 +417,13 @@ else { DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR); - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; goto out; } } - bRedefineBlock = FALSE; - bDecIndex = FALSE; + bRedefineBlock = false; + bDecIndex = false; } out: @@ -445,7 +445,7 @@ if (pszChars[I] == '"') { dwCookie &= ~COOKIE_STRING; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -468,7 +468,7 @@ if (bFirstChar) { if (!xisspace (pszChars[I])) - bFirstChar = FALSE; + bFirstChar = false; } if (pBuf == NULL) @@ -494,7 +494,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -502,7 +502,7 @@ { if (pszChars[j] == '(') { - bFunction = TRUE; + bFunction = true; } break; } @@ -512,8 +512,8 @@ DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME); } } - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; nIdentBegin = -1; } } @@ -531,7 +531,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -539,7 +539,7 @@ { if (pszChars[j] == '(') { - bFunction = TRUE; + bFunction = true; } break; } Modified: trunk/Src/editlib/batch.cpp =================================================================== --- trunk/Src/editlib/batch.cpp 2013-03-27 18:41:57 UTC (rev 7615) +++ trunk/Src/editlib/batch.cpp 2013-03-28 20:41:42 UTC (rev 7616) @@ -649,19 +649,19 @@ NULL }; -static BOOL +static bool IsBatKeyword (LPCTSTR pszChars, int nLength) { for (int L = 0; s_apszBatKeywordList[L] != NULL; L++) { if (_tcsnicmp (s_apszBatKeywordList[L], pszChars, nLength) == 0 && s_apszBatKeywordList[L][nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsUser1Keyword (LPCTSTR pszChars, int nLength) { TCHAR buffer[13]; @@ -670,40 +670,40 @@ { if (_tcsnicmp (s_apszUser1KeywordList[L], pszChars, nLength) == 0 && s_apszUser1KeywordList[L][nLength] == 0) - return TRUE; + return true; _tcscpy (buffer, s_apszUser1KeywordList[L]); _tcscat (buffer, _T (".COM")); if (_tcsnicmp (buffer, pszChars, nLength) == 0 && buffer[nLength] == 0) - return TRUE; + return true; _tcscpy (buffer, s_apszUser1KeywordList[L]); _tcscat (buffer, _T (".EXE")); if (_tcsnicmp (buffer, pszChars, nLength) == 0 && buffer[nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength) { for (int L = 0; apszKeywords[L] != NULL; L++) { if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0 && apszKeywords[L][nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsUser2Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszUser2KeywordList, pszChars, nLength); } -static BOOL +static bool IsBatNumber (LPCTSTR pszChars, int nLength) { if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x') @@ -713,20 +713,20 @@ if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') || (pszChars[I] >= 'a' && pszChars[I] <= 'f')) continue; - return FALSE; + return false; } - return TRUE; + return true; } if (!_istdigit (pszChars[0])) - return FALSE; + return false; for (int I = 1; I < nLength; I++) { if (!_istdigit (pszChars[I]) && pszChars[I] != '+' && pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' && pszChars[I] != 'E') - return FALSE; + return false; } - return TRUE; + return true; } #define DEFINE_BLOCK(pos, colorindex) \ @@ -754,9 +754,9 @@ return dwCookie & COOKIE_EXT_COMMENT; LPCTSTR pszChars = GetLineChars (nLineIndex); - BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; - BOOL bRedefineBlock = TRUE; - BOOL bDecIndex = FALSE; + bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; + bool bRedefineBlock = true; + bool bDecIndex = false; int nIdentBegin = -1; int nPrevI = -1; int I=0; @@ -795,13 +795,13 @@ else { DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR); - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; goto out; } } - bRedefineBlock = FALSE; - bDecIndex = FALSE; + bRedefineBlock = false; + bDecIndex = false; } out: @@ -823,7 +823,7 @@ if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_STRING; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -834,7 +834,7 @@ if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_CHAR; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -900,7 +900,7 @@ continue; } if (!xisspace (pszChars[I])) - bFirstChar = FALSE; + bFirstChar = false; } if (pBuf == NULL) @@ -949,8 +949,8 @@ DEFINE_BLOCK (nIdentBegin, COLORINDEX_NUMBER); } } - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; nIdentBegin = -1; } } Modified: trunk/Src/editlib/cplusplus.cpp =================================================================== --- trunk/Src/editlib/cplusplus.cpp 2013-03-27 18:41:57 UTC (rev 7615) +++ trunk/Src/editlib/cplusplus.cpp 2013-03-28 20:41:42 UTC (rev 7616) @@ -223,31 +223,31 @@ NULL }; -static BOOL +static bool IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength) { for (int L = 0; apszKeywords[L] != NULL; L++) { if (_tcsncmp (apszKeywords[L], pszChars, nLength) == 0 && apszKeywords[L][nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsCppKeyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszCppKeywordList, pszChars, nLength); } -static BOOL +static bool IsUser1Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszUser1KeywordList, pszChars, nLength); } -static BOOL +static bool IsCppNumber (LPCTSTR pszChars, int nLength) { if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x') @@ -257,20 +257,20 @@ if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') || (pszChars[I] >= 'a' && pszChars[I] <= 'f')) continue; - return FALSE; + return false; } - return TRUE; + return true; } if (!_istdigit (pszChars[0])) - return FALSE; + return false; for (int I = 1; I < nLength; I++) { if (!_istdigit (pszChars[I]) && pszChars[I] != '+' && pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' && pszChars[I] != 'E') - return FALSE; + return false; } - return TRUE; + return true; } #define DEFINE_BLOCK(pos, colorindex) \ @@ -298,10 +298,10 @@ return dwCookie & COOKIE_EXT_COMMENT; LPCTSTR pszChars = GetLineChars (nLineIndex); - BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; - BOOL bRedefineBlock = TRUE; - BOOL bWasCommentStart = FALSE; - BOOL bDecIndex = FALSE; + bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; + bool bRedefineBlock = true; + bool bWasCommentStart = false; + bool bDecIndex = false; int nIdentBegin = -1; int nPrevI = -1; int I=0; @@ -340,13 +340,13 @@ else { DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR); - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; goto out; } } - bRedefineBlock = FALSE; - bDecIndex = FALSE; + bRedefineBlock = false; + bDecIndex = false; } out: @@ -368,7 +368,7 @@ if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_STRING; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -379,7 +379,7 @@ if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_CHAR; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -391,9 +391,9 @@ if ((I > 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*' /*&& *::CharPrev(pszChars, pszChars + nPrevI) != '/'*/ && !bWasCommentStart) || (I == 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*')) { dwCookie &= ~COOKIE_EXT_COMMENT; - bRedefineBlock = TRUE; + bRedefineBlock = true; } - bWasCommentStart = FALSE; + bWasCommentStart = false; continue; } @@ -436,11 +436,11 @@ { DEFINE_BLOCK (nPrevI, COLORINDEX_COMMENT); dwCookie |= COOKIE_EXT_COMMENT; - bWasCommentStart = TRUE; + bWasCommentStart = true; continue; } - bWasCommentStart = FALSE; + bWasCommentStart = false; if (bFirstChar) { @@ -451,7 +451,7 @@ continue; } if (!xisspace (pszChars[I])) - bFirstChar = FALSE; + bFirstChar = false; } if (pBuf == NULL) @@ -481,7 +481,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -489,7 +489,7 @@ { if (pszChars[j] == '(') { - bFunction = TRUE; + bFunction = true; } break; } @@ -499,8 +499,8 @@ DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME); } } - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; nIdentBegin = -1; } } @@ -522,7 +522,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -530,7 +530,7 @@ { if (pszChars[j] == '(') { - bFunction = TRUE; + bFunction = true; } break; } Modified: trunk/Src/editlib/csharp.cpp =================================================================== --- trunk/Src/editlib/csharp.cpp 2013-03-27 18:41:57 UTC (rev 7615) +++ trunk/Src/editlib/csharp.cpp 2013-03-28 20:41:42 UTC (rev 7616) @@ -120,25 +120,25 @@ }; -static BOOL +static bool IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength) { for (int L = 0; apszKeywords[L] != NULL; L++) { if (_tcsncmp (apszKeywords[L], pszChars, nLength) == 0 && apszKeywords[L][nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsCppKeyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszCppKeywordList, pszChars, nLength); } -static BOOL +static bool IsCppNumber (LPCTSTR pszChars, int nLength) { if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x') @@ -148,20 +148,20 @@ if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') || (pszChars[I] >= 'a' && pszChars[I] <= 'f')) continue; - return FALSE; + return false; } - return TRUE; + return true; } if (!_istdigit (pszChars[0])) - return FALSE; + return false; for (int I = 1; I < nLength; I++) { if (!_istdigit (pszChars[I]) && pszChars[I] != '+' && pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' && pszChars[I] != 'E') - return FALSE; + return false; } - return TRUE; + return true; } #define DEFINE_BLOCK(pos, colorindex) \ @@ -189,10 +189,10 @@ return dwCookie & COOKIE_EXT_COMMENT; LPCTSTR pszChars = GetLineChars (nLineIndex); - BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; - BOOL bRedefineBlock = TRUE; - BOOL bWasCommentStart = FALSE; - BOOL bDecIndex = FALSE; + bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; + bool bRedefineBlock = true; + bool bWasCommentStart = false; + bool bDecIndex = false; int nIdentBegin = -1; int nPrevI = -1; int I=0; @@ -231,13 +231,13 @@ else { DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR); - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; goto out; } } - bRedefineBlock = FALSE; - bDecIndex = FALSE; + bRedefineBlock = false; + bDecIndex = false; } out: @@ -259,7 +259,7 @@ if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_STRING; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -270,7 +270,7 @@ if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_CHAR; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -282,9 +282,9 @@ if ((I > 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*' /*&& *::CharPrev(pszChars, pszChars + nPrevI) != '/'*/ && !bWasCommentStart) || (I == 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*')) { dwCookie &= ~COOKIE_EXT_COMMENT; - bRedefineBlock = TRUE; + bRedefineBlock = true; } - bWasCommentStart = FALSE; + bWasCommentStart = false; continue; } @@ -327,11 +327,11 @@ { DEFINE_BLOCK (nPrevI, COLORINDEX_COMMENT); dwCookie |= COOKIE_EXT_COMMENT; - bWasCommentStart = TRUE; + bWasCommentStart = true; continue; } - bWasCommentStart = FALSE; + bWasCommentStart = false; if (bFirstChar) { @@ -342,7 +342,7 @@ continue; } if (!xisspace (pszChars[I])) - bFirstChar = FALSE; + bFirstChar = false; } if (pBuf == NULL) @@ -368,7 +368,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -376,7 +376,7 @@ { if (pszChars[j] == '(') { - bFunction = TRUE; + bFunction = true; } break; } @@ -386,8 +386,8 @@ DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME); } } - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; nIdentBegin = -1; } } @@ -405,7 +405,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -413,7 +413,7 @@ { if (pszChars[j] == '(') { - bFunction = TRUE; + bFunction = true; } break; } Modified: trunk/Src/editlib/css.cpp =================================================================== --- trunk/Src/editlib/css.cpp 2013-03-27 18:41:57 UTC (rev 7615) +++ trunk/Src/editlib/css.cpp 2013-03-28 20:41:42 UTC (rev 7616) @@ -180,25 +180,25 @@ NULL }; -static BOOL +static bool IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength) { for (int L = 0; apszKeywords[L] != NULL; L++) { if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0 && apszKeywords[L][nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsCss1Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszCss1KeywordList, pszChars, nLength); } -static BOOL +static bool IsCss2Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszCss2KeywordList, pszChars, nLength); @@ -231,10 +231,10 @@ return dwCookie & (COOKIE_EXT_COMMENT|COOKIE_EXT_DEFINITION|COOKIE_EXT_VALUE); LPCTSTR pszChars = GetLineChars (nLineIndex); - BOOL bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_DEFINITION|COOKIE_EXT_VALUE)) == 0; - BOOL bRedefineBlock = TRUE; - BOOL bWasCommentStart = FALSE; - BOOL bDecIndex = FALSE; + bool bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_DEFINITION|COOKIE_EXT_VALUE)) == 0; + bool bRedefineBlock = true; + bool bWasCommentStart = false; + bool bDecIndex = false; int nIdentBegin = -1; int nPrevI = -1; int I=0; @@ -272,13 +272,13 @@ else { DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR); - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; goto out; } } - bRedefineBlock = FALSE; - bDecIndex = FALSE; + bRedefineBlock = false; + bDecIndex = false; } out: @@ -311,9 +311,9 @@ if ((I > 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*' && !bWasCommentStart) || (I == 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*')) { dwCookie &= ~COOKIE_EXT_COMMENT; - bRedefineBlock = TRUE; + bRedefineBlock = true; } - bWasCommentStart = FALSE; + bWasCommentStart = false; continue; } @@ -326,16 +326,16 @@ { DEFINE_BLOCK (nPrevI, COLORINDEX_COMMENT); dwCookie |= COOKIE_EXT_COMMENT; - bWasCommentStart = TRUE; + bWasCommentStart = true; continue; } - bWasCommentStart = FALSE; + bWasCommentStart = false; if (bFirstChar) { if (!xisspace (pszChars[I])) - bFirstChar = FALSE; + bFirstChar = false; } if (pBuf == NULL) @@ -366,8 +366,8 @@ goto next; } } - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; nIdentBegin = -1; next: ; Modified: trunk/Src/editlib/dcl.cpp =================================================================== --- trunk/Src/editlib/dcl.cpp 2013-03-27 18:41:57 UTC (rev 7615) +++ trunk/Src/editlib/dcl.cpp 2013-03-28 20:41:42 UTC (rev 7616) @@ -110,37 +110,37 @@ NULL }; -static BOOL +static bool IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength) { for (int L = 0; apszKeywords[L] != NULL; L++) { if (_tcsncmp (apszKeywords[L], pszChars, nLength) == 0 && apszKeywords[L][nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsDclKeyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszDclKeywordList, pszChars, nLength); } -static BOOL +static bool IsUser1Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszUser1KeywordList, pszChars, nLength); } -static BOOL +static bool IsUser2Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszUser2KeywordList, pszChars, nLength); } -static BOOL +static bool IsDclNumber (LPCTSTR pszChars, int nLength) { if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x') @@ -150,20 +150,20 @@ if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') || (pszChars[I] >= 'a' && pszChars[I] <= 'f')) continue; - return FALSE; + return false; } - return TRUE; + return true; } if (!_istdigit (pszChars[0])) - return FALSE; + return false; for (int I = 1; I < nLength; I++) { if (!_istdigit (pszChars[I]) && pszChars[I] != '+' && pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' && pszChars[I] != 'E') - return FALSE; + return false; } - return TRUE; + return true; } #define DEFINE_BLOCK(pos, colorindex) \ @@ -191,10 +191,10 @@ return dwCookie & COOKIE_EXT_COMMENT; LPCTSTR pszChars = GetLineChars (nLineIndex); - BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; - BOOL bRedefineBlock = TRUE; - BOOL bWasCommentStart = FALSE; - BOOL bDecIndex = FALSE; + bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; + bool bRedefineBlock = true; + bool bWasCommentStart = false; + bool bDecIndex = false; int nIdentBegin = -1; int nPrevI = -1; int I=0; @@ -229,13 +229,13 @@ else { DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR); - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; goto out; } } - bRedefineBlock = FALSE; - bDecIndex = FALSE; + bRedefineBlock = false; + bDecIndex = false; } out: @@ -257,7 +257,7 @@ if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_STRING; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -268,7 +268,7 @@ if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_CHAR; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -280,9 +280,9 @@ if ((I > 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*' /*&& *::CharPrev(pszChars, pszChars + nPrevI) != '/'*/ && !bWasCommentStart) || (I == 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*')) { dwCookie &= ~COOKIE_EXT_COMMENT; - bRedefineBlock = TRUE; + bRedefineBlock = true; } - bWasCommentStart = FALSE; + bWasCommentStart = false; continue; } @@ -314,16 +314,16 @@ { DEFINE_BLOCK (nPrevI, COLORINDEX_COMMENT); dwCookie |= COOKIE_EXT_COMMENT; - bWasCommentStart = TRUE; + bWasCommentStart = true; continue; } - bWasCommentStart = FALSE; + bWasCommentStart = false; if (bFirstChar) { if (!xisspace (pszChars[I])) - bFirstChar = FALSE; + bFirstChar = false; } if (pBuf == NULL) @@ -357,7 +357,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -365,7 +365,7 @@ { if (pszChars[j] == '{' || pszChars[j] == ':') { - bFunction = TRUE; + bFunction = true; } break; } @@ -378,7 +378,7 @@ { if (pszChars[j] == ':') { - bFunction = TRUE; + bFunction = true; } break; } @@ -389,8 +389,8 @@ DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME); } } - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; nIdentBegin = -1; } } @@ -416,7 +416,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -424,7 +424,7 @@ { if (pszChars[j] == '{' || pszChars[j] == ':') { - bFunction = TRUE; + bFunction = true; } break; } @@ -437,7 +437,7 @@ { if (pszChars[j] == ':') { - bFunction = TRUE; + bFunction = true; } break; } Modified: trunk/Src/editlib/fortran.cpp =================================================================== --- trunk/Src/editlib/fortran.cpp 2013-03-27 18:41:57 UTC (rev 7615) +++ trunk/Src/editlib/fortran.cpp 2013-03-28 20:41:42 UTC (rev 7616) @@ -237,25 +237,25 @@ NULL }; -static BOOL +static bool IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength) { for (int L = 0; apszKeywords[L] != NULL; L++) { if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0 && apszKeywords[L][nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsFortranKeyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszFortranKeywordList, pszChars, nLength); } -static BOOL +static bool IsFortranNumber (LPCTSTR pszChars, int nLength) { if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x') @@ -265,20 +265,20 @@ if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') || (pszChars[I] >= 'a' && pszChars[I] <= 'f')) continue; - return FALSE; + return false; } - return TRUE; + return true; } if (!_istdigit (pszChars[0])) - return FALSE; + return false; for (int I = 1; I < nLength; I++) { if (!_istdigit (pszChars[I]) && pszChars[I] != '+' && pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' && pszChars[I] != 'E') - return FALSE; + return false; } - return TRUE; + return true; } #define DEFINE_BLOCK(pos, colorindex) \ @@ -306,9 +306,9 @@ return dwCookie & COOKIE_EXT_COMMENT; LPCTSTR pszChars = GetLineChars (nLineIndex); - BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; - BOOL bRedefineBlock = TRUE; - BOOL bDecIndex = FALSE; + bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; + bool bRedefineBlock = true; + bool bDecIndex = false; int nIdentBegin = -1; int nPrevI = -1; int I=0; @@ -343,13 +343,13 @@ else { DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR); - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; goto out; } } - bRedefineBlock = FALSE; - bDecIndex = FALSE; + bRedefineBlock = false; + bDecIndex = false; } out: @@ -371,7 +371,7 @@ if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_STRING; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -382,7 +382,7 @@ if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_CHAR; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -415,7 +415,7 @@ if (bFirstChar) { if (!xisspace (pszChars[I])) - bFirstChar = FALSE; + bFirstChar = false; } if (pBuf == NULL) @@ -439,8 +439,8 @@ { DEFINE_BLOCK (nIdentBegin, COLORINDEX_NUMBER); } - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; nIdentBegin = -1; } } Modified: trunk/Src/editlib/html.cpp =================================================================== --- trunk/Src/editlib/html.cpp 2013-03-27 18:41:57 UTC (rev 7615) +++ trunk/Src/editlib/html.cpp 2013-03-28 20:41:42 UTC (rev 7616) @@ -369,37 +369,37 @@ NULL }; -static BOOL +static bool IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength) { for (int L = 0; apszKeywords[L] != NULL; L++) { if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0 && apszKeywords[L][nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsHtmlKeyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszHtmlKeywordList, pszChars, nLength); } -static BOOL +static bool IsUser1Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszUser1KeywordList, pszChars, nLength); } -static BOOL +static bool IsUser2Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszUser2KeywordList, pszChars, nLength); } -static BOOL +static bool IsHtmlNumber (LPCTSTR pszChars, int nLength) { if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x') @@ -409,20 +409,20 @@ if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') || (pszChars[I] >= 'a' && pszChars[I] <= 'f')) continue; - return FALSE; + return false; } - return TRUE; + return true; } if (!_istdigit (pszChars[0])) - return FALSE; + return false; for (int I = 1; I < nLength; I++) { if (!_istdigit (pszChars[I]) && pszChars[I] != '+' && pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' && pszChars[I] != 'E') - return FALSE; + return false; } - return TRUE; + return true; } #define DEFINE_BLOCK(pos, colorindex) \ @@ -452,9 +452,9 @@ return dwCookie & (COOKIE_EXT_COMMENT|COOKIE_EXT_USER1); LPCTSTR pszChars = GetLineChars (nLineIndex); - BOOL bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_USER1)) == 0; - BOOL bRedefineBlock = TRUE; - BOOL bDecIndex = FALSE; + bool bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_USER1)) == 0; + bool bRedefineBlock = true; + bool bDecIndex = false; int nIdentBegin = -1; int nPrevI = -1; int I=0; @@ -497,13 +497,13 @@ else { DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR); - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; goto out; } } - bRedefineBlock = FALSE; - bDecIndex = FALSE; + bRedefineBlock = false; + bDecIndex = false; } out: @@ -525,7 +525,7 @@ if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_STRING; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -536,7 +536,7 @@ if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_CHAR; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -547,7 +547,7 @@ if (I > 1 && pszChars[I] == '>' && pszChars[nPrevI] == '-' && *::CharPrev(pszChars, pszChars + nPrevI) == '-') { dwCookie &= ~COOKIE_EXT_COMMENT; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -558,7 +558,7 @@ if (I > 0 && pszChars[I] == '>' && (pszChars[nPrevI] == '?' || pszChars[nPrevI] == '%')) { dwCookie &= ~COOKIE_EXT_USER1; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -594,7 +594,7 @@ if (bFirstChar) { if (!xisspace (pszChars[I])) - bFirstChar = FALSE; + bFirstChar = false; } if (pBuf == NULL) @@ -640,8 +640,8 @@ goto next; } } - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; nIdentBegin = -1; next: ; @@ -673,8 +673,8 @@ { dwCookie &= ~COOKIE_EXT_USER1; nIdentBegin = -1; - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; continue; } } @@ -686,8 +686,8 @@ { dwCookie &= ~COOKIE_PREPROCESSOR; nIdentBegin = -1; - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; continue; } } @@ -733,7 +733,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -741,7 +741,7 @@ { if (pszChars[j] == '(') { - bFunction = TRUE; + bFunction = true; } break; } Modified: trunk/Src/editlib/ini.cpp =================================================================== --- trunk/Src/editlib/ini.cpp 2013-03-27 18:41:57 UTC (rev 7615) +++ trunk/Src/editlib/ini.cpp 2013-03-28 20:41:42 UTC (rev 7616) @@ -27,7 +27,7 @@ static char THIS_FILE[] = __FILE__; #endif -static BOOL +static bool IsIniNumber (LPCTSTR pszChars, int nLength) { if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x') @@ -37,20 +37,20 @@ if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') || (pszChars[I] >= 'a' && pszChars[I] <= 'f')) continue; - return FALSE; + return false; } - return TRUE; + return true; } if (!_istdigit (pszChars[0])) - return FALSE; + return false; for (int I = 1; I < nLength; I++) { if (!_istdigit (pszChars[I]) && pszChars[I] != '+' && pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' && pszChars[I] != 'E') - return FALSE; + return false; } - return TRUE; + return true; } #define DEFINE_BLOCK(pos, colorindex) \ @@ -80,9 +80,9 @@ return dwCookie & COOKIE_EXT_COMMENT; LPCTSTR pszChars = GetLineChars (nLineIndex); - BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; - BOOL bRedefineBlock = TRUE; - BOOL bDecIndex = FALSE; + bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; + bool bRedefineBlock = true; + bool bDecIndex = false; int nIdentBegin = -1; int nPrevI = -1; int I=0; @@ -125,13 +125,13 @@ else { DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR); - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; goto out; } } - bRedefineBlock = FALSE; - bDecIndex = FALSE; + bRedefineBlock = false; + bDecIndex = false; } out: @@ -153,7 +153,7 @@ if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_STRING; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -164,7 +164,7 @@ if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_CHAR; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -175,7 +175,7 @@ if (pszChars[I] == ']') { dwCookie &= ~COOKIE_SECTION; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -186,7 +186,7 @@ if (I + 1 < nLength && pszChars[I + 1] == '=') { dwCookie &= ~COOKIE_KEY; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -229,7 +229,7 @@ dwCookie |= COOKIE_KEY; } if (!xisspace (pszChars[I])) - bFirstChar = FALSE; + bFirstChar = false; } if (pBuf == NULL) @@ -249,8 +249,8 @@ { DEFINE_BLOCK (nIdentBegin, COLORINDEX_NUMBER); } - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; nIdentBegin = -1; } } Modified: trunk/Src/editlib/innosetup.cpp =================================================================== --- trunk/Src/editlib/innosetup.cpp 2013-03-27 18:41:57 UTC (rev 7615) +++ trunk/Src/editlib/innosetup.cpp 2013-03-28 20:41:42 UTC (rev 7616) @@ -318,31 +318,31 @@ NULL }; -static BOOL +static bool IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength) { for (int L = 0; apszKeywords[L] != NULL; L++) { if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0 && apszKeywords[L][nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsInnoSetupKeyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszInnoSetupKeywordList, pszChars, nLength); } -static BOOL +static bool IsUser1Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszUser1KeywordList, pszChars, nLength); } -static BOOL +static bool IsInnoSetupNumber (LPCTSTR pszChars, int nLength) { if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x') @@ -352,20 +352,20 @@ if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') || (pszChars[I] >= 'a' && pszChars[I] <= 'f')) continue; - return FALSE; + return false; } - return TRUE; + return true; } if (!_istdigit (pszChars[0])) - return FALSE; + return false; for (int I = 1; I < nLength; I++) { if (!_istdigit (pszChars[I]) && pszChars[I] != '+' && pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' && pszChars[I] != 'E') - return FALSE; + return false; } - return TRUE; + return true; } #define DEFINE_BLOCK(pos, colorindex) \ @@ -395,9 +395,9 @@ return dwCookie & (COOKIE_EXT_COMMENT | COOKIE_EXT_COMMENT2); LPCTSTR pszChars = GetLineChars (nLineIndex); - BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; - BOOL bRedefineBlock = TRUE; - BOOL bDecIndex = FALSE; + bool bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0; + bool bRedefineBlock = true; + bool bDecIndex = false; int nIdentBegin = -1; int nPrevI = -1; int I=0; @@ -440,13 +440,13 @@ else { DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR); - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; goto out; } } - bRedefineBlock = FALSE; - bDecIndex = FALSE; + bRedefineBlock = false; + bDecIndex = false; } out: @@ -468,7 +468,7 @@ if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_STRING; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -479,7 +479,7 @@ if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\'))) { dwCookie &= ~COOKIE_CHAR; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -491,7 +491,7 @@ if ((I > 1 && pszChars[I] == ')' && pszChars[nPrevI] == '*' && *::CharPrev(pszChars, pszChars + nPrevI) != '(') || (I == 1 && pszChars[I] == ')' && pszChars[nPrevI] == '*')) { dwCookie &= ~COOKIE_EXT_COMMENT; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -502,7 +502,7 @@ if (pszChars[I] == '}') { dwCookie &= ~COOKIE_EXT_COMMENT2; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -520,7 +520,7 @@ if (pszChars[I] == ']') { dwCookie &= ~COOKIE_SECTION; - bRedefineBlock = TRUE; + bRedefineBlock = true; } continue; } @@ -577,7 +577,7 @@ continue; } if (!xisspace (pszChars[I])) - bFirstChar = FALSE; + bFirstChar = false; } if (pBuf == NULL) @@ -607,7 +607,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -615,7 +615,7 @@ { if (pszChars[j] == '(') { - bFunction = TRUE; + bFunction = true; } break; } @@ -625,8 +625,8 @@ DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME); } } - bRedefineBlock = TRUE; - bDecIndex = TRUE; + bRedefineBlock = true; + bDecIndex = true; nIdentBegin = -1; } } @@ -648,7 +648,7 @@ } else { - bool bFunction = FALSE; + bool bFunction = false; for (int j = I; j < nLength; j++) { @@ -656,7 +656,7 @@ { if (pszChars[j] == '(') { - bFunction = TRUE; + bFunction = true; } break; } Modified: trunk/Src/editlib/is.cpp =================================================================== --- trunk/Src/editlib/is.cpp 2013-03-27 18:41:57 UTC (rev 7615) +++ trunk/Src/editlib/is.cpp 2013-03-28 20:41:42 UTC (rev 7616) @@ -417,37 +417,37 @@ _T ("XCopyFile"), */ -static BOOL +static bool IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength) { for (int L = 0; apszKeywords[L] != NULL; L++) { if (_tcsncmp (apszKeywords[L], pszChars, nLength) == 0 && apszKeywords[L][nLength] == 0) - return TRUE; + return true; } - return FALSE; + return false; } -static BOOL +static bool IsISKeyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszISKeywordList, pszChars, nLength); } -static BOOL +static bool IsUser1Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszUser1KeywordList, pszChars, nLength); } -static BOOL +static bool IsUser2Keyword (LPCTSTR pszChars, int nLength) { return IsXKeyword (s_apszUser2KeywordList, pszChars, nLength); } -static BOOL +static bool IsISNumber (LPCTSTR pszChars, int nLength) { if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x') @@ -457,20 +457,20 @@ if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') || (pszChars[I] >= 'a' && pszChars[I] <= 'f')) continue; - return FALSE; + return false; } - return TRUE; + return true; } if (!_istdigit (pszChars[0])) - retur... [truncated message content] |