2008-08-20 11:50 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

* tests/onidle.prg * tests/codebloc.prg * tests/keywords.prg * tests/wvtext.prg * tests/test_all.prg * tests/ainstest.prg * doc/es/compiler.txt * doc/es/file.txt * contrib/hbct/numconv.prg * contrib/hbct/tests/expomant.prg * contrib/hbwhat32/whatutil.prg * contrib/hbwhat32/winrbar.prg * contrib/hbwhat32/wintabs.prg * contrib/hbwhat32/wincomm.prg * contrib/hbwhat32/wincdlg.prg * contrib/hbwhat32/wintbar.prg * contrib/hbwhat32/_wininet.c * contrib/hbwhat32/wincore.prg * contrib/hbw32/w32_ole.c * contrib/hbapollo/tests/apollo.prg * contrib/hbnf/dispmsg.prg * contrib/hbnf/fttext.c * contrib/hbnf/mouse1.prg * contrib/hbnf/menu1.prg * contrib/hbnf/sleep.prg * contrib/hbnf/xbox.prg * contrib/hbnf/popadder.prg * contrib/hbnf/mouse2.prg * contrib/hbnf/pchr.prg * contrib/hbhpdf/tests/harupdf.prg * contrib/gtwvg/wvgclass.prg * contrib/gtwvg/tests/demowvg.prg * contrib/gtwvg/wvgpaint.prg * contrib/rddads/tests/testmg.prg * contrib/hbclipsm/tests/testgaug.prg * contrib/hbfimage/tests/fitest.prg * contrib/hbmisc/twirler.prg * contrib/hbtip/httpcln.prg * contrib/hbtip/ftpcln.prg * contrib/hbvpdf/hbvpdft.prg * utils/hbmake/hbmake.prg * Some more general code cleanups. * iif(), quote char, #include, filename-casing, = usage cleanups, hardcoded absolute paths, non-ASCII drawing chars in source. Using mixed-case filenames to #include .ch files breaks on non-WinDOS platforms.
2008-08-20 09:56:47 +00:00
parent 824a7170e6
commit 35ad1b2ae4
42 changed files with 1444 additions and 1397 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,54 @@
   2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */

+2008-08-20 11:50 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * tests/onidle.prg
+   * tests/codebloc.prg
+   * tests/keywords.prg
+   * tests/wvtext.prg
+   * tests/test_all.prg
+   * tests/ainstest.prg
+   * doc/es/compiler.txt
+   * doc/es/file.txt
+   * contrib/hbct/numconv.prg
+   * contrib/hbct/tests/expomant.prg
+   * contrib/hbwhat32/whatutil.prg
+   * contrib/hbwhat32/winrbar.prg
+   * contrib/hbwhat32/wintabs.prg
+   * contrib/hbwhat32/wincomm.prg
+   * contrib/hbwhat32/wincdlg.prg
+   * contrib/hbwhat32/wintbar.prg
+   * contrib/hbwhat32/_wininet.c
+   * contrib/hbwhat32/wincore.prg
+   * contrib/hbw32/w32_ole.c
+   * contrib/hbapollo/tests/apollo.prg
+   * contrib/hbnf/dispmsg.prg
+   * contrib/hbnf/fttext.c
+   * contrib/hbnf/mouse1.prg
+   * contrib/hbnf/menu1.prg
+   * contrib/hbnf/sleep.prg
+   * contrib/hbnf/xbox.prg
+   * contrib/hbnf/popadder.prg
+   * contrib/hbnf/mouse2.prg
+   * contrib/hbnf/pchr.prg
+   * contrib/hbhpdf/tests/harupdf.prg
+   * contrib/gtwvg/wvgclass.prg
+   * contrib/gtwvg/tests/demowvg.prg
+   * contrib/gtwvg/wvgpaint.prg
+   * contrib/rddads/tests/testmg.prg
+   * contrib/hbclipsm/tests/testgaug.prg
+   * contrib/hbfimage/tests/fitest.prg
+   * contrib/hbmisc/twirler.prg
+   * contrib/hbtip/httpcln.prg
+   * contrib/hbtip/ftpcln.prg
+   * contrib/hbvpdf/hbvpdft.prg
+   * utils/hbmake/hbmake.prg
+     * Some more general code cleanups.
+     * iif(), quote char, #include, filename-casing, = usage cleanups, 
+       hardcoded absolute paths, non-ASCII drawing chars in source.
+       Using mixed-case filenames to #include .ch files breaks on 
+       non-WinDOS platforms.
+
 2008-08-20 10:22 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbdoc/hbdoc.prg
   * utils/hbdoc/gentrf.prg
--- a/harbour/contrib/gtwvg/tests/demowvg.prg
+++ b/harbour/contrib/gtwvg/tests/demowvg.prg
--- a/harbour/contrib/gtwvg/wvgclass.prg
+++ b/harbour/contrib/gtwvg/wvgclass.prg
@@ -66,13 +66,13 @@
 //-------------------------------------------------------------------//
 //-------------------------------------------------------------------//

-#include                 'hbclass.ch'
-#include                   'inkey.ch'
-#include                  'common.ch'
-#include                 'setcurs.ch'
+#include                 "hbclass.ch"
+#include                   "inkey.ch"
+#include                  "common.ch"
+#include                 "setcurs.ch"

-#include                  'wvtwin.ch'
-//#include                     'xhb.ch'
+#include                  "wvtwin.ch"
+//#include                     "xhb.ch"

 //-------------------------------------------------------------------//

--- a/harbour/contrib/gtwvg/wvgpaint.prg
+++ b/harbour/contrib/gtwvg/wvgpaint.prg
@@ -59,8 +59,8 @@
 //-------------------------------------------------------------------//
 //-------------------------------------------------------------------//

-#include 'wvtwin.ch'
-#include 'common.ch'
+#include "wvtwin.ch"
+#include "common.ch"

 //-------------------------------------------------------------------//

--- a/harbour/contrib/hbapollo/tests/apollo.prg
+++ b/harbour/contrib/hbapollo/tests/apollo.prg
@@ -50,18 +50,19 @@
 *
 */

-#include "Apollo.ch"
+#include "apollo.ch"


-Function Main()
-LOCAL nAlias,f
+FUNCTION Main()
+LOCAL nAlias
+LOCAL f

   SET DATE FRENCH
   SET CENTURY ON

   sx_SetMemoBlockSize( 32 )
   sx_SetDateFormat( SX_FRENCH )
-   sx_SetCentury( .t. )
+   sx_SetCentury( .T. )

   ? "Apollo version " + sx_Version()

@@ -74,11 +75,11 @@ LOCAL nAlias,f

   ? ""
   ? "Creating a new database file.."
-   nAlias:=sx_CreateNew("test.dbf",;  // full path filename
-                        "test1",;     // Alias
-                        SX_SDENSX,;   // rdeType
-                        6)            // Maximum fields added by sx_CreateField
-   IF nAlias=0
+   nAlias := sx_CreateNew("test.dbf",;  // full path filename
+                          "test1",;     // Alias
+                          SX_SDENSX,;   // rdeType
+                          6)            // Maximum fields added by sx_CreateField
+   IF nAlias == 0
      ? "Error creating database"
      RETU NIL
   ENDIF
@@ -94,21 +95,21 @@ LOCAL nAlias,f
   sx_Close()
   ?? "OK!"

-   nAlias:=sx_Use("test.dbf","test2",SX_EXCLUSIVE,SX_SDENSX)
+   nAlias := sx_Use("test.dbf","test2",SX_EXCLUSIVE,SX_SDENSX)
   sx_Zap()
-   IF Valtype(nAlias)="N" .AND. nAlias # 0
+   IF Valtype(nAlias) == "N" .AND. nAlias != 0
      ? "OK opening 'test.dbf'"


      ? "Adding 1000 records..."
-      FOR f=1 to 1000
+      FOR f := 1 to 1000
         sx_AppendBlank()
         sx_Replace("FIRST"    , SX_R_CHAR   , "Patrick " + Str( f ) )
         sx_Replace("LAST"     , SX_R_CHAR   , LTrim( Str( f ) ) + " Mast" )
         sx_Replace("NOTES"    , SX_R_MEMO   , "This is record " + LTrim( Str( f ) ) )
         sx_Replace("AGE"      , SX_R_DOUBLE , f )
         sx_Replace("BIRTDATE" , SX_R_DATESTR, DtoC( Date() ) )
-        *sx_Replace("MARRIED"  , SX_R_LOGICAL, If(f%5=2,1,0) ) /* Logical does not work yet.. */
+      // sx_Replace("MARRIED"  , SX_R_LOGICAL, If(f%5==2,1,0) ) /* Logical does not work yet.. */
         sx_Commit()
      NEXT

@@ -131,7 +132,7 @@ LOCAL nAlias,f

      ? ""
      sx_GoTop()
-      sx_SetSoftSeek( .f. ) // SetSoftSeek OFF
+      sx_SetSoftSeek( .F. ) // SetSoftSeek OFF
      IF sx_Seek( "928 Mast" )
         ? "String '928 Mast' found in record number "+ LTrim( Str( sx_RecNo() ) )
      ELSE
@@ -154,4 +155,4 @@ LOCAL nAlias,f
      ? "ERROR Opening 'test.dbf'"
   ENDIF

-return
+return
--- a/harbour/contrib/hbclipsm/tests/testgaug.prg
+++ b/harbour/contrib/hbclipsm/tests/testgaug.prg
@@ -4,8 +4,8 @@

 /* Testing Harbour's Gauge */

-#include "Inkey.ch"
-#include "SetCurs.ch"
+#include "inkey.ch"
+#include "setcurs.ch"

 function Test()

--- a/harbour/contrib/hbct/numconv.prg
+++ b/harbour/contrib/hbct/numconv.prg
@@ -148,7 +148,7 @@ IF ISCHARACTER(xNum) .and. nBase >= 2 .and. nBase <= 36

   xNum := UPPER( ALLTRIM( xNum) )

-   FOR i=1 TO LEN( xNum )
+   FOR i := 1 TO LEN( xNum )
      nPos := AT( SUBSTR( xNum, i, 1 ), WORLD )
      IF nPos == 0 .or. nPos > nBase
         EXIT
--- a/harbour/contrib/hbct/tests/expomant.prg
+++ b/harbour/contrib/hbct/tests/expomant.prg
@@ -61,7 +61,7 @@ local n

 SET DECIMALS TO 15

- for n=1 to 1000
+ for n := 1 to 1000
   outstd (str(n,20,15)+": "+str(mantissa(n),20,15)+" "+str(exponent(n),4) + hb_osnewline())
   outstd (str(sqrt(n),20,15)+": "+str(mantissa(sqrt(n)),20,15)+" "+str(exponent(sqrt(n)),4) + hb_osnewline())
 next n
--- a/harbour/contrib/hbfimage/tests/fitest.prg
+++ b/harbour/contrib/hbfimage/tests/fitest.prg
@@ -8,7 +8,7 @@
 * FreeImage API test file
 */

-#include "FreeImage.ch"
+#include "freeimage.ch"

 #include "common.ch"
 #include "fileio.ch"
--- a/harbour/contrib/hbhpdf/tests/harupdf.prg
+++ b/harbour/contrib/hbhpdf/tests/harupdf.prg
@@ -59,23 +59,23 @@
 //----------------------------------------------------------------------//
 //----------------------------------------------------------------------//

-#include 'harupdf.ch'
+#include "harupdf.ch"
 #ifdef __oHARBOUR__
-#include 'xhb.ch'
+#include "xhb.ch"
 #endif
 //----------------------------------------------------------------------//

 Function Main( cFileToSave )

   if empty( cFileToSave )
-      cFileToSave := 'myharu.pdf'
+      cFileToSave := "myharu.pdf"
   endif

   if DesignHaruPDF( cFileToSave )
-      Alert( 'PDF File <'+cFileToSave+'> is Created!' )
+      Alert( "PDF File <"+cFileToSave+"> is Created!" )

   else
-      Alert( 'Some problems in creating the PDF!' )
+      Alert( "Some problems in creating the PDF!" )

   endif

@@ -85,7 +85,7 @@ Function Main( cFileToSave )

 Function DesignHaruPDF( cFileToSave )
   Local i, page, height, width, def_font, tw,  samp_text, font
-   Local page_title := 'Vouch'
+   Local page_title := "Vouch"
   Local font_list  := { ;
                        "Courier",                  ;
                        "Courier-Bold",             ;
@@ -106,7 +106,7 @@ Function DesignHaruPDF( cFileToSave )
   Local pdf := HPDF_New()

   if pdf == NIL
-      alert( ' Pdf could not been created!' )
+      alert( " Pdf could not been created!" )
      return nil
   endif

@@ -116,7 +116,7 @@ Function DesignHaruPDF( cFileToSave )
   /*
   // Passwords and Permissions
   //
-   HPDF_SetPassword(pdf, 'owner','user' )
+   HPDF_SetPassword(pdf, "owner","user" )
   HPDF_SetPermission(pdf, HPDF_ENABLE_READ)  // cannot print
   HPDF_SetEncryptionMode(pdf, HPDF_ENCRYPT_R3, 16)
   */
@@ -672,7 +672,7 @@ Static Function PrintText( page)
   static no := 0
   no++

-   buf := ltrim( str( no ) )+ ' '+ltrim(str(pos[1]))+' '+ltrim(str(pos[2]))
+   buf := ltrim( str( no ) )+ " "+ltrim(str(pos[1]))+" "+ltrim(str(pos[2]))

   HPDF_Page_ShowText(page, buf)
   Return nil
--- a/harbour/contrib/hbmisc/twirler.prg
+++ b/harbour/contrib/hbmisc/twirler.prg
@@ -8,7 +8,7 @@
   Donated to the public domain on 2001-03-15 by David G. Holm <dholm@jsd-llc.com>
 */

-#include <hbclass.ch>
+#include "hbclass.ch"

 class Twirler
   var n_Row
--- a/harbour/contrib/hbnf/dispmsg.prg
+++ b/harbour/contrib/hbnf/dispmsg.prg
@@ -156,8 +156,8 @@ PROCEDURE Main( cCmdLine )
   cErrE  := IIF( lColor, "N/W" , "N/W"  )

   cDosScrn := SAVESCREEN()
-   nDosRow=ROW()
-   nDosCol=COL()
+   nDosRow := ROW()
+   nDosCol := COL()
   SETCOLOR( "W/N" )
   CLS
   nMaxRow := MAXROW()
--- a/harbour/contrib/hbnf/fttext.c
+++ b/harbour/contrib/hbnf/fttext.c
@@ -208,7 +208,7 @@ static int  isEof[   TEXT_WORKAREAS];
 static int  error[   TEXT_WORKAREAS];

 /* for debugging purposes */
-static int doInt=0;
+static int doInt = 0;

 HB_FUNC_EXTERN( FT_GOBOT );

--- a/harbour/contrib/hbnf/menu1.prg
+++ b/harbour/contrib/hbnf/menu1.prg
@@ -258,8 +258,8 @@ STATIC NHPOS, NVPOS, NMAXROW, NMAXCOL
   cErrE  := IF( lColor, "N/W" , "N/W"  )

   SAVE SCREEN TO sDosScrn
-   nDosRow=ROW()
-   nDosCol=COL()
+   nDosRow := ROW()
+   nDosCol := COL()
   SETCOLOR( "w/n" )
   CLS
   NOSNOW( ( "NOSNOW" $ UPPER( cCmdLine ) ) )
--- a/harbour/contrib/hbnf/mouse1.prg
+++ b/harbour/contrib/hbnf/mouse1.prg
@@ -20,16 +20,16 @@ static s_lMinit:=.F.
     local nHoriz, nVert, nDouble
     local nTime

-     IF nRow=NIL
-        nRow=MAXROW()+1
+     IF nRow == NIL
+        nRow := MAXROW()+1
     ELSE
-        nRow=VAL(nRow)
+        nRow := VAL(nRow)
     ENDIF

-     IF nCol=NIL
-        nCol=MAXCOL()+1
+     IF nCol == NIL
+        nCol := MAXCOL()+1
     ELSE
-        nCol=VAL(nCol)
+        nCol := VAL(nCol)
     ENDIF

     if  !FT_MINIT() 
@@ -97,14 +97,14 @@ static s_lMinit:=.F.
 * to a "normal" CLIPPER program so some of these examples are a bit out of
 * the ordinary.

-        DO WHILE nX=0.AND.nY=0
+        DO WHILE nX == 0 .AND. nY == 0
             FT_MMICKEYS( @nX, @nY )
        ENDDO
 * tell the mouse driver where updates will be taking place so it can hide
 * the cursor when necessary.

        FT_MCONOFF( 9, 23, 16, 53 )
-        nTime=-1
+        nTime := -1

        devpos( 9, 23 )
        devout( nX )
@@ -306,32 +306,32 @@ LOCAL nPrs           // number of presses which occurred

 * Initialize any empty arguments

-   if nClick=NIL
-      nClick=1
+   if nClick==NIL
+      nClick:=1
   endif

-   if nButton=NIL
-        nButton=0
+   if nButton==NIL
+        nButton:=0
   endif

-   if nRow=NIL
-       nRow=FT_MGETX()
+   if nRow==NIL
+       nRow:=FT_MGETX()
   endif

-   if nCol=NIL
-       nCol=FT_MGETY()
+   if nCol==NIL
+       nCol:=FT_MGETY()
   endif

-   if nInterval=NIL
-       nInterval=0.5
+   if nInterval==NIL
+       nInterval:=0.5
   endif

-   if nStart=NIL
-       nStart=seconds()
+   if nStart==NIL
+       nStart:=seconds()
   endif

-   nVert=nRow
-   nHorz=nCol
+   nVert:=nRow
+   nHorz:=nCol
   lDouble:=lDone:=nClick==0

   // Wait for first press if requested
@@ -339,24 +339,24 @@ LOCAL nPrs           // number of presses which occurred
   do while !lDone

           FT_MBUTPRS( nButton, @nPrs, @nVert, @nHorz )
-           nVert=INT(nVert/8)
-           nHorz=INT(nHorz/8)
+           nVert:=INT(nVert/8)
+           nHorz:=INT(nHorz/8)

-           lDouble=(nPrs>0)
-           ldone= seconds() - nStart >= nInterval .or. lDouble
+           lDouble:=(nPrs>0)
+           ldone:= seconds() - nStart >= nInterval .or. lDouble

   enddo

   // if we have not moved then keep the preliminary double click setting

-   lDouble=lDouble.and.(nVert=nRow.and.nHorz=nCol)
+   lDouble:=lDouble.and.(nVert==nRow.and.nHorz==nCol)

   // change start time if we waited for first click. nInterval is the
   // maximum time between clicks not the total time for two clicks if
   // requested.

   if nClick>0
-      nStart=seconds()
+      nStart:=seconds()
   endif

   // If we have fulfilled all of the requirements then wait for second click
@@ -368,17 +368,17 @@ LOCAL nPrs           // number of presses which occurred
      do while !lDone

           FT_MBUTPRS( nButton, @nPrs, @nVert, @nHorz )
-           nVert=INT(nVert/8)
-           nHorz=INT(nHorz/8)
+           nVert:=INT(nVert/8)
+           nHorz:=INT(nHorz/8)

-           lDouble=(nPrs>0)
-           lDone= seconds() - nStart >= nInterval .or. lDouble
+           lDouble:=(nPrs>0)
+           lDone:= seconds() - nStart >= nInterval .or. lDouble

      enddo

  // make sure we haven't moved

-      lDouble=lDouble.and.(nVert=nRow.and.nHorz=nCol)
+      lDouble:=lDouble.and.(nVert==nRow.and.nHorz==nCol)

   endif

@@ -532,16 +532,16 @@ FT_MGETSENS(@nCurHoriz, @nCurVert, @nCurDouble)

 // Set defaults if necessary

-IF VALTYPE(nHoriz)!="N"
-    nHoriz=nCurHoriz
+IF !( VALTYPE( nHoriz ) == "N" )
+    nHoriz := nCurHoriz
 ENDIF

-IF VALTYPE(nVert)!="N"
-    nVert=nCurVert
+IF !( VALTYPE( nVert ) == "N" )
+    nVert := nCurVert
 ENDIF

-IF VALTYPE(nDouble)!="N"
-    nDouble=nCurDouble
+IF !( VALTYPE( nDouble ) == "N" )
+    nDouble := nCurDouble
 ENDIF

 * Fill the registers
@@ -586,7 +586,7 @@ FUNCTION FT_MGETSENS(nHoriz, nVert, nDouble)
 /*
 * Fill the register

-aReg[AX]=27
+aReg[AX]:=27

 * Execute interupt

@@ -595,9 +595,9 @@ FT_INT86( 51, aReg )        // execute mouse interrupt
 */                           
 // Set the return values

-nHoriz = _mget_horispeed()
-nVert  = _mget_verspeed()
-nDouble= _mget_doublespeed()
+nHoriz := _mget_horispeed()
+nVert  := _mget_verspeed()
+nDouble:= _mget_doublespeed()

 RETURN NIL

@@ -636,7 +636,7 @@ RETURN NIL
 *    my screen showed 6.24 but this routine returned 30 for the minor version
 *    number!
 * $EXAMPLES$
- *    nMajor=FT_MVERSION( @nMinor )
+ *    nMajor:=FT_MVERSION( @nMinor )
 *    IF (nMajor+nMinor/100)<7.2
 *         ? "Sorry mouse driver version too old"
 *         RETURN
@@ -650,7 +650,7 @@ FUNCTION FT_MVERSION(nMinor, nType, nIRQ)
 Local aReturn:={}
 // Set up register
 /*
-aReg[AX] = 36
+aReg[AX] := 36

 // Call interupt

@@ -659,9 +659,9 @@ FT_INT86( 51, aReg)
 // decode out of half registers
 areturn:=_mget_mversion()

-nMinor=areturn[1]
-nType=areturn[2]
-nIRQ=areturn[3]
+nMinor := areturn[1]
+nType  := areturn[2]
+nIRQ   := areturn[3]

 // Return

@@ -697,8 +697,8 @@ FUNCTION FT_MSETPAGE(nPage)

 // Set up register
 /*
-aReg[AX] = 29
-aReg[BX]=nPage
+aReg[AX] := 29
+aReg[BX] := nPage

 // Call interupt

@@ -737,7 +737,7 @@ FUNCTION FT_MGETPAGE()

 // Set up register
 /*
-aReg[AX] = 30
+aReg[AX] := 30

 // Call interupt

@@ -803,7 +803,7 @@ LOCAL lStatus
   aReg[AX] := 0          // set mouse function call 0
   FT_INT86( 51, aReg )  // execute mouse interrupt
   */
-   s_lCrsState=.F.         // Cursor is off after reset
+   s_lCrsState:=.F.         // Cursor is off after reset
 lStatus:=_m_reset()
 * Reset maximum x and y limits

@@ -842,7 +842,7 @@ RETURN lStatus          // return status code
 FUNCTION FT_MCURSOR( lState )
   local lSavState := s_lCrsState

-   if VALTYPE(lState)="L"
+   if VALTYPE(lState)=="L"
      if ( s_lCrsState := lState )
         FT_MSHOWCRS()
      else
@@ -1181,9 +1181,9 @@ RETURN NIL                     // no function output

 FUNCTION FT_MXLIMIT( nXMin, nXMax )   // set vertical minimum and maximum coordinates
 /*
-   aReg[AX] = 7                        // set mouse function call 7
-   aReg[CX] = nXMin                    // load vertical minimum parameter
-   aReg[DX] = nXMax                    // load vertical maximum parameter
+   aReg[AX] := 7                        // set mouse function call 7
+   aReg[CX] := nXMin                    // load vertical minimum parameter
+   aReg[DX] := nXMax                    // load vertical maximum parameter
   FT_INT86( 51, aReg )               // execute mouse interrupt
   */
    _m_mxlimit(nXMin,nXMAX)
@@ -1216,9 +1216,9 @@ RETURN NIL

 FUNCTION FT_MYLIMIT( nYMin, nYMax )  // set horizontal minimum and maximum coordinates
 /*
-   aReg[AX] = 8                       // set mouse function call 8
-   aReg[CX] = nYMin                   // load horz minimum parameter
-   aReg[DX] = nYMax                   // load horz maximum parameter
+   aReg[AX] := 8                       // set mouse function call 8
+   aReg[CX] := nYMin                   // load horz minimum parameter
+   aReg[DX] := nYMax                   // load horz maximum parameter
   FT_INT86( 51, aReg )              // execute mouse interrupt
   */
  _m_mYlimit(nYMin,nYMAX)
@@ -1401,10 +1401,10 @@ RETURN iButton

 FUNCTION FT_MDEFCRS( nCurType, nScrMask, nCurMask )   // define text cursor type and masks
 /*
-   aReg[AX] = 10         // set mouse function call 10
-   aReg[BX] = nCurType   // load cursor type parameter
-   aReg[CX] = nScrMask   // load screen mask value
-   aReg[DX] = nCurMask   // load cursor mask value
+   aReg[AX] := 10         // set mouse function call 10
+   aReg[BX] := nCurType   // load cursor type parameter
+   aReg[CX] := nScrMask   // load screen mask value
+   aReg[DX] := nCurMask   // load cursor mask value
   FT_INT86( 51, aReg )  // execute mouse interrupt
   */
 _m_mdefcrs(nCurType, nScrMask, nCurMask ) 
--- a/harbour/contrib/hbnf/mouse2.prg
+++ b/harbour/contrib/hbnf/mouse2.prg
@@ -87,16 +87,16 @@ static lMinit:=.F.
     local nHoriz, nVert, nDouble
     local nTime

-     IF nRow=NIL
-         nRow=MAXROW()+1
+     IF nRow==NIL
+         nRow:=MAXROW()+1
     ELSE
-         nRow=VAL(nRow)
+         nRow:=VAL(nRow)
     ENDIF

-     IF nCol=NIL
-         nCol=MAXCOL()+1
+     IF nCol==NIL
+         nCol:=MAXCOL()+1
     ELSE
-         nCol=VAL(nCol)
+         nCol:=VAL(nCol)
     ENDIF

     IF .NOT.SETMODE(nRow,nCol)
@@ -170,14 +170,14 @@ static lMinit:=.F.
 * to a "normal" CLIPPER program so some of these examples are a bit out of
 * the ordinary.

-        DO WHILE nX=0.AND.nY=0
+        DO WHILE nX==0.AND.nY==0
             FT_MMICKEYS( @nX, @nY )
        ENDDO
 * tell the mouse driver where updates will be taking place so it can hide
 * the cursor when necessary.

        FT_MCONOFF( 9, 23, 16, 53 )
-        nTime=-1
+        nTime:=-1

        devpos( 9, 23 )
        devout( nX )
--- a/harbour/contrib/hbnf/pchr.prg
+++ b/harbour/contrib/hbnf/pchr.prg
@@ -119,7 +119,7 @@ Function FT_PCHR(c_nums)
  Local c_ret:='', c_st:=0,c_part,c_st2,c_hex:="0123456789ABCDEF"
  Local c_upper,c_t1,c_t2

-   If Substr(c_nums,1,1)=','.or.Trim(c_nums)==''
+   If Substr(c_nums,1,1)==','.or.Trim(c_nums)==''
      Return ""
   Endif

@@ -128,32 +128,32 @@ Function FT_PCHR(c_nums)

   Do While .not.(c_part=="~".or.c_part=="")

-      If Substr(c_part,1,1)=Chr(34)
+      If Substr(c_part,1,1)==Chr(34)

         c_st2:=At(Chr(34),Substr(c_part,2))+1
         c_ret:=c_ret+Substr(c_part,2,c_st2-2)

-      Elseif Substr(c_part,1,1)="&"
+      Elseif Substr(c_part,1,1)=="&"

-         c_upper=Upper(c_part)
-         c_t1=At(Substr(c_upper,2,1),c_hex)-1
+         c_upper:=Upper(c_part)
+         c_t1:=At(Substr(c_upper,2,1),c_hex)-1
         If c_t1>-1
-            c_t2=At(Substr(c_upper,3,1),c_hex)-1
+            c_t2:=At(Substr(c_upper,3,1),c_hex)-1
            If c_t2>-1
-               c_t1=c_t1*16+c_t2
+               c_t1:=c_t1*16+c_t2
            Endif
-            c_ret=c_ret+Chr(c_t1)
+            c_ret:=c_ret+Chr(c_t1)
         Endif

-      ElseIf (Val(c_part)>0.and.Val(c_part)<256).or.c_part="0"
+      ElseIf (Val(c_part)>0.and.Val(c_part)<256).or.c_part=="0"

-         c_ret=c_ret+Chr(Val(c_part))
+         c_ret:=c_ret+Chr(Val(c_part))

      Else

-         If Substr(c_part,1,1)="/"
+         If Substr(c_part,1,1)=="/"

-            c_upper=Upper(c_part)
+            c_upper:=Upper(c_part)

            Do Case
               Case c_upper = '/GRAPHIC'
--- a/harbour/contrib/hbnf/popadder.prg
+++ b/harbour/contrib/hbnf/popadder.prg
--- a/harbour/contrib/hbnf/sleep.prg
+++ b/harbour/contrib/hbnf/sleep.prg
@@ -74,8 +74,8 @@
 *     Example 1:
 *         FT_SLEEP(10.0)    && Sleep for 10.0 seconds
 *     Example 2:
- *         nTime=SECONDS()   && usually after some interupt from mouse or
- *                           && keyboard
+ *         nTime := SECONDS()   && usually after some interupt from mouse or
+ *                              && keyboard
 *
 *         ... intervening code ...
 *
--- a/harbour/contrib/hbnf/xbox.prg
+++ b/harbour/contrib/hbnf/xbox.prg
@@ -179,9 +179,9 @@ FUNCTION FT_XBOX(cJustType,; // "L" = left, otherwise centered
  AEVAL(aLines_,{|| nLLen:=Max(nLLen,Len(aLines_[nLoop])),nLoop++})

  // calculate corners
-  nLCol = if(nStartCol=99,Int((76-nLLen)/2),Min(nStartCol,74-nLLen))
+  nLCol = if(nStartCol==99,Int((76-nLLen)/2),Min(nStartCol,74-nLLen))
  nRCol = nLCol+nLLen+3
-  nTRow = if(nStartRow=99,INT((24-nNumRows)/2),Min(nStartRow,22-nNumRows))
+  nTRow = if(nStartRow==99,INT((24-nNumRows)/2),Min(nStartRow,22-nNumRows))
  nBRow = nTRow+nNumRows+1

  // form box and border
--- a/harbour/contrib/hbtip/ftpcln.prg
+++ b/harbour/contrib/hbtip/ftpcln.prg
@@ -630,7 +630,7 @@ METHOD MGET( cSpec,cLocalPath ) CLASS tIPClientFTP
   IF cSpec == nil
      cSpec := ""
   ENDIF
-   IF cLocalPath=nil
+   IF cLocalPath == nil
      cLocalPath:=""
   ENDIF
   IF ::bUsePasv
--- a/harbour/contrib/hbtip/httpcln.prg
+++ b/harbour/contrib/hbtip/httpcln.prg
@@ -365,7 +365,7 @@ METHOD ReadAll() CLASS tIPClientHTTP
   ENDIF
   IF ::bChunked
      cChunk:=::read()
-      while cChunk!=nil
+      while cChunk != nil
         cOut+=cChunk
      // ::nLength:=-1
         cChunk:=::read()
@@ -393,8 +393,8 @@ METHOD setCookie(cLine) CLASS tIPClientHTTP
   y:=len(aParam)
   FOR x:=1 to y
      aElements := HB_RegexSplit( "=", aParam[x], 1)
-      IF len(aElements)==2
-         IF x=1
+      IF len(aElements) == 2
+         IF x == 1
            cName:=alltrim(aElements[1])
            cValue:=alltrim(aElements[2])
         else
@@ -425,10 +425,10 @@ return NIL
 METHOD getcookies(cHost,cPath) CLASS tIPClientHTTP
   local x,y,aDomKeys:={},aKeys,z,cKey,aPathKeys,nPath
   local a, b, cOut := "", c, d
-   IF cHost=nil
+   IF cHost == nil
      cHost:=::oUrl:cServer
   ENDIF
-   IF cPath=nil
+   IF cPath == nil
      cPath:=::oUrl:cPath
      IF empty(cPath)
         cPath:="/"
@@ -493,8 +493,8 @@ METHOD Boundary(nType) CLASS tIPClientHTTP

   local cBound:=::cBoundary
   LOCAL i
-   IF nType=nil
-      nType=0
+   IF nType == nil
+      nType := 0
   ENDIF
   IF empty(cBound)
      cBound:=replicate("-",27)+space(11)
@@ -503,7 +503,7 @@ METHOD Boundary(nType) CLASS tIPClientHTTP
      NEXT
      ::cBoundary:=cBound
   endif
-   cBound:=iif(nType<2,"--","")+cBound+if(nType=1,"--","")
+   cBound:=iif(nType<2,"--","")+cBound+if(nType == 1,"--","")
   RETURN(cBound)

 METHOD Attach(cName,cFileName,cType) CLASS tIPClientHTTP
@@ -571,8 +571,8 @@ METHOD PostMultiPart( cPostData, cQuery ) CLASS tIPClientHTTP
      nbuf:=8192
      nRead:=nBuf
      cBuf:=space(nBuf)
-      while nRead=nBuf
-         //nRead=FRead( nFile,@cBuf,nBuf)
+      while nRead == nBuf
+         //nRead := FRead( nFile,@cBuf,nBuf)
         cBuf:=FReadstr( nFile,nBuf)
         nRead:=len(cBuf)
 /*         IF nRead<nBuf
--- a/harbour/contrib/hbvpdf/hbvpdft.prg
+++ b/harbour/contrib/hbvpdf/hbvpdft.prg
@@ -20,7 +20,7 @@


 #ifdef __HARBOUR__             //  Harbour and xHarbour
-   #include      'hbclass.ch'
+   #include      "hbclass.ch"
 #endif

 #ifdef __XPP__             //  xBase++
@@ -30,12 +30,12 @@
 #endif

 #ifdef __CLP__             //  Clipper
-   #include     'class(y).ch'
+   #include     "class(y).ch"
 #endif

 //-------------------------\\

-#include             'hbvpdf.ch'
+#include             "hbvpdf.ch"

 //-------------------------\\

@@ -325,7 +325,7 @@ local cName := ::GetFontInfo( "NAME" )
      ::aReport[ FONTNAME ] := 2
   ELSEIF cName == "Helvetica"
      ::aReport[ FONTNAME ] := 6
-   ELSEIF cName == 'Courier'
+   ELSEIF cName == "Courier"
      ::aReport[ FONTNAME ] := 10    // Courier // 0.04
   ENDIF

@@ -349,7 +349,7 @@ IF     cName == "Times"
   ::aReport[ FONTNAME ] := 4
 ELSEIF cName == "Helvetica"
   ::aReport[ FONTNAME ] := 8
-ELSEIF cName == 'Courier'
+ELSEIF cName == "Courier"
   ::aReport[ FONTNAME ] := 12 // 0.04
 ENDIF

@@ -1000,7 +1000,7 @@ local nI, cTemp, cToken, k, nL, nRow, nLines, nLineLen, nStart
 local lParagraph, nSpace, nNew, nTokenLen, nCRLF, nTokens, nLen

 DEFAULT nTab     TO -1
-DEFAULT cUnits   TO 'R'
+DEFAULT cUnits   TO "R"
 DEFAULT nJustify TO 4 
 DEFAULT lPrint   TO .t.
 DEFAULT cColor   TO ""
@@ -1126,14 +1126,14 @@ METHOD OpenHeader( cFile )

 local nErrorCode := 0, nAt, cCmd 

-DEFAULT cFile TO ''
+DEFAULT cFile TO ""

   IF !empty( cFile )
      cFile := alltrim( cFile )
      IF len( cFile ) > 12 .or. ;
-         at( ' ', cFile ) > 0 .or. ;
-         ( at( ' ', cFile ) == 0 .and. len( cFile ) > 8 ) .or. ;
-         ( ( nAt := at( '.', cFile )) > 0 .and. len( substr( cFile, nAt + 1 )) > 3 )
+         at( " ", cFile ) > 0 .or. ;
+         ( at( " ", cFile ) == 0 .and. len( cFile ) > 8 ) .or. ;
+         ( ( nAt := at( ".", cFile )) > 0 .and. len( substr( cFile, nAt + 1 )) > 3 )
         
         cCmd := "copy " + cFile + " temp.tmp > nul"
         RunExternal( cCmd )
@@ -1250,7 +1250,7 @@ METHOD SaveHeader( cFile )

 local nErrorCode := 0, cCmd

-Array2File( 'temp.tmp', ::aReport[ HEADER ] )
+Array2File( "temp.tmp", ::aReport[ HEADER ] )

 cCmd := "copy temp.tmp " + cFile + " > nul"
 RunExternal( cCmd )
@@ -1643,7 +1643,7 @@ METHOD tPdf:ImageInfo( cFile )
 METHOD ImageInfo( cFile ) 
 #endif

-local cTemp := upper(substr( cFile, rat('.', cFile) + 1 )), aTemp := {}
+local cTemp := upper(substr( cFile, rat(".", cFile) + 1 )), aTemp := {}
   do case
   case cTemp == "TIF"
      aTemp := ::TIFFInfo( cFile )
@@ -1670,11 +1670,11 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0

   nHandle := fopen( cFile )

-   c2 := '  '
+   c2 := "  "
   fread( nHandle, @c2, 2 )
   fread( nHandle, @c2, 2 )

-   cIFDNext := '    '
+   cIFDNext := "    "
   fread( nHandle, @cIFDNext, 4 )

   cTemp  := space(12)
@@ -1712,10 +1712,10 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0
         IF nFieldType ==  ASCII
            --nCount
         ENDIF
-         cTag := ''
+         cTag := ""
         do case
         case nTag == 256
-            cTag := 'ImageWidth'
+            cTag := "ImageWidth"

            IF nFieldType ==  SHORT
               nWidth := bin2w( substr( cValues, 1, 2 ))
@@ -1724,7 +1724,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0
            ENDIF

         case nTag == 257
-            cTag := 'ImageLength'
+            cTag := "ImageLength"
            IF nFieldType ==  SHORT
               nHeight := bin2w(substr( cValues, 1, 2 ))
            ELSEIF nFieldType ==  LONG
@@ -1732,32 +1732,32 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0
            ENDIF

         case nTag == 258
-            cTag := 'BitsPerSample'
+            cTag := "BitsPerSample"
            nTemp := 0
            IF nFieldType == SHORT
               nTemp := bin2w( cValues )
            ENDIF
            nBits := nTemp
         case nTag == 259
-            cTag := 'Compression'
+            cTag := "Compression"
            nTemp := 0
            IF nFieldType == SHORT
               nTemp := bin2w( cValues )
            ENDIF
         case nTag == 262
-            cTag := 'PhotometricInterpretation'
+            cTag := "PhotometricInterpretation"
            nTemp := -1
            IF nFieldType == SHORT
               nTemp := bin2w( cValues )
            ENDIF
         case nTag == 264
-            cTag := 'CellWidth'
+            cTag := "CellWidth"
         case nTag == 265
-            cTag := 'CellLength'
+            cTag := "CellLength"
         case nTag == 266
-            cTag := 'FillOrder'
+            cTag := "FillOrder"
         case nTag == 273
-            cTag := 'StripOffsets'
+            cTag := "StripOffsets"
            IF nFieldType ==  SHORT
               nFrom := bin2w(substr( cValues, 1, 2 ))
            ELSEIF nFieldType ==  LONG
@@ -1765,11 +1765,11 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0
            ENDIF

         case nTag == 277
-            cTag := 'SamplesPerPixel'
+            cTag := "SamplesPerPixel"
         case nTag == 278
-            cTag := 'RowsPerStrip'
+            cTag := "RowsPerStrip"
         case nTag == 279
-            cTag := 'StripByteCounts'
+            cTag := "StripByteCounts"
            IF nFieldType ==  SHORT
               nLength := bin2w(substr( cValues, 1, 2 ))
            ELSEIF nFieldType ==  LONG
@@ -1779,37 +1779,37 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0
            nLength *= nCount // Count all strips !!!

         case nTag == 282
-            cTag := 'XResolution'
+            cTag := "XResolution"
            xRes := bin2l(substr( cValues, 1, 4 ))
         case nTag == 283
-            cTag := 'YResolution'
+            cTag := "YResolution"
            yRes := bin2l(substr( cValues, 1, 4 ))
         case nTag == 284
-            cTag := 'PlanarConfiguration'
+            cTag := "PlanarConfiguration"
         case nTag == 288
-            cTag := 'FreeOffsets'
+            cTag := "FreeOffsets"
         case nTag == 289
-            cTag := 'FreeByteCounts'
+            cTag := "FreeByteCounts"
         case nTag == 296
-            cTag := 'ResolutionUnit'
+            cTag := "ResolutionUnit"
            nTemp := 0
            IF nFieldType == SHORT
               nTemp := bin2w( cValues )
            ENDIF
         case nTag == 305
-            cTag := 'Software'
+            cTag := "Software"
         case nTag == 306
-            cTag := 'DateTime'
+            cTag := "DateTime"
         case nTag == 315
-            cTag := 'Artist'
+            cTag := "Artist"
         case nTag == 320
-            cTag := 'ColorMap'
+            cTag := "ColorMap"
         case nTag == 338
-            cTag := 'ExtraSamples'
+            cTag := "ExtraSamples"
         case nTag == 33432
-            cTag := 'Copyright'
+            cTag := "Copyright"
         otherwise
-            cTag := 'Unknown'
+            cTag := "Unknown"
         endcase
      next
      fread( nHandle, @cIFDNext, 4 )
@@ -2367,7 +2367,7 @@ local cRun := cPathAcro + "\AcroRd32.exe /t " + cFile + " " + ;
            chr(34) + "HP LaserJet 5/5M PostScript" + chr(34) + " " + ;
            chr(34) + "LPT1" + chr(34)

-IF ( ! RunExternal( cRun, 'print' ) )
+IF ( ! RunExternal( cRun, "print" ) )
   alert( "Error printing to PDF reader." )
   break
 ENDIF
@@ -2385,7 +2385,7 @@ METHOD Execute( cFile )
 local cPathAcro := "c:\progra~1\Adobe\Acroba~1.0\Reader"
 local cRun := cPathAcro + "\AcroRd32.exe /t " + cFile + " " + chr(34) + "HP LaserJet 5/5M PostScript" + chr(34) + " " + chr(34) + "LPT1" + chr(34)

-IF (! RunExternal( cRun, 'open', cFile ) )
+IF (! RunExternal( cRun, "open", cFile ) )
   alert("Error printing to PDF reader.")
   break
 ENDIF
@@ -2540,7 +2540,7 @@ local cData  := valtype(xData)
   elseif ISDATE( xData )
       cData += i2bin( 8 )+dtos(xData)
   elseif ISLOGICAL(xData)
-       cData += i2bin( 1 )+if( xData,'T','F' )
+       cData += i2bin( 1 )+if( xData,"T","F" )
   elseif ISARRAY( xData )
       cData += i2bin( len( xData ) )
   else
@@ -2563,7 +2563,7 @@ if hFile == NIL        // First Timer
   endif
   cData := space( 3 )
   fRead( hFile, @cData, 3 )
-   if left( cData,1 ) != 'A'     //  If format of file != array
+   if !( left( cData,1 ) == "A" )     //  If format of file != array
      fClose( hFile )            //////////
      return( aRay )
   endif
@@ -2578,7 +2578,7 @@ do while nDepth < nLen
    endif
    cType    := padl( cData,1 )
    nDataLen := bin2i( right( cData,2 ) )
-    if cType != 'A'
+    if !( cType == "A" )
       cData := space( nDataLen )
       nBytes:= fRead( hFile, @cData, nDataLen )
       if nBytes < nDataLen
@@ -2587,15 +2587,15 @@ do while nDepth < nLen
    endif
    nDepth++
    aadd( aRay,NIL )
-    if cType=='C'
+    if cType=="C"
        aRay[ nDepth ] := cData
-    elseif cType=='N'
+    elseif cType=="N"
        aRay[ nDepth ] := val(cData)
-    elseif cType=='D'
+    elseif cType=="D"
        aRay[ nDepth ] := ctod( left( cData, 4 ) + "/" + substr( cData, 5, 2 ) + "/" + substr( cData, 7, 2 )) //stod(cData)
-    elseif cType=='L'
-        aRay[ nDepth ] := ( cData=='T' )
-    elseif cType=='A'
+    elseif cType=="L"
+        aRay[ nDepth ] := ( cData=="T" )
+    elseif cType=="A"
        aRay[ nDepth ] := File2Array( , nDataLen, hFile )
    endif
 enddo
@@ -2624,7 +2624,7 @@ static function RunExternal( cCmd, cVerb, cFile )
 local lRet := .t.

 #ifdef __CLP__
-   lRet := SwpRunCmd( cCmd, 0, '', '' )
+   lRet := SwpRunCmd( cCmd, 0, "", "" )
 #endif

 #ifdef __HARBOUR__
--- a/harbour/contrib/hbw32/w32_ole.c
+++ b/harbour/contrib/hbw32/w32_ole.c
@@ -77,7 +77,7 @@

 #ifndef __MINGW32__
   // Missing in Mingw V 2.
-   //#include <OleDB.h>
+   //#include <oledb.h>
 #endif

 #include <shlobj.h>
--- a/harbour/contrib/hbwhat32/_wininet.c
+++ b/harbour/contrib/hbwhat32/_wininet.c
@@ -26,7 +26,7 @@
 #include   <windows.h>
 #include   <commctrl.h>
 #include   <shlobj.h>
-#include   <shellApi.h>
+#include   <shellapi.h>
 #include   <wininet.h>

 #include   "hbapi.h"
@@ -288,8 +288,8 @@ HB_FUNC( FTPCOMMAND )
   );
 */
 //
-//   #include  'WinTypes.ch'
-//   #include  'cStruct.ch'
+//   #include  "wintypes.ch"
+//   #include  "cstruct.ch"
 //
 //
 //   pragma pack(4)
--- a/harbour/contrib/hbwhat32/whatutil.prg
+++ b/harbour/contrib/hbwhat32/whatutil.prg
@@ -7,12 +7,12 @@
 #include "common.ch"

 #include "winuser.ch"
-#include "What32.ch"
-#include 'debug.ch'
-#include 'wingdi.ch'
+#include "what32.ch"
+#include "debug.ch"
+#include "wingdi.ch"

-#include 'wintypes.ch'
-#include 'cstruct.ch'
+#include "wintypes.ch"
+#include "cstruct.ch"

 #define CTYPE_BOOL 5

@@ -96,7 +96,7 @@ Function Alert( cMsg, aChoices )
      Endif
   EndIf

-   cTitle := 'Alert'
+   cTitle := "Alert"

   If aChoices == NIL
      aChoices := { "&Ok" }
@@ -158,7 +158,7 @@ Function Alert( cMsg, aChoices )

   aDlg := MakeDlgTemplate( cTitle, ;
                           WS_CAPTION + DS_MODALFRAME + WS_VISIBLE + 4 + WS_POPUP + DS_SETFONT, ;
-                           0, 0, w, h, 8, 'MS Sans Serif' )
+                           0, 0, w, h, 8, "MS Sans Serif" )

   For i := 1 To n
      aDlg := AddDlgItem( aDlg, i, "BUTTON", ;
@@ -244,8 +244,8 @@ Function WrapText(cText,nMaxSize,hFont)
  For i:=1 To Len(a)
    c:=""
    Do While UnMapDialogRect(a[i],hFont)[1] > nMaxSize
-      If (n:=rat(' ',a[i])) > 0
-        c:=SubStr(a[i],n+1)+' '+c
+      If (n:=rat(" ",a[i])) > 0
+        c:=SubStr(a[i],n+1)+" "+c
        a[i]:=Left(a[i],n-1)
      Else
        Exit
@@ -267,7 +267,7 @@ Function UnMapDialogRect(cText,hfont)
  Local hDC := GetDC(0)
  Local hOldFont:=SelectObject(hDC,hFont)
  Local aTextExt:=GetTextExtentPoint32(hDC,;
-  'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')
+  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")

  Local arect:={0,0,100,100}

@@ -392,7 +392,7 @@ Function str2a ( string, parser )
   Local commapos := 0

   If parser == NIL
-      parser := ','
+      parser := ","
   EndIf

   Do While Len( string ) > 0
@@ -402,7 +402,7 @@ Function str2a ( string, parser )
         string := SubStr( string, commapos + Len( parser ) )
      Else
         aAdd( retar, string )
-         string := ''
+         string := ""
      EndIf
   EndDo

@@ -411,11 +411,11 @@ Function str2a ( string, parser )
 *-----------------------------------------------------------------------------*
 FUNCTION a2str( a, parser )

-  LOCAL retstr := ''
+  LOCAL retstr := ""
  LOCAL i

  IF parser == NIL
-    parser := ','
+    parser := ","
  ENDIF

  FOR i := 1 TO Len( a )
@@ -708,33 +708,33 @@ Function Bin2Array( cBin, aTypes )
 FUNCTION WinColors( nfg, nbg )

  LOCAL acolors := { ; // valueas below are PROBABLY (!) correct.
-  { 'N' , RGB( 0, 0, 0 ) } , ;
-  { 'B' , RGB( 0, 0, 128 ) } , ;
-  { 'G' , RGB( 0, 128, 0 ) } , ;
-  { 'BG' , RGB( 0, 128, 128 ) } , ;
-  { 'GB' , RGB( 0, 128, 128 ) } , ;
-  { 'R' , RGB( 128, 0, 0 ) } , ;
-  { 'RB' , RGB( 128, 0, 128 ) } , ;
-  { 'BR' , RGB( 128, 0, 128 ) } , ;
-  { 'GR' , RGB( 128, 128, 0 ) } , ;
-  { 'RG' , RGB( 128, 128, 0 ) } , ;
-  { 'W' , RGB( 192, 192, 192 ) } , ;
-  { 'N+' , RGB( 128, 128, 128 ) } , ;
-  { 'B+' , RGB( 0, 0, 255 ) } , ;
-  { 'G+' , RGB( 0, 255, 0 ) } , ;
-  { 'BG+', RGB( 0, 255, 255 ) } , ;
-  { 'GB+', RGB( 0, 255, 255 ) } , ;
-  { 'R+' , RGB( 255, 0, 0 ) } , ;
-  { 'RB+', RGB( 255, 0, 255 ) } , ;
-  { 'BR+', RGB( 255, 0, 255 ) } , ;
-  { 'GR+', RGB( 255, 255, 0 ) } , ;
-  { 'RG+', RGB( 255, 255, 0 ) } , ;
-  { 'W+' , RGB( 255, 255, 255 ) } }
+  { "N" , RGB( 0, 0, 0 ) } , ;
+  { "B" , RGB( 0, 0, 128 ) } , ;
+  { "G" , RGB( 0, 128, 0 ) } , ;
+  { "BG" , RGB( 0, 128, 128 ) } , ;
+  { "GB" , RGB( 0, 128, 128 ) } , ;
+  { "R" , RGB( 128, 0, 0 ) } , ;
+  { "RB" , RGB( 128, 0, 128 ) } , ;
+  { "BR" , RGB( 128, 0, 128 ) } , ;
+  { "GR" , RGB( 128, 128, 0 ) } , ;
+  { "RG" , RGB( 128, 128, 0 ) } , ;
+  { "W" , RGB( 192, 192, 192 ) } , ;
+  { "N+" , RGB( 128, 128, 128 ) } , ;
+  { "B+" , RGB( 0, 0, 255 ) } , ;
+  { "G+" , RGB( 0, 255, 0 ) } , ;
+  { "BG+", RGB( 0, 255, 255 ) } , ;
+  { "GB+", RGB( 0, 255, 255 ) } , ;
+  { "R+" , RGB( 255, 0, 0 ) } , ;
+  { "RB+", RGB( 255, 0, 255 ) } , ;
+  { "BR+", RGB( 255, 0, 255 ) } , ;
+  { "GR+", RGB( 255, 255, 0 ) } , ;
+  { "RG+", RGB( 255, 255, 0 ) } , ;
+  { "W+" , RGB( 255, 255, 255 ) } }

-  LOCAL ccolor := Left( setcolor( ) , at( ',', setcolor( ) ) - 1 )
-  LOCAL ishibg := ( '*' $ ccolor )
-  LOCAL cfg := Upper(StrTran( Left( ccolor, at( '/', ccolor ) - 1 ) , '*', '' ))
-  LOCAL cbg := Upper(StrTran(SubStr( ccolor, at( '/', ccolor ) + 1 ),'*','')) + iif( ishibg, '+', '' )
+  LOCAL ccolor := Left( setcolor( ) , at( ",", setcolor( ) ) - 1 )
+  LOCAL ishibg := ( "*" $ ccolor )
+  LOCAL cfg := Upper(StrTran( Left( ccolor, at( "/", ccolor ) - 1 ) , "*", "" ))
+  LOCAL cbg := Upper(StrTran(SubStr( ccolor, at( "/", ccolor ) + 1 ),"*","")) + iif( ishibg, "+", "" )
  LOCAL npos := 0

  nfg := RGB( 255, 255, 255 )
--- a/harbour/contrib/hbwhat32/wincdlg.prg
+++ b/harbour/contrib/hbwhat32/wincdlg.prg
@@ -4,13 +4,13 @@

 // WHAT32
 // Common Dialog interface
-#Define WT_DIALOG     0      // used internally (user custom dialog class - advanced option)
-#Include "commdlg.ch"
-#Include "winuser.ch"
+#define WT_DIALOG     0      // used internally (user custom dialog class - advanced option)
+#include "commdlg.ch"
+#include "winuser.ch"
 /*
 pragma(4)
-#Include "ctruct.ch"
-#Include "WinStruc.ch"
+#include "ctruct.ch"
+#include "winstruc.ch"
 */

 // Under development !!!
--- a/harbour/contrib/hbwhat32/wincomm.prg
+++ b/harbour/contrib/hbwhat32/wincomm.prg
@@ -6,9 +6,9 @@

 // common controls and common dialogs

-#Include "winuser.ch"
-#include 'commctrl.ch'
-#include 'what32.ch'
+#include "winuser.ch"
+#include "commctrl.ch"
+#include "what32.ch"


 *------------------------------------------------------------------------------
--- a/harbour/contrib/hbwhat32/wincore.prg
+++ b/harbour/contrib/hbwhat32/wincore.prg
@@ -23,8 +23,8 @@

 #include "common.ch"

-#Include "winuser.ch"
-#Include "hboo.ch"
+#include "winuser.ch"
+#include "hboo.ch"

 //PUBLIC lPrevInstance
 //PUBLIC hThisInstance
@@ -42,7 +42,7 @@ Static aProc       // array of possible windows procedures (10)
 INIT PROCEDURE _CheckMultiInst


-   lPrevInstance:=(empty(CreateMutex( , .T., strtran(GetModuleFileName(),'\','_') )) ;
+   lPrevInstance:=(empty(CreateMutex( , .T., strtran(GetModuleFileName(),"\","_") )) ;
                   .or. (GetLastError() > 0) )

   hThisInstance:=_getinstance()
--- a/harbour/contrib/hbwhat32/winrbar.prg
+++ b/harbour/contrib/hbwhat32/winrbar.prg
@@ -7,20 +7,20 @@

 #include "common.ch"

-#Include "winuser.ch"
+#include "winuser.ch"
 #include "hbclass.ch"

-#Include "wintypes.ch"
-#Include "cstruct.ch"
+#include "wintypes.ch"
+#include "cstruct.ch"

 pragma pack(4)

-#Include "winstruc.ch"
+#include "winstruc.ch"

-#Include 'what32.ch'
-#Include "commctrl.ch"
+#include 'what32.ch'
+#include "commctrl.ch"

-#Include 'debug.ch'
+#include 'debug.ch'

 typedef struct tagREBARINFO;
 {;
--- a/harbour/contrib/hbwhat32/wintabs.prg
+++ b/harbour/contrib/hbwhat32/wintabs.prg
@@ -2,14 +2,14 @@
 * $Id$
 */

-#Define WIN_WANT_VER4
+#define WIN_WANT_VER4
 #define WIN_WANT_ALL
-#Include "winuser.ch"
+#include "winuser.ch"
 #include "hbclass.ch"
-//#Include 'debug.ch'
-#Include "commctrl.ch"
-#Include "wintypes.ch"
-#Include "cstruct.ch"
+//#include "debug.ch"
+#include "commctrl.ch"
+#include "wintypes.ch"
+#include "cstruct.ch"
 #include "wingdi.ch"


--- a/harbour/contrib/hbwhat32/wintbar.prg
+++ b/harbour/contrib/hbwhat32/wintbar.prg
@@ -8,13 +8,13 @@

 #include "common.ch"

-#Include "winuser.ch"
+#include "winuser.ch"
 #include "hbclass.ch"
-#Include "commctrl.ch"
-#Include 'debug.ch'
-#Include "wintypes.ch"
-#Include "cstruct.ch"
-#Include 'what32.ch'
+#include "commctrl.ch"
+#include "debug.ch"
+#include "wintypes.ch"
+#include "cstruct.ch"
+#include "what32.ch"

 pragma pack(4)

--- a/harbour/contrib/rddads/tests/testmg.prg
+++ b/harbour/contrib/rddads/tests/testmg.prg
@@ -53,7 +53,7 @@

 #include "ord.ch"
 #include "set.ch"
-#include "Ads.ch"
+#include "ads.ch"

 function Main()

--- a/harbour/doc/es/compiler.txt
+++ b/harbour/doc/es/compiler.txt
@@ -77,7 +77,7 @@
 *          /gp          tipo de salida: fuente de Pascal (.pas)
 *          /gr          tipo de salida: recursos de Windows (.rc)
 *
- *      /i<ruta>         Agrega la ruta de búsqueda de archivos #Include
+ *      /i<ruta>         Agrega la ruta de búsqueda de archivos #include
 *      ----------------
 *
 *      /l               Suprime la informaci¢n del número de L¡nea
--- a/harbour/doc/es/file.txt
+++ b/harbour/doc/es/file.txt
@@ -351,9 +351,9 @@
 *      Note que esos valores podr¡an ser distintos en otra plataforma
 *      (sistema operativo) distinta a DOS/Windows.
 *  $EXAMPLES$
- *      #include "Fileio.ch"
+ *      #include "fileio.ch"
 *      //
- *      nHandle := FCREATE("Temp.txt", FC_NORMAL)
+ *      nHandle := FCREATE("temp.txt", FC_NORMAL)
 *
 *      IF FERROR() != 0
 *         ? "No se puede crear el archivo, DOS error ", FERROR()
@@ -639,8 +639,8 @@
 *      Nota: La utilizaci¢n de caracteres comodines '*' y '?' todav¡a no
 *            est  soportada comletamente.
 *  $EXAMPLES$
- *      ? FILE( "c:\harbour\doc\compiler.txt")
- *      ? FILE( "c:\harbour\doc\subcodes.txt")
+ *      ? FILE( "C:\harbour\doc\compiler.txt")
+ *      ? FILE( "C:\harbour\doc\subcodes.txt")
 *  </fixed>
 *  $STATUS$
 *      S (el soporte de comodines todav¡a est  ausente)
@@ -964,7 +964,7 @@
 *      SET CONSOLE ON
 *
 *      // Visualiza el archivo mitexto.dat en la pantalla y lo env¡a al
- *      // archivo MiReporte.txt
+ *      // archivo mireporte.txt
 *      TYPE mitexto.dat TO FILE MiReporte
 *      </fixed>
 *  $STATUS$
--- a/harbour/tests/ainstest.prg
+++ b/harbour/tests/ainstest.prg
@@ -69,7 +69,7 @@ function aDump( aShow )

   QQOut( "Len=", ALLTRIM( STR( len( aShow ) ) ) )
   QQOut( ": " )
-   for n=1 to len(aShow)
+   for n := 1 to len(aShow)

      QQOut( "[" )
      QQOut( ALLTRIM (STR (n)) )
--- a/harbour/tests/codebloc.prg
+++ b/harbour/tests/codebloc.prg
@@ -39,7 +39,7 @@ function Main()
   AnotherTest( a, "==> Another " )
   OutStd( crlf )

-   a ={|c| IIF( c=NIL, {|a| "First "+a}, {|a| "Second "+a}) }
+   a ={|c| IIF( c==NIL, {|a| "First "+a}, {|a| "Second "+a}) }
   a =EVAL( a )
   OutStd( crlf )
   OutStd( EVAL( a, "codeblock created in a codeblock" ) )
--- a/harbour/tests/keywords.prg
+++ b/harbour/tests/keywords.prg
@@ -212,7 +212,7 @@ begin sequence
  break->break :=break->break +break->break
  BREAK
  break :=break[ 2 ] //not allowed in Clipper
-  bReak :=IIF( bReak=1, BREAK(0), BREAK(bReak) )
+  bReak :=IIF( bReak==1, BREAK(0), BREAK(bReak) )
 recover USING bReak
  BREAK( Break( break(0) ) )
 end
--- a/harbour/tests/onidle.prg
+++ b/harbour/tests/onidle.prg
@@ -23,7 +23,7 @@ LOCAL nPrev:=SECONDS()
  @ 12,2 SAY "Memory after collecting" + STR( MEMORY(HB_MEM_USED) )
  nH1 := HB_IDLEADD( {|| DEVPOS(0,01), DEVOUT( TIME() ) } )
  nH2 := HB_IDLEADD( {|| DEVPOS(0,21), TEST(), DEVOUT( MEMORY(HB_MEM_USED) ) } )
-  nH3 := HB_IDLEADD( {|| DEVPOS(0,41), IIF(n=4,n:=1,n++),DEVOUT(aSign[n]) } )
+  nH3 := HB_IDLEADD( {|| DEVPOS(0,41), IIF(n==4,n:=1,n++),DEVOUT(aSign[n]) } )
  nH4 := HB_IDLEADD( {|| DEVPOS(0,61), DEVOUT( 1000*(SECONDS()-nPrev) ), nPrev:=SECONDS() } )

  ? VALTYPE(nH1), nH1, VALTYPE(nH2), nH2, VALTYPE(nH3), nH3, VALTYPE(nH4), nH4
@@ -73,4 +73,3 @@ LOCAL cb
  EVAL( cb )

 RETURN
-
--- a/harbour/tests/test_all.prg
+++ b/harbour/tests/test_all.prg
@@ -33,7 +33,7 @@ Function Main( cOption, cCmd )

   fWrite(o,"if not .%1==. goto %1" + Chr(13) + Chr(10))

-   FOR f=1 TO Len(aDir)
+   FOR f := 1 TO Len(aDir)
      IF TestIt(aDir[f][1])
         p := At(".prg",Lower(aDir[f][1]))
         IF p > 1
@@ -53,15 +53,15 @@ RETURN NIL
 Function TestIt(cFile)
 LOCAL nH1,lRetu,nH2

-   nH1=fOpen(cFile)
-   lRetu:=Upper(fReadStr(nH1,8))<>"//NOTEST"
+   nH1 := fOpen(cFile)
+   lRetu := Upper(fReadStr(nH1,8))<>"//NOTEST"
   fClose(nH1)

   IF !lRetu
      IF !File("NotTestd.txt")
-         nH2=fCreate("nottestd.txt")
+         nH2 := fCreate("nottestd.txt")
      ELSE
-         nH2=fOpen("nottestd.txt", FO_WRITE)
+         nH2 := fOpen("nottestd.txt", FO_WRITE)
      ENDIF
      fSeek(nH2, 0, FS_END)
      fWrite(nH2,DtoC(Date())+"  "+Time()+"  "+cFile+Chr(13)+Chr(10))
--- a/harbour/tests/wvtext.prg
+++ b/harbour/tests/wvtext.prg
@@ -14,10 +14,10 @@
 //----------------------------------------------------------------------//
 //----------------------------------------------------------------------//

-#include 'hbgtinfo.ch'
-#include 'inkey.ch'
+#include "hbgtinfo.ch"
+#include "inkey.ch"
 #ifdef __GTWVG__
-#include 'hbgtwvg.ch'
+#include "hbgtwvg.ch"
 #endif

 #define RGB(r,g,b) ( r + ( g * 256 ) + ( b * 256 * 256 ) )
@@ -34,10 +34,10 @@ FUNCTION Main()
   Hb_GtInfo( HB_GTI_FONTWIDTH, nWidth  )
   Hb_GtInfo( HB_GTI_FONTSIZE , nHeight )
   #ifdef __GTWVG__
-   Hb_GtInfo( HB_GTI_ICONFILE, 'C:\Harbour\Contrib\Gtwvg\Tests\Vr_1.ico' )
+   Hb_GtInfo( HB_GTI_ICONFILE, "..\contrib\gtwvg\tests\vr_1.ico" )
   #endif
   SetCursor( 0 )
-   SetColor( 'n/w' )
+   SetColor( "n/w" )

   HB_GtInfo( HB_GTI_NOTIFIERBLOCK, {|nEvent, ...| MyNotifier( nEvent, ... ) } )

@@ -51,7 +51,7 @@ FUNCTION Main()

      DO CASE
      CASE nKey == K_ENTER
-         Alert( '<Enter> Pressed' )
+         Alert( "<Enter> Pressed" )

      CASE nKey == K_F2
         lMark := Hb_GtInfo( HB_GTI_SELECTCOPY )
@@ -92,11 +92,11 @@ STATIC FUNCTION MyNotifier( nEvent, ... )

   CASE nEvent == HB_GTE_SETFOCUS
      DispScreen()
-      DispOutAt( maxrow(), 33, "We got focus", 'B/G*' )
+      DispOutAt( maxrow(), 33, "We got focus", "B/G*" )

   CASE nEvent == HB_GTE_CLOSE
      DispScreen()
-      if Alert( 'Close Application', {'Yes','No' } ) == 2
+      if Alert( "Close Application", {"Yes","No" } ) == 2
         Return ( 1 )
      endif

@@ -108,32 +108,32 @@ STATIC FUNCTION MyNotifier( nEvent, ... )

 STATIC FUNCTION DispScreen()
   Local nRow := 12, nCol := 28
-   Local cColor := 'N/W'
+   Local cColor := "N/W"
   Local nMaxCol := MaxCol()+1

   DispBegin()

   CLS
-   DispOutAt( 0, 0,padc( 'Harbour GT - New Features', maxcol()+1 ), 'N/GR*' )
+   DispOutAt( 0, 0,padc( "Harbour GT - New Features", maxcol()+1 ), "N/GR*" )

   // Contributed by Massimo Belgrano
-   DispOutAt( 2, 0, padc( "______  __             ______________________                        ",nMaxCol ), 'W+/W' )
-   DispOutAt( 3, 0, padc( "___  / / /_____ ___________ /___________  _________    __  ____/____/",nMaxCol ), 'W+/W' )
-   DispOutAt( 4, 0, padc( "__  /_/ /_  __ `/_  ___/_  __ \  __ \  / / /_  ___/    _  / __ __/   ",nMaxCol ), 'W+/W' )
-   DispOutAt( 5, 0, padc( "_  __  / / /_/ /_  /   _  /_/ / /_/ / /_/ /_  /        / /_/ / _  /  ",nMaxCol ), 'W+/W' )
-   DispOutAt( 6, 0, padc( "/_/ /_/  \__,_/ /_/    /_.___/\____/\__,_/ /_/         \____/  /_/   ",nMaxCol ), 'W+/W' )
+   DispOutAt( 2, 0, padc( "______  __             ______________________                        ",nMaxCol ), "W+/W" )
+   DispOutAt( 3, 0, padc( "___  / / /_____ ___________ /___________  _________    __  ____/____/",nMaxCol ), "W+/W" )
+   DispOutAt( 4, 0, padc( "__  /_/ /_  __ `/_  ___/_  __ \  __ \  / / /_  ___/    _  / __ __/   ",nMaxCol ), "W+/W" )
+   DispOutAt( 5, 0, padc( "_  __  / / /_/ /_  /   _  /_/ / /_/ / /_/ /_  /        / /_/ / _  /  ",nMaxCol ), "W+/W" )
+   DispOutAt( 6, 0, padc( "/_/ /_/  \__,_/ /_/    /_.___/\____/\__,_/ /_/         \____/  /_/   ",nMaxCol ), "W+/W" )

-   DispOutAt( ++nRow, nCol, '< F2 MarkCopy    Toggle >', cColor )
-   DispOutAt( ++nRow, nCol, '< F3 Resize      Toggle >', cColor )
-   DispOutAt( ++nRow, nCol, '< F4 Closable    Toggle >', cColor )
-   DispOutAt( ++nRow, nCol, '< F5 Palette L   Repeat >', cColor )
-   DispOutAt( ++nRow, nCol, '< F6 Palette D   Repeat >', cColor )
-   DispOutAt( ++nRow, nCol, '< F7 Palette By Index R >', cColor )
-   DispOutAt( ++nRow, nCol, '< F8 MarkCopy menu text >', cColor )
-   DispOutAt( ++nRow, nCol, '<    Click Other Window >', cColor )
-   DispOutAt( ++nRow, nCol, '<    Click X Button     >', cColor )
+   DispOutAt( ++nRow, nCol, "< F2 MarkCopy    Toggle >", cColor )
+   DispOutAt( ++nRow, nCol, "< F3 Resize      Toggle >", cColor )
+   DispOutAt( ++nRow, nCol, "< F4 Closable    Toggle >", cColor )
+   DispOutAt( ++nRow, nCol, "< F5 Palette L   Repeat >", cColor )
+   DispOutAt( ++nRow, nCol, "< F6 Palette D   Repeat >", cColor )
+   DispOutAt( ++nRow, nCol, "< F7 Palette By Index R >", cColor )
+   DispOutAt( ++nRow, nCol, "< F8 MarkCopy menu text >", cColor )
+   DispOutAt( ++nRow, nCol, "<    Click Other Window >", cColor )
+   DispOutAt( ++nRow, nCol, "<    Click X Button     >", cColor )
 #ifdef __GTWVG__
-   DispOutAt( ++nRow, nCol, '< F9 Run in SysTray     >', cColor )
+   DispOutAt( ++nRow, nCol, "< F9 Run in SysTray     >", cColor )
 #endif

   DispOutAt( maxrow(), 0, Space( maxcol()+1 ), "N/G*" )
@@ -178,7 +178,7 @@ FUNCTION SetPalette( nMode )
   nG += if( nMode == 0, -5, 5 )
   nB += if( nMode == 0, -5, 5 )

-   // Change 'W' to slightly gray everytime you press F5
+   // Change "W" to slightly gray everytime you press F5
   //
   aPalette[ 8 ] := RGB( nR, nG, nB )

@@ -203,12 +203,12 @@ FUNCTION SetPaletteIndex()

 FUNCTION RunInSysTray()
   #ifdef __GTWVG__
-   Alert( 'Please check your System Tray area after exiting this alert,'+;
-             ';then right click on the icon'+;
-                 ';displaying tooltip "Harbour GT in SysTray" !' )
+   Alert( "Please check your System Tray area after exiting this alert,"+;
+             ";then right click on the icon"+;
+                 ";displaying tooltip "Harbour GT in SysTray" !" )

   Hb_GtInfo( HB_GTI_SPEC, HB_GTS_SYSTRAYICON, { NIM_ADD, NIT_FILE, ;
-                'C:\Harbour\Contrib\Gtwvg\Tests\Vr_1.ico', 'Harbour GT in SysTray' } )
+                "..\contrib\gtwvg\tests\vr_1.ico", "Harbour GT in SysTray" } )
   #endif
   RETURN NIL

--- a/harbour/utils/hbmake/hbmake.prg
+++ b/harbour/utils/hbmake/hbmake.prg
@@ -3273,7 +3273,7 @@ RETURN NIL
 *------------------------------------------------------------
 FUNCTION ScanInclude( cFile, lRecursive, cExclExtent, aFiles)
 *------------------------------------------------------------
-// Search for #Include & Set Procedure To & Set Proc To
+// Search for #include & Set Procedure To & Set Proc To

   LOCAL cFileList := ""
   LOCAL nHandle   := -1
@@ -3339,7 +3339,7 @@ FUNCTION ScanInclude( cFile, lRecursive, cExclExtent, aFiles)
                   ENDDO
               ENDIF
               // Dependencies
-               IF Upper(Left( cTemp ,8)) == "#INCLUDE"
+               IF Lower(Left( cTemp ,8)) == "#include"
                   cTemp := AllTrim(SubStr( cTemp, 9))
               Else
                   IF lPrg .and. Upper(Left( cTemp, 16)) == "SET PROCEDURE TO"