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

[<ge...@us...>]

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]