diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cba3484274..3a8485e03e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,36 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-17 10:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * source/rdd/usrrdd/rdds/arrayrdd.prg + * contrib/hbct/tests/datetime.prg + * contrib/xhb/decode.prg + * contrib/hbsqlit3/tests/hooks.prg + * contrib/hbsqlit3/tests/backup.prg + * contrib/hbsqlit3/tests/authoriz.prg + * contrib/hbblat/blatcls.prg + * contrib/hbnf/nooccur.prg + * contrib/hbnf/floptst.prg + * contrib/hbfimage/tests/fitest.prg + * contrib/hbgd/tests/gdtestcl.prg + * contrib/hbgd/tests/counter.prg + * contrib/hbgd/gdchart.prg + * contrib/hbgd/gdimage.prg + * TRUE/FALSE in .prg code changed to .T./.F. + + - contrib/gtwvg/tests/v_calcltr.ico + + contrib/gtwvg/tests/v_clclt.ico + * Renamed to short name. (this file isn't used BTW) + + * contrib/hbblat/tests/blattest.prg + - contrib/hbblat/tests/f_sample1.txt + + contrib/hbblat/tests/f_sampl1.txt + - contrib/hbblat/tests/f_subjectline.txt + + contrib/hbblat/tests/f_subjct.txt + - contrib/hbblat/tests/f_listtext.txt + + contrib/hbblat/tests/f_listtx.txt + * Renamed to short names. + 2009-09-17 01:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk ! Fixed clang autodetection on darwin. diff --git a/harbour/contrib/gtwvg/tests/v_calcltr.ico b/harbour/contrib/gtwvg/tests/v_clclt.ico similarity index 100% rename from harbour/contrib/gtwvg/tests/v_calcltr.ico rename to harbour/contrib/gtwvg/tests/v_clclt.ico diff --git a/harbour/contrib/hbblat/blatcls.prg b/harbour/contrib/hbblat/blatcls.prg index 98a03f5ba1..3f8cd75aa6 100644 --- a/harbour/contrib/hbblat/blatcls.prg +++ b/harbour/contrib/hbblat/blatcls.prg @@ -65,14 +65,14 @@ CREATE CLASS HBBlat VAR cCommand AS STRING INIT "" VAR cVersion AS STRING INIT "0.1" VAR cBlatVersion AS STRING INIT "2.6.2" - VAR lChecked AS LOGICAL INIT FALSE + VAR lChecked AS LOGICAL INIT .F. EXPORTED: // Installation - VAR lSaveSettings AS LOGICAL INIT FALSE // store common settings to the Windows Registry. Takes the + VAR lSaveSettings AS LOGICAL INIT .F. // store common settings to the Windows Registry. Takes the // same parameters as -install, and is only for SMTP settings. METHOD SaveSettings( ... ) INLINE ::Install( "SMTP", ... ) - //VAR lInstall AS LOGICAL INIT FALSE + //VAR lInstall AS LOGICAL INIT .F. METHOD Install( cService, cServerAddress, cSenderEmailAddress, nTries, nPort, cProfile, cUsername, cPassword ) VIRTUAL // TODO // Basics @@ -84,9 +84,9 @@ CREATE CLASS HBBlat VAR cBCC AS STRING // blind carbon copy recipient list (comma separated) VAR cBCCFile AS STRING // bcc recipient list filename VAR nMaxNames AS NUMERIC INIT 0 // send to groups of x number of recipients - VAR lToUndiscloseRecipients AS LOGICAL INIT FALSE // set To: header to Undisclosed Recipients if not using the ::cTo and ::cCC options + VAR lToUndiscloseRecipients AS LOGICAL INIT .F. // set To: header to Undisclosed Recipients if not using the ::cTo and ::cCC options VAR cSubject AS STRING // subject line - VAR lSuppressSubject AS LOGICAL INIT FALSE // suppress subject line if it is not defined + VAR lSuppressSubject AS LOGICAL INIT .F. // suppress subject line if it is not defined VAR cSubjectFile AS STRING // file containing subject line VAR cBody AS STRING // message body VAR cBodyFile AS STRING // file containing the message body @@ -96,7 +96,7 @@ CREATE CLASS HBBlat // Registry Overrides VAR cProfile AS STRING // Send using cProfile profile (using server, user, and port) - VAR lShowProfiles AS LOGICAL INIT FALSE // list all profiles in the Registry + VAR lShowProfiles AS LOGICAL INIT .F. // list all profiles in the Registry VAR cServerSMTP AS STRING // specify SMTP server to be used (optionally, addr:port) VAR cServerNNTP AS STRING // specify NNTP server to be used (optionally, addr:port) VAR cServerPOP3 AS STRING // specify POP3 server to be used (optionally, addr:port) when POP3 access is required before sending email @@ -121,18 +121,18 @@ CREATE CLASS HBBlat VAR cOrganization AS STRING VAR cUserAgent AS STRING VAR cXHeader AS STRING - VAR lNoBlatHomePage AS LOGICAL INIT TRUE - VAR lNoBlatXHeader AS LOGICAL INIT TRUE - VAR lRequestDisposition AS LOGICAL INIT FALSE - VAR lRequestReturnReceipt AS LOGICAL INIT FALSE + VAR lNoBlatHomePage AS LOGICAL INIT .T. + VAR lNoBlatXHeader AS LOGICAL INIT .T. + VAR lRequestDisposition AS LOGICAL INIT .F. + VAR lRequestReturnReceipt AS LOGICAL INIT .F. VAR cCharSet AS STRING VAR cUserHeader1 AS STRING VAR cUserHeader2 AS STRING VAR cDSN AS STRING // Delivery Status Notifications (RFC 3461): n = never, s = successful, f = failure, d = delayed - can be used together, however N takes precedence - VAR lEHBase64 AS LOGICAL INIT FALSE // use base64 for encoding headers, if necessary - VAR lEHQuoted AS LOGICAL INIT FALSE // use quoted-printable for encoding headers, if necessary - VAR lLowPriority AS LOGICAL INIT FALSE - VAR lHighPriority AS LOGICAL INIT FALSE + VAR lEHBase64 AS LOGICAL INIT .F. // use base64 for encoding headers, if necessary + VAR lEHQuoted AS LOGICAL INIT .F. // use quoted-printable for encoding headers, if necessary + VAR lLowPriority AS LOGICAL INIT .F. + VAR lHighPriority AS LOGICAL INIT .F. VAR nSensitivity AS NUMERIC INIT -1 // set message sensitity 0 for personal, 1 for private, 2 for company-confidential // Attachment and encoding options @@ -152,41 +152,41 @@ CREATE CLASS HBBlat VAR cAttachListTextFile AS STRING VAR cAttachListEmbeddedFile AS STRING - VAR lSendBinaryBase64 AS LOGICAL INIT FALSE - VAR lSendBinaryUUEncoded AS LOGICAL INIT FALSE - VAR lSendEnrichedText AS LOGICAL INIT FALSE - VAR lUnicode AS LOGICAL INIT FALSE - VAR lHtml AS LOGICAL INIT FALSE + VAR lSendBinaryBase64 AS LOGICAL INIT .F. + VAR lSendBinaryUUEncoded AS LOGICAL INIT .F. + VAR lSendEnrichedText AS LOGICAL INIT .F. + VAR lUnicode AS LOGICAL INIT .F. + VAR lHtml AS LOGICAL INIT .F. VAR cAlternateText AS STRING VAR cAlternateTextFile AS STRING - VAR lMime AS LOGICAL INIT FALSE // MIME Quoted-Printable Content-Transfer-Encoding - VAR lAskFor8BitMime AS LOGICAL INIT FALSE // ask for 8bit data support when sending MIME + VAR lMime AS LOGICAL INIT .F. // MIME Quoted-Printable Content-Transfer-Encoding + VAR lAskFor8BitMime AS LOGICAL INIT .F. // ask for 8bit data support when sending MIME VAR nMultipartSize AS NUMERIC // send multipart messages, breaking attachments on KB boundaries, where is per 1000 bytes - VAR lNoMultipartMessage AS LOGICAL INIT FALSE // do not allow multipart messages + VAR lNoMultipartMessage AS LOGICAL INIT .F. // do not allow multipart messages // NNTP specific options VAR cGroups AS STRING // list of newsgroups (comma separated) // Other options - VAR lXtndXmit AS LOGICAL INIT FALSE // Attempt to use POP3 to transmit when accessing POP3 first - VAR lHelp AS LOGICAL INIT FALSE // displays this help (also -?, /?, -help or /help) - VAR lQuiet AS LOGICAL INIT TRUE // suppresses all output to the screen - VAR lDebug AS LOGICAL INIT FALSE // echoes server communications to a log file or screen (overrides -q if echoes to the screen) + VAR lXtndXmit AS LOGICAL INIT .F. // Attempt to use POP3 to transmit when accessing POP3 first + VAR lHelp AS LOGICAL INIT .F. // displays this help (also -?, /?, -help or /help) + VAR lQuiet AS LOGICAL INIT .T. // suppresses all output to the screen + VAR lDebug AS LOGICAL INIT .F. // echoes server communications to a log file or screen (overrides -q if echoes to the screen) VAR cLogFile AS STRING // log everything but usage to - VAR lLogTimestamp AS LOGICAL INIT FALSE // when -log is used, a timestamp is added to each log line - VAR lLogOverwrite AS LOGICAL INIT FALSE // when -log is used, overwrite the log file + VAR lLogTimestamp AS LOGICAL INIT .F. // when -log is used, a timestamp is added to each log line + VAR lLogOverwrite AS LOGICAL INIT .F. // when -log is used, overwrite the log file VAR nTimeout AS NUMERIC INIT 60 // set timeout to 'n' seconds. Blat will wait 'n' seconds for server responses VAR nTry AS NUMERIC INIT 1 // -1 == INFINITE, how many times blat should try to send (1 to 'INFINITE') - VAR lBinary AS LOGICAL INIT FALSE // do not convert ASCII | (pipe, 0x7c) to CrLf in the message body + VAR lBinary AS LOGICAL INIT .F. // do not convert ASCII | (pipe, 0x7c) to CrLf in the message body VAR cHostname AS STRING // select the hostname used to send the message via SMTP this is typically your local machine name - VAR lRaw AS LOGICAL INIT FALSE // do not add CR/LF after headers + VAR lRaw AS LOGICAL INIT .F. // do not add CR/LF after headers VAR nDelay AS NUMERIC INIT 1 // wait x seconds between messages being sent when used with -maxnames or -multipart VAR cCommentChar AS STRING // use this character to mark the start of commments in options files and recipient list files. The default is ; - VAR lSuperDebug AS LOGICAL INIT FALSE // hex/ascii dump the data between Blat and the server - VAR lSuperDebugText AS LOGICAL INIT FALSE // ascii dump the data between Blat and the server + VAR lSuperDebug AS LOGICAL INIT .F. // hex/ascii dump the data between Blat and the server + VAR lSuperDebugText AS LOGICAL INIT .F. // ascii dump the data between Blat and the server // Other - VAR lIgnoreErrors AS LOGICAL INIT FALSE + VAR lIgnoreErrors AS LOGICAL INIT .F. // Methods @@ -562,7 +562,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // No Blat Home Page - // Add only if ::lNoBlatXHeader is FALSE + // Add only if ::lNoBlatXHeader is .F. IF !::lNoBlatXHeader IF ::lNoBlatHomePage ::cCommand += " -noh" @@ -619,7 +619,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ::cCommand += " -hdrencq" ENDIF - // lHighPriority / lLowPriority - if both == FALSE, priority is standard + // lHighPriority / lLowPriority - if both == .F., priority is standard IF ::lHighPriority ::cCommand += " -priority 1" ELSEIF ::lLowPriority @@ -890,7 +890,7 @@ METHOD PROCEDURE Check() CLASS HBBlat //-------------------------------------------------- // Check done - ::lChecked := TRUE + ::lChecked := .T. ENDIF diff --git a/harbour/contrib/hbblat/tests/blattest.prg b/harbour/contrib/hbblat/tests/blattest.prg index 760a711e35..6893d35631 100644 --- a/harbour/contrib/hbblat/tests/blattest.prg +++ b/harbour/contrib/hbblat/tests/blattest.prg @@ -84,15 +84,15 @@ PROCEDURE Main() :cServerSMTP := SERVER_SMTP :cSubject := "Test from Blat" //:lSuppressSubject := TRUE - //:cSubjectFile := "f_subjectline.txt" + //:cSubjectFile := "f_subjct.txt" //:lToUndiscloseRecipients := TRUE :cPostScriptumFile := "f_ps.txt" :lRequestDisposition := TRUE // does not work ??? :lRequestReturnReceipt := TRUE - :cAttachTextFiles := "f_subjectline.txt" + :cAttachTextFiles := "f_subjct.txt" :aAttachTextFiles := { "f_ps.txt", "blattest.prg", "blatcmd.prg" } - :cAttachListTextFile := "f_listtext.txt" + :cAttachListTextFile := "f_listtx.txt" :cLogFile := "log.txt" :lLogTimestamp := TRUE @@ -124,4 +124,3 @@ PROCEDURE Main() RETURN //----------------------------------------- - diff --git a/harbour/contrib/hbblat/tests/f_listtext.txt b/harbour/contrib/hbblat/tests/f_listtext.txt deleted file mode 100644 index 184df9f603..0000000000 --- a/harbour/contrib/hbblat/tests/f_listtext.txt +++ /dev/null @@ -1,2 +0,0 @@ -f_sample.txt -f_sample1.txt diff --git a/harbour/contrib/hbblat/tests/f_listtx.txt b/harbour/contrib/hbblat/tests/f_listtx.txt new file mode 100644 index 0000000000..53c953303d --- /dev/null +++ b/harbour/contrib/hbblat/tests/f_listtx.txt @@ -0,0 +1,2 @@ +f_sample.txt +f_sampl1.txt diff --git a/harbour/contrib/hbblat/tests/f_sample1.txt b/harbour/contrib/hbblat/tests/f_sampl1.txt similarity index 100% rename from harbour/contrib/hbblat/tests/f_sample1.txt rename to harbour/contrib/hbblat/tests/f_sampl1.txt diff --git a/harbour/contrib/hbblat/tests/f_subjectline.txt b/harbour/contrib/hbblat/tests/f_subjct.txt similarity index 100% rename from harbour/contrib/hbblat/tests/f_subjectline.txt rename to harbour/contrib/hbblat/tests/f_subjct.txt diff --git a/harbour/contrib/hbct/tests/datetime.prg b/harbour/contrib/hbct/tests/datetime.prg index 3e1c1f0c10..61a73498d0 100644 --- a/harbour/contrib/hbct/tests/datetime.prg +++ b/harbour/contrib/hbct/tests/datetime.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Program to test functions to mimic Clipper Tools III date & time functions. * (C) Alan Secker 2002 - * + * * small changes: Martin Vogel 2003 * * www - http://www.harbour-project.org @@ -86,8 +86,8 @@ local farr := { "addmonth ( ddate ) Add a month to ddate ", ; "mdy ( dDate ) Returns stg Month DD, YY ", ; "ntocdow ( nDay ) Returns name of day ", ; "ntocmonth ( nMth ) Returns name of month ", ; - "quarter (date) Returns qtr number of date", ; - "stod( ansi date) Returns Clipper date ", ; + "quarter (date) Returns qtr number of date", ; + "stod( ansi date) Returns Clipper date ", ; "week( ddate, lSWN ) Returns numbef of week ", } set date british @@ -179,15 +179,15 @@ do while c @ 8, 60 get mnth picture "99" set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() if nKey == K_ESC - c := FALSE + c := .F. else @ 11, 39 say "The returned date is " + dtoc ( addmonth (ddate, mnth) ) @@ -197,10 +197,10 @@ do while c set cursor on endif - + enddo - - @ 0, 0 clear + + @ 0, 0 clear return NIL @@ -222,15 +222,15 @@ do while c @ 9, 10 get ddate set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() if nKey == K_ESC - c := FALSE + c := .F. else @ 11, 10 say "The returned date is " + dtoc ( bom (ddate) ) @@ -241,11 +241,11 @@ do while c endif enddo - - @ 0, 0 clear + + @ 0, 0 clear return NIL - + *:-------------------------------------------------------------------- FUNCTION boqtest () @@ -258,38 +258,38 @@ local ddate := ctod (" / / ") local c := .T. local nKey - do while c - @ 5, 10 say "boq (ddate) returns the date of the first day of the" - @ 6, 10 say "quarter in which ddate is situated. If ddate is" + do while c + @ 5, 10 say "boq (ddate) returns the date of the first day of the" + @ 6, 10 say "quarter in which ddate is situated. If ddate is" @ 7, 10 say "15/10/2002 (that's in dd/mm/yyy), BOQ () should return" - @ 8, 10 say "01/09/2002. Test it, Insert a date" - - @ 9, 10 get ddate - - set confirm on - set escape on - read - set escape off - set confirm on - - nKey := lastkey() - - if nKey == K_ESC - c := FALSE - else - @ 11, 10 say "The returned date is " + dtoc ( boq (ddate) ) - - set cursor off - inkey(0) - set cursor on - - endif - - enddo - - @ 0, 0 clear - - return NIL + @ 8, 10 say "01/09/2002. Test it, Insert a date" + + @ 9, 10 get ddate + + set confirm on + set escape on + read + set escape off + set confirm on + + nKey := lastkey() + + if nKey == K_ESC + c := .F. + else + @ 11, 10 say "The returned date is " + dtoc ( boq (ddate) ) + + set cursor off + inkey(0) + set cursor on + + endif + + enddo + + @ 0, 0 clear + + return NIL *:-------------------------------------------------------------------- @@ -310,15 +310,15 @@ do while c @ 9, 10 get ddate set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() if nKey == K_ESC - c := FALSE + c := .F. else @ 11, 10 say "The returned date is " + dtoc ( boy (ddate) ) @@ -331,8 +331,8 @@ do while c endif enddo - - @ 0, 0 clear + + @ 0, 0 clear return NIL @@ -348,8 +348,8 @@ FUNCTION ctodowtest () local getlist := {} local cDow := space (9) -local nkey -local c := TRUE +local nkey +local c := .T. do while c @ 5, 10 say "ctodow (ddate) receives the name of a day of the week and " @@ -358,15 +358,15 @@ do while c @ 9, 10 get cDow set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() if nKey == K_ESC - c := FALSE + c := .F. else @ 11, 10 say "The day number is " + str ( ctodow ( upper (alltrim (cDow))) ) @@ -379,11 +379,11 @@ do while c endif enddo - - @ 0, 0 clear + + @ 0, 0 clear return NIL - + *:---------------------------------------------------------------- FUNCTION ctomonthtest () @@ -405,17 +405,17 @@ do while c @ 9, 10 get cDom picture "!!!!!!!!!" set confirm on - set escape on + set escape on read set escape off set confirm on - + cDom := alltrim ( cDom ) - + nKey := lastkey() if nKey == K_ESC - c := FALSE + c := .F. else @ 11, 10 say "The day number is " + str ( ctomonth ( cDom) ) set cursor off @@ -426,18 +426,18 @@ do while c endif enddo - - @ 0, 0 clear + + @ 0, 0 clear return NIL - + *:---------------------------------------------------------------- FUNCTION dInMonthtest () *:---------------------------------------------------------------- *: daysInMonth ( xDate, lleap ) *: ============================ -*: Returns the number of days in nMonth, either whose name as a +*: Returns the number of days in nMonth, either whose name as a *: string or month number is passed. English Month names only. local getlist := {} @@ -446,7 +446,7 @@ local c := .T. local nMonth local nKey local cLeap := "N" -local lleap := FALSE +local lleap := .F. do while c @ 5, 10 say "daysInmonth () receives either the number of a month or" @@ -455,62 +455,62 @@ local lleap := FALSE @ 8, 10 say "Is it a leap year?" @ 7, 60 get cMonth picture "XXXXXXXXX" @ 8, 60 get cleap picture "Y" - + set confirm on - set escape on + set escape on read set escape off set confirm on - + cMonth := upper (rtrim (cMonth)) nMonth := val (cMonth) - - do case + + do case case valtype ( cMonth ) == "C" .and. nmonth == 0 nMonth := ctomonth ( cMonth) case nMonth == 0 .or. ; - nMonth > 12 + nMonth > 12 loop endcase if cLeap == "Y" - lleap := TRUE + lleap := .T. endif - + nKey := lastkey() - + if nKey == K_ESC - c := FALSE + c := .F. else @ 10, 40 say "The day number is " + ; ltrim (str ( daysInMonth ( nMonth, lLeap ))) - + set cursor off inkey(0) set cursor on - + cMonth := space (9) cLeap := "N" - + endif - + enddo - - @ 0, 0 clear - + + @ 0, 0 clear + return NIL - - + + *:---------------------------------------------------------------- FUNCTION d2month () *:---------------------------------------------------------------- *: daystomonth() *: ============= *: Total number days from first of Jan to beginning of nMonth. -*: lLeap is FALSE for a non-leap year but TRUE if it is. If so and +*: lLeap is .F. for a non-leap year but .T. if it is. If so and *: nMonth is greater than 2, ndays is incremented. local getlist := {} @@ -531,22 +531,22 @@ do while c @ 9, 33 get cLeap picture "Y" set confirm on - set escape on + set escape on read set escape off set confirm on - + nMonth := val ( cMonth ) - + nKey := lastkey() if nKey == K_ESC - c := FALSE + c := .F. else if cLeap == "Y" lLeap := .T. - endif - + endif + @ 11, 10 say "The day number is " + ; ltrim (str ( daystomonth ( nMonth, lLeap ))) @@ -560,8 +560,8 @@ do while c endif enddo - - @ 0, 0 clear + + @ 0, 0 clear return NIL @@ -570,9 +570,9 @@ FUNCTION dmytest () *:---------------------------------------------------------------- *: dmy ( ddate, lmode) *: =================== -*: Returns the date as a string in DD Month YY format. If lmode -*: is TRUE, a "." is inserted after the DD -*: This version does not observe the Nations module. English +*: Returns the date as a string in DD Month YY format. If lmode +*: is .T., a "." is inserted after the DD +*: This version does not observe the Nations module. English *: only. local getlist := {} @@ -591,36 +591,36 @@ local nKey @ 10, 10 say "inssert a full stop Y/N?" @ 9, 36 get ddate picture "@D / / " @ 10, 45 get cMode picture "Y" - + set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() - + if nKey == K_ESC - c := FALSE + c := .F. else if (cMode == "Y", lMode := .T., lMode := .F.) - + @ 12, 10 say "The date string returned is " + ; ltrim (dmy ( ddate, lmode )) - + set cursor off inkey(0) set cursor on - - ddate := ctod (" / / ") + + ddate := ctod (" / / ") cMode := space (1) endif enddo - @ 0, 0 clear - + @ 0, 0 clear + return NIL *:---------------------------------------------------------------- @@ -639,18 +639,18 @@ local nKey do while c @ 5, 10 say "doy (ddate) returns the day of the year for the" @ 6, 10 say "date passed. Test it, Insert a date" - @ 9, 10 get ddate + @ 9, 10 get ddate set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() if nKey == K_ESC - c := FALSE + c := .F. else @ 11, 10 say "The day of the date entered is " + ; ltrim ( str (doy ( ddate ))) @@ -664,8 +664,8 @@ do while c endif enddo - - @ 0, 0 clear + + @ 0, 0 clear return NIL @@ -676,7 +676,7 @@ FUNCTION eomtest () *: dBom := eom ( ddate ) *: ===================== *: Returns the last date in the month of the month appearing in -*: date. +*: date. local getlist := {} local ddate := ctod (" / / ") @@ -686,18 +686,18 @@ local nKey do while c @ 5, 10 say "eom (ddate) returns the last date in the month of the" @ 6, 10 say "month appearing in ddate. Test it, Insert a date" - @ 9, 10 get ddate + @ 9, 10 get ddate set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() if nKey == K_ESC - c := FALSE + c := .F. else @ 11, 10 say "The last date in the month is " + ; @@ -712,8 +712,8 @@ do while c endif enddo - - @ 0, 0 clear + + @ 0, 0 clear return NIL @@ -723,46 +723,46 @@ FUNCTION eoqtest () *:---------------------------------------------------------------- *: dret := eoq ( ddate ) *: ===================== -*: Returns the last date in the quarter in which ddate falls. +*: Returns the last date in the quarter in which ddate falls. local getlist := {} local ddate := ctod (" / / ") local c := .T. local nKey - do while c + do while c @ 5, 10 say "EOQ (ddate) returns the last date in the quarter in" - @ 6, 10 say "which ddate falls. Test it, Insert a date" - @ 9, 10 get ddate - - set confirm on - set escape on - read - set escape off - set confirm on - - nKey := lastkey() - - if nKey == K_ESC - c := FALSE - else - - @ 11, 10 say "The last date in the month is " + ; - ltrim ( dtoc (eoq ( ddate ))) - - set cursor off - inkey(0) - set cursor on - - ddate := ctod (" / / ") - - endif - - enddo - - @ 0, 0 clear - - return NIL + @ 6, 10 say "which ddate falls. Test it, Insert a date" + @ 9, 10 get ddate + + set confirm on + set escape on + read + set escape off + set confirm on + + nKey := lastkey() + + if nKey == K_ESC + c := .F. + else + + @ 11, 10 say "The last date in the month is " + ; + ltrim ( dtoc (eoq ( ddate ))) + + set cursor off + inkey(0) + set cursor on + + ddate := ctod (" / / ") + + endif + + enddo + + @ 0, 0 clear + + return NIL *:---------------------------------------------------------------- @@ -771,7 +771,7 @@ FUNCTION eoytest () *: dEoy := eoy ( ddate ) *: ===================== *: Returns the last date in the year of the year appearing in -*: date. +*: date. local getlist := {} local ddate := ctod (" / / ") @@ -781,34 +781,34 @@ local nKey do while c @ 5, 10 say "eoy (ddate) returns the last date in the year of the" @ 6, 10 say "year appearing in ddate. Test it, Insert a date" - @ 9, 10 get ddate - + @ 9, 10 get ddate + set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() - + if nKey == K_ESC - c := FALSE + c := .F. else - + @ 11, 10 say "The last date in the year is " + ; ltrim ( dtoc (eoy ( ddate ))) - + set cursor off inkey(0) set cursor on - + ddate := ctod (" / / ") - + endif - + enddo - - @ 0, 0 clear + + @ 0, 0 clear return NIL @@ -818,7 +818,7 @@ FUNCTION isleaptest () *:---------------------------------------------------------------- *: lRet := isleap ( ddate ) *: ======================== -*: if ddate is a leap year, lRet is TRUE, otherwise FALSE. +*: if ddate is a leap year, lRet is .T., otherwise .F.. *: Leap years are exactly divisible by 4 and 1,000 but not 100. local getlist := {} @@ -830,20 +830,20 @@ local nKey do while c @ 5, 10 say "isleap (ddate) returns TRUE if ddate is a leap year" @ 6, 10 say "Test it, Insert a date" - @ 9, 10 get ddate - + @ 9, 10 get ddate + set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() - + if nKey == K_ESC - c := FALSE + c := .F. else - + if isleap ( ddate ) cResult := "TRUE " else @@ -851,18 +851,18 @@ local nKey endif @ 11, 10 say "The result is " + cResult - + set cursor off inkey(0) set cursor on - + ddate := ctod (" / / ") endif - + enddo - - @ 0, 0 clear + + @ 0, 0 clear return NIL @@ -872,7 +872,7 @@ FUNCTION lastdayomtest () *: ndays := lastdayom ( xDate ) *:-------------------------------------------------------------- *: Returns the the number of days in the month. -*: xDate can be a date or a month number. If empty uses the +*: xDate can be a date or a month number. If empty uses the *: system date. *: If xDate is invalid, returns 0 @@ -889,19 +889,19 @@ local cMth := " " @ 9, 10 say "Insert a date (or)" @ 10, 10 say "a month" - @ 9, 30 get ddate + @ 9, 30 get ddate @ 10, 38 get cMth picture "99" //valid val (cmth) < 12 - + set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() if nKey == K_ESC - c := FALSE + c := .F. else if (empty (ddate), ddate := val (cMth), ddate) @@ -916,11 +916,11 @@ local cMth := " " cMth := " " endif - + enddo - @ 0, 0 clear - + @ 0, 0 clear + return NIL *:---------------------------------------------------------------- @@ -942,17 +942,17 @@ local nKey @ 6, 10 say "a string in month DD YY format. Test it" @ 8, 10 say "Insert a date" @ 8, 30 get ddate picture "@D / / " - + set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() if nKey == K_ESC - c := FALSE + c := .F. else @ 11, 10 say "The date string returned is " + ; @@ -965,21 +965,21 @@ local nKey ddate := ctod (" / / ") endif - + enddo - - @ 0, 0 clear - + + @ 0, 0 clear + return NIL - + *:---------------------------------------------------------------- FUNCTION ntocdowtest () *:---------------------------------------------------------------- *: cDay := ntocdow ( nDayNum ) *: ================================== -*: ntocdow() receives the number of a day and returns its -*: name as a string. This version does not observe the Nations +*: ntocdow() receives the number of a day and returns its +*: name as a string. This version does not observe the Nations *: module. English only. local getlist := {} @@ -993,15 +993,15 @@ do while c @ 6, 60 get cDay set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() if nKey == K_ESC - c := FALSE + c := .F. else @ 11, 10 say "The day selected is " + ; @@ -1016,8 +1016,8 @@ do while c endif enddo - - @ 0, 0 clear + + @ 0, 0 clear return NIL @@ -1027,8 +1027,8 @@ FUNCTION ntocmthtest () *:---------------------------------------------------------------- *: cMonth := ntocmonth ( nMonthNum ) *: ================================== -*: ntocmonth() receives the number of a month and returns its -*: name as a string. This version does not observe the Nations +*: ntocmonth() receives the number of a month and returns its +*: name as a string. This version does not observe the Nations *: module. English only. local getlist := {} @@ -1039,18 +1039,18 @@ local nKey do while c @ 5, 10 say "ntocmonth(n) returns the name of the month number n" @ 6, 10 say "Test it, Insert a month number" - @ 6, 60 get cMonth + @ 6, 60 get cMonth set confirm on - set escape on + set escape on read set escape off set confirm on - + nKey := lastkey() if nKey == K_ESC - c := FALSE + c := .F. else @ 11, 10 say "The month selected is " + ; @@ -1065,8 +1065,8 @@ do while c endif enddo - - @ 0, 0 clear + + @ 0, 0 clear return NIL @@ -1083,39 +1083,39 @@ local ddate := ctod (" / / ") local c := .T. local nKey - do while c - @ 5, 10 say "quarter (ddate) returns the number of the quarter" - @ 6, 10 say "Test it, Insert a date" - @ 6, 52 get ddate - - set confirm on - set escape on - read - set escape off - set confirm on - - nKey := lastkey() - - if nKey == K_ESC - c := FALSE - else - - @ 8, 10 say "The quarter number is " + ; + do while c + @ 5, 10 say "quarter (ddate) returns the number of the quarter" + @ 6, 10 say "Test it, Insert a date" + @ 6, 52 get ddate + + set confirm on + set escape on + read + set escape off + set confirm on + + nKey := lastkey() + + if nKey == K_ESC + c := .F. + else + + @ 8, 10 say "The quarter number is " + ; padr (ltrim ( str ( quarter ( ddate ))), 10) - - set cursor off - inkey(0) - set cursor on - - ddate := ctod (" / / ") - - endif - - enddo - - @ 0, 0 clear - - return NIL + + set cursor off + inkey(0) + set cursor on + + ddate := ctod (" / / ") + + endif + + enddo + + @ 0, 0 clear + + return NIL *:---------------------------------------------------------------- @@ -1139,28 +1139,28 @@ local nKey @ 8, 57 get cAnsidate picture "999999999" valid chkansi (cAnsidate) set confirm on - set escape on + set escape on read set escape off set confirm on nKey := lastkey() - + if nKey == K_ESC - c := FALSE + c := .F. else - + ddate := stod ( cAnsidate ) - + @ 10, 10 say "The Clipper format date is " + ; padr (ltrim ( dtoc ( ddate )), 10) - + set cursor off inkey(0) set cursor on - + cAnsidate := space(8) - + endif enddo @@ -1174,7 +1174,7 @@ local ddate local nYear local nMonth local nDay -local lretval := TRUE +local lretval := .T. nYear := val ( left ( cAnsidate, 4)) nMonth := val (substr ( cAnsidate, 5, 2)) @@ -1182,12 +1182,12 @@ local lretval := TRUE do case - case nYear < 1 - lretval := FALSE + case nYear < 1 + lretval := .F. case nMonth < 1 .or. nMonth > 12 - lretval := FALSE + lretval := .F. case nday < 0 .or. nday > 31 - lretval := FALSE + lretval := .F. endcase return lretval @@ -1208,44 +1208,40 @@ local c := .T. local nKey local cMode := space(1) - do while c + do while c @ 5, 10 say "week (ddate, lSWN) returns the calendar number of the week" @ 6, 10 say "if lSWN == .T., the simple week number is returned" @ 7, 10 say "if lSWN == .F.(default), the ISO8601 week number is returned" - @ 8, 10 say "Test it, Insert a date and " - @ 9, 52 get ddate + @ 8, 10 say "Test it, Insert a date and " + @ 9, 52 get ddate @ 10, 61 get cMode picture "Y" - - set confirm on - set escape on - read - set escape off - set confirm on - - nKey := lastkey() - - if nKey == K_ESC - c := FALSE - else - - @ 8, 10 say "The week number is " + ; - padr (ltrim ( str (week ( ddate, cMode=="Y"))), 10) - - set cursor off - inkey(0) - set cursor on - - ddate := ctod (" / / ") - - endif - - enddo - - @ 0, 0 clear - - return NIL + set confirm on + set escape on + read + set escape off + set confirm on + nKey := lastkey() + if nKey == K_ESC + c := .F. + else + @ 8, 10 say "The week number is " + ; + padr (ltrim ( str (week ( ddate, cMode=="Y"))), 10) + + set cursor off + inkey(0) + set cursor on + + ddate := ctod (" / / ") + + endif + + enddo + + @ 0, 0 clear + + return NIL diff --git a/harbour/contrib/hbfimage/tests/fitest.prg b/harbour/contrib/hbfimage/tests/fitest.prg index 8413be84af..89bc5e1a11 100644 --- a/harbour/contrib/hbfimage/tests/fitest.prg +++ b/harbour/contrib/hbfimage/tests/fitest.prg @@ -89,7 +89,7 @@ PROCEDURE Main() centerx := fi_GetWidth( clone ) / 2 centery := fi_GetHeight( clone ) / 2 - ? "Rotate Ex :", ValToPrg( rotatedEx := fi_RotateEx( clone, 15, 0, 0, centerx, centery, TRUE ) ) + ? "Rotate Ex :", ValToPrg( rotatedEx := fi_RotateEx( clone, 15, 0, 0, centerx, centery, .T. ) ) ? "Save JPG ? :", fi_Save( FIF_JPEG, rotatedEx, IMAGES_OUT + "rotateex.jpg", JPEG_DEFAULT ) fi_Unload( rotatedEx ) @@ -149,7 +149,7 @@ PROCEDURE Main() ? "Save GIF ? :", fi_Save( FIF_GIF, im, IMAGES_OUT + "wrong.gif", 0 ) //? ValToPrg( fi_GetInfoHeader( im ) ) - //bmpinfoheader:Buffer( fi_GetInfoHeader( im ), TRUE ) + //bmpinfoheader:Buffer( fi_GetInfoHeader( im ), .T. ) //bmpinfoheader:Pointer( fi_GetInfoHeader( im ) ) //? "Header :", ValToPrg( bmpinfoheader ) //? bmpinfoheader:SayMembers(" ", .t., .t.) diff --git a/harbour/contrib/hbgd/gdchart.prg b/harbour/contrib/hbgd/gdchart.prg index bf12cdfcf3..6219577415 100644 --- a/harbour/contrib/hbgd/gdchart.prg +++ b/harbour/contrib/hbgd/gdchart.prg @@ -192,14 +192,14 @@ METHOD PieChart() CLASS GDChart nExtrude := HGetValue( hElement, "EXTRUDE" ) pTile := HGetValue( hElement, "TILE" ) IF nExtrude <> NIL - lExtruded := TRUE + lExtruded := .T. ELSE - lExtruded := FALSE + lExtruded := .F. ENDIF colorp := HGetValue( hElement, "COLOR" ) nVal := hElement["VALUE"] nDim := 360 * ( ( nVal / nTot ) * 100 ) / 100 - DEFAULT lFilled TO FALSE + DEFAULT lFilled TO .F. DEFAULT nExtrude TO 0 DEFAULT colorp TO ::SetColor( 0, 0, 0 ) IF lExtruded @@ -218,9 +218,9 @@ METHOD PieChart() CLASS GDChart endif ENDIF IF lFilled - ::Arc( nPosX, nPosY, nWidth, nWidth, nDegree, nDegree + nDim, TRUE, colorp, gdPie ) + ::Arc( nPosX, nPosY, nWidth, nWidth, nDegree, nDegree + nDim, .T., colorp, gdPie ) ELSE - ::Arc( nPosX, nPosY, nWidth, nWidth, nDegree, nDegree + nDim, TRUE, colorp, gdNoFill + gdEdged ) + ::Arc( nPosX, nPosY, nWidth, nWidth, nDegree, nDegree + nDim, .T., colorp, gdNoFill + gdEdged ) ENDIF IF cLabel <> NIL hFont := HGetValue( hElement, "FONT" ) @@ -273,10 +273,10 @@ METHOD VerticalBarChart() CLASS GDChart LOCAL nRightLabelSpace //:= 40 LOCAL nBottomLabelSpace //:= 40 LOCAL nTopLabelSpace := 40 - LOCAL lShowLabelLeft := TRUE - LOCAL lShowLabelRight := TRUE //FALSE - LOCAL lShowLabelBottom := TRUE - LOCAL lShowLabelTop := FALSE + LOCAL lShowLabelLeft := .T. + LOCAL lShowLabelRight := .T. //.F. + LOCAL lShowLabelBottom := .T. + LOCAL lShowLabelTop := .F. LOCAL cAxisPict LOCAL cFontPitch @@ -301,8 +301,8 @@ METHOD VerticalBarChart() CLASS GDChart DEFAULT nWidth TO ::Width() DEFAULT nHeight TO ::Height() DEFAULT color TO ::GetColor() - DEFAULT lShowAxis TO TRUE - DEFAULT lShowGrid TO TRUE + DEFAULT lShowAxis TO .T. + DEFAULT lShowGrid TO .T. DEFAULT cAxisPict TO "@E 9,999.99" DEFAULT cFontPitch TO "TINY" @@ -368,7 +368,7 @@ METHOD VerticalBarChart() CLASS GDChart nSize := nWidth / Len( aDataOfHash ) IF lShowGrid - ::Rectangle( x, ::Height() - ( y + nHeight ), x + nWidth, ::Height() - y, FALSE, color ) + ::Rectangle( x, ::Height() - ( y + nHeight ), x + nWidth, ::Height() - y, .F., color ) nThick := ::SetThickness( 1 ) @@ -412,15 +412,15 @@ METHOD VerticalBarChart() CLASS GDChart //nExtrude := HGetValue( hElement, "EXTRUDE" ) pTile := HGetValue( hElement, "TILE" ) //IF nExtrude <> NIL - // lExtruded := TRUE + // lExtruded := .T. //ELSE - // lExtruded := FALSE + // lExtruded := .F. //ENDIF colorp := HGetValue( hElement, "COLOR" ) nVal := hElement["VALUE"] nDim := ( nVal / nMaxValue ) * nHeight - DEFAULT lFilled TO FALSE + DEFAULT lFilled TO .F. //DEFAULT nExtrude TO 0 DEFAULT colorp TO ::SetColor( 0, 0, 0 ) @@ -462,10 +462,10 @@ METHOD HorizontalBarChart() CLASS GDChart LOCAL nRightLabelSpace //:= 40 LOCAL nBottomLabelSpace //:= 40 LOCAL nTopLabelSpace //:= 40 - LOCAL lShowLabelLeft := TRUE - LOCAL lShowLabelRight := TRUE - LOCAL lShowLabelBottom := TRUE - LOCAL lShowLabelTop := TRUE + LOCAL lShowLabelLeft := .T. + LOCAL lShowLabelRight := .T. + LOCAL lShowLabelBottom := .T. + LOCAL lShowLabelTop := .T. LOCAL cAxisPict LOCAL cFontPitch @@ -490,8 +490,8 @@ METHOD HorizontalBarChart() CLASS GDChart DEFAULT nWidth TO ::Width() DEFAULT nHeight TO ::Height() DEFAULT color TO ::GetColor() - DEFAULT lShowAxis TO TRUE - DEFAULT lShowGrid TO TRUE + DEFAULT lShowAxis TO .T. + DEFAULT lShowGrid TO .T. DEFAULT cAxisPict TO "@E 9,999.99" DEFAULT cFontPitch TO "TINY" @@ -553,7 +553,7 @@ METHOD HorizontalBarChart() CLASS GDChart nSize := nHeight / Len( aDataOfHash ) IF lShowGrid - ::Rectangle( x, ::Height() - ( y + nHeight ), x + nWidth, ::Height() - y, FALSE, color ) + ::Rectangle( x, ::Height() - ( y + nHeight ), x + nWidth, ::Height() - y, .F., color ) nThick := ::SetThickness( 1 ) @@ -596,15 +596,15 @@ METHOD HorizontalBarChart() CLASS GDChart //nExtrude := HGetValue( hElement, "EXTRUDE" ) pTile := HGetValue( hElement, "TILE" ) //IF nExtrude <> NIL - // lExtruded := TRUE + // lExtruded := .T. //ELSE - // lExtruded := FALSE + // lExtruded := .F. //ENDIF colorp := HGetValue( hElement, "COLOR" ) nVal := hElement["VALUE"] nDim := ( nVal / nMaxValue ) * nWidth //__OutDebug( "nDim", nDim ) - DEFAULT lFilled TO FALSE + DEFAULT lFilled TO .F. //DEFAULT nExtrude TO 0 DEFAULT colorp TO ::SetColor( 0, 0, 0 ) @@ -648,10 +648,10 @@ METHOD LineChart() CLASS GDChart LOCAL nRightLabelSpace //:= 40 LOCAL nBottomLabelSpace //:= 40 LOCAL nTopLabelSpace := 40 - LOCAL lShowLabelLeft := TRUE - LOCAL lShowLabelRight := TRUE //FALSE - LOCAL lShowLabelBottom := TRUE - LOCAL lShowLabelTop := FALSE + LOCAL lShowLabelLeft := .T. + LOCAL lShowLabelRight := .T. //.F. + LOCAL lShowLabelBottom := .T. + LOCAL lShowLabelTop := .F. LOCAL cAxisPict LOCAL cFontPitch @@ -677,8 +677,8 @@ METHOD LineChart() CLASS GDChart DEFAULT nWidth TO ::Width() DEFAULT nHeight TO ::Height() DEFAULT colorp TO ::GetColor() - DEFAULT lShowAxis TO TRUE - DEFAULT lShowGrid TO TRUE + DEFAULT lShowAxis TO .T. + DEFAULT lShowGrid TO .T. DEFAULT cAxisPict TO "@E 9,999.99" DEFAULT cFontPitch TO "TINY" @@ -774,7 +774,7 @@ METHOD LineChart() CLASS GDChart nTotRange := nMaxValue + iif( nMinValue < 0, abs( nMinValue ), 0 ) IF lShowGrid - ::Rectangle( x, ::Height() - ( y + nHeight ), x + nWidth, ::Height() - y, FALSE, colorp ) + ::Rectangle( x, ::Height() - ( y + nHeight ), x + nWidth, ::Height() - y, .F., colorp ) nThick := ::SetThickness( 1 ) @@ -824,15 +824,15 @@ METHOD LineChart() CLASS GDChart //nExtrude := HGetValue( hElement, "EXTRUDE" ) pTile := HGetValue( hElement, "TILE" ) //IF nExtrude <> NIL - // lExtruded := TRUE + // lExtruded := .T. //ELSE - // lExtruded := FALSE + // lExtruded := .F. //ENDIF colorp := HGetValue( hElement, "COLOR" ) nVal := hElement["VALUE"] nDim := ( ( nVal + abs( nMinValue ) ) / nTotRange ) * nHeight - //DEFAULT lFilled TO FALSE + //DEFAULT lFilled TO .F. //DEFAULT nExtrude TO 0 DEFAULT colorp TO ::SetColor( 0, 0, 0 ) @@ -897,7 +897,7 @@ METHOD Clone() CLASS GDChart //pImage := oDestImage:pImage //// Signal that this image must not be destroyed - //oDestImage:lDestroy := FALSE + //oDestImage:lDestroy := .F. //oDestImage := NIL //oDestImage:pImage := pImage diff --git a/harbour/contrib/hbgd/gdimage.prg b/harbour/contrib/hbgd/gdimage.prg index 828b17f2f8..4895a961ea 100644 --- a/harbour/contrib/hbgd/gdimage.prg +++ b/harbour/contrib/hbgd/gdimage.prg @@ -71,7 +71,7 @@ CLASS GDImage DATA aPoints INIT {} DATA aStyles INIT {} - DATA lDestroy INIT TRUE + DATA lDestroy INIT .T. EXPORTED: DATA hFile @@ -259,8 +259,8 @@ CLASS GDImage METHOD SetTransparent( pColor ) INLINE gdImageColorTransparent( ::pImage, pColor ) METHOD SetSharpen( nPerc ) INLINE gdImageSharpen( ::pImage, nPerc ) METHOD SetInterlace( lOnOff ) INLINE gdImageInterlace( ::pImage, lOnOff ) - METHOD SetInterlaceOn() INLINE gdImageInterlace( ::pImage, TRUE ) - METHOD SetInterlaceOff() INLINE gdImageInterlace( ::pImage, FALSE ) + METHOD SetInterlaceOn() INLINE gdImageInterlace( ::pImage, .T. ) + METHOD SetInterlaceOff() INLINE gdImageInterlace( ::pImage, .F. ) /* COPY AND RESIZING FUNCTIONS */ METHOD Copy() @@ -307,7 +307,7 @@ RETURN METHOD Polygon( aPoints, lFilled, color ) CLASS GDImage DEFAULT aPoints TO ::aPoints - DEFAULT lFilled TO FALSE + DEFAULT lFilled TO .F. DEFAULT color TO ::pColor IF lFilled gdImageFilledPolygon( ::pImage, aPoints, color ) @@ -325,7 +325,7 @@ RETURN Self #endif METHOD Rectangle( x1, y1, x2, y2, lFilled, color ) CLASS GDImage - DEFAULT lFilled TO FALSE + DEFAULT lFilled TO .F. DEFAULT color TO ::pColor IF lFilled gdImageFilledRectangle( ::pImage, x1, y1, x2, y2, color ) @@ -335,7 +335,7 @@ METHOD Rectangle( x1, y1, x2, y2, lFilled, color ) CLASS GDImage RETURN Self METHOD Arc( x, y, nWidth, nHeight, nStartDegree, nEndDegree, lFilled, color, nStyle ) CLASS GDImage - DEFAULT lFilled TO FALSE + DEFAULT lFilled TO .F. DEFAULT color TO ::pColor DEFAULT nStyle TO gdArc IF lFilled @@ -346,7 +346,7 @@ METHOD Arc( x, y, nWidth, nHeight, nStartDegree, nEndDegree, lFilled, color, nSt RETURN Self METHOD Ellipse( x, y, nWidth, nHeight, lFilled, color ) CLASS GDImage - DEFAULT lFilled TO FALSE + DEFAULT lFilled TO .F. DEFAULT color TO ::pColor IF lFilled gdImageFilledEllipse( ::pImage, x, y, nWidth, nHeight, color ) @@ -362,7 +362,7 @@ METHOD LoadFromFile( cFile ) CLASS GDImage ::Destroy() Self := ::CloneDataFrom( aLoad[1] ) //Self := __objClone( aLoad[1] ) - aLoad[1]:lDestroy := FALSE + aLoad[1]:lDestroy := .F. aLoad[1] := NIL ::hFile := aLoad[2] @@ -520,7 +520,7 @@ METHOD Rotate( nAngle, lInside ) CLASS GDImage LOCAL nWidth, nHeight LOCAL nAngRad := nAngle * PI() / 180 - DEFAULT lInside TO FALSE + DEFAULT lInside TO .F. IF !lInside nWidth := ::Width * cos( nAngRad ) + ::Height * sin( nAngRad ) @@ -548,7 +548,7 @@ METHOD Rotate( nAngle, lInside ) CLASS GDImage // Move new image to existing one // Signal that this image must not be destroyed - oDestImage:lDestroy := FALSE + oDestImage:lDestroy := .F. oDestImage := NIL RETURN Self @@ -563,7 +563,7 @@ METHOD Crop( nX, nY, nWidth, nHeight ) CLASS GDImage // Move new image to existing one // Signal that this image must not be destroyed - oDestImage:lDestroy := FALSE + oDestImage:lDestroy := .F. oDestImage := NIL RETURN Self @@ -578,7 +578,7 @@ METHOD Resize( nWidth, nHeight ) CLASS GDImage // Move new image to existing one // Signal that this image must not be destroyed - oDestImage:lDestroy := FALSE + oDestImage:lDestroy := .F. oDestImage := NIL RETURN Self @@ -593,7 +593,7 @@ METHOD Zoom( nPerc ) CLASS GDImage // Move new image to existing one // Signal that this image must not be destroyed - oDestImage:lDestroy := FALSE + oDestImage:lDestroy := .F. oDestImage := NIL RETURN Self @@ -617,7 +617,7 @@ METHOD Clone() CLASS GDImage //pImage := oDestImage:pImage //// Signal that this image must not be destroyed - //oDestImage:lDestroy := FALSE + //oDestImage:lDestroy := .F. //oDestImage := NIL //oDestImage:pImage := pImage diff --git a/harbour/contrib/hbgd/tests/counter.prg b/harbour/contrib/hbgd/tests/counter.prg index 1980e07750..1e899e9450 100644 --- a/harbour/contrib/hbgd/tests/counter.prg +++ b/harbour/contrib/hbgd/tests/counter.prg @@ -128,7 +128,7 @@ PROCEDURE Main( cValue, cBaseImage ) // Set the digit as tile that I have to use to fill position in counter oI:SetTile( oTemp ) // Fill the position with the image digit - oI:Rectangle( (n - 1) * nNumWidth, 0, (n - 1) * nNumWidth + nNumWidth, nHeight, TRUE, gdTiled ) + oI:Rectangle( (n - 1) * nNumWidth, 0, (n - 1) * nNumWidth + nNumWidth, nHeight, .T., gdTiled ) NEXT /* Write Final Counter Image */ diff --git a/harbour/contrib/hbgd/tests/gdtestcl.prg b/harbour/contrib/hbgd/tests/gdtestcl.prg index 6543888063..0486500296 100644 --- a/harbour/contrib/hbgd/tests/gdtestcl.prg +++ b/harbour/contrib/hbgd/tests/gdtestcl.prg @@ -245,13 +245,13 @@ PROCEDURE Main() oI5:AddDef( "FONTPITCH", "GIANT" ) oI5:SetData( { ; - { "LABEL" => "One" , "VALUE" => 10, "COLOR" => blue , "FILLED" => TRUE, "EXTRUDE" => 40/*, "TILE" => oB*/ },; - { "LABEL" => "Two" , "VALUE" => 35, "COLOR" => gray , "FILLED" => TRUE, "FONT" => { "NAME" => "Verdana", "PITCH" => 12, "ANGLE" => 0, "COLOR" => red } },; - { "LABEL" => "Three", "VALUE" => 55, "COLOR" => green, "FILLED" => TRUE }, ; - { "LABEL" => "Four" , "VALUE" => 55, "FILLED" => TRUE , "TILE" => oB }, ; - { "LABEL" => "Five" , "VALUE" => 55, "COLOR" => red , "FILLED" => TRUE, "EXTRUDE" => 20}, ; - { "LABEL" => "Six" , "VALUE" => 55, "FILLED" => TRUE , "TILE" => oB }, ; - { "LABEL" => "Seven", "VALUE" => 55, "FILLED" => TRUE , "COLOR" => green } ; + { "LABEL" => "One" , "VALUE" => 10, "COLOR" => blue , "FILLED" => .T., "EXTRUDE" => 40/*, "TILE" => oB*/ },; + { "LABEL" => "Two" , "VALUE" => 35, "COLOR" => gray , "FILLED" => .T., "FONT" => { "NAME" => "Verdana", "PITCH" => 12, "ANGLE" => 0, "COLOR" => red } },; + { "LABEL" => "Three", "VALUE" => 55, "COLOR" => green, "FILLED" => .T. }, ; + { "LABEL" => "Four" , "VALUE" => 55, "FILLED" => .T. , "TILE" => oB }, ; + { "LABEL" => "Five" , "VALUE" => 55, "COLOR" => red , "FILLED" => .T., "EXTRUDE" => 20 }, ; + { "LABEL" => "Six" , "VALUE" => 55, "FILLED" => .T. , "TILE" => oB }, ; + { "LABEL" => "Seven", "VALUE" => 55, "FILLED" => .T. , "COLOR" => green } ; } ) //oI5:VerticalBarChart() @@ -284,29 +284,29 @@ PROCEDURE Main() /* oI5:SetData( { ; - { "LABEL" => "One", "VALUE" => 1000, "COLOR" => blue, "FILLED" => TRUE, "EXTRUDE" => 40 },; - { "LABEL" => "Two", "VALUE" => 3500, "COLOR" => gray, "FILLED" => TRUE, "FONT" => { "NAME" => "Verdana", "PITCH" => 12, "ANGLE" => 0, "COLOR" => red } },; - { "LABEL" => "Three", "VALUE" => 5500, "COLOR" => green, "FILLED" => TRUE }, ; - { "LABEL" => "Four", "VALUE" => 6500, "FILLED" => TRUE, "TILE" => oB }, ; - { "LABEL" => "Five", "VALUE" => 3400, "FILLED" => TRUE, "COLOR" => green }, ; + { "LABEL" => "One", "VALUE" => 1000, "COLOR" => blue, "FILLED" => .T., "EXTRUDE" => 40 },; + { "LABEL" => "Two", "VALUE" => 3500, "COLOR" => gray, "FILLED" => .T., "FONT" => { "NAME" => "Verdana", "PITCH" => 12, "ANGLE" => 0, "COLOR" => red } },; + { "LABEL" => "Three", "VALUE" => 5500, "COLOR" => green, "FILLED" => .T. }, ; + { "LABEL" => "Four", "VALUE" => 6500, "FILLED" => .T., "TILE" => oB }, ; + { "LABEL" => "Five", "VALUE" => 3400, "FILLED" => .T., "COLOR" => green }, ; { "LABEL" => "Six", "VALUE" => 10000 }, ; - { "LABEL" => "Seven", "VALUE" => 0, "FILLED" => TRUE, "COLOR" => red }, ; + { "LABEL" => "Seven", "VALUE" => 0, "FILLED" => .T., "COLOR" => red }, ; { "LABEL" => "Eight", "VALUE" => -2200 }, ; - { "LABEL" => "Nine", "VALUE" => -3600, "COLOR" => blue, "FILLED" => TRUE } ; + { "LABEL" => "Nine", "VALUE" => -3600, "COLOR" => blue, "FILLED" => .T. } ; } ) */ oI5:SetData( { ; - { "LABEL" => "One", "VALUE" => 10, "COLOR" => blue, "FILLED" => TRUE, "EXTRUDE" => 40/*, "TILE" => oB*/ },; - { "LABEL" => "Two", "VALUE" => 35, "COLOR" => gray, "FILLED" => TRUE, "FONT" => { "NAME" => "Verdana", "PITCH" => 12, "ANGLE" => 0, "COLOR" => red } },; - { "LABEL" => "Three", "VALUE" => 55, "COLOR" => green, "FILLED" => TRUE }, ; - { "LABEL" => "Four", "VALUE" => 65, "FILLED" => TRUE, "TILE" => oB }, ; - { "LABEL" => "Five", "VALUE" => 34, "FILLED" => TRUE, "COLOR" => green }, ; + { "LABEL" => "One", "VALUE" => 10, "COLOR" => blue, "FILLED" => .T., "EXTRUDE" => 40/*, "TILE" => oB*/ },; + { "LABEL" => "Two", "VALUE" => 35, "COLOR" => gray, "FILLED" => .T., "FONT" => { "NAME" => "Verdana", "PITCH" => 12, "ANGLE" => 0, "COLOR" => red } },; + { "LABEL" => "Three", "VALUE" => 55, "COLOR" => green, "FILLED" => .T. }, ; + { "LABEL" => "Four", "VALUE" => 65, "FILLED" => .T., "TILE" => oB }, ; + { "LABEL" => "Five", "VALUE" => 34, "FILLED" => .T., "COLOR" => green }, ; { "LABEL" => "Six", "VALUE" => 100 }, ; - { "LABEL" => "Seven", "VALUE" => 0, "FILLED" => TRUE, "COLOR" => red }, ; + { "LABEL" => "Seven", "VALUE" => 0, "FILLED" => .T., "COLOR" => red }, ; { "LABEL" => "Eight", "VALUE" => -0 }, ; - { "LABEL" => "Nine", "VALUE" => -0, "COLOR" => blue, "FILLED" => TRUE } ; + { "LABEL" => "Nine", "VALUE" => -0, "COLOR" => blue, "FILLED" => .T. } ; } ) @@ -330,4 +330,3 @@ PROCEDURE Main() ? RETURN - diff --git a/harbour/contrib/hbnf/floptst.prg b/harbour/contrib/hbnf/floptst.prg index ca52f0cc40..57ff5610cc 100644 --- a/harbour/contrib/hbnf/floptst.prg +++ b/harbour/contrib/hbnf/floptst.prg @@ -90,9 +90,6 @@ #include "ftint86.ch" -#define TRUE .T. -#define FALSE .F. - #DEFINE ERR_WRONG_PARAMETERS -1 #DEFINE ERR_NO_ERROR 0 #DEFINE ERR_DRIVE_NOT_READY 1 @@ -171,7 +168,7 @@ STATIC FUNCTION _GetDisketteNum( ; // returns false if no floppy drive // ASSERT 0 <= nDrive_i - lRetCode := FALSE + lRetCode := .F. IF FT_INT86( 1*16+1, aRegs ) // INT for equipment determination nByte := lowbyte( aRegs[AX] ) // bit 0 indicates floppy drive installed @@ -179,7 +176,7 @@ STATIC FUNCTION _GetDisketteNum( ; // returns false if no floppy drive // bits 6 & 7 indicate number of floppies installed upto 4. nDriveCount := Asc( FT_BYTEAND( Chr(nByte), chr(BITS_6AND7) ) ) IF nDriveCount >= nDrive_i - lRetCode := TRUE + lRetCode := .T. ENDIF ENDIF ENDIF @@ -259,7 +256,7 @@ STATIC FUNCTION _CallInt13hRetry( ; // logical: did the interrupt su LOCAL nInterrupt_c := 1*16+3 // INT 13h LOCAL i - lCarrySet := FALSE + lCarrySet := .F. aRegisters := AClone( aRegs_io ) lSuccess := FT_INT86( nInterrupt_c, aRegisters ) IF lSuccess diff --git a/harbour/contrib/hbnf/nooccur.prg b/harbour/contrib/hbnf/nooccur.prg index 53a89066c3..e21ea19a05 100644 --- a/harbour/contrib/hbnf/nooccur.prg +++ b/harbour/contrib/hbnf/nooccur.prg @@ -56,7 +56,7 @@ * // Find the number of times "the" appears in cMemoString, case * // sensitive * - * nNoOfOccurrences := FT_NOOCCUR( "the", cMemoString, TRUE ) + * nNoOfOccurrences := FT_NOOCCUR( "the", cMemoString, .T. ) * $END$ */ diff --git a/harbour/contrib/hbsqlit3/tests/authoriz.prg b/harbour/contrib/hbsqlit3/tests/authoriz.prg index 248bc527b8..cf7539651a 100644 --- a/harbour/contrib/hbsqlit3/tests/authoriz.prg +++ b/harbour/contrib/hbsqlit3/tests/authoriz.prg @@ -53,26 +53,26 @@ /* * Using sqlite3_set_authorizer() * - * This routine registers a authorizer callback with a particular - * database connection, supplied in the first argument. + * This routine registers a authorizer callback with a particular + * database connection, supplied in the first argument. * The authorizer callback is invoked as SQL statements are being compiled * by sqlite3_prepare(). * * When the callback returns SQLITE_OK, that means the operation requested - * is ok. + * is ok. * When the callback returns SQLITE_DENY, the sqlite3_prepare() or * equivalent call that triggered the authorizer will fail with an error - * message explaining that access is denied. - * If the authorizer code is SQLITE_READ and the callback returns + * message explaining that access is denied. + * If the authorizer code is SQLITE_READ and the callback returns * SQLITE_IGNORE then the prepared statement statement is constructed to - * substitute a NULL value in place of the table column that would have - * been read if SQLITE_OK had been returned. + * substitute a NULL value in place of the table column that would have + * been read if SQLITE_OK had been returned. * The SQLITE_IGNORE return can be used to deny an untrusted user access * to individual columns of a table. * - * The first parameter to the authorizer callback is an integer - * action code that specifies the particular action to be authorized. - * The second through fourth parameters to the callback are strings + * The first parameter to the authorizer callback is an integer + * action code that specifies the particular action to be authorized. + * The second through fourth parameters to the callback are strings * that contain additional details about the action to be authorized. */ @@ -86,7 +86,7 @@ FUNCTION main() IF Empty( pDb := PrepareDB(cFile) ) RETURN 1 ENDIF - // Authorizer1 + // Authorizer1 sqlite3_set_authorizer( pDb, @Authorizer() /*"Authorizer"*/ ) QOut( cSQLTEXT := "SELECT * FROM main.person WHERE age BETWEEN 20 AND 40" ) @@ -108,7 +108,7 @@ FUNCTION main() Qout( cErrorMsg(sqlite3_exec(pDb, cSQLTEXT, cb), FALSE) ) sqlite3_sleep( 3000 ) - // + // pDb := Nil // close database // RETURN 0 @@ -127,7 +127,7 @@ RETURN SQLITE_OK /** */ FUNCTION Authorizer2( nAction, cName1, cName2, cDatabaseName, cTriggerOrViewName ) -LOCAL oldColor := SetColor( "R/N" ) +LOCAL oldColor := SetColor( "R/N" ) // Qout( "=>", StrZero(nAction, 2), cName1, cName2, cDatabaseName, cTriggerOrViewName ) @@ -189,9 +189,9 @@ STATIC FUNCTION cErrorMsg( nError, lShortMsg ) { SQLITE_DONE , "SQLITE_DONE" , "sqlite3_step() has finished executing" } ; }, nIndex, cErrorMsg := "UNKNOWN" // - DEFAULT lShortMsg TO TRUE + DEFAULT lShortMsg TO .T. - IF hb_IsNumeric( nError ) + IF hb_IsNumeric( nError ) IF nError == 0 cErrorMsg := "SQLITE_OK" ELSE @@ -215,7 +215,7 @@ STATIC FUNCTION PrepareDB( cFile ) "Ivet" => 28 ; }, enum // - pDb := sqlite3_open( cFile, TRUE ) + pDb := sqlite3_open( cFile, .T. ) IF Empty( pDb ) QOut( "Can't open/create database : ", cFile ) diff --git a/harbour/contrib/hbsqlit3/tests/backup.prg b/harbour/contrib/hbsqlit3/tests/backup.prg index d4531a310a..662c376b9f 100644 --- a/harbour/contrib/hbsqlit3/tests/backup.prg +++ b/harbour/contrib/hbsqlit3/tests/backup.prg @@ -53,13 +53,13 @@ /* * Using sqlite3_backup_*() * - * This API is used to overwrite the contents of one database with that - * of another. It is useful either for creating backups of databases or + * This API is used to overwrite the contents of one database with that + * of another. It is useful either for creating backups of databases or * for copying in-memory databases to or from persistent files. * - * sqlite3_backup_init() is called once to initialize the backup, + * sqlite3_backup_init() is called once to initialize the backup, * sqlite3_backup_step() is called one or more times to transfer the data - * between the two databases, and finally + * between the two databases, and finally * sqlite3_backup_finish() is called to release all resources associated * with the backup operation. */ @@ -89,7 +89,7 @@ FUNCTION main() RETURN 1 ENDIF - sqlite3_trace( pDbDest, TRUE, "backup.log" ) + sqlite3_trace( pDbDest, .T., "backup.log" ) // pBackup := sqlite3_backup_init( pDbDest, "main", pDbSource, "main" ) @@ -169,9 +169,9 @@ STATIC FUNCTION cErrorMsg( nError, lShortMsg ) { SQLITE_DONE , "SQLITE_DONE" , "sqlite3_step() has finished executing" } ; }, nIndex, cErrorMsg := "UNKNOWN" // - DEFAULT lShortMsg TO TRUE + DEFAULT lShortMsg TO .T. - IF hb_IsNumeric( nError ) + IF hb_IsNumeric( nError ) IF nError == 0 cErrorMsg := "SQLITE_OK" ELSE @@ -195,14 +195,14 @@ STATIC FUNCTION PrepareDB( cFile ) "Ivet" => 28 ; }, enum // - pDb := sqlite3_open( cFile, TRUE ) + pDb := sqlite3_open( cFile, .T. ) IF Empty( pDb ) QOut( "Can't open/create database : ", cFile ) RETURN NIL ENDIF - sqlite3_trace( pDb, TRUE, "backup.log" ) + sqlite3_trace( pDb, .T., "backup.log" ) cSQLTEXT := "CREATE TABLE person( name TEXT, age INTEGER )" cMsg := cErrorMsg( sqlite3_exec(pDb, cSQLTEXT) ) diff --git a/harbour/contrib/hbsqlit3/tests/hooks.prg b/harbour/contrib/hbsqlit3/tests/hooks.prg index 3ae07e9d29..bd83d1419e 100644 --- a/harbour/contrib/hbsqlit3/tests/hooks.prg +++ b/harbour/contrib/hbsqlit3/tests/hooks.prg @@ -183,9 +183,9 @@ STATIC FUNCTION cErrorMsg( nError, lShortMsg ) { SQLITE_DONE , "SQLITE_DONE" , "sqlite3_step() has finished executing" } ; }, nIndex, cErrorMsg := "UNKNOWN" // - DEFAULT lShortMsg TO TRUE + DEFAULT lShortMsg TO .T. - IF hb_IsNumeric( nError ) + IF hb_IsNumeric( nError ) IF nError == 0 cErrorMsg := "SQLITE_OK" ELSE @@ -209,7 +209,7 @@ STATIC FUNCTION PrepareDB( cFile ) "Ivet" => 28 ; }, enum // - pDb := sqlite3_open( cFile, TRUE ) + pDb := sqlite3_open( cFile, .T. ) IF Empty( pDb ) QOut( "Can't open/create database : ", cFile ) @@ -234,7 +234,7 @@ STATIC FUNCTION PrepareDB( cFile ) RETURN NIL ENDIF - + QOut( sqlite3_sql(pStmt) ) QOut( Replicate("-", Len(cSQLTEXT)) ) diff --git a/harbour/contrib/xhb/decode.prg b/harbour/contrib/xhb/decode.prg index cc5ab8bc05..1687c01f57 100644 --- a/harbour/contrib/xhb/decode.prg +++ b/harbour/contrib/xhb/decode.prg @@ -105,14 +105,14 @@ FUNCTION HB_Decode(...) xVal := aParams[ 1 ] - hb_ADel( aParams, 1, TRUE ) // Resize params + hb_ADel( aParams, 1, .T. ) // Resize params nParams := Len( aParams ) // if I have a odd number of members, last is default IF ( nParams % 2 <> 0 ) xDefault := aTail( aParams ) // Resize again deleting last - hb_ADel( aParams, nParams, TRUE ) + hb_ADel( aParams, nParams, .T. ) nParams := Len( aParams ) ENDIF @@ -185,7 +185,7 @@ FUNCTION HB_Decode(...) ENDIF // Then add Decoding value at beginning - hb_AIns( aParams, 1, xVal, TRUE ) + hb_AIns( aParams, 1, xVal, .T. ) // And run decode() again xRet := hb_ExecFromArray( @hb_Decode(), aParams ) diff --git a/harbour/source/rdd/usrrdd/rdds/arrayrdd.prg b/harbour/source/rdd/usrrdd/rdds/arrayrdd.prg index 1d4f75c06a..13059954a9 100644 --- a/harbour/source/rdd/usrrdd/rdds/arrayrdd.prg +++ b/harbour/source/rdd/usrrdd/rdds/arrayrdd.prg @@ -121,7 +121,7 @@ STATIC FUNCTION AR_DATABASEINIT() {} ,; // DATABASE_RECORDS {} ,; // DATABASE_RECINFO 0 ,; // DATABASE_OPENNUMBER - FALSE ,; // DATABASE_LOCKED + .F. ,; // DATABASE_LOCKED NIL ; // DATABASE_STRUCT - aStruct } @@ -131,18 +131,18 @@ STATIC FUNCTION AR_WADATAINIT() 0 ,; // WADATA_WORKAREA NIL ,; // WADATA_OPENINFO 0 ,; // WADATA_RECNO - FALSE ,; // WADATA_BOF - FALSE ,; // WADATA_FORCEBOF // to solve an hack in dbf1.c - FALSE ,; // WADATA_EOF - FALSE ,; // WADATA_TOP - FALSE ,; // WADATA_BOTTOM - FALSE ,; // WADATA_FOUND + .F. ,; // WADATA_BOF + .F. ,; // WADATA_FORCEBOF // to solve an hack in dbf1.c + .F. ,; // WADATA_EOF + .F. ,; // WADATA_TOP + .F. ,; // WADATA_BOTTOM + .F. ,; // WADATA_FOUND {} ; // WADATA_LOCKS } STATIC FUNCTION AR_RECDATAINIT() RETURN { ; - FALSE ; // RECDATA_DELETED + .F. ; // RECDATA_DELETED } /* @@ -236,7 +236,7 @@ STATIC FUNCTION AR_CREATE( nWA, aOpenInfo ) /* Setting file attribs */ aDBFData[ DATABASE_FILENAME ] := cFullName - aDBFData[ DATABASE_LOCKED ] := TRUE /* I need Exclusive mode in creation */ + aDBFData[ DATABASE_LOCKED ] := .T. /* I need Exclusive mode in creation */ /* Adding new database in RDD memory slots using filename as key */ hb_hSet( hRDDData, cFullName, aDBFData ) @@ -363,7 +363,7 @@ STATIC FUNCTION AR_OPEN( nWA, aOpenInfo ) // Open file in exclusive mode IF !aOpenInfo[ UR_OI_SHARED ] IF aDBFData[ DATABASE_OPENNUMBER ] == 1 - aDBFData[ DATABASE_LOCKED ] := TRUE + aDBFData[ DATABASE_LOCKED ] := .T. ELSE oError := ErrorNew() oError:GenCode := EG_OPEN @@ -396,7 +396,7 @@ STATIC FUNCTION AR_CLOSE( nWA ) aDBFData[ DATABASE_OPENNUMBER ]-- // unlock file - aDBFData[ DATABASE_LOCKED ] := FALSE // Exclusive mode + aDBFData[ DATABASE_LOCKED ] := .F. // Exclusive mode ENDIF RETURN UR_SUPER_CLOSE( nWA ) @@ -440,7 +440,7 @@ STATIC FUNCTION AR_PUTVALUE( nWA, nField, xValue ) #endif IF nField > 0 .AND. nField <= Len( aStruct ) .AND. ; - IIF( ValType( xValue ) == "C" .AND. aStruct[ nField ][ DBS_TYPE ] == "M", TRUE, ValType( xValue ) == aStruct[ nField ][ DBS_TYPE ] ) + IIF( ValType( xValue ) == "C" .AND. aStruct[ nField ][ DBS_TYPE ] == "M", .T., ValType( xValue ) == aStruct[ nField ][ DBS_TYPE ] ) xVal := PutValue( xValue, aStruct[ nField ][ DBS_TYPE ], aStruct[ nField ][ DBS_LEN ], aStruct[ nField ][ DBS_DEC ] ) @@ -486,8 +486,8 @@ STATIC FUNCTION AR_GOTO( nWA, nRecord ) aWAData[ WADATA_EOF ] := aWAData[ WADATA_BOF ] := .F. aWAData[ WADATA_RECNO ] := nRecord - //pArea->fBof = pArea->fEof = pArea->fValidBuffer = FALSE; - //pArea->fPositioned = TRUE; + //pArea->fBof = pArea->fEof = pArea->fValidBuffer = .F.; + //pArea->fPositioned = .T.; ELSEIF nRecCount == 0 @@ -594,8 +594,8 @@ STATIC FUNCTION AR_SKIPFILTER( nWA, nRecords ) RETURN HB_FAILURE ENDIF IF nToSkip < 0 .AND. aWAData[ WADATA_BOF ] - lBof := TRUE - aWAData[ WADATA_BOF ] := FALSE + lBof := .T. + aWAData[ WADATA_BOF ] := .F. nToSkip := 1 ELSEIF nToSkip > 0 .AND. aWAData[ WADATA_EOF ] EXIT @@ -609,7 +609,7 @@ STATIC FUNCTION AR_SKIPFILTER( nWA, nRecords ) ENDDO IF lBof != NIL - aWAData[ WADATA_BOF ] := TRUE + aWAData[ WADATA_BOF ] := .T. ENDIF ENDIF @@ -665,7 +665,7 @@ STATIC FUNCTION AR_BOF( nWA, lBof ) // This is a hack to protect from dbf1.c skipraw hack IF aWAData[ WADATA_FORCEBOF ] .AND. lBof aWAData[ WADATA_BOF ] := lBof - aWAData[ WADATA_FORCEBOF ] := FALSE + aWAData[ WADATA_FORCEBOF ] := .F. ELSE lBof := aWAData[ WADATA_BOF ] ENDIF @@ -1191,7 +1191,7 @@ STATIC FUNCTION EmptyValue( cType, nLen, nDec ) CASE cType == "D" xVal := CToD( "" ) CASE cType == "L" - xVal := FALSE + xVal := .F. CASE cType == "N" xVal := Val( Str( 0, nLen, nDec ) ) ENDCASE @@ -1221,14 +1221,14 @@ STATIC FUNCTION HB_Decode(...) xVal := aParams[ 1 ] - aDel( aParams, 1, TRUE ) // Resize params + aDel( aParams, 1, .T. ) // Resize params nParams := Len( aParams ) // if I have a odd number of members, last is default IF ( nParams % 2 <> 0 ) xDefault := aTail( aParams ) // Resize again deleting last - aDel( aParams, nParams, TRUE ) + aDel( aParams, nParams, .T. ) nParams := Len( aParams ) ENDIF @@ -1301,7 +1301,7 @@ STATIC FUNCTION HB_Decode(...) ENDIF // Then add Decoding value at beginning - aIns( aParams, 1, xVal, TRUE ) + aIns( aParams, 1, xVal, .T. ) // And run decode() again xRet := hb_ExecFromArray( @hb_Decode(), aParams )