From e0146bde32e6be79efbc655dde1491a66374cd51 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 5 Oct 2012 19:35:54 +0000 Subject: [PATCH] 2012-10-05 21:31 UTC+0200 Viktor Szakats (vszakats syenar.net) * extras/hbvpdf/hbvpdf.prg ! s&r typo in recent mods * extras/hbvpdf/hbvpsup.prg ! typo in recent mods * contrib/hbnf/doc/en/mouse2.txt * contrib/xhb/xhbtedit.prg * extras/gfspell/spell.prg * extras/hbvpdf/tests/pdf_demo.prg * .not. -> ! * contrib/hbformat/hbfmtcls.prg + enabled to convert .not. to ! by default --- harbour/ChangeLog | 16 ++++++++++++++++ harbour/contrib/hbformat/hbfmtcls.prg | 2 +- harbour/contrib/hbnf/doc/en/mouse2.txt | 2 +- harbour/contrib/xhb/xhbtedit.prg | 2 +- harbour/extras/gfspell/spell.prg | 4 ++-- harbour/extras/hbvpdf/hbvpdf.prg | 2 +- harbour/extras/hbvpdf/hbvpsup.prg | 2 +- harbour/extras/hbvpdf/tests/pdf_demo.prg | 2 +- 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1185d8f449..0f87a7ebbe 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,22 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-05 21:31 UTC+0200 Viktor Szakats (vszakats syenar.net) + * extras/hbvpdf/hbvpdf.prg + ! s&r typo in recent mods + + * extras/hbvpdf/hbvpsup.prg + ! typo in recent mods + + * contrib/hbnf/doc/en/mouse2.txt + * contrib/xhb/xhbtedit.prg + * extras/gfspell/spell.prg + * extras/hbvpdf/tests/pdf_demo.prg + * .not. -> ! + + * contrib/hbformat/hbfmtcls.prg + + enabled to convert .not. to ! by default + 2012-10-05 19:22 UTC+0200 Viktor Szakats (vszakats syenar.net) * contrib/gtwvg/syswnd.prg * contrib/gtwvg/tests/tbrowser.prg diff --git a/harbour/contrib/hbformat/hbfmtcls.prg b/harbour/contrib/hbformat/hbfmtcls.prg index 51249a3c9d..c4b8a98f15 100644 --- a/harbour/contrib/hbformat/hbfmtcls.prg +++ b/harbour/contrib/hbformat/hbfmtcls.prg @@ -87,7 +87,7 @@ CREATE CLASS HBFORMATCODE VAR nIndCont INIT 3 // Indent for continuation ( after ';' ) lines - amount of spaces VAR lCnvAst INIT .T. // If true, convert asterisk '*' to '//' VAR lCnvAmp INIT .T. // If true, convert '&&' to '//' - VAR lCnvNot INIT .F. // If true, convert .NOT. TO ! + VAR lCnvNot INIT .T. // If true, convert .NOT. TO ! VAR nCaseCmd INIT 1 // Case of commands ( -1 - no change, 1 - upper, 2 - lower, 3 - title ) VAR nCaseBoo INIT 1 // Case of boolean operators ( -1 - no change, 1 - upper, 2 - lower, 3 - title ) VAR nCaseFnc INIT 4 // Case of functions ( -1 - no change, 1 - upper, 2 - lower, 3 - title, 4 - as in pattern ) diff --git a/harbour/contrib/hbnf/doc/en/mouse2.txt b/harbour/contrib/hbnf/doc/en/mouse2.txt index 087e9a6c9e..160c936f26 100644 --- a/harbour/contrib/hbnf/doc/en/mouse2.txt +++ b/harbour/contrib/hbnf/doc/en/mouse2.txt @@ -22,7 +22,7 @@ * movement is set to the maximum for the current video mode. * Use FT_MSHOWCRS() to display the mouse cursor. * $EXAMPLES$ - * IF .NOT. FT_MINIT() + * IF ! FT_MINIT() * ? "No mouse driver is installed" * ENDIF * $SEEALSO$ diff --git a/harbour/contrib/xhb/xhbtedit.prg b/harbour/contrib/xhb/xhbtedit.prg index 524189ec41..6b03f6d7d1 100644 --- a/harbour/contrib/xhb/xhbtedit.prg +++ b/harbour/contrib/xhb/xhbtedit.prg @@ -2122,7 +2122,7 @@ METHOD SplitLine( nRow ) CLASS XHBEditor LOCAL nPosInWord // Do something only if Word Wrapping is on - IF .NOT. ::lWordWrap // .OR. ( ::LineLen( nRow ) <= ::nWordWrapCol ) + IF ! ::lWordWrap // .OR. ::LineLen( nRow ) <= ::nWordWrapCol RETURN Self ENDIF diff --git a/harbour/extras/gfspell/spell.prg b/harbour/extras/gfspell/spell.prg index 7884927d6e..93149db60a 100644 --- a/harbour/extras/gfspell/spell.prg +++ b/harbour/extras/gfspell/spell.prg @@ -1190,7 +1190,7 @@ endif // See if the DBF file exists // ////////////////////////////////////// -if .not. "."$cDBF +if ! "."$cDBF cDBF += ".DBF" endif @@ -1364,7 +1364,7 @@ endif // See if the DBF file exists // ////////////////////////////////////// -if .not. "."$cDBF +if ! "."$cDBF cDBF += ".DBF" endif diff --git a/harbour/extras/hbvpdf/hbvpdf.prg b/harbour/extras/hbvpdf/hbvpdf.prg index 6ccda16f3f..6a410a804d 100644 --- a/harbour/extras/hbvpdf/hbvpdf.prg +++ b/harbour/extras/hbvpdf/hbvpdf.prg @@ -2448,7 +2448,7 @@ local cData := valtype(xData) if HB_ISSTRING(xData) cData += i2bin(len(xData))+xData elseif HB_ISNUMERIC(xData) - cData += i2bin(len(alhb_ntos(xData)) )+hb_ntos(str(xData)) + cData += i2bin(len(hb_ntos(xData)))+hb_ntos(xData) elseif HB_ISDATE(xData) cData += i2bin(8)+dtos(xData) elseif HB_ISLOGICAL(xData) diff --git a/harbour/extras/hbvpdf/hbvpsup.prg b/harbour/extras/hbvpdf/hbvpsup.prg index 8097ac1159..fa3254fa60 100644 --- a/harbour/extras/hbvpdf/hbvpsup.prg +++ b/harbour/extras/hbvpdf/hbvpsup.prg @@ -3,4 +3,4 @@ */ FUNCTION vpdf_FontsDat() - #pragma __streaminclude "fonts.dat" | RETURN { %s } + #pragma __streaminclude "fonts.dat" | RETURN %s diff --git a/harbour/extras/hbvpdf/tests/pdf_demo.prg b/harbour/extras/hbvpdf/tests/pdf_demo.prg index 6a035e34f9..9657ea2e1c 100644 --- a/harbour/extras/hbvpdf/tests/pdf_demo.prg +++ b/harbour/extras/hbvpdf/tests/pdf_demo.prg @@ -173,7 +173,7 @@ STATIC FUNCTION cton( cString, nBase ) // this function called only used in pdf_ FOR nI := 1 TO nLen cChar := SubStr( cTemp, nI, 1 ) - IF .NOT. IsDigit( cChar ) + IF ! IsDigit( cChar ) n := n + ( ( Asc( cChar ) - 65 ) + 10 ) * ( nBase ^ ( nI - 1 ) ) ELSE n := n + ( ( nBase ^ ( nI - 1 ) ) * Val( cChar ) )