From 2a2d1764dcfbc9ee1a0206274681d112722c504a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 4 Jun 2012 17:08:19 +0000 Subject: [PATCH] 2012-06-04 19:02 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib\gtwvg\wvg3stat.prg * contrib\gtwvg\wvgax.prg * contrib\gtwvg\wvgcheck.prg * contrib\gtwvg\wvgclass.prg * contrib\gtwvg\wvgcombo.prg * contrib\gtwvg\wvgcrt.prg * contrib\gtwvg\wvgdarea.prg * contrib\gtwvg\wvgdatar.prg * contrib\gtwvg\wvgdlg.prg * contrib\gtwvg\wvggenrc.prg * contrib\gtwvg\wvghtmlv.prg * contrib\gtwvg\wvglistb.prg * contrib\gtwvg\wvgmenub.prg * contrib\gtwvg\wvgmle.prg * contrib\gtwvg\wvgpaint.prg * contrib\gtwvg\wvgphdlr.prg * contrib\gtwvg\wvgpushb.prg * contrib\gtwvg\wvgradio.prg * contrib\gtwvg\wvgscrlb.prg * contrib\gtwvg\wvgsle.prg * contrib\gtwvg\wvgstatb.prg * contrib\gtwvg\wvgstatc.prg * contrib\gtwvg\wvgsysw.prg * contrib\gtwvg\wvgtabpg.prg * contrib\gtwvg\wvgtoolb.prg * contrib\gtwvg\wvgtreev.prg * contrib\gtwvg\wvgwnd.prg * contrib\hbblat\blatcls.prg * contrib\hbblink\blinker.prg * contrib\hbcomm\comm.prg * contrib\hbct\ctmisc.prg * contrib\hbct\ctrand.prg * contrib\hbct\cttime.prg * contrib\hbct\fcopy.prg * contrib\hbct\getinfo.prg * contrib\hbct\getinput.prg * contrib\hbct\getsecrt.prg * contrib\hbct\keysec.prg * contrib\hbct\keytime.prg * contrib\hbct\kxlat.prg * contrib\hbct\screen3.prg * contrib\hbct\scrmark.prg * contrib\hbct\showtime.prg * contrib\hbct\tempfile.prg * contrib\hbfbird\tests\test.prg * contrib\hbfbird\tfirebrd.prg * contrib\hbgd\gd.prg * contrib\hbgd\gdbar.prg * contrib\hbgd\gdbarcod.prg * contrib\hbgd\gdchart.prg * contrib\hbmisc\calldll.prg * contrib\hbmisc\hbedit.prg * contrib\hbmisc\udpds.prg * contrib\hbmysql\tmysql.prg * contrib\hbmysql\tsqlbrw.prg * contrib\hbodbc\browodbc.prg * contrib\hbodbc\todbc.prg * contrib\hbpgsql\tpostgre.prg * contrib\hbqt\qtcore\hbqt_misc.prg * contrib\hbrun\hbrun.prg * contrib\hbsms\sms.prg * contrib\hbsqlit3\hdbcsqlt.prg * contrib\hbtip\cgi.prg * contrib\hbtip\client.prg * contrib\hbtip\encb64.prg * contrib\hbtip\encoder.prg * contrib\hbtip\ftpcli.prg * contrib\hbtip\httpcli.prg * contrib\hbtip\log.prg * contrib\hbtip\mail.prg * contrib\hbtip\popcli.prg * contrib\hbtip\sendmail.prg * contrib\hbtip\smtpcli.prg * contrib\hbtip\thtml.prg * contrib\hbtip\url.prg * contrib\hbtpathy\telepath.prg * contrib\hbwin\tests\testprn.prg * contrib\hbwin\wce_sim.prg * contrib\hbwin\win_os.prg * contrib\hbwin\win_reg.prg * contrib\hbwin\win_tbmp.prg * contrib\hbwin\win_tprn.prg * contrib\hbxbp\hbpprocess.prg * contrib\hbxbp\xbp3state.prg * contrib\hbxbp\xbpbrowse.prg * contrib\hbxbp\xbpcheckbox.prg * contrib\hbxbp\xbpcombobox.prg * contrib\hbxbp\xbpcrt.prg * contrib\hbxbp\xbpdataref.prg * contrib\hbxbp\xbpdialog.prg * contrib\hbxbp\xbpfiledialog.prg * contrib\hbxbp\xbpfontdialog.prg * contrib\hbxbp\xbpgeneric.prg * contrib\hbxbp\xbpgra.prg * contrib\hbxbp\xbphtmlviewer.prg * contrib\hbxbp\xbplistbox.prg * contrib\hbxbp\xbpmenubar.prg * contrib\hbxbp\xbpmle.prg * contrib\hbxbp\xbpparthandler.prg * contrib\hbxbp\xbppresspace.prg * contrib\hbxbp\xbpprintdialog.prg * contrib\hbxbp\xbpprinter.prg * contrib\hbxbp\xbppushbutton.prg * contrib\hbxbp\xbpradiobutton.prg * contrib\hbxbp\xbprtf.prg * contrib\hbxbp\xbpscrollbar.prg * contrib\hbxbp\xbpsle.prg * contrib\hbxbp\xbpspinbutton.prg * contrib\hbxbp\xbpstatic.prg * contrib\hbxbp\xbpstatusbar.prg * contrib\hbxbp\xbpstyle.prg * contrib\hbxbp\xbptabpage.prg * contrib\hbxbp\xbptoolbar.prg * contrib\hbxbp\xbptreeview.prg * contrib\hbxbp\xbpwindow.prg * contrib\hbxpp\dbfuncsx.prg * contrib\hbxpp\runshell.prg * contrib\hbxpp\thfuncx.prg * contrib\hbxpp\tthreadx.prg * contrib\xhb\cstruct.prg * contrib\xhb\dbgfx.prg * contrib\xhb\dirrec.prg * contrib\xhb\dumpvar.prg * contrib\xhb\hbcomprs.prg * contrib\xhb\hblog.prg * contrib\xhb\hjwindow.prg * contrib\xhb\hterrsys.prg * contrib\xhb\htmutil.prg * contrib\xhb\sprintf.prg * contrib\xhb\tedit.prg * contrib\xhb\tframe.prg * contrib\xhb\thtm.prg * contrib\xhb\trpc.prg * contrib\xhb\trpccli.prg * contrib\xhb\ttable.prg * contrib\xhb\xcstr.prg * contrib\xhb\xdbmodst.prg * contrib\xhb\xhberr.prg * contrib\xhb\xhbmemo.prg * contrib\xhb\xhbmt.prg * contrib\xhb\xhbtedit.prg * contrib\xhb\xhbver.prg * examples\guestbk\inifiles.prg * examples\hbdoc2\genhtml.prg * examples\hbdoc2\hbdoc2.prg * examples\hbvpdf\hbvpdf.prg * examples\hbvpdf\hbvpdft.prg * examples\httpsrv\uhttpd.prg * examples\rddado\adordd.prg * IS*() macros converted to HB_IS*() function calls. (using full uppercase to make them stand out) % deleted '#include "common.ch"' where possible --- harbour/ChangeLog | 154 +++++++++++++++++++++ harbour/contrib/gtwvg/wvg3stat.prg | 6 +- harbour/contrib/gtwvg/wvgax.prg | 4 +- harbour/contrib/gtwvg/wvgcheck.prg | 8 +- harbour/contrib/gtwvg/wvgclass.prg | 16 +-- harbour/contrib/gtwvg/wvgcombo.prg | 26 ++-- harbour/contrib/gtwvg/wvgcrt.prg | 138 +++++++++---------- harbour/contrib/gtwvg/wvgdarea.prg | 6 +- harbour/contrib/gtwvg/wvgdatar.prg | 18 +-- harbour/contrib/gtwvg/wvgdlg.prg | 6 +- harbour/contrib/gtwvg/wvggenrc.prg | 2 +- harbour/contrib/gtwvg/wvghtmlv.prg | 12 +- harbour/contrib/gtwvg/wvglistb.prg | 16 +-- harbour/contrib/gtwvg/wvgmenub.prg | 24 ++-- harbour/contrib/gtwvg/wvgmle.prg | 22 +-- harbour/contrib/gtwvg/wvgpaint.prg | 8 +- harbour/contrib/gtwvg/wvgphdlr.prg | 72 +++++----- harbour/contrib/gtwvg/wvgpushb.prg | 18 +-- harbour/contrib/gtwvg/wvgradio.prg | 2 +- harbour/contrib/gtwvg/wvgscrlb.prg | 8 +- harbour/contrib/gtwvg/wvgsle.prg | 22 +-- harbour/contrib/gtwvg/wvgstatb.prg | 18 +-- harbour/contrib/gtwvg/wvgstatc.prg | 8 +- harbour/contrib/gtwvg/wvgsysw.prg | 6 +- harbour/contrib/gtwvg/wvgtabpg.prg | 4 +- harbour/contrib/gtwvg/wvgtoolb.prg | 12 +- harbour/contrib/gtwvg/wvgtreev.prg | 24 ++-- harbour/contrib/gtwvg/wvgwnd.prg | 144 ++++++++++---------- harbour/contrib/hbblat/blatcls.prg | 135 ++++++++++--------- harbour/contrib/hbblink/blinker.prg | 14 +- harbour/contrib/hbcomm/comm.prg | 12 +- harbour/contrib/hbct/ctmisc.prg | 13 +- harbour/contrib/hbct/ctrand.prg | 4 +- harbour/contrib/hbct/cttime.prg | 8 +- harbour/contrib/hbct/fcopy.prg | 5 +- harbour/contrib/hbct/getinfo.prg | 8 +- harbour/contrib/hbct/getinput.prg | 8 +- harbour/contrib/hbct/getsecrt.prg | 7 +- harbour/contrib/hbct/keysec.prg | 10 +- harbour/contrib/hbct/keytime.prg | 4 +- harbour/contrib/hbct/kxlat.prg | 17 ++- harbour/contrib/hbct/screen3.prg | 6 +- harbour/contrib/hbct/scrmark.prg | 10 +- harbour/contrib/hbct/showtime.prg | 4 +- harbour/contrib/hbct/tempfile.prg | 5 +- harbour/contrib/hbfbird/tests/test.prg | 13 +- harbour/contrib/hbfbird/tfirebrd.prg | 25 ++-- harbour/contrib/hbgd/gd.prg | 10 +- harbour/contrib/hbgd/gdbar.prg | 2 +- harbour/contrib/hbgd/gdbarcod.prg | 2 +- harbour/contrib/hbgd/gdchart.prg | 12 +- harbour/contrib/hbmisc/calldll.prg | 8 +- harbour/contrib/hbmisc/hbedit.prg | 17 ++- harbour/contrib/hbmisc/udpds.prg | 2 +- harbour/contrib/hbmysql/tmysql.prg | 41 +++--- harbour/contrib/hbmysql/tsqlbrw.prg | 6 +- harbour/contrib/hbodbc/browodbc.prg | 3 +- harbour/contrib/hbodbc/todbc.prg | 13 +- harbour/contrib/hbpgsql/tpostgre.prg | 37 +++-- harbour/contrib/hbqt/qtcore/hbqt_misc.prg | 6 +- harbour/contrib/hbrun/hbrun.prg | 9 +- harbour/contrib/hbsms/sms.prg | 22 ++- harbour/contrib/hbsqlit3/hdbcsqlt.prg | 7 +- harbour/contrib/hbtip/cgi.prg | 32 ++--- harbour/contrib/hbtip/client.prg | 36 ++--- harbour/contrib/hbtip/encb64.prg | 4 +- harbour/contrib/hbtip/encoder.prg | 5 +- harbour/contrib/hbtip/ftpcli.prg | 8 +- harbour/contrib/hbtip/httpcli.prg | 20 +-- harbour/contrib/hbtip/log.prg | 3 +- harbour/contrib/hbtip/mail.prg | 30 ++--- harbour/contrib/hbtip/popcli.prg | 7 +- harbour/contrib/hbtip/sendmail.prg | 54 ++++---- harbour/contrib/hbtip/smtpcli.prg | 10 +- harbour/contrib/hbtip/thtml.prg | 41 +++--- harbour/contrib/hbtip/url.prg | 6 +- harbour/contrib/hbtpathy/telepath.prg | 51 ++++--- harbour/contrib/hbwin/tests/testprn.prg | 5 +- harbour/contrib/hbwin/wce_sim.prg | 16 +-- harbour/contrib/hbwin/win_os.prg | 5 +- harbour/contrib/hbwin/win_reg.prg | 15 +-- harbour/contrib/hbwin/win_tbmp.prg | 5 +- harbour/contrib/hbwin/win_tprn.prg | 17 ++- harbour/contrib/hbxbp/hbpprocess.prg | 8 +- harbour/contrib/hbxbp/xbp3state.prg | 4 +- harbour/contrib/hbxbp/xbpbrowse.prg | 114 ++++++++-------- harbour/contrib/hbxbp/xbpcheckbox.prg | 4 +- harbour/contrib/hbxbp/xbpcombobox.prg | 12 +- harbour/contrib/hbxbp/xbpcrt.prg | 128 +++++++++--------- harbour/contrib/hbxbp/xbpdataref.prg | 12 +- harbour/contrib/hbxbp/xbpdialog.prg | 12 +- harbour/contrib/hbxbp/xbpfiledialog.prg | 8 +- harbour/contrib/hbxbp/xbpfontdialog.prg | 18 +-- harbour/contrib/hbxbp/xbpgeneric.prg | 12 +- harbour/contrib/hbxbp/xbpgra.prg | 8 +- harbour/contrib/hbxbp/xbphtmlviewer.prg | 10 +- harbour/contrib/hbxbp/xbplistbox.prg | 38 +++--- harbour/contrib/hbxbp/xbpmenubar.prg | 46 +++---- harbour/contrib/hbxbp/xbpmle.prg | 22 +-- harbour/contrib/hbxbp/xbpparthandler.prg | 4 +- harbour/contrib/hbxbp/xbppresspace.prg | 32 ++--- harbour/contrib/hbxbp/xbpprintdialog.prg | 4 +- harbour/contrib/hbxbp/xbpprinter.prg | 18 +-- harbour/contrib/hbxbp/xbppushbutton.prg | 8 +- harbour/contrib/hbxbp/xbpradiobutton.prg | 4 +- harbour/contrib/hbxbp/xbprtf.prg | 34 ++--- harbour/contrib/hbxbp/xbpscrollbar.prg | 6 +- harbour/contrib/hbxbp/xbpsle.prg | 14 +- harbour/contrib/hbxbp/xbpspinbutton.prg | 12 +- harbour/contrib/hbxbp/xbpstatic.prg | 2 +- harbour/contrib/hbxbp/xbpstatusbar.prg | 14 +- harbour/contrib/hbxbp/xbpstyle.prg | 4 +- harbour/contrib/hbxbp/xbptabpage.prg | 12 +- harbour/contrib/hbxbp/xbptoolbar.prg | 18 +-- harbour/contrib/hbxbp/xbptreeview.prg | 20 +-- harbour/contrib/hbxbp/xbpwindow.prg | 156 +++++++++++----------- harbour/contrib/hbxpp/dbfuncsx.prg | 8 +- harbour/contrib/hbxpp/runshell.prg | 6 +- harbour/contrib/hbxpp/thfuncx.prg | 10 +- harbour/contrib/hbxpp/tthreadx.prg | 17 ++- harbour/contrib/xhb/cstruct.prg | 11 +- harbour/contrib/xhb/dbgfx.prg | 6 +- harbour/contrib/xhb/dirrec.prg | 4 +- harbour/contrib/xhb/dumpvar.prg | 19 ++- harbour/contrib/xhb/hbcomprs.prg | 23 ++-- harbour/contrib/xhb/hblog.prg | 9 +- harbour/contrib/xhb/hjwindow.prg | 2 +- harbour/contrib/xhb/hterrsys.prg | 11 +- harbour/contrib/xhb/htmutil.prg | 4 +- harbour/contrib/xhb/sprintf.prg | 4 +- harbour/contrib/xhb/tedit.prg | 12 +- harbour/contrib/xhb/tframe.prg | 22 +-- harbour/contrib/xhb/thtm.prg | 78 +++++------ harbour/contrib/xhb/trpc.prg | 14 +- harbour/contrib/xhb/trpccli.prg | 14 +- harbour/contrib/xhb/ttable.prg | 4 +- harbour/contrib/xhb/xcstr.prg | 7 +- harbour/contrib/xhb/xdbmodst.prg | 5 +- harbour/contrib/xhb/xhberr.prg | 46 +++---- harbour/contrib/xhb/xhbmemo.prg | 32 ++--- harbour/contrib/xhb/xhbmt.prg | 10 +- harbour/contrib/xhb/xhbtedit.prg | 8 +- harbour/contrib/xhb/xhbver.prg | 3 +- harbour/examples/guestbk/inifiles.prg | 32 +++-- harbour/examples/hbdoc2/genhtml.prg | 2 +- harbour/examples/hbdoc2/hbdoc2.prg | 12 +- harbour/examples/hbvpdf/hbvpdf.prg | 12 +- harbour/examples/hbvpdf/hbvpdft.prg | 12 +- harbour/examples/httpsrv/uhttpd.prg | 8 +- harbour/examples/rddado/adordd.prg | 8 +- 150 files changed, 1520 insertions(+), 1452 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5e3d48b5bf..4b50d98ea6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,160 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-04 19:02 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib\gtwvg\wvg3stat.prg + * contrib\gtwvg\wvgax.prg + * contrib\gtwvg\wvgcheck.prg + * contrib\gtwvg\wvgclass.prg + * contrib\gtwvg\wvgcombo.prg + * contrib\gtwvg\wvgcrt.prg + * contrib\gtwvg\wvgdarea.prg + * contrib\gtwvg\wvgdatar.prg + * contrib\gtwvg\wvgdlg.prg + * contrib\gtwvg\wvggenrc.prg + * contrib\gtwvg\wvghtmlv.prg + * contrib\gtwvg\wvglistb.prg + * contrib\gtwvg\wvgmenub.prg + * contrib\gtwvg\wvgmle.prg + * contrib\gtwvg\wvgpaint.prg + * contrib\gtwvg\wvgphdlr.prg + * contrib\gtwvg\wvgpushb.prg + * contrib\gtwvg\wvgradio.prg + * contrib\gtwvg\wvgscrlb.prg + * contrib\gtwvg\wvgsle.prg + * contrib\gtwvg\wvgstatb.prg + * contrib\gtwvg\wvgstatc.prg + * contrib\gtwvg\wvgsysw.prg + * contrib\gtwvg\wvgtabpg.prg + * contrib\gtwvg\wvgtoolb.prg + * contrib\gtwvg\wvgtreev.prg + * contrib\gtwvg\wvgwnd.prg + * contrib\hbblat\blatcls.prg + * contrib\hbblink\blinker.prg + * contrib\hbcomm\comm.prg + * contrib\hbct\ctmisc.prg + * contrib\hbct\ctrand.prg + * contrib\hbct\cttime.prg + * contrib\hbct\fcopy.prg + * contrib\hbct\getinfo.prg + * contrib\hbct\getinput.prg + * contrib\hbct\getsecrt.prg + * contrib\hbct\keysec.prg + * contrib\hbct\keytime.prg + * contrib\hbct\kxlat.prg + * contrib\hbct\screen3.prg + * contrib\hbct\scrmark.prg + * contrib\hbct\showtime.prg + * contrib\hbct\tempfile.prg + * contrib\hbfbird\tests\test.prg + * contrib\hbfbird\tfirebrd.prg + * contrib\hbgd\gd.prg + * contrib\hbgd\gdbar.prg + * contrib\hbgd\gdbarcod.prg + * contrib\hbgd\gdchart.prg + * contrib\hbmisc\calldll.prg + * contrib\hbmisc\hbedit.prg + * contrib\hbmisc\udpds.prg + * contrib\hbmysql\tmysql.prg + * contrib\hbmysql\tsqlbrw.prg + * contrib\hbodbc\browodbc.prg + * contrib\hbodbc\todbc.prg + * contrib\hbpgsql\tpostgre.prg + * contrib\hbqt\qtcore\hbqt_misc.prg + * contrib\hbrun\hbrun.prg + * contrib\hbsms\sms.prg + * contrib\hbsqlit3\hdbcsqlt.prg + * contrib\hbtip\cgi.prg + * contrib\hbtip\client.prg + * contrib\hbtip\encb64.prg + * contrib\hbtip\encoder.prg + * contrib\hbtip\ftpcli.prg + * contrib\hbtip\httpcli.prg + * contrib\hbtip\log.prg + * contrib\hbtip\mail.prg + * contrib\hbtip\popcli.prg + * contrib\hbtip\sendmail.prg + * contrib\hbtip\smtpcli.prg + * contrib\hbtip\thtml.prg + * contrib\hbtip\url.prg + * contrib\hbtpathy\telepath.prg + * contrib\hbwin\tests\testprn.prg + * contrib\hbwin\wce_sim.prg + * contrib\hbwin\win_os.prg + * contrib\hbwin\win_reg.prg + * contrib\hbwin\win_tbmp.prg + * contrib\hbwin\win_tprn.prg + * contrib\hbxbp\hbpprocess.prg + * contrib\hbxbp\xbp3state.prg + * contrib\hbxbp\xbpbrowse.prg + * contrib\hbxbp\xbpcheckbox.prg + * contrib\hbxbp\xbpcombobox.prg + * contrib\hbxbp\xbpcrt.prg + * contrib\hbxbp\xbpdataref.prg + * contrib\hbxbp\xbpdialog.prg + * contrib\hbxbp\xbpfiledialog.prg + * contrib\hbxbp\xbpfontdialog.prg + * contrib\hbxbp\xbpgeneric.prg + * contrib\hbxbp\xbpgra.prg + * contrib\hbxbp\xbphtmlviewer.prg + * contrib\hbxbp\xbplistbox.prg + * contrib\hbxbp\xbpmenubar.prg + * contrib\hbxbp\xbpmle.prg + * contrib\hbxbp\xbpparthandler.prg + * contrib\hbxbp\xbppresspace.prg + * contrib\hbxbp\xbpprintdialog.prg + * contrib\hbxbp\xbpprinter.prg + * contrib\hbxbp\xbppushbutton.prg + * contrib\hbxbp\xbpradiobutton.prg + * contrib\hbxbp\xbprtf.prg + * contrib\hbxbp\xbpscrollbar.prg + * contrib\hbxbp\xbpsle.prg + * contrib\hbxbp\xbpspinbutton.prg + * contrib\hbxbp\xbpstatic.prg + * contrib\hbxbp\xbpstatusbar.prg + * contrib\hbxbp\xbpstyle.prg + * contrib\hbxbp\xbptabpage.prg + * contrib\hbxbp\xbptoolbar.prg + * contrib\hbxbp\xbptreeview.prg + * contrib\hbxbp\xbpwindow.prg + * contrib\hbxpp\dbfuncsx.prg + * contrib\hbxpp\runshell.prg + * contrib\hbxpp\thfuncx.prg + * contrib\hbxpp\tthreadx.prg + * contrib\xhb\cstruct.prg + * contrib\xhb\dbgfx.prg + * contrib\xhb\dirrec.prg + * contrib\xhb\dumpvar.prg + * contrib\xhb\hbcomprs.prg + * contrib\xhb\hblog.prg + * contrib\xhb\hjwindow.prg + * contrib\xhb\hterrsys.prg + * contrib\xhb\htmutil.prg + * contrib\xhb\sprintf.prg + * contrib\xhb\tedit.prg + * contrib\xhb\tframe.prg + * contrib\xhb\thtm.prg + * contrib\xhb\trpc.prg + * contrib\xhb\trpccli.prg + * contrib\xhb\ttable.prg + * contrib\xhb\xcstr.prg + * contrib\xhb\xdbmodst.prg + * contrib\xhb\xhberr.prg + * contrib\xhb\xhbmemo.prg + * contrib\xhb\xhbmt.prg + * contrib\xhb\xhbtedit.prg + * contrib\xhb\xhbver.prg + * examples\guestbk\inifiles.prg + * examples\hbdoc2\genhtml.prg + * examples\hbdoc2\hbdoc2.prg + * examples\hbvpdf\hbvpdf.prg + * examples\hbvpdf\hbvpdft.prg + * examples\httpsrv\uhttpd.prg + * examples\rddado\adordd.prg + * IS*() macros converted to HB_IS*() function calls. + (using full uppercase to make them stand out) + % deleted '#include "common.ch"' where possible + 2012-06-04 17:51 UTC+0200 Viktor Szakats (harbour syenar.net) * include/harbour.hbx * src/rtl/Makefile diff --git a/harbour/contrib/gtwvg/wvg3stat.prg b/harbour/contrib/gtwvg/wvg3stat.prg index ec763158e7..a17b10fea5 100644 --- a/harbour/contrib/gtwvg/wvg3stat.prg +++ b/harbour/contrib/gtwvg/wvg3stat.prg @@ -156,7 +156,7 @@ METHOD Wvg3State:handleEvent( nMessage, aNM ) IF aNM[ NMH_code ] == BN_CLICKED ::editBuffer := WVG_Button_GetCheck( ::hWnd ) - IF hb_isBlock( ::sl_lbClick ) + IF HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, ::editBuffer, NIL, self ) RETURN 0 @@ -164,10 +164,10 @@ METHOD Wvg3State:handleEvent( nMessage, aNM ) ENDIF CASE nMessage == HB_GTE_CTLCOLOR - IF hb_isNumeric( ::clr_FG ) + IF HB_ISNUMERIC( ::clr_FG ) WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF - IF hb_isNumeric( ::hBrushBG ) + IF HB_ISNUMERIC( ::hBrushBG ) WVG_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE diff --git a/harbour/contrib/gtwvg/wvgax.prg b/harbour/contrib/gtwvg/wvgax.prg index aaf696d32b..bb2dfa1168 100644 --- a/harbour/contrib/gtwvg/wvgax.prg +++ b/harbour/contrib/gtwvg/wvgax.prg @@ -224,7 +224,7 @@ METHOD WvgActiveXControl:handleEvent( nEvent, aNM ) IF ::isParentCrt() ::rePosition() ENDIF - IF hb_isBlock( ::sl_resize ) + IF HB_ISBLOCK( ::sl_resize ) eval( ::sl_resize, NIL, NIL, Self ) ENDIF EXIT @@ -265,7 +265,7 @@ METHOD WvgActiveXControl:Destroy() METHOD WvgActiveXControl:mapEvent( nEvent, bBlock ) - IF hb_isNumeric( nEvent ) .AND. hb_isBlock( bBlock ) + IF HB_ISNUMERIC( nEvent ) .AND. HB_ISBLOCK( bBlock ) ::hEvents[ nEvent ] := bBlock ENDIF diff --git a/harbour/contrib/gtwvg/wvgcheck.prg b/harbour/contrib/gtwvg/wvgcheck.prg index 1fe81c33f3..210b18de5c 100644 --- a/harbour/contrib/gtwvg/wvgcheck.prg +++ b/harbour/contrib/gtwvg/wvgcheck.prg @@ -154,7 +154,7 @@ METHOD WvgCheckBox:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_COMMAND IF aNM[ NMH_code ] == BN_CLICKED ::editBuffer := ( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED ) - IF hb_isBlock( ::sl_lbClick ) + IF HB_ISBLOCK( ::sl_lbClick ) IF ::isParentCrt() ::oParent:setFocus() ENDIF @@ -166,10 +166,10 @@ METHOD WvgCheckBox:handleEvent( nMessage, aNM ) ENDIF CASE nMessage == HB_GTE_CTLCOLOR - IF hb_isNumeric( ::clr_FG ) + IF HB_ISNUMERIC( ::clr_FG ) WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF - IF hb_isNumeric( ::hBrushBG ) + IF HB_ISNUMERIC( ::hBrushBG ) WVG_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE @@ -180,7 +180,7 @@ METHOD WvgCheckBox:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_ANY IF ::isParentCrt() IF aNM[ 1 ] == WM_LBUTTONUP - IF hb_isBlock( ::sl_lbClick ) + IF HB_ISBLOCK( ::sl_lbClick ) ::oParent:setFocus() ::sendMessage( BM_SETCHECK, iif( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED, BST_UNCHECKED, BST_CHECKED ), 0 ) ::editBuffer := ( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED ) diff --git a/harbour/contrib/gtwvg/wvgclass.prg b/harbour/contrib/gtwvg/wvgclass.prg index 5ab30621dc..b09ab9cb3f 100644 --- a/harbour/contrib/gtwvg/wvgclass.prg +++ b/harbour/contrib/gtwvg/wvgclass.prg @@ -597,7 +597,7 @@ METHOD wvtDialog:Inkey() ENDIF IF !( ::lEventHandled ) - IF ISBLOCK( SetKey( ::nKey ) ) + IF HB_ISBLOCK( SetKey( ::nKey ) ) Eval( SetKey( ::nKey ) ) ENDIF ENDIF @@ -697,7 +697,7 @@ METHOD wvtDialog:CreateObjects() METHOD wvtDialog:Eval( bBlock, p1,p2,p3,p4,p5 ) LOCAL lRet - IF ( lRet := ISBLOCK( bBlock ) ) + IF ( lRet := HB_ISBLOCK( bBlock ) ) eval( bBlock, p1,p2,p3,p4,p5 ) ENDIF @@ -821,7 +821,7 @@ CLASS WvtObject METHOD SetToolTip() INLINE Wvt_SetToolTip( ::nTop, ::nLeft, ::nBottom, ::nRight, ::Tooltip ) METHOD Refresh() INLINE Wvt_InvalidateRect( ::nTop, ::nLeft, ::nTop, ::nLeft ) - METHOD Eval( bBlock ) INLINE iif( ISBLOCK( bBlock ), Eval( bBlock, self ), nil ) + METHOD Eval( bBlock ) INLINE iif( HB_ISBLOCK( bBlock ), Eval( bBlock, self ), nil ) METHOD AddChild( aChild ) INLINE aadd( ::aChildren, aChild ) METHOD AddParent( aParent ) INLINE aadd( ::aParent, aParent ) @@ -985,7 +985,7 @@ METHOD WvtObject:ShowPopup() IF ( n := ascan( ::aPopup, {|e_| e_[ 3 ] == nRet } ) ) > 0 lRet := .t. - IF ISBLOCK( ::aPopup[ n,2 ] ) + IF HB_ISBLOCK( ::aPopup[ n,2 ] ) Eval( ::aPopup[ n,2 ] ) ENDIF ENDIF @@ -1147,7 +1147,7 @@ METHOD WvtBrowse:SetHBar() METHOD WvtBrowse:Refresh() LOCAL nWorkArea := Select() - IF ISBLOCK( ::bOnRefresh ) + IF HB_ISBLOCK( ::bOnRefresh ) eval( ::bOnRefresh, self ) ELSE Select( ::cAlias ) @@ -1226,7 +1226,7 @@ METHOD WvtBrowse:DeHilite() METHOD WvtBrowse:SetTooltip() LOCAL cTip, nArea - IF ISBLOCK( ::bTooltip ) + IF HB_ISBLOCK( ::bTooltip ) ::SaveSettings() nArea := Select( ::cAlias ) @@ -1251,7 +1251,7 @@ METHOD WvtBrowse:SetTooltip() METHOD WvtBrowse:SaveSettings() - IF ISBLOCK( ::bSaveSettings ) + IF HB_ISBLOCK( ::bSaveSettings ) ::xSettings := Eval( ::bSaveSettings, self ) ENDIF @@ -1261,7 +1261,7 @@ METHOD WvtBrowse:SaveSettings() METHOD WvtBrowse:RestSettings() - IF ::xSettings != nil .and. ISBLOCK( ::bRestSettings ) + IF ::xSettings != nil .and. HB_ISBLOCK( ::bRestSettings ) Eval( ::bRestSettings, self ) ENDIF diff --git a/harbour/contrib/gtwvg/wvgcombo.prg b/harbour/contrib/gtwvg/wvgcombo.prg index 3d71ff0e4d..25eb75164d 100644 --- a/harbour/contrib/gtwvg/wvgcombo.prg +++ b/harbour/contrib/gtwvg/wvgcombo.prg @@ -184,10 +184,10 @@ METHOD WvgComboBox:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisibl METHOD WvgComboBox:destroy() #if 0 - IF hb_isObject( ::oSLE ) + IF HB_ISOBJECT( ::oSLE ) ::oSLE:destroy() ENDIF - IF hb_isObject( ::oListBox ) + IF HB_ISOBJECT( ::oListBox ) ::oListBox:destroy() ENDIF #endif @@ -253,10 +253,10 @@ METHOD WvgComboBox:handleEvent( nMessage, aNM ) ENDIF CASE nMessage == HB_GTE_CTLCOLOR - IF hb_isNumeric( ::clr_FG ) + IF HB_ISNUMERIC( ::clr_FG ) WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF - IF hb_isNumeric( ::hBrushBG ) + IF HB_ISNUMERIC( ::hBrushBG ) WVG_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE @@ -282,7 +282,7 @@ METHOD WvgComboBox:addItem( cItem ) METHOD WvgComboBox:listBoxFocus( lFocus ) LOCAL lOldFocus := ::sendCBMessage( CB_GETDROPPEDSTATE ) - IF hb_isLogical( lFocus ) + IF HB_ISLOGICAL( lFocus ) ::sendCBMessage( CB_SHOWDROPDOWN, lFocus ) ENDIF @@ -292,7 +292,7 @@ METHOD WvgComboBox:listBoxFocus( lFocus ) METHOD WvgComboBox:sleSize() - IF hb_isObject( ::oSLE ) + IF HB_ISOBJECT( ::oSLE ) RETURN ::oSLE:currentSize() ENDIF @@ -302,7 +302,7 @@ METHOD WvgComboBox:sleSize() METHOD WvgComboBox:listBoxSize() - IF hb_isObject( ::oListBox ) + IF HB_ISOBJECT( ::oListBox ) RETURN ::oListBox:currentSize() ENDIF @@ -319,9 +319,9 @@ METHOD WvgComboBox:setIcon( nItem, cIcon ) METHOD WvgComboBox:itemMarked( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_itemMarked := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_itemMarked ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_itemMarked ) eval( ::sl_itemMarked, NIL, NIL, Self ) ENDIF RETURN Self @@ -330,9 +330,9 @@ METHOD WvgComboBox:itemMarked( ... ) METHOD WvgComboBox:itemSelected( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_itemSelected := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_itemSelected ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_itemSelected ) eval( ::sl_itemSelected, NIL, NIL, Self ) ENDIF RETURN Self @@ -341,9 +341,9 @@ METHOD WvgComboBox:itemSelected( ... ) METHOD WvgComboBox:drawItem( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_xbePDrawItem := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_xbePDrawItem ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_xbePDrawItem ) eval( ::sl_xbePDrawItem, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self diff --git a/harbour/contrib/gtwvg/wvgcrt.prg b/harbour/contrib/gtwvg/wvgcrt.prg index 8ea594877e..3175e499f3 100644 --- a/harbour/contrib/gtwvg/wvgcrt.prg +++ b/harbour/contrib/gtwvg/wvgcrt.prg @@ -264,16 +264,16 @@ METHOD WvgCrt:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::WvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) - IF hb_isArray( aPos ) + IF HB_ISARRAY( aPos ) ::aPos := aPos ENDIF - IF hb_isArray( aSize ) + IF HB_ISARRAY( aSize ) ::aSize := aSize ENDIF - IF hb_isArray( aPresParams ) + IF HB_ISARRAY( aPresParams ) ::aPresParams := aPresParams ENDIF - IF hb_isLogical( lVisible ) + IF HB_ISLOGICAL( lVisible ) ::visible := lVisible ENDIF @@ -328,7 +328,7 @@ METHOD WvgCrt:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::maxRow+1, ::maxCol+1, ::pGTp, .F., lRowCol, HB_WNDTYPE_CRT } ) hb_gtInfo( HB_GTI_SETFONT, { ::fontName, ::fontHeight, ::fontWidth } ) - IF hb_isNumeric( ::icon ) + IF HB_ISNUMERIC( ::icon ) hb_gtInfo( HB_GTI_ICONRES, ::icon ) ELSE IF ( ".ico" $ lower( ::icon ) ) @@ -385,7 +385,7 @@ METHOD WvgCrt:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD WvgCrt:destroy() - IF hb_isObject( ::oMenu ) + IF HB_ISOBJECT( ::oMenu ) ::oMenu:destroy() ENDIF @@ -521,7 +521,7 @@ METHOD WvgCrt:lockUpdate() METHOD WvgCrt:menuBar() - IF !( hb_isObject( ::oMenu ) ) + IF !( HB_ISOBJECT( ::oMenu ) ) ::oMenu := WvgMenuBar():New( self ):create() ENDIF @@ -610,7 +610,7 @@ METHOD WvgCrt:setPresParam() METHOD WvgCrt:setSize( aSize, lPaint ) - if hb_isArray( aSize ) + if HB_ISARRAY( aSize ) DEFAULT lPaint TO .T. hb_gtInfo( HB_GTI_SCREENHEIGHT, aSize[ 1 ] ) @@ -663,12 +663,12 @@ METHOD WvgCrt:winDevice() METHOD WvgCrt:enter( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_enter ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_enter ) eval( ::sl_enter, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_enter := xParam RETURN NIL endif @@ -679,12 +679,12 @@ METHOD WvgCrt:enter( xParam ) METHOD WvgCrt:leave( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_leave ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_leave ) eval( ::sl_leave, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_leave := xParam RETURN NIL endif @@ -695,12 +695,12 @@ METHOD WvgCrt:leave( xParam ) METHOD WvgCrt:lbClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_lbClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbClick := xParam RETURN NIL endif @@ -711,12 +711,12 @@ METHOD WvgCrt:lbClick( xParam ) METHOD WvgCrt:lbDblClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_lbDblClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_lbDblClick ) eval( ::sl_lbDblClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbDblClick := xParam RETURN NIL endif @@ -727,12 +727,12 @@ METHOD WvgCrt:lbDblClick( xParam ) METHOD WvgCrt:lbDown( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_lbDown ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_lbDown ) eval( ::sl_lbDown, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbDown := xParam RETURN NIL endif @@ -743,12 +743,12 @@ METHOD WvgCrt:lbDown( xParam ) METHOD WvgCrt:lbUp( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_lbUp ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_lbUp ) eval( ::sl_lbUp, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbUp := xParam RETURN NIL endif @@ -759,12 +759,12 @@ METHOD WvgCrt:lbUp( xParam ) METHOD WvgCrt:mbClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_mbClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_mbClick ) eval( ::sl_mbClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_mbClick := xParam RETURN NIL endif @@ -775,12 +775,12 @@ METHOD WvgCrt:mbClick( xParam ) METHOD WvgCrt:mbDblClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_mbDblClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_mbDblClick ) eval( ::sl_mbDblClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_mbDblClick := xParam RETURN NIL endif @@ -791,12 +791,12 @@ METHOD WvgCrt:mbDblClick( xParam ) METHOD WvgCrt:mbDown( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_mbDown ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_mbDown ) eval( ::sl_mbDown, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_mbDown := xParam RETURN NIL endif @@ -807,12 +807,12 @@ METHOD WvgCrt:mbDown( xParam ) METHOD WvgCrt:mbUp( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_mbUp ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_mbUp ) eval( ::sl_mbUp, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_mbUp := xParam RETURN NIL endif @@ -823,12 +823,12 @@ METHOD WvgCrt:mbUp( xParam ) METHOD WvgCrt:motion( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_motion ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_motion ) eval( ::sl_motion, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_motion := xParam RETURN NIL endif @@ -839,12 +839,12 @@ METHOD WvgCrt:motion( xParam ) METHOD WvgCrt:rbClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_rbClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_rbClick ) eval( ::sl_rbClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_rbClick := xParam RETURN NIL endif @@ -855,12 +855,12 @@ METHOD WvgCrt:rbClick( xParam ) METHOD WvgCrt:rbDblClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_rbDblClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_rbDblClick ) eval( ::sl_rbDblClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_rbDblClick := xParam RETURN NIL endif @@ -871,12 +871,12 @@ METHOD WvgCrt:rbDblClick( xParam ) METHOD WvgCrt:rbDown( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_rbDown ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_rbDown ) eval( ::sl_rbDown, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_rbDown := xParam RETURN NIL endif @@ -887,12 +887,12 @@ METHOD WvgCrt:rbDown( xParam ) METHOD WvgCrt:rbUp( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_rbUp ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_rbUp ) eval( ::sl_rbUp, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_rbUp := xParam RETURN NIL endif @@ -903,12 +903,12 @@ METHOD WvgCrt:rbUp( xParam ) METHOD WvgCrt:wheel( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_wheel ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_wheel ) eval( ::sl_wheel, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_wheel := xParam RETURN NIL endif @@ -921,12 +921,12 @@ METHOD WvgCrt:wheel( xParam ) METHOD WvgCrt:close( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_close ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_close ) eval( ::sl_close, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_close := xParam RETURN NIL endif @@ -937,12 +937,12 @@ METHOD WvgCrt:close( xParam ) METHOD WvgCrt:helpRequest( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_helpRequest ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_helpRequest ) eval( ::sl_helpRequest, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_helpRequest := xParam RETURN NIL endif @@ -953,12 +953,12 @@ METHOD WvgCrt:helpRequest( xParam ) METHOD WvgCrt:keyboard( xParam ) - if hb_isNumeric( xParam ) .and. hb_isBlock( ::sl_keyboard ) + if HB_ISNUMERIC( xParam ) .and. HB_ISBLOCK( ::sl_keyboard ) eval( ::sl_keyboard, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_keyboard := xParam RETURN NIL endif @@ -969,12 +969,12 @@ METHOD WvgCrt:keyboard( xParam ) METHOD WvgCrt:killDisplayFocus( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_killDisplayFocus ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_killDisplayFocus ) eval( ::sl_killDisplayFocus, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_killDisplayFocus := xParam RETURN NIL endif @@ -985,12 +985,12 @@ METHOD WvgCrt:killDisplayFocus( xParam ) METHOD WvgCrt:killInputFocus( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_killInputFocus ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_killInputFocus ) eval( ::sl_killInputFocus, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_killInputFocus := xParam RETURN NIL endif @@ -1001,12 +1001,12 @@ METHOD WvgCrt:killInputFocus( xParam ) METHOD WvgCrt:move( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_move ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_move ) eval( ::sl_move, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_move := xParam RETURN NIL endif @@ -1017,12 +1017,12 @@ METHOD WvgCrt:move( xParam ) METHOD WvgCrt:paint( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_paint ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_paint ) eval( ::sl_paint, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_paint := xParam RETURN NIL endif @@ -1033,12 +1033,12 @@ METHOD WvgCrt:paint( xParam ) METHOD WvgCrt:quit( xParam, xParam1 ) - if hb_isNumeric( xParam ) .and. hb_isBlock( ::sl_quit ) + if HB_ISNUMERIC( xParam ) .and. HB_ISBLOCK( ::sl_quit ) eval( ::sl_quit, xParam, xParam1, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_quit := xParam RETURN NIL endif @@ -1049,7 +1049,7 @@ METHOD WvgCrt:quit( xParam, xParam1 ) METHOD WvgCrt:resize( xParam ) - if hb_isBlock( xParam )/* .or. hb_isNil( xParam ) */ + if HB_ISBLOCK( xParam )/* .or. HB_ISNIL( xParam ) */ ::sl_resize := xParam RETURN NIL endif @@ -1063,12 +1063,12 @@ METHOD WvgCrt:resize( xParam ) METHOD WvgCrt:setDisplayFocus( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::setDisplayFocus ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::setDisplayFocus ) eval( ::setDisplayFocus, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::setDisplayFocus := xParam RETURN NIL endif @@ -1079,12 +1079,12 @@ METHOD WvgCrt:setDisplayFocus( xParam ) METHOD WvgCrt:setInputFocus( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_setInputFocus ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_setInputFocus ) eval( ::sl_setInputFocus, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_setInputFocus := xParam RETURN NIL endif @@ -1095,12 +1095,12 @@ METHOD WvgCrt:setInputFocus( xParam ) METHOD WvgCrt:dragEnter( xParam, xParam1 ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_dragEnter ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_dragEnter ) eval( ::sl_dragEnter, xParam, xParam1, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_dragEnter := xParam RETURN NIL endif @@ -1111,12 +1111,12 @@ METHOD WvgCrt:dragEnter( xParam, xParam1 ) METHOD WvgCrt:dragMotion( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_dragMotion ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_dragMotion ) eval( ::sl_dragMotion, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_dragMotion := xParam RETURN NIL endif @@ -1127,12 +1127,12 @@ METHOD WvgCrt:dragMotion( xParam ) METHOD WvgCrt:dragLeave( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_dragLeave ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_dragLeave ) eval( ::sl_dragLeave, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_dragLeave := xParam RETURN NIL endif @@ -1143,12 +1143,12 @@ METHOD WvgCrt:dragLeave( xParam ) METHOD WvgCrt:dragDrop( xParam, xParam1 ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_dragDrop ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_dragDrop ) eval( ::sl_dragDrop, xParam, xParam1, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_dragDrop := xParam RETURN NIL endif diff --git a/harbour/contrib/gtwvg/wvgdarea.prg b/harbour/contrib/gtwvg/wvgdarea.prg index 3802edf371..251401ca09 100644 --- a/harbour/contrib/gtwvg/wvgdarea.prg +++ b/harbour/contrib/gtwvg/wvgdarea.prg @@ -127,17 +127,17 @@ METHOD WvgDrawingArea:handleEvent( nMessage, aNM ) DO CASE CASE nMessage == HB_GTE_RESIZED - IF hb_isBlock( ::sl_resize ) + IF HB_ISBLOCK( ::sl_resize ) eval( ::sl_resize, NIL, NIL, self ) ENDIF aeval( ::aChildren, {|o| o:handleEvent( HB_GTE_RESIZED, { 0, 0, 0, 0, 0 } ) } ) RETURN EVENT_HANDELLED CASE nMessage == HB_GTE_CTLCOLOR - IF hb_isNumeric( ::clr_FG ) + IF HB_ISNUMERIC( ::clr_FG ) WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF - IF hb_isNumeric( ::hBrushBG ) + IF HB_ISNUMERIC( ::hBrushBG ) WVG_SetBkMode( aNM[ 1 ], 1 ) WVG_FillRect( aNM[ 1 ], { 0,0,::currentSize()[1],::currentSize()[2]}, ::hBrushBG ) RETURN EVENT_HANDELLED diff --git a/harbour/contrib/gtwvg/wvgdatar.prg b/harbour/contrib/gtwvg/wvgdatar.prg index 4f7705ea9c..3bddbac8d0 100644 --- a/harbour/contrib/gtwvg/wvgdatar.prg +++ b/harbour/contrib/gtwvg/wvgdatar.prg @@ -113,11 +113,11 @@ METHOD WvgDataRef:getData() DO CASE CASE ::className == "COMBOBOX" - IF hb_isObject( ::XbpListBox ) .AND. hb_isBlock( ::XbpListBox:dataLink ) + IF HB_ISOBJECT( ::XbpListBox ) .AND. HB_ISBLOCK( ::XbpListBox:dataLink ) ::sl_editBuffer := ::XbpListBox:getData() - ELSEIF hb_isObject( ::XbpSLE ) .AND. hb_isBlock( ::XbpSLE:dataLink ) + ELSEIF HB_ISOBJECT( ::XbpSLE ) .AND. HB_ISBLOCK( ::XbpSLE:dataLink ) ::sl_editBuffer := ::XbpSLE:getData() - ELSEIF hb_isObject( ::XbpListBox ) + ELSEIF HB_ISOBJECT( ::XbpListBox ) ::sl_editBuffer := ::XbpListBox:getData() ENDIF @@ -139,7 +139,7 @@ METHOD WvgDataRef:getData() #endif ENDCASE - IF hb_isBlock( ::dataLink ) + IF HB_ISBLOCK( ::dataLink ) eval( ::dataLink, ::sl_editBuffer ) ENDIF @@ -152,7 +152,7 @@ METHOD WvgDataRef:setData( xValue, mp2 ) HB_SYMBOL_UNUSED( mp2 ) - IF hb_isBlock( ::dataLink ) + IF HB_ISBLOCK( ::dataLink ) ::sl_editBuffer := eval( ::dataLink ) ELSEIF xValue != NIL ::sl_editBuffer := xValue @@ -164,7 +164,7 @@ METHOD WvgDataRef:setData( xValue, mp2 ) ::sendMessage( BM_SETCHECK, iif( ::sl_editBuffer, BST_CHECKED, BST_UNCHECKED ), 0 ) CASE ::className == "LISTBOX" /* Single Selection */ - IF hb_isNumeric( ::sl_editBuffer ) + IF HB_ISNUMERIC( ::sl_editBuffer ) RETURN WVG_LBSetCurSel( ::hWnd, ::sl_editBuffer - 1 ) >= 0 ENDIF @@ -184,7 +184,7 @@ METHOD WvgDataRef:setData( xValue, mp2 ) ENDIF CASE ::className == "COMBOBOX" - IF hb_isArray( ::sl_editBuffer ) + IF HB_ISARRAY( ::sl_editBuffer ) // NOT sure which way it should behave. // XBase++ documentation IN this regard is crappy. FOR EACH s IN ::sl_editBuffer @@ -206,9 +206,9 @@ METHOD WvgDataRef:undo() METHOD WvgDataRef:validate( xParam ) - IF PCount() == 0 .and. hb_isBlock( ::sl_validate ) + IF PCount() == 0 .and. HB_ISBLOCK( ::sl_validate ) RETURN eval( ::sl_validate, self ) - ELSEIF hb_isBlock( xParam ) + ELSEIF HB_ISBLOCK( xParam ) ::sl_validate := xParam ENDIF diff --git a/harbour/contrib/gtwvg/wvgdlg.prg b/harbour/contrib/gtwvg/wvgdlg.prg index eb49e02b99..0cb98b32ac 100644 --- a/harbour/contrib/gtwvg/wvgdlg.prg +++ b/harbour/contrib/gtwvg/wvgdlg.prg @@ -147,7 +147,7 @@ METHOD WvgDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) hb_gtInfo( HB_GTI_WINTITLE , ::title ) if !empty( ::icon ) - if hb_isNumeric( ::icon ) + if HB_ISNUMERIC( ::icon ) hb_gtInfo( HB_GTI_ICONRES, ::icon ) elseif hb_isChar( ::icon ) @@ -187,7 +187,7 @@ METHOD WvgDialog:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible METHOD WvgDialog:destroy() - IF hb_isObject( ::oMenu ) + IF HB_ISOBJECT( ::oMenu ) ::oMenu:destroy() ENDIF @@ -241,7 +241,7 @@ METHOD WvgDialog:getFrameState() METHOD WvgDialog:menuBar() - IF !( hb_isObject( ::oMenu ) ) + IF !( HB_ISOBJECT( ::oMenu ) ) ::oMenu := WvgMenuBar():New( self ):create() ENDIF diff --git a/harbour/contrib/gtwvg/wvggenrc.prg b/harbour/contrib/gtwvg/wvggenrc.prg index d18ba96521..63d860b2b3 100644 --- a/harbour/contrib/gtwvg/wvggenrc.prg +++ b/harbour/contrib/gtwvg/wvggenrc.prg @@ -82,7 +82,7 @@ EXIT PROCEDURE KillGTChildren() - IF hb_isObject( s_oCrt ) .AND. __objGetClsName( s_oCrt ) == "WVGCRT" .AND. s_oCrt:isGT + IF HB_ISOBJECT( s_oCrt ) .AND. __objGetClsName( s_oCrt ) == "WVGCRT" .AND. s_oCrt:isGT s_oCrt:destroy() s_oCrt := NIL ENDIF diff --git a/harbour/contrib/gtwvg/wvghtmlv.prg b/harbour/contrib/gtwvg/wvghtmlv.prg index 32c563541a..a6fa023096 100644 --- a/harbour/contrib/gtwvg/wvghtmlv.prg +++ b/harbour/contrib/gtwvg/wvghtmlv.prg @@ -184,7 +184,7 @@ METHOD WvgHTMLViewer:xBeforeNavigate( cURL, Flags, TFName, PData, Headers ) HB_SYMBOL_UNUSED( PData ) HB_SYMBOL_UNUSED( Headers ) - IF PCount() >= 1 .and. hb_isBlock( ::sl_beforeNavigate ) + IF PCount() >= 1 .and. HB_ISBLOCK( ::sl_beforeNavigate ) eval( ::sl_beforeNavigate, cURL, NIL, Self ) RETURN nil ENDIF @@ -195,7 +195,7 @@ METHOD WvgHTMLViewer:xBeforeNavigate( cURL, Flags, TFName, PData, Headers ) METHOD WvgHTMLViewer:xStatusTextChange( cText ) - IF hb_isBlock( ::sl_statusTextChange ) + IF HB_ISBLOCK( ::sl_statusTextChange ) eval( ::sl_statusTextChange, cText, NIL, Self ) ENDIF @@ -205,7 +205,7 @@ METHOD WvgHTMLViewer:xStatusTextChange( cText ) METHOD WvgHTMLViewer:xNavigateComplete( cURL ) - IF hb_isBlock( ::sl_navigateComplete ) + IF HB_ISBLOCK( ::sl_navigateComplete ) eval( ::sl_navigateComplete, cURL, NIL, Self ) ENDIF @@ -215,7 +215,7 @@ METHOD WvgHTMLViewer:xNavigateComplete( cURL ) METHOD WvgHTMLViewer:xProgressChange( nProgress, nProgMax ) - IF hb_isBlock( ::sl_progressChange ) + IF HB_ISBLOCK( ::sl_progressChange ) eval( ::sl_progressChange, nProgress, nProgMax, Self ) ENDIF @@ -225,7 +225,7 @@ METHOD WvgHTMLViewer:xProgressChange( nProgress, nProgMax ) METHOD WvgHTMLViewer:xTitleChange( cTitle ) - IF hb_isBlock( ::sl_titleChange ) + IF HB_ISBLOCK( ::sl_titleChange ) eval( ::sl_titleChange, cTitle, NIL, Self ) ENDIF @@ -235,7 +235,7 @@ METHOD WvgHTMLViewer:xTitleChange( cTitle ) METHOD WvgHTMLViewer:xDocumentComplete( cURI ) - IF hb_isBlock( ::sl_documentComplete ) + IF HB_ISBLOCK( ::sl_documentComplete ) eval( ::sl_documentComplete, cURI, NIL, Self ) ENDIF diff --git a/harbour/contrib/gtwvg/wvglistb.prg b/harbour/contrib/gtwvg/wvglistb.prg index 1dff874493..9eb748fea2 100644 --- a/harbour/contrib/gtwvg/wvglistb.prg +++ b/harbour/contrib/gtwvg/wvglistb.prg @@ -200,7 +200,7 @@ METHOD WvgListBox:handleEvent( nMessage, aNM ) IF ::isParentCrt() ::oParent:setFocus() ENDIF - IF hb_isBlock( ::sl_itemMarked ) + IF HB_ISBLOCK( ::sl_itemMarked ) eval( ::sl_itemMarked, NIL, NIL, self ) ENDIF IF ::isParentCrt() @@ -214,7 +214,7 @@ METHOD WvgListBox:handleEvent( nMessage, aNM ) IF ::isParentCrt() ::oParent:setFocus() ENDIF - IF hb_isBlock( ::sl_itemSelected ) + IF HB_ISBLOCK( ::sl_itemSelected ) eval( ::sl_itemSelected, NIL, NIL, self ) ENDIF IF ::isParentCrt() @@ -236,7 +236,7 @@ METHOD WvgListBox:handleEvent( nMessage, aNM ) IF ::isParentCrt() ::oParent:setFocus() ENDIF - IF hb_isBlock( ::sl_itemSelected ) + IF HB_ISBLOCK( ::sl_itemSelected ) eval( ::sl_itemSelected, NIL, NIL, self ) ENDIF IF ::isParentCrt() @@ -249,10 +249,10 @@ METHOD WvgListBox:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_NOTIFY CASE nMessage == HB_GTE_CTLCOLOR - IF hb_isNumeric( ::clr_FG ) + IF HB_ISNUMERIC( ::clr_FG ) WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF - IF hb_isNumeric( ::hBrushBG ) + IF HB_ISNUMERIC( ::hBrushBG ) WVG_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE @@ -262,7 +262,7 @@ METHOD WvgListBox:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_ANY /* This will never be reached */ IF aNM[ 1 ] == WM_LBUTTONUP ::nCurSelected := WVG_LBGetCurSel( ::hWnd ) + 1 - IF hb_isBlock( ::sl_itemMarked ) + IF HB_ISBLOCK( ::sl_itemMarked ) IF ::isParentCrt() ::oParent:setFocus() ENDIF @@ -274,7 +274,7 @@ METHOD WvgListBox:handleEvent( nMessage, aNM ) ELSEIF aNM[ 1 ] == WM_LBUTTONDBLCLK ::editBuffer := ::nCurSelected - IF hb_isBlock( ::sl_itemSelected ) + IF HB_ISBLOCK( ::sl_itemSelected ) IF ::isParentCrt() ::oParent:setFocus() ENDIF @@ -288,7 +288,7 @@ METHOD WvgListBox:handleEvent( nMessage, aNM ) ELSEIF aNM[ 1 ] == WM_KEYUP IF ::nCurSelected != WVG_LBGetCurSel( ::hWnd ) + 1 ::nCurSelected := WVG_LBGetCurSel( ::hWnd ) + 1 - IF hb_isBlock( ::sl_itemMarked ) + IF HB_ISBLOCK( ::sl_itemMarked ) IF ::isParentCrt() ::oParent:setFocus() ENDIF diff --git a/harbour/contrib/gtwvg/wvgmenub.prg b/harbour/contrib/gtwvg/wvgmenub.prg index 271eba1f93..663028396c 100644 --- a/harbour/contrib/gtwvg/wvgmenub.prg +++ b/harbour/contrib/gtwvg/wvgmenub.prg @@ -415,7 +415,7 @@ METHOD WvgMenuBar:checkItem( nItemNum, lCheck ) DEFAULT lCheck TO .T. - IF !empty( ::hMenu ) .AND. hb_isNumeric( nItemNum ) + IF !empty( ::hMenu ) .AND. HB_ISNUMERIC( nItemNum ) nRet := WVG_CheckMenuItem( ::hMenu, nItemNum-1, MF_BYPOSITION + iif( lCheck, MF_CHECKED, MF_UNCHECKED ) ) ENDIF @@ -426,7 +426,7 @@ METHOD WvgMenuBar:checkItem( nItemNum, lCheck ) METHOD WvgMenuBar:enableItem( nItemNum ) LOCAL lSuccess := .f. - IF !empty( ::hMenu ) .AND. hb_isNumeric( nItemNum ) + IF !empty( ::hMenu ) .AND. HB_ISNUMERIC( nItemNum ) lSuccess := WVG_EnableMenuItem( ::hMenu, nItemNum-1, MF_BYPOSITION + MF_ENABLED ) ENDIF @@ -447,7 +447,7 @@ METHOD WvgMenuBar:disableItem( nItemNum ) METHOD WvgMenuBar:getItem( nItemNum ) - IF hb_isNumeric( nItemNum ) .AND. nItemNum > 0 .AND. nItemNum <= len( ::aMenuItems ) + IF HB_ISNUMERIC( nItemNum ) .AND. nItemNum > 0 .AND. nItemNum <= len( ::aMenuItems ) RETURN { ::aMenuItems[ nItemNum, 3 ], ::aMenuItems[ nItemNum, 4 ], ::aMenuItems[ nItemNum, 5 ], ::aMenuItems[ nItemNum, 6 ] } ENDIF @@ -477,7 +477,7 @@ METHOD WvgMenuBar:isItemEnabled( nItemNum ) METHOD WvgMenuBar:selectItem( nItemNum ) - IF hb_isNumeric( nItemNum ) + IF HB_ISNUMERIC( nItemNum ) RETURN .f. ENDIF @@ -495,7 +495,7 @@ METHOD WvgMenuBar:setItem( nItemNum, aItem ) METHOD WvgMenuBar:beginMenu( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_beginMenu := xParam RETURN NIL ENDIF @@ -506,7 +506,7 @@ METHOD WvgMenuBar:beginMenu( xParam ) METHOD WvgMenuBar:endMenu( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_endMenu := xParam RETURN NIL ENDIF @@ -517,7 +517,7 @@ METHOD WvgMenuBar:endMenu( xParam ) METHOD WvgMenuBar:itemMarked( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_itemMarked := xParam RETURN NIL ENDIF @@ -528,7 +528,7 @@ METHOD WvgMenuBar:itemMarked( xParam ) METHOD WvgMenuBar:itemSelected( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_itemSelected := xParam RETURN NIL ENDIF @@ -539,7 +539,7 @@ METHOD WvgMenuBar:itemSelected( xParam ) METHOD WvgMenuBar:drawItem( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_drawItem := xParam RETURN NIL ENDIF @@ -550,7 +550,7 @@ METHOD WvgMenuBar:drawItem( xParam ) METHOD WvgMenuBar:measureItem( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_measureItem := xParam RETURN NIL ENDIF @@ -561,7 +561,7 @@ METHOD WvgMenuBar:measureItem( xParam ) METHOD WvgMenuBar:onMenuKey( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_onMenuKey := xParam RETURN NIL ENDIF @@ -646,7 +646,7 @@ METHOD WvgMenu:popUp( oXbp, aPos, nDefaultItem, nControl ) nCmd := WVG_TrackPopupMenu( ::hMenu, TPM_LEFTALIGN + TPM_TOPALIGN + TPM_RETURNCMD, aPos[ 1 ], aPos[ 2 ], oXbp:hWnd ) aMenuItem := ::findMenuItemById( nCmd ) - IF hb_isArray( aMenuItem ) .and. hb_isBlock( aMenuItem[ 2 ] ) + IF HB_ISARRAY( aMenuItem ) .and. HB_ISBLOCK( aMenuItem[ 2 ] ) Eval( aMenuItem[ 2 ], aMenuItem[ 1 ], NIL, aMenuItem[ 4 ] ) ENDIF diff --git a/harbour/contrib/gtwvg/wvgmle.prg b/harbour/contrib/gtwvg/wvgmle.prg index 1da251f94c..8a6b97d707 100644 --- a/harbour/contrib/gtwvg/wvgmle.prg +++ b/harbour/contrib/gtwvg/wvgmle.prg @@ -198,22 +198,22 @@ METHOD WvgMLE:handleEvent( nMessage, aNM ) CASE nMessage == HB_GTE_COMMAND DO CASE CASE aNM[ NMH_code ] == EN_KILLFOCUS - IF hb_isBlock( ::sl_killInputFocus ) + IF HB_ISBLOCK( ::sl_killInputFocus ) eval( ::sl_killInputFocus, NIL, NIL, Self ) ENDIF CASE aNM[ NMH_code ] == EN_SETFOCUS - IF hb_isBlock( ::sl_setInputFocus ) + IF HB_ISBLOCK( ::sl_setInputFocus ) eval( ::sl_setInputFocus, NIL, NIL, Self ) ENDIF CASE aNM[ NMH_code ] == EN_HSCROLL - IF hb_isBlock( ::sl_hScroll ) + IF HB_ISBLOCK( ::sl_hScroll ) eval( ::sl_hScroll, NIL, NIL, Self ) ENDIF CASE aNM[ NMH_code ] == EN_VSCROLL - IF hb_isBlock( ::sl_vScroll ) + IF HB_ISBLOCK( ::sl_vScroll ) eval( ::sl_vScroll, NIL, NIL, Self ) ENDIF @@ -224,10 +224,10 @@ METHOD WvgMLE:handleEvent( nMessage, aNM ) ENDCASE CASE nMessage == HB_GTE_CTLCOLOR - IF hb_isNumeric( ::clr_FG ) + IF HB_ISNUMERIC( ::clr_FG ) WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF - IF hb_isNumeric( ::hBrushBG ) + IF HB_ISNUMERIC( ::hBrushBG ) WVG_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE @@ -245,22 +245,22 @@ METHOD WvgMLE:handleEvent( nMessage, aNM ) ENDIF CASE aNM[ NMH_code ] == WM_KILLFOCUS - IF hb_isBlock( ::sl_killInputFocus ) + IF HB_ISBLOCK( ::sl_killInputFocus ) eval( ::sl_killInputFocus, NIL, NIL, Self ) ENDIF CASE aNM[ NMH_code ] == WM_SETFOCUS - IF hb_isBlock( ::sl_setInputFocus ) + IF HB_ISBLOCK( ::sl_setInputFocus ) eval( ::sl_setInputFocus, NIL, NIL, Self ) ENDIF CASE aNM[ NMH_code ] == WM_HSCROLL - IF hb_isBlock( ::sl_hScroll ) + IF HB_ISBLOCK( ::sl_hScroll ) eval( ::sl_hScroll, NIL, NIL, Self ) ENDIF CASE aNM[ NMH_code ] == WM_VSCROLL - IF hb_isBlock( ::sl_vScroll ) + IF HB_ISBLOCK( ::sl_vScroll ) eval( ::sl_vScroll, NIL, NIL, Self ) ENDIF @@ -286,7 +286,7 @@ METHOD WvgMLE:destroy() METHOD WvgMLE:changed( lChanged ) LOCAL lChg := ::sendMessage( EM_GETMODIFY, 0, 0 ) - IF hb_isLogical( lChanged ) + IF HB_ISLOGICAL( lChanged ) ::sendMessage( EM_SETMODIFY, iif( lChanged, 0, 1 ), 0 ) ENDIF diff --git a/harbour/contrib/gtwvg/wvgpaint.prg b/harbour/contrib/gtwvg/wvgpaint.prg index 3f102c609a..f4696261e1 100644 --- a/harbour/contrib/gtwvg/wvgpaint.prg +++ b/harbour/contrib/gtwvg/wvgpaint.prg @@ -262,7 +262,7 @@ FUNCTION Wvt_SetDlgCoMode( nMode ) STATIC sMode := 0 nOldMode := sMode - IF hb_isNumeric( nMode ) .and. nMode <= 1 .and. nMode >= 0 + IF HB_ISNUMERIC( nMode ) .and. nMode <= 1 .and. nMode >= 0 sMode := nMode ENDIF @@ -322,7 +322,7 @@ FUNCTION Wvt_MakeDlgTemplate( nTop, nLeft, nRows, nCols, aOffSet, cTitle, nStyle nH := nRows ENDIF - If !ISNUMBER( nStyle ) + If !HB_ISNUMERIC( nStyle ) nStyle := + WS_CAPTION + WS_SYSMENU ; + WS_GROUP + WS_TABSTOP + DS_SETFONT ; + WS_THICKFRAME + WS_VISIBLE + WS_POPUP ; @@ -409,7 +409,7 @@ Function Wvt_AddDlgItem( aDlg, nTop, nLeft, nRows, nCols, aOffSet,; aAdd( aDlg[ 8 ] , nH ) aAdd( aDlg[ 9 ] , cnId ) aAdd( aDlg[ 10 ] , cnDlgClass ) - aAdd( aDlg[ 11 ] , iif( ISCHARACTER( cText ), cText, iif( ISNUMBER( cText ), cText, "" ) ) ) + aAdd( aDlg[ 11 ] , iif( HB_ISSTRING( cText ), cText, iif( HB_ISNUMERIC( cText ), cText, "" ) ) ) aAdd( aDlg[ 12 ] , 0 ) Return aDlg @@ -670,7 +670,7 @@ FUNCTION Wvt_GetRGBColorByString( cColor, nForeBack ) LOCAL nIndex := 0 LOCAL a_:= { "N", "B", "G", "BG", "R", "RB", "GR", "W" } - nForeBack := iif( hb_isNumeric( nForeBack ), nForeBack, 0 ) + nForeBack := iif( HB_ISNUMERIC( nForeBack ), nForeBack, 0 ) IF hb_isChar( cColor ) IF ( n := at( cColor, "/" ) ) > 0 diff --git a/harbour/contrib/gtwvg/wvgphdlr.prg b/harbour/contrib/gtwvg/wvgphdlr.prg index 989bf8a862..2f308f91bc 100644 --- a/harbour/contrib/gtwvg/wvgphdlr.prg +++ b/harbour/contrib/gtwvg/wvgphdlr.prg @@ -275,67 +275,67 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) SWITCH xParams[ 1 ] CASE WM_MOUSEHOVER - IF hb_isBlock( ::sl_enter ) + IF HB_ISBLOCK( ::sl_enter ) eval( ::sl_enter, aPos, NIL, Self ) ENDIF EXIT CASE WM_MOUSELEAVE - IF hb_isBlock( ::sl_leave ) + IF HB_ISBLOCK( ::sl_leave ) eval( ::sl_leave, aPos, NIL, Self ) ENDIF EXIT CASE WM_RBUTTONDOWN - IF hb_isBlock( ::sl_rbDown ) + IF HB_ISBLOCK( ::sl_rbDown ) eval( ::sl_rbDown, aPos, NIL, Self ) ENDIF EXIT CASE WM_LBUTTONDOWN - IF hb_isBlock( ::sl_lbDown ) + IF HB_ISBLOCK( ::sl_lbDown ) eval( ::sl_lbDown, aPos, NIL, Self ) ENDIF EXIT CASE WM_RBUTTONUP - IF hb_isBlock( ::sl_rbUp ) + IF HB_ISBLOCK( ::sl_rbUp ) eval( ::sl_rbUp, aPos, NIL, Self ) ENDIF EXIT CASE WM_LBUTTONUP - IF hb_isBlock( ::sl_lbUp ) + IF HB_ISBLOCK( ::sl_lbUp ) eval( ::sl_lbUp, aPos, NIL, Self ) ENDIF EXIT CASE WM_RBUTTONDBLCLK - IF hb_isBlock( ::sl_rbDblClick ) + IF HB_ISBLOCK( ::sl_rbDblClick ) eval( ::sl_rbDblClick, aPos, NIL, Self ) ENDIF EXIT CASE WM_LBUTTONDBLCLK - IF hb_isBlock( ::sl_lbDblClick ) + IF HB_ISBLOCK( ::sl_lbDblClick ) eval( ::sl_lbDblClick, aPos, NIL, Self ) ENDIF EXIT CASE WM_MBUTTONDOWN - IF hb_isBlock( ::sl_mbDown ) + IF HB_ISBLOCK( ::sl_mbDown ) eval( ::sl_mbDown, aPos, NIL, Self ) ENDIF EXIT CASE WM_MBUTTONUP - IF hb_isBlock( ::sl_mbClick ) + IF HB_ISBLOCK( ::sl_mbClick ) eval( ::sl_mbClick, aPos, NIL, Self ) ENDIF EXIT CASE WM_MBUTTONDBLCLK - IF hb_isBlock( ::sl_mbDblClick ) + IF HB_ISBLOCK( ::sl_mbDblClick ) eval( ::sl_mbDblClick, aPos, NIL, Self ) ENDIF EXIT CASE WM_MOUSEMOVE - IF hb_isBlock( ::sl_motion ) + IF HB_ISBLOCK( ::sl_motion ) eval( ::sl_motion, aPos, NIL, Self ) ENDIF EXIT CASE WM_MOUSEWHEEL - IF hb_isBlock( ::sl_wheel ) + IF HB_ISBLOCK( ::sl_wheel ) eval( ::sl_wheel, aPos, NIL, Self ) ENDIF EXIT @@ -344,20 +344,20 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) END CASE nEvent == HB_GTE_KEYBOARD - IF hb_isBlock( ::keyboard ) + IF HB_ISBLOCK( ::keyboard ) eval( ::keyboard, xParams, NIL, Self ) ENDIF CASE nEvent == HB_GTE_SETFOCUS /* aeval( ::aChildren, {|o| WVG_InvalidateRect( o:hWnd ) } ) */ - IF hb_isBlock( ::sl_setInputFocus ) + IF HB_ISBLOCK( ::sl_setInputFocus ) eval( ::sl_setInputFocus, NIL, NIL, Self ) ENDIF ::lHasInputFocus := .t. CASE nEvent == HB_GTE_KILLFOCUS - IF hb_isBlock( ::sl_killInputFocus ) + IF HB_ISBLOCK( ::sl_killInputFocus ) eval( ::sl_killInputFocus, NIL, NIL, Self ) ENDIF ::lHasInputFocus := .f. @@ -372,32 +372,32 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) aeval( ::aChildren, {|o| WVG_InvalidateRect( o:hWnd ) } ) CASE nEvent == HB_GTE_CLOSE - IF hb_isBlock( ::close ) + IF HB_ISBLOCK( ::close ) nReturn := eval( ::close, NIL, NIL, Self ) ENDIF CASE nEvent == HB_GTE_MENU DO CASE CASE xParams[ 1 ] == 0 /* menu selected */ - IF hb_isObject( ::oMenu ) + IF HB_ISOBJECT( ::oMenu ) IF !empty( aMenuItem := ::oMenu:FindMenuItemById( xParams[ 2 ] ) ) - IF hb_isBlock( aMenuItem[ 2 ] ) + IF HB_ISBLOCK( aMenuItem[ 2 ] ) Eval( aMenuItem[ 2 ], aMenuItem[ 1 ], NIL, aMenuItem[ 4 ] ) - ELSEIF hb_isBlock( aMenuItem[ 3 ] ) + ELSEIF HB_ISBLOCK( aMenuItem[ 3 ] ) Eval( aMenuItem[ 3 ], aMenuItem[ 1 ], NIL, aMenuItem[ 4 ] ) ENDIF ENDIF ENDIF - CASE xParams[ 1 ] == 1 .and. hb_isObject( ::oMenu ) /* enter menu loop */ - IF hb_isBlock( ::oMenu:sl_beginMenu ) + CASE xParams[ 1 ] == 1 .and. HB_ISOBJECT( ::oMenu ) /* enter menu loop */ + IF HB_ISBLOCK( ::oMenu:sl_beginMenu ) Eval( ::oMenu:sl_beginMenu, NIL, NIL, Self ) ENDIF - CASE xParams[ 1 ] == 2 .and. hb_isObject( ::oMenu ) /* exit menu loop */ - IF hb_isBlock( ::oMenu:sl_endMenu ) + CASE xParams[ 1 ] == 2 .and. HB_ISOBJECT( ::oMenu ) /* exit menu loop */ + IF HB_ISBLOCK( ::oMenu:sl_endMenu ) Eval( ::oMenu:sl_endMenu, NIL, NIL, Self ) ENDIF @@ -417,7 +417,7 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) CASE nEvent == HB_GTE_CTLCOLOR oObj := ::findObjectByHandle( xParams[ 2 ] ) - IF hb_isObject( oObj ) + IF HB_ISOBJECT( oObj ) RETURN oObj:handleEvent( HB_GTE_CTLCOLOR, xParams ) ENDIF @@ -426,7 +426,7 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) RETURN ::handleEvent( HB_GTE_VSCROLL, xParams ) ELSE oObj := ::findObjectByHandle( xParams[ 3 ] ) - IF hb_isObject( oObj ) + IF HB_ISOBJECT( oObj ) RETURN oObj:handleEvent( HB_GTE_VSCROLL, xParams ) ENDIF ENDIF @@ -436,7 +436,7 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) RETURN ::handleEvent( HB_GTE_VSCROLL, xParams ) ELSE oObj := ::findObjectByHandle( xParams[ 3 ] ) - IF hb_isObject( oObj ) + IF HB_ISOBJECT( oObj ) RETURN oObj:handleEvent( HB_GTE_VSCROLL, xParams ) ENDIF ENDIF @@ -447,7 +447,7 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) ::drawingArea:setPosAndSize( {0,0}, ::currentSize(), .f. ) ENDIF ENDIF - IF hb_isBlock( ::sl_resize ) + IF HB_ISBLOCK( ::sl_resize ) eval( ::sl_resize, { xParams[ 1 ], xParams[ 2 ] }, { xParams[ 3 ], xParams[ 4 ] }, Self ) ENDIF aeval( ::aChildren, {|o| o:handleEvent( HB_GTE_RESIZED, { 0, 0, 0, 0, 0 } ) } ) @@ -457,7 +457,7 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) RETURN ::handleEvent( HB_GTE_KEYTOITEM, xParams ) ELSE oObj := ::findObjectByHandle( xParams[ 3 ] ) - IF hb_isObject( oObj ) + IF HB_ISOBJECT( oObj ) RETURN oObj:handleEvent( HB_GTE_KEYTOITEM, xParams ) ENDIF ENDIF @@ -487,12 +487,12 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) hWndCtrl := nlParam IF hWndCtrl == 0 /* It is menu */ - IF hb_isObject( ::oMenu ) + IF HB_ISOBJECT( ::oMenu ) IF !empty( aMenuItem := ::oMenu:FindMenuItemById( nCtrlID ) ) - IF hb_isBlock( aMenuItem[ 2 ] ) + IF HB_ISBLOCK( aMenuItem[ 2 ] ) Eval( aMenuItem[ 2 ], aMenuItem[ 1 ], NIL, aMenuItem[ 4 ] ) - ELSEIF hb_isBlock( aMenuItem[ 3 ] ) + ELSEIF HB_ISBLOCK( aMenuItem[ 3 ] ) Eval( aMenuItem[ 3 ], aMenuItem[ 1 ], NIL, aMenuItem[ 4 ] ) ENDIF @@ -502,7 +502,7 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) ELSE IF ( nObj := ascan( ::aChildren, {|o| o:nID == nCtrlID } ) ) > 0 nReturn := ::aChildren[ nObj ]:handleEvent( HB_GTE_COMMAND, { nNotifctn, nCtrlID, hWndCtrl } ) - IF hb_isNumeric( nReturn ) .AND. nReturn == 0 + IF HB_ISNUMERIC( nReturn ) .AND. nReturn == 0 RETURN 0 ENDIF ENDIF @@ -512,9 +512,9 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) CASE WM_NOTIFY IF ( nObj := ascan( ::aChildren, {| o | o:nID == nwParam } ) ) > 0 nReturn := ::aChildren[ nObj ]:handleEvent( HB_GTE_NOTIFY, { nwParam, nlParam } ) - IF hb_isNumeric( nReturn ) .AND. nReturn == EVENT_HANDELLED + IF HB_ISNUMERIC( nReturn ) .AND. nReturn == EVENT_HANDELLED RETURN 0 - ELSEIF hb_isLogical( nReturn ) + ELSEIF HB_ISLOGICAL( nReturn ) RETURN nReturn ENDIF ENDIF @@ -528,7 +528,7 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) CASE WM_CTLCOLORSCROLLBAR CASE WM_CTLCOLORSTATIC oObj := ::findObjectByHandle( nlParam ) - IF hb_isObject( oObj ) + IF HB_ISOBJECT( oObj ) nReturn := oObj:handleEvent( HB_GTE_CTLCOLOR, { nwParam, nlParam } ) IF nReturn == EVENT_UNHANDELLED RETURN WVG_CallWindowProc( ::nOldProc, hWnd, nMessage, nwParam, nlParam ) diff --git a/harbour/contrib/gtwvg/wvgpushb.prg b/harbour/contrib/gtwvg/wvgpushb.prg index fc0b0c663e..99308c7355 100644 --- a/harbour/contrib/gtwvg/wvgpushb.prg +++ b/harbour/contrib/gtwvg/wvgpushb.prg @@ -120,7 +120,7 @@ METHOD WvgPushButton:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) - IF hb_isNumeric( ::caption ) + IF HB_ISNUMERIC( ::caption ) ::style += BS_BITMAP ELSEIF hb_isChar( ::caption ) IF ".ICO" == upper( right( ::caption, 4 ) ) @@ -159,13 +159,13 @@ METHOD WvgPushButton:handleEvent( nMessage, aNM ) ::rePosition() ENDIF ::sendMessage( WM_SIZE, 0, 0 ) - IF hb_isBlock( ::sl_resize ) + IF HB_ISBLOCK( ::sl_resize ) eval( ::sl_resize, NIL, NIL, self ) ENDIF CASE nMessage == HB_GTE_COMMAND IF aNM[ 1 ] == BN_CLICKED - IF hb_isBlock( ::sl_lbClick ) + IF HB_ISBLOCK( ::sl_lbClick ) IF ::isParentCrt() ::oParent:setFocus() ENDIF @@ -181,10 +181,10 @@ METHOD WvgPushButton:handleEvent( nMessage, aNM ) // Will never be issued because pushbutton sends WM_COMMAND CASE nMessage == HB_GTE_CTLCOLOR - IF hb_isNumeric( ::clr_FG ) + IF HB_ISNUMERIC( ::clr_FG ) WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF - IF hb_isNumeric( ::hBrushBG ) + IF HB_ISNUMERIC( ::hBrushBG ) WVG_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ENDIF @@ -192,7 +192,7 @@ METHOD WvgPushButton:handleEvent( nMessage, aNM ) #if 0 /* Must not reach here if WndProc is not installed */ CASE nMessage == HB_GTE_ANY IF aNM[ 1 ] == WM_LBUTTONUP - IF hb_isBlock( ::sl_lbClick ) + IF HB_ISBLOCK( ::sl_lbClick ) IF ::isParentCrt() ::oParent:setFocus() ENDIF @@ -233,7 +233,7 @@ METHOD WvgPushButton:setCaption( xCaption, cDll ) WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) ENDIF - ELSEIF hb_isNumeric( xCaption ) /* Handle to the bitmap */ + ELSEIF HB_ISNUMERIC( xCaption ) /* Handle to the bitmap */ ::caption := xCaption WVG_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_BITMAP, ::caption ) @@ -245,7 +245,7 @@ METHOD WvgPushButton:setCaption( xCaption, cDll ) METHOD WvgPushButton:activate( xParam ) - IF hb_isBlock( xParam ) .OR. ( xParam == NIL ) + IF HB_ISBLOCK( xParam ) .OR. ( xParam == NIL ) ::sl_lbClick := xParam ENDIF @@ -255,7 +255,7 @@ METHOD WvgPushButton:activate( xParam ) METHOD WvgPushButton:draw( xParam ) - IF hb_isBlock( xParam ) .or. ( xParam == NIL ) + IF HB_ISBLOCK( xParam ) .or. ( xParam == NIL ) ::sl_paint := xParam ENDIF diff --git a/harbour/contrib/gtwvg/wvgradio.prg b/harbour/contrib/gtwvg/wvgradio.prg index ef23f9716b..0e2114ee77 100644 --- a/harbour/contrib/gtwvg/wvgradio.prg +++ b/harbour/contrib/gtwvg/wvgradio.prg @@ -150,7 +150,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgRadioButton IF aNM[ NMH_code ] == BN_CLICKED ::editBuffer := ( WVG_Button_GetCheck( ::hWnd ) == BST_CHECKED ) - IF hb_isBlock( ::sl_lbClick ) + IF HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, ::editBuffer, NIL, self ) RETURN 0 ENDIF diff --git a/harbour/contrib/gtwvg/wvgscrlb.prg b/harbour/contrib/gtwvg/wvgscrlb.prg index d17e44ab1b..7dfde9f93f 100644 --- a/harbour/contrib/gtwvg/wvgscrlb.prg +++ b/harbour/contrib/gtwvg/wvgscrlb.prg @@ -204,7 +204,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgScrollBar ::sendMessage( WM_SIZE, 0, 0 ) CASE nMessage == HB_GTE_CTLCOLOR - IF hb_isNumeric( ::hBrushBG ) + IF HB_ISNUMERIC( ::hBrushBG ) WVG_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ENDIF @@ -214,7 +214,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgScrollBar ::oParent:setFocus() ENDIF - IF ! hb_isBlock( ::sl_xbeSB_Scroll ) + IF ! HB_ISBLOCK( ::sl_xbeSB_Scroll ) RETURN EVENT_UNHANDELLED ENDIF @@ -293,7 +293,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgScrollBar nScrPos := WAPI_GetScrollPos( ::pWnd, SB_CTL ) ENDIF - IF ! hb_isBlock( ::sl_xbeSB_Scroll ) + IF ! HB_ISBLOCK( ::sl_xbeSB_Scroll ) RETURN EVENT_UNHANDELLED ENDIF @@ -370,7 +370,7 @@ METHOD destroy() CLASS WvgScrollBar METHOD scroll( xParam ) CLASS WvgScrollBar - IF hb_isBlock( xParam ) + IF HB_ISBLOCK( xParam ) ::sl_xbeSB_Scroll := xParam ENDIF diff --git a/harbour/contrib/gtwvg/wvgsle.prg b/harbour/contrib/gtwvg/wvgsle.prg index a2021bf016..99b22a046d 100644 --- a/harbour/contrib/gtwvg/wvgsle.prg +++ b/harbour/contrib/gtwvg/wvgsle.prg @@ -170,7 +170,7 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgSL ENDIF ::setPosAndSize() - IF hb_isObject( ::datalink ) + IF HB_ISOBJECT( ::datalink ) eval( ::datalink ) ENDIF @@ -199,22 +199,22 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgSLE CASE aNM[ NMH_code ] == EN_MAXTEXT CASE aNM[ NMH_code ] == EN_KILLFOCUS - IF hb_isBlock( ::sl_killInputFocus ) + IF HB_ISBLOCK( ::sl_killInputFocus ) eval( ::sl_killInputFocus, NIL, NIL, Self ) ENDIF CASE aNM[ NMH_code ] == EN_SETFOCUS - IF hb_isBlock( ::sl_setInputFocus ) + IF HB_ISBLOCK( ::sl_setInputFocus ) eval( ::sl_setInputFocus, NIL, NIL, Self ) ENDIF ENDCASE CASE nMessage == HB_GTE_CTLCOLOR - IF hb_isNumeric( ::clr_FG ) + IF HB_ISNUMERIC( ::clr_FG ) WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF - IF hb_isNumeric( ::hBrushBG ) + IF HB_ISNUMERIC( ::hBrushBG ) WVG_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE @@ -224,12 +224,12 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgSLE CASE nMessage == HB_GTE_ANY DO CASE CASE aNM[ NMH_code ] == WM_KILLFOCUS - IF hb_isBlock( ::sl_killInputFocus ) + IF HB_ISBLOCK( ::sl_killInputFocus ) eval( ::sl_killInputFocus, NIL, NIL, Self ) ENDIF CASE aNM[ NMH_code ] == WM_SETFOCUS - IF hb_isBlock( ::sl_setInputFocus ) + IF HB_ISBLOCK( ::sl_setInputFocus ) eval( ::sl_setInputFocus, NIL, NIL, Self ) ENDIF @@ -238,7 +238,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgSLE IF ::isParentCrt() ::oParent:setFocus() ENDIF - IF hb_isBlock( ::sl_returnPressed ) + IF HB_ISBLOCK( ::sl_returnPressed ) eval( ::sl_returnPressed, NIL, NIL, Self ) ENDIF ELSEIF aNM[ 2 ] == VK_TAB @@ -271,7 +271,7 @@ METHOD destroy() CLASS WvgSLE METHOD WvgSLE:changed( lChanged ) LOCAL lChg := ::sendMessage( EM_GETMODIFY, 0, 0 ) - IF hb_isLogical( lChanged ) + IF HB_ISLOGICAL( lChanged ) ::sendMessage( EM_SETMODIFY, iif( lChanged, 0, 1 ), 0 ) ENDIF @@ -321,9 +321,9 @@ METHOD WvgSLE:cutMarked() METHOD WvgSLE:returnPressed( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_returnPressed := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_returnPressed ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_returnPressed ) eval( ::sl_returnPressed, NIL, NIL, Self ) ENDIF RETURN Self diff --git a/harbour/contrib/gtwvg/wvgstatb.prg b/harbour/contrib/gtwvg/wvgstatb.prg index e5eb4ff2a5..befd49ff32 100644 --- a/harbour/contrib/gtwvg/wvgstatb.prg +++ b/harbour/contrib/gtwvg/wvgstatb.prg @@ -157,7 +157,7 @@ METHOD WvgStatusBar:handleEvent( nMessage, aNM ) RETURN 0 CASE nMessage == HB_GTE_COMMAND - IF hb_isBlock( ::sl_lbClick ) + IF HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, NIL, NIL, self ) RETURN 0 ENDIF @@ -169,7 +169,7 @@ METHOD WvgStatusBar:handleEvent( nMessage, aNM ) CASE aNMH[ NMH_code ] == NM_CLICK - IF hb_isBlock( ::sl_lbClick ) + IF HB_ISBLOCK( ::sl_lbClick ) IF aNMH[ NMH_dwItemSpec ] >= 0 nObj := aNMH[ NMH_dwItemSpec ] + 1 @@ -183,10 +183,10 @@ METHOD WvgStatusBar:handleEvent( nMessage, aNM ) ENDCASE CASE nMessage == HB_GTE_CTLCOLOR - IF hb_isNumeric( ::clr_FG ) + IF HB_ISNUMERIC( ::clr_FG ) WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF - IF hb_isNumeric( ::hBrushBG ) + IF HB_ISNUMERIC( ::hBrushBG ) WVG_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE @@ -252,9 +252,9 @@ METHOD WvgStatusBar:addItem( cCaption, xImage, cDLL, nStyle, cKey, nMode ) METHOD WvgStatusBar:delItem( nItemORcKey ) LOCAL nIndex := 0 - IF hb_isNumeric( nItemORcKey ) + IF HB_ISNUMERIC( nItemORcKey ) nIndex := ascan( ::aItems, {|o| o:key == nItemORcKey } ) - ELSEIF hb_isNumeric( nItemORcKey ) + ELSEIF HB_ISNUMERIC( nItemORcKey ) nIndex := nItemORcKey ENDIF @@ -274,7 +274,7 @@ METHOD WvgStatusBar:getItem( nItemORcKey ) IF hb_isChar( nItemORcKey ) nIndex := ascan( ::aItems, {|o| o:key == nItemORcKey } ) - ELSEIF hb_isNumeric( nItemORcKey ) + ELSEIF HB_ISNUMERIC( nItemORcKey ) nIndex := nItemORcKey ENDIF @@ -302,7 +302,7 @@ METHOD WvgStatusBar:clear() METHOD WvgStatusBar:panelClick( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbClick := xParam ENDIF @@ -312,7 +312,7 @@ METHOD WvgStatusBar:panelClick( xParam ) METHOD WvgStatusBar:panelDblClick( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbDblClick := xParam ENDIF diff --git a/harbour/contrib/gtwvg/wvgstatc.prg b/harbour/contrib/gtwvg/wvgstatc.prg index 1d5f0f2a74..b4f15e6af3 100644 --- a/harbour/contrib/gtwvg/wvgstatc.prg +++ b/harbour/contrib/gtwvg/wvgstatc.prg @@ -247,17 +247,17 @@ METHOD WvgStatic:handleEvent( nMessage, aNM ) IF ::isParentCrt() ::rePosition() ENDIF - IF hb_isBlock( ::sl_resize ) + IF HB_ISBLOCK( ::sl_resize ) eval( ::sl_resize, NIL, NIL, self ) ENDIF aeval( ::aChildren, {|o| o:handleEvent( HB_GTE_RESIZED, { 0, 0, 0, 0, 0 } ) } ) RETURN EVENT_HANDELLED CASE nMessage == HB_GTE_CTLCOLOR - IF hb_isNumeric( ::clr_FG ) + IF HB_ISNUMERIC( ::clr_FG ) WVG_SetTextColor( aNM[ 1 ], ::clr_FG ) ENDIF - IF hb_isNumeric( ::hBrushBG ) + IF HB_ISNUMERIC( ::hBrushBG ) WVG_SetBkMode( aNM[ 1 ], 1 ) RETURN ::hBrushBG ELSE @@ -309,7 +309,7 @@ METHOD WvgStatic:setCaption( xCaption, cDll ) WVG_DeleteObject( ::hBitmap ) ENDIF - ::hBitmap := WVG_LoadImage( ::caption, iif( hb_isNUmeric( ::caption ), 1, 2 ) ) + ::hBitmap := WVG_LoadImage( ::caption, iif( HB_ISNUMERIC( ::caption ), 1, 2 ) ) WVG_SendMessage( ::hWnd, STM_SETIMAGE, IMAGE_BITMAP, ::hBitmap ) diff --git a/harbour/contrib/gtwvg/wvgsysw.prg b/harbour/contrib/gtwvg/wvgsysw.prg index 765082d7a7..48b292dadd 100644 --- a/harbour/contrib/gtwvg/wvgsysw.prg +++ b/harbour/contrib/gtwvg/wvgsysw.prg @@ -397,17 +397,17 @@ METHOD wndProc( hWnd, nMessage, nwParam, nlParam ) CLASS WvgFontDialog CASE nL == IDOK ::ok := .t. - IF hb_isBlock( ::sl_activateOk ) + IF HB_ISBLOCK( ::sl_activateOk ) eval( ::sl_activateOk, ::GetWvgFont(), NIL, Self ) ENDIF CASE nL == IDCANCEL - IF hb_isBlock( ::sl_activateCancel ) + IF HB_ISBLOCK( ::sl_activateCancel ) eval( ::sl_activateCancel, NIL, NIL, Self ) ENDIF CASE nL == 1026 - IF hb_isBlock( ::sl_activateApply ) + IF HB_ISBLOCK( ::sl_activateApply ) eval( ::sl_activateApply, ::GetWvgFont(), NIL, Self ) ENDIF diff --git a/harbour/contrib/gtwvg/wvgtabpg.prg b/harbour/contrib/gtwvg/wvgtabpg.prg index 349da824e5..a2a46bac93 100644 --- a/harbour/contrib/gtwvg/wvgtabpg.prg +++ b/harbour/contrib/gtwvg/wvgtabpg.prg @@ -164,7 +164,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgTabPage DO CASE CASE nMessage == HB_GTE_SETFOCUS - IF hb_isBlock( ::sl_tabActivate ) + IF HB_ISBLOCK( ::sl_tabActivate ) RETURN EVENT_HANDELLED ENDIF @@ -195,7 +195,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgTabPage METHOD tabActivate( xParam ) CLASS WvgTabPage - IF hb_isBlock( xParam ) + IF HB_ISBLOCK( xParam ) ::sl_tabActivate := xParam ENDIF diff --git a/harbour/contrib/gtwvg/wvgtoolb.prg b/harbour/contrib/gtwvg/wvgtoolb.prg index 3abadc0216..c60b480dc7 100644 --- a/harbour/contrib/gtwvg/wvgtoolb.prg +++ b/harbour/contrib/gtwvg/wvgtoolb.prg @@ -224,7 +224,7 @@ METHOD WvgToolBar:handleEvent( nMessage, aNM ) CASE aNMMouse[ NMH_code ] == NM_CLICK IF ( nObj := ascan( ::aItems, {|e_| e_[ 1 ] == aNMMouse[ NMH_dwItemSpec ] } ) ) > 0 - IF hb_isBlock( ::sl_lbClick ) + IF HB_ISBLOCK( ::sl_lbClick ) IF ::isParentCrt() ::oParent:setFocus() ENDIF @@ -326,7 +326,7 @@ METHOD WvgToolBar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS IF ! empty( pBitmap ) /* oBtn:image := pBitmap */ - IF hb_isNumeric( nMapRGB ) + IF HB_ISNUMERIC( nMapRGB ) nBtn := WAPI_ImageList_AddMasked( ::hImageList, pBitmap, nMapRGB ) ELSE nBtn := WAPI_ImageList_Add( ::hImageList, pBitmap ) @@ -412,7 +412,7 @@ METHOD WvgToolBar:setSize() METHOD WvgToolBar:buttonClick( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbClick := xParam ENDIF @@ -422,7 +422,7 @@ METHOD WvgToolBar:buttonClick( xParam ) METHOD WvgToolBar:change( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_change := xParam ENDIF @@ -432,7 +432,7 @@ METHOD WvgToolBar:change( xParam ) METHOD WvgToolBar:buttonMenuClick( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_buttonMenuClick := xParam ENDIF @@ -442,7 +442,7 @@ METHOD WvgToolBar:buttonMenuClick( xParam ) METHOD WvgToolBar:buttonDropDown( xParam ) - IF hb_isBlock( xParam ) .or. hb_isNil( xParam ) + IF HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_buttonDropDown := xParam ENDIF diff --git a/harbour/contrib/gtwvg/wvgtreev.prg b/harbour/contrib/gtwvg/wvgtreev.prg index b7c96805d4..1761b98e47 100644 --- a/harbour/contrib/gtwvg/wvgtreev.prg +++ b/harbour/contrib/gtwvg/wvgtreev.prg @@ -118,7 +118,7 @@ CLASS WvgTreeView INHERIT WvgWindow, WvgDataRef METHOD setColorBG( nRGB ) INLINE WVG_TreeView_SetBkColor( ::hWnd, iif( hb_isChar( nRGB ), Wvt_GetRGBColorByString( nRGB, 1 ), nRGB ) ) METHOD setColorLines( nRGB ) INLINE WVG_TreeView_SetLineColor( ::hWnd, nRGB ) METHOD showExpanded( lExpanded, nLevels ) INLINE Wvg_TreeView_ShowExpanded( ::hWnd, ; - iif( hb_isNil( lExpanded ), .f., lExpanded ), nLevels ) + iif( HB_ISNIL( lExpanded ), .f., lExpanded ), nLevels ) ENDCLASS @@ -185,7 +185,7 @@ METHOD WvgTreeView:handleEvent( nMessage, aNM ) ::sendMessage( WM_SIZE, 0, 0 ) CASE HB_GTE_COMMAND - IF hb_isBlock( ::sl_lbClick ) + IF HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, NIL, NIL, self ) RETURN EVENT_HANDELLED ENDIF @@ -200,7 +200,7 @@ METHOD WvgTreeView:handleEvent( nMessage, aNM ) IF ::isParentCrt() ::oParent:setFocus() ENDIF - IF hb_isBlock( ::sl_itemSelected ) + IF HB_ISBLOCK( ::sl_itemSelected ) Eval( ::sl_itemSelected, ::oItemSelected, { 0,0,0,0 }, Self ) ENDIF IF ::isParentCrt() @@ -217,7 +217,7 @@ METHOD WvgTreeView:handleEvent( nMessage, aNM ) IF ::isParentCrt() ::oParent:setFocus() ENDIF - IF hb_isBlock( ::sl_itemMarked ) + IF HB_ISBLOCK( ::sl_itemMarked ) Eval( ::sl_itemMarked, ::oItemSelected, { 0,0,0,0 }, Self ) ENDIF IF ::isParentCrt() @@ -240,7 +240,7 @@ METHOD WvgTreeView:handleEvent( nMessage, aNM ) IF aNM[ 1 ] == WM_LBUTTONDOWN aHdr := Wvg_GetNMTreeViewInfo( aNM[ 3 ] ) ::getSelectionInfo( aNM[ 2 ] ) - IF hb_isBlock( ::sl_lbClick ) + IF HB_ISBLOCK( ::sl_lbClick ) IF ::isParentCrt() ::oParent:setFocus() ENDIF @@ -253,7 +253,7 @@ METHOD WvgTreeView:handleEvent( nMessage, aNM ) ELSEIF aNM[ 1 ] == WM_LBUTTONDBLCLK .OR. ( aNM[ 1 ] == WM_KEYDOWN .AND. aNM[ 2 ] == K_ENTER ) ::editBuffer := ::oItemSelected - IF hb_isBlock( ::sl_itemSelected ) + IF HB_ISBLOCK( ::sl_itemSelected ) IF ::isParentCrt() ::oParent:setFocus() ENDIF @@ -314,7 +314,7 @@ METHOD WvgTreeView:itemFromPos( aPos ) METHOD WvgTreeView:itemCollapsed( xParam ) - IF hb_isBlock( xParam ) .or. ( xParam == NIL ) + IF HB_ISBLOCK( xParam ) .or. ( xParam == NIL ) ::sl_paint := xParam ENDIF @@ -324,7 +324,7 @@ METHOD WvgTreeView:itemCollapsed( xParam ) METHOD WvgTreeView:itemExpanded( xParam ) - IF hb_isBlock( xParam ) .or. ( xParam == NIL ) + IF HB_ISBLOCK( xParam ) .or. ( xParam == NIL ) ::sl_itemExpanded := xParam ENDIF @@ -334,7 +334,7 @@ METHOD WvgTreeView:itemExpanded( xParam ) METHOD WvgTreeView:itemMarked( xParam ) - IF hb_isBlock( xParam ) .or. ( xParam == NIL ) + IF HB_ISBLOCK( xParam ) .or. ( xParam == NIL ) ::sl_itemMarked := xParam ENDIF @@ -344,7 +344,7 @@ METHOD WvgTreeView:itemMarked( xParam ) #if 0 METHOD WvgTreeView:itemSelected( xParam ) - IF hb_isBlock( xParam ) .or. ( xParam == NIL ) + IF HB_ISBLOCK( xParam ) .or. ( xParam == NIL ) ::sl_itemSelected := xParam ENDIF @@ -375,7 +375,7 @@ CLASS WvgTreeViewItem METHOD destroy() METHOD expand( lExpand ) INLINE WVG_TreeView_Expand( ::hTree, ::hItem, ; - iif( hb_isLogical( lExpand ), lExpand, .t. ) ) + iif( HB_ISLOGICAL( lExpand ), lExpand, .t. ) ) METHOD isExpanded() METHOD setCaption( cCaption ) METHOD setExpandedImage( nResIdoBitmap ) @@ -462,7 +462,7 @@ METHOD addItem( cCaption ) CLASS WvgTreeViewItem oItem:caption := cCaption oItem:oWnd := ::oWnd - hParent := iif( hb_isObject( oItem:oParent ), oItem:oParent:hItem, NIL ) + hParent := iif( HB_ISOBJECT( oItem:oParent ), oItem:oParent:hItem, NIL ) oItem:hItem := Wvg_TreeView_AddItem( oItem:hTree, hParent, oItem:caption ) diff --git a/harbour/contrib/gtwvg/wvgwnd.prg b/harbour/contrib/gtwvg/wvgwnd.prg index c229986932..f9053bc5fe 100644 --- a/harbour/contrib/gtwvg/wvgwnd.prg +++ b/harbour/contrib/gtwvg/wvgwnd.prg @@ -494,7 +494,7 @@ METHOD WvgWindow:setColorBG( nRGB ) IF hb_isChar( nRGB ) nRGB := Wvt_GetRGBColorByString( nRGB, 1 ) ENDIF - IF hb_isNumeric( nRGB ) + IF HB_ISNUMERIC( nRGB ) hBrush := WVG_CreateBrush( BS_SOLID, nRGB, 0 ) IF hBrush != 0 ::clr_BG := nRGB @@ -531,7 +531,7 @@ METHOD WvgWindow:setTrackPointer() METHOD WvgWindow:setPos( aPos, lPaint ) LOCAL aPosSz - IF hb_isArray( aPos ) + IF HB_ISARRAY( aPos ) DEFAULT lPaint TO .T. SWITCH ::objType @@ -565,7 +565,7 @@ METHOD WvgWindow:setPosAndSize( aPos, aSize, lPaint ) DEFAULT aPos TO ::aPos DEFAULT aSize TO ::aSize - IF hb_isArray( aPos ) .AND. hb_isArray( aSize ) + IF HB_ISARRAY( aPos ) .AND. HB_ISARRAY( aSize ) DEFAULT lPaint TO .T. SWITCH ::objType @@ -588,7 +588,7 @@ METHOD WvgWindow:setPosAndSize( aPos, aSize, lPaint ) METHOD WvgWindow:setSize( aSize, lPaint ) LOCAL aPosSz - IF hb_isArray( aSize ) + IF HB_ISARRAY( aSize ) DEFAULT lPaint TO .T. SWITCH ::objType @@ -618,7 +618,7 @@ METHOD WvgWindow:isDerivedFrom( cClassORoObject ) lTrue := .t. ENDIF - ELSEIF hb_isObject( cClassORoObject ) + ELSEIF HB_ISOBJECT( cClassORoObject ) IF upper( substr( cClassORoObject:className,4 ) ) == upper( substr( cCls,4 ) ) lTrue := .t. ENDIF @@ -675,7 +675,7 @@ METHOD WvgWindow:setFontCompoundName( xFont ) cOldFont := ::fnt_COMMPOUNDNAME - IF hb_isNumeric( cFont ) + IF HB_ISNUMERIC( cFont ) ELSE IF !empty( xFont ) @@ -753,12 +753,12 @@ METHOD WvgWindow:hasInputFocus() METHOD WvgWindow:enter( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_enter ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_enter ) eval( ::sl_enter, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_enter := xParam RETURN NIL endif @@ -769,12 +769,12 @@ METHOD WvgWindow:enter( xParam ) METHOD WvgWindow:leave( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_leave ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_leave ) eval( ::sl_leave, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_leave := xParam RETURN NIL endif @@ -785,12 +785,12 @@ METHOD WvgWindow:leave( xParam ) METHOD WvgWindow:lbClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_lbClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbClick := xParam RETURN NIL endif @@ -801,12 +801,12 @@ METHOD WvgWindow:lbClick( xParam ) METHOD WvgWindow:lbDblClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_lbDblClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_lbDblClick ) eval( ::sl_lbDblClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbDblClick := xParam RETURN NIL endif @@ -817,12 +817,12 @@ METHOD WvgWindow:lbDblClick( xParam ) METHOD WvgWindow:lbDown( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_lbDown ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_lbDown ) eval( ::sl_lbDown, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbDown := xParam RETURN NIL endif @@ -833,12 +833,12 @@ METHOD WvgWindow:lbDown( xParam ) METHOD WvgWindow:lbUp( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_lbUp ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_lbUp ) eval( ::sl_lbUp, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbUp := xParam RETURN NIL endif @@ -849,12 +849,12 @@ METHOD WvgWindow:lbUp( xParam ) METHOD WvgWindow:mbClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_mbClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_mbClick ) eval( ::sl_mbClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_mbClick := xParam RETURN NIL endif @@ -865,12 +865,12 @@ METHOD WvgWindow:mbClick( xParam ) METHOD WvgWindow:mbDblClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_mbDblClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_mbDblClick ) eval( ::sl_mbDblClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_mbDblClick := xParam RETURN NIL endif @@ -881,12 +881,12 @@ METHOD WvgWindow:mbDblClick( xParam ) METHOD WvgWindow:mbDown( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_mbDown ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_mbDown ) eval( ::sl_mbDown, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_mbDown := xParam RETURN NIL endif @@ -897,12 +897,12 @@ METHOD WvgWindow:mbDown( xParam ) METHOD WvgWindow:mbUp( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_mbUp ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_mbUp ) eval( ::sl_mbUp, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_mbUp := xParam RETURN NIL endif @@ -913,12 +913,12 @@ METHOD WvgWindow:mbUp( xParam ) METHOD WvgWindow:motion( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_motion ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_motion ) eval( ::sl_motion, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_motion := xParam RETURN NIL endif @@ -929,12 +929,12 @@ METHOD WvgWindow:motion( xParam ) METHOD WvgWindow:rbClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_rbClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_rbClick ) eval( ::sl_rbClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_rbClick := xParam RETURN NIL endif @@ -945,12 +945,12 @@ METHOD WvgWindow:rbClick( xParam ) METHOD WvgWindow:rbDblClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_rbDblClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_rbDblClick ) eval( ::sl_rbDblClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_rbDblClick := xParam RETURN NIL endif @@ -961,12 +961,12 @@ METHOD WvgWindow:rbDblClick( xParam ) METHOD WvgWindow:rbDown( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_rbDown ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_rbDown ) eval( ::sl_rbDown, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_rbDown := xParam RETURN NIL endif @@ -977,12 +977,12 @@ METHOD WvgWindow:rbDown( xParam ) METHOD WvgWindow:rbUp( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_rbUp ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_rbUp ) eval( ::sl_rbUp, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_rbUp := xParam RETURN NIL endif @@ -993,12 +993,12 @@ METHOD WvgWindow:rbUp( xParam ) METHOD WvgWindow:wheel( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_wheel ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_wheel ) eval( ::sl_wheel, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_wheel := xParam RETURN NIL endif @@ -1011,12 +1011,12 @@ METHOD WvgWindow:wheel( xParam ) METHOD WvgWindow:close( xParam ) if ::objType == objTypeCrt - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_close ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_close ) eval( ::sl_close, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_close := xParam RETURN NIL endif @@ -1027,12 +1027,12 @@ METHOD WvgWindow:close( xParam ) METHOD WvgWindow:helpRequest( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_helpRequest ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_helpRequest ) eval( ::sl_helpRequest, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_helpRequest := xParam RETURN NIL endif @@ -1043,12 +1043,12 @@ METHOD WvgWindow:helpRequest( xParam ) METHOD WvgWindow:keyboard( xParam ) - if hb_isNumeric( xParam ) .and. hb_isBlock( ::sl_keyboard ) + if HB_ISNUMERIC( xParam ) .and. HB_ISBLOCK( ::sl_keyboard ) eval( ::sl_keyboard, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_keyboard := xParam RETURN NIL endif @@ -1059,12 +1059,12 @@ METHOD WvgWindow:keyboard( xParam ) METHOD WvgWindow:killDisplayFocus( xParam ) if ::objType == objTypeCrt - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_killDisplayFocus ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_killDisplayFocus ) eval( ::sl_killDisplayFocus, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_killDisplayFocus := xParam RETURN NIL endif @@ -1075,12 +1075,12 @@ METHOD WvgWindow:killDisplayFocus( xParam ) METHOD WvgWindow:killInputFocus( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_killInputFocus ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_killInputFocus ) eval( ::sl_killInputFocus, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_killInputFocus := xParam RETURN NIL endif @@ -1091,12 +1091,12 @@ METHOD WvgWindow:killInputFocus( xParam ) METHOD WvgWindow:move( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_move ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_move ) eval( ::sl_move, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_move := xParam RETURN NIL endif @@ -1107,12 +1107,12 @@ METHOD WvgWindow:move( xParam ) METHOD WvgWindow:paint( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_paint ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_paint ) eval( ::sl_paint, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_paint := xParam RETURN NIL endif @@ -1123,12 +1123,12 @@ METHOD WvgWindow:paint( xParam ) METHOD WvgWindow:quit( xParam, xParam1 ) - if hb_isNumeric( xParam ) .and. hb_isBlock( ::sl_quit ) + if HB_ISNUMERIC( xParam ) .and. HB_ISBLOCK( ::sl_quit ) eval( ::sl_quit, xParam, xParam1, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_quit := xParam RETURN NIL endif @@ -1139,12 +1139,12 @@ METHOD WvgWindow:quit( xParam, xParam1 ) METHOD WvgWindow:resize( xParam, xParam1 ) - if hb_isArray( xParam ) .and. hb_isArray( xParam1 ) .and. hb_isBlock( ::sl_resize ) + if HB_ISARRAY( xParam ) .and. HB_ISARRAY( xParam1 ) .and. HB_ISBLOCK( ::sl_resize ) eval( ::sl_resize, xParam, xParam1, Self ) RETURN Self endif - if hb_isBlock( xParam ) /*.or. hb_isNil( xParam )*/ + if HB_ISBLOCK( xParam ) /*.or. HB_ISNIL( xParam )*/ ::sl_resize := xParam RETURN NIL endif @@ -1156,12 +1156,12 @@ METHOD WvgWindow:resize( xParam, xParam1 ) METHOD WvgWindow:setDisplayFocus( xParam ) if ::objType == objTypeCrt - if hb_isNil( xParam ) .and. hb_isBlock( ::setDisplayFocus ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::setDisplayFocus ) eval( ::setDisplayFocus, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::setDisplayFocus := xParam RETURN NIL endif @@ -1172,12 +1172,12 @@ METHOD WvgWindow:setDisplayFocus( xParam ) METHOD WvgWindow:setInputFocus( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_setInputFocus ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_setInputFocus ) eval( ::sl_setInputFocus, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_setInputFocus := xParam RETURN NIL endif @@ -1188,12 +1188,12 @@ METHOD WvgWindow:setInputFocus( xParam ) METHOD WvgWindow:dragEnter( xParam, xParam1 ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_dragEnter ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_dragEnter ) eval( ::sl_dragEnter, xParam, xParam1, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_dragEnter := xParam RETURN NIL endif @@ -1204,12 +1204,12 @@ METHOD WvgWindow:dragEnter( xParam, xParam1 ) METHOD WvgWindow:dragMotion( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_dragMotion ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_dragMotion ) eval( ::sl_dragMotion, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_dragMotion := xParam RETURN NIL endif @@ -1220,12 +1220,12 @@ METHOD WvgWindow:dragMotion( xParam ) METHOD WvgWindow:dragLeave( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_dragLeave ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_dragLeave ) eval( ::sl_dragLeave, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_dragLeave := xParam RETURN NIL endif @@ -1236,12 +1236,12 @@ METHOD WvgWindow:dragLeave( xParam ) METHOD WvgWindow:dragDrop( xParam, xParam1 ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_dragDrop ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_dragDrop ) eval( ::sl_dragDrop, xParam, xParam1, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_dragDrop := xParam RETURN NIL endif @@ -1306,16 +1306,16 @@ METHOD WvgWindow:getPosAndSize( aPs, aSz ) aSize := aclone( aSz ) IF ::isParentCrt() - IF hb_isBlock( aPos[ 1 ] ) + IF HB_ISBLOCK( aPos[ 1 ] ) aPos[ 1 ] := eval( aPos[ 1 ] ) ENDIF - IF hb_isBlock( aPos[ 2 ] ) + IF HB_ISBLOCK( aPos[ 2 ] ) aPos[ 2 ] := eval( aPos[ 2 ] ) ENDIF - IF hb_isBlock( aSize[ 1 ] ) + IF HB_ISBLOCK( aSize[ 1 ] ) aSize[ 1 ] := eval( aSize[ 1 ] ) ENDIF - IF hb_isBlock( aSize[ 2 ] ) + IF HB_ISBLOCK( aSize[ 2 ] ) aSize[ 2 ] := eval( aSize[ 2 ] ) ENDIF diff --git a/harbour/contrib/hbblat/blatcls.prg b/harbour/contrib/hbblat/blatcls.prg index 86ef05f24e..91304724c8 100644 --- a/harbour/contrib/hbblat/blatcls.prg +++ b/harbour/contrib/hbblat/blatcls.prg @@ -50,7 +50,6 @@ * */ -#include "common.ch" #include "hbblat.ch" #include "hbclass.ch" @@ -235,7 +234,7 @@ METHOD PROCEDURE Check() CLASS HBBlat // The Basics ---------------------------------- // to - IF ! ISCHARACTER( ::cTO ) .AND. ! ISCHARACTER( ::cTOFile ) .AND. !::lToUndiscloseRecipients + IF ! HB_ISSTRING( ::cTO ) .AND. ! HB_ISSTRING( ::cTOFile ) .AND. !::lToUndiscloseRecipients ::nError := BLAT_ERR_MISSING_TO ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_TO ) AAdd( ::aErrors, { ::nError, ::cError } ) @@ -243,13 +242,13 @@ METHOD PROCEDURE Check() CLASS HBBlat RETURN ENDIF ELSE - IF ISCHARACTER( ::cTO ) + IF HB_ISSTRING( ::cTO ) ::cCommand += " -to " + ::cTo ENDIF ENDIF // tofile - optional - IF ISCHARACTER( ::cTOFile ) + IF HB_ISSTRING( ::cTOFile ) IF !hb_FileExists( ::cTOFile ) ::nError := BLAT_ERR_MISSING_TOFILE ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_TOFILE ) + ": " + ::cToFile @@ -263,12 +262,12 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cc - optional - IF ISCHARACTER( ::cCC ) + IF HB_ISSTRING( ::cCC ) ::cCommand += " -cc " + ::cCC ENDIF // ccfile - optional - IF ISCHARACTER( ::cCCFile ) + IF HB_ISSTRING( ::cCCFile ) IF !hb_FileExists( ::cCCFile ) ::nError := BLAT_ERR_MISSING_CCFILE ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_CCFILE ) + ": " + ::cCCFile @@ -282,12 +281,12 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // bcc - optional - IF ISCHARACTER( ::cBCC ) + IF HB_ISSTRING( ::cBCC ) ::cCommand += " -bcc " + ::cBCC ENDIF // bccfile - optional - IF ISCHARACTER( ::cBCCFile ) + IF HB_ISSTRING( ::cBCCFile ) IF !hb_FileExists( ::cBCCFile ) ::nError := BLAT_ERR_MISSING_BCCFILE ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_BCCFILE ) + ": " + ::cBCCFile @@ -301,7 +300,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // nMaxNames - IF ISNUMBER( ::nMaxNames ) .AND. ::nMaxNames > 0 + IF HB_ISNUMERIC( ::nMaxNames ) .AND. ::nMaxNames > 0 ::cCommand += ' -maxNames ' + hb_ntos( ::nMaxNames ) ENDIF @@ -311,7 +310,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cSubject - optional - IF ISCHARACTER( ::cSubject ) + IF HB_ISSTRING( ::cSubject ) ::cCommand += ' -subject "' + ::cSubject + '"' ENDIF @@ -321,7 +320,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cSubjectFile - optional - IF ISCHARACTER( ::cSubjectFile ) + IF HB_ISSTRING( ::cSubjectFile ) IF !hb_FileExists( ::cSubjectFile ) ::nError := BLAT_ERR_MISSING_SUBJECTFILE ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_SUBJECTFILE ) + ": " + ::cSubjectFile @@ -335,7 +334,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // bodyfile - optional - IF ISCHARACTER( ::cBodyFile ) + IF HB_ISSTRING( ::cBodyFile ) IF !hb_FileExists( ::cBodyFile ) ::nError := BLAT_ERR_MISSING_BODYFILE ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_BODYFILE ) + ": " + ::cBodyFile @@ -349,7 +348,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // body - IF ! ISCHARACTER( ::cBody ) .AND. ! ISCHARACTER( ::cBodyFile ) + IF ! HB_ISSTRING( ::cBody ) .AND. ! HB_ISSTRING( ::cBodyFile ) ::nError := BLAT_ERR_MISSING_BODY ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_BODY ) AAdd( ::aErrors, { ::nError, ::cError } ) @@ -357,7 +356,7 @@ METHOD PROCEDURE Check() CLASS HBBlat RETURN ENDIF ELSE - IF ISCHARACTER( ::cBody ) + IF HB_ISSTRING( ::cBody ) ::cCommand += ' -body "' + ::cBody + '"' ELSE IF !hb_FileExists( ::cBodyFile ) @@ -374,7 +373,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cSignatureFile - IF ISCHARACTER( ::cSignatureFile ) + IF HB_ISSTRING( ::cSignatureFile ) IF !hb_FileExists( ::cSignatureFile ) ::nError := BLAT_ERR_MISSING_SIGNATUREFILE ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_SIGNATUREFILE ) + ": " + ::cSignatureFile @@ -388,7 +387,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cTagFile - IF ISCHARACTER( ::cTagFile ) + IF HB_ISSTRING( ::cTagFile ) IF !hb_FileExists( ::cTagFile ) ::nError := BLAT_ERR_MISSING_TAGFILE ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_TAGFILE ) + ": " + ::cTagFile @@ -402,7 +401,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cPostScriptumFile - optional - IF ISCHARACTER( ::cPostScriptumFile ) + IF HB_ISSTRING( ::cPostScriptumFile ) IF !hb_FileExists( ::cPostScriptumFile ) ::nError := BLAT_ERR_MISSING_PSFILE ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_PSFILE ) + ": " + ::cPostScriptumFile @@ -418,7 +417,7 @@ METHOD PROCEDURE Check() CLASS HBBlat // Registry overrides ------------------------------ // cProfile - IF ISCHARACTER( ::cProfile ) + IF HB_ISSTRING( ::cProfile ) ::cCommand += " -p " + ::cProfile ENDIF @@ -428,7 +427,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cServerSMTP - IF ! ISCHARACTER( ::cServerSMTP ) + IF ! HB_ISSTRING( ::cServerSMTP ) ::nError := BLAT_ERR_MISSING_SERVERSMTP ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_SERVERSMTP ) AAdd( ::aErrors, { ::nError, ::cError } ) @@ -440,27 +439,27 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cServerNNTP - IF ISCHARACTER( ::cServerNNTP ) + IF HB_ISSTRING( ::cServerNNTP ) ::cCommand += " -serverNNTP " + ::cServerNNTP ENDIF // cServerPOP3 - IF ISCHARACTER( ::cServerPOP3 ) + IF HB_ISSTRING( ::cServerPOP3 ) ::cCommand += " -serverPOP3 " + ::cServerPOP3 ENDIF // cServerIMAP - IF ISCHARACTER( ::cServerIMAP ) + IF HB_ISSTRING( ::cServerIMAP ) ::cCommand += " -serverIMAP " + ::cServerIMAP ENDIF // cMailFrom - IF ISCHARACTER( ::cMailFrom ) + IF HB_ISSTRING( ::cMailFrom ) ::cCommand += " -mailfrom " + ::cMailFrom ENDIF // cFrom - IF ! ISCHARACTER( ::cFrom ) + IF ! HB_ISSTRING( ::cFrom ) ::nError := BLAT_ERR_MISSING_FROM ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_FROM ) AAdd( ::aErrors, { ::nError, ::cError } ) @@ -472,72 +471,72 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cReplyTo - IF ISCHARACTER( ::cReplyTo ) + IF HB_ISSTRING( ::cReplyTo ) ::cCommand += ' -replyto ' + ::cReplyTo ENDIF // cReplyTo - IF ISCHARACTER( ::cReplyTo ) + IF HB_ISSTRING( ::cReplyTo ) ::cCommand += ' -replyto ' + ::cReplyTo ENDIF // cReturnPath - IF ISCHARACTER( ::cReturnPath ) + IF HB_ISSTRING( ::cReturnPath ) ::cCommand += ' -returnpath ' + ::cReturnPath ENDIF // cSender - IF ISCHARACTER( ::cSender ) + IF HB_ISSTRING( ::cSender ) ::cCommand += ' -sender ' + ::cSender ENDIF // nPortSMTP - IF ISNUMBER( ::nPortSMTP ) .AND. ::nPortSMTP > 0 + IF HB_ISNUMERIC( ::nPortSMTP ) .AND. ::nPortSMTP > 0 ::cCommand += ' -portSMTP ' + hb_ntos( ::nPortSMTP ) ENDIF // nPortNNTP - IF ISNUMBER( ::nPortNNTP ) .AND. ::nPortNNTP > 0 + IF HB_ISNUMERIC( ::nPortNNTP ) .AND. ::nPortNNTP > 0 ::cCommand += ' -portNNTP ' + hb_ntos( ::nPortNNTP ) ENDIF // nPortPOP3 - IF ISNUMBER( ::nPortPOP3 ) .AND. ::nPortPOP3 > 0 + IF HB_ISNUMERIC( ::nPortPOP3 ) .AND. ::nPortPOP3 > 0 ::cCommand += ' -portPOP3 ' + hb_ntos( ::nPortPOP3 ) ENDIF // nPortIMAP - IF ISNUMBER( ::nPortIMAP ) .AND. ::nPortIMAP > 0 + IF HB_ISNUMERIC( ::nPortIMAP ) .AND. ::nPortIMAP > 0 ::cCommand += ' -portIMAP ' + hb_ntos( ::nPortIMAP ) ENDIF // cUserAUTH - IF ISCHARACTER( ::cUserAUTH ) + IF HB_ISSTRING( ::cUserAUTH ) ::cCommand += ' -u ' + ::cUserAUTH ENDIF // cPasswordAUTH - IF ISCHARACTER( ::cPasswordAUTH ) + IF HB_ISSTRING( ::cPasswordAUTH ) ::cCommand += ' -pw ' + ::cPasswordAUTH ENDIF // cUserPOP3 - IF ISCHARACTER( ::cUserPOP3 ) + IF HB_ISSTRING( ::cUserPOP3 ) ::cCommand += ' -pu ' + ::cUserPOP3 ENDIF // cPasswordPOP3 - IF ISCHARACTER( ::cPasswordPOP3 ) + IF HB_ISSTRING( ::cPasswordPOP3 ) ::cCommand += ' -ppw ' + ::cPasswordPOP3 ENDIF // cUserIMAP - IF ISCHARACTER( ::cUserIMAP ) + IF HB_ISSTRING( ::cUserIMAP ) ::cCommand += ' -iu ' + ::cUserIMAP ENDIF // cPasswordIMAP - IF ISCHARACTER( ::cPasswordIMAP ) + IF HB_ISSTRING( ::cPasswordIMAP ) ::cCommand += ' -ipw ' + ::cPasswordIMAP ENDIF @@ -549,17 +548,17 @@ METHOD PROCEDURE Check() CLASS HBBlat // Miscellaneous RFC header switches ---------------------- // cOrganization - IF ISCHARACTER( ::cOrganization ) + IF HB_ISSTRING( ::cOrganization ) ::cCommand += ' -organization ' + ::cOrganization ENDIF // cUserAgent - IF ISCHARACTER( ::cUserAgent ) + IF HB_ISSTRING( ::cUserAgent ) ::cCommand += ' -ua ' + ::cUserAgent ENDIF // cXHeader - IF ISCHARACTER( ::cXHeader ) + IF HB_ISSTRING( ::cXHeader ) ::cCommand += ' -x ' + ::cXHeader ENDIF @@ -587,22 +586,22 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cCharSet - IF ISCHARACTER( ::cCharSet ) + IF HB_ISSTRING( ::cCharSet ) ::cCommand += ' -charset ' + ::cCharSet ENDIF // cUserHeader1 - IF ISCHARACTER( ::cUserHeader1 ) + IF HB_ISSTRING( ::cUserHeader1 ) ::cCommand += ' -a1 ' + ::cUserHeader1 ENDIF // cUserHeader2 - IF ISCHARACTER( ::cUserHeader2 ) + IF HB_ISSTRING( ::cUserHeader2 ) ::cCommand += ' -a2 ' + ::cUserHeader2 ENDIF // cDSN - IF ISCHARACTER( ::cDSN ) + IF HB_ISSTRING( ::cDSN ) IF ( "n" $ Lower( ::cDSN ) .OR. "s" $ Lower( ::cDSN ) .OR. ; "f" $ Lower( ::cDSN ) .OR. "d" $ Lower( ::cDSN ) ) ::cCommand += " -dsn " + ::cDSN @@ -634,7 +633,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // nSensitivity - IF ISNUMBER( ::nSensitivity ) .AND. AScan( { 0, 1, 2 }, ::nSensitivity ) > 0 + IF HB_ISNUMERIC( ::nSensitivity ) .AND. AScan( { 0, 1, 2 }, ::nSensitivity ) > 0 ::cCommand += " -sensitivity " + hb_ntos( ::nSensitivity ) ENDIF @@ -642,58 +641,58 @@ METHOD PROCEDURE Check() CLASS HBBlat // Attach Binary Files IF !Empty( ::aAttachBinFiles ) - IF ISCHARACTER( ::cAttachBinFiles ) + IF HB_ISSTRING( ::cAttachBinFiles ) ::cAttachBinFiles += "," ELSE ::cAttachBinFiles := "" ENDIF ::cAttachBinFiles += ArrayToString( ::aAttachBinFiles ) ENDIF - IF ISCHARACTER( ::cAttachBinFiles ) + IF HB_ISSTRING( ::cAttachBinFiles ) ::cCommand += " -attach " + ::cAttachBinFiles ENDIF // Attach Text Files IF !Empty( ::aAttachTextFiles ) - IF ISCHARACTER( ::cAttachTextFiles ) + IF HB_ISSTRING( ::cAttachTextFiles ) ::cAttachTextFiles += "," ELSE ::cAttachTextFiles := "" ENDIF ::cAttachTextFiles += ArrayToString( ::aAttachTextFiles ) ENDIF - IF ISCHARACTER( ::cAttachTextFiles ) + IF HB_ISSTRING( ::cAttachTextFiles ) ::cCommand += " -attacht " + ::cAttachTextFiles ENDIF // Attach INLINE Files IF !Empty( ::aAttachInlineFiles ) - IF ISCHARACTER( ::cAttachInlineFiles ) + IF HB_ISSTRING( ::cAttachInlineFiles ) ::cAttachInlineFiles += "," ELSE ::cAttachInlineFiles := "" ENDIF ::cAttachInlineFiles += ArrayToString( ::aAttachInlineFiles ) ENDIF - IF ISCHARACTER( ::cAttachInlineFiles ) + IF HB_ISSTRING( ::cAttachInlineFiles ) ::cCommand += " -attachi " + ::cAttachInlineFiles ENDIF // Attach Html Embedded Files IF !Empty( ::aHtmlEmbeddedFiles ) - IF ISCHARACTER( ::cHtmlEmbeddedFiles ) + IF HB_ISSTRING( ::cHtmlEmbeddedFiles ) ::cHtmlEmbeddedFiles += "," ELSE ::cHtmlEmbeddedFiles := "" ENDIF ::cHtmlEmbeddedFiles += ArrayToString( ::aHtmlEmbeddedFiles ) ENDIF - IF ISCHARACTER( ::cHtmlEmbeddedFiles ) + IF HB_ISSTRING( ::cHtmlEmbeddedFiles ) ::cCommand += " -embed " + ::cHtmlEmbeddedFiles ENDIF // cAttachListBinFile - optional - IF ISCHARACTER( ::cAttachListBinFile ) + IF HB_ISSTRING( ::cAttachListBinFile ) IF !hb_FileExists( ::cAttachListBinFile ) ::nError := BLAT_ERR_MISSING_ATTACHLISTBINFILE ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_ATTACHLISTBINFILE ) + ": " + ::cAttachListBinFile @@ -707,7 +706,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cAttachListTextFile - optional - IF ISCHARACTER( ::cAttachListTextFile ) + IF HB_ISSTRING( ::cAttachListTextFile ) IF !hb_FileExists( ::cAttachListTextFile ) ::nError := BLAT_ERR_MISSING_ATTACHLISTTEXTFILE ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_ATTACHLISTTEXTFILE ) + ": " + ::cAttachListTextFile @@ -721,7 +720,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cAttachListEmbeddedFile - optional - IF ISCHARACTER( ::cAttachListEmbeddedFile ) + IF HB_ISSTRING( ::cAttachListEmbeddedFile ) IF !hb_FileExists( ::cAttachListEmbeddedFile ) ::nError := BLAT_ERR_MISSING_ATTACHLISTEMBEDDEDFILE ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_ATTACHLISTEMBEDDEDFILE ) + ": " + ::cAttachListEmbeddedFile @@ -760,12 +759,12 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cAlternateText - optional - IF ISCHARACTER( ::cAlternateText ) + IF HB_ISSTRING( ::cAlternateText ) ::cCommand += ' -alttext ' + ::cAlternateText ENDIF // cAlternateTextFile - optional - IF ISCHARACTER( ::cAlternateTextFile ) + IF HB_ISSTRING( ::cAlternateTextFile ) IF !hb_FileExists( ::cAlternateTextFile ) ::nError := BLAT_ERR_MISSING_ALTERNATETEXTFILE ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_ALTERNATETEXTFILE ) + ": " + ::cAlternateTextFile @@ -789,7 +788,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // nMultipartSize - optional - IF ISNUMBER( ::nMultipartSize ) .AND. ::nMultipartSize > 0 + IF HB_ISNUMERIC( ::nMultipartSize ) .AND. ::nMultipartSize > 0 ::cCommand += " -multipart " + hb_ntos( ::nMultipartSize ) ENDIF @@ -799,14 +798,14 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cContentType - optional - IF ISCHARACTER( ::cContentType ) + IF HB_ISSTRING( ::cContentType ) ::cCommand += ' -contentType ' + ::cContentType ENDIF // NNTP specific options ------------------ // cGroups - optional - IF ISCHARACTER( ::cGroups ) + IF HB_ISSTRING( ::cGroups ) ::cCommand += " -groups " + ::cGroups ENDIF @@ -835,7 +834,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cLogFile - IF ISCHARACTER( ::cLogFile ) + IF HB_ISSTRING( ::cLogFile ) ::cCommand += ' -log ' + ::cLogFile ENDIF @@ -850,12 +849,12 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // nTimeout - IF ISNUMBER( ::nTimeout ) .AND. ::nTimeout > 0 + IF HB_ISNUMERIC( ::nTimeout ) .AND. ::nTimeout > 0 ::cCommand += " -ti " + hb_ntos( ::nTimeout ) ENDIF // nTry - IF ISNUMBER( ::nTry ) + IF HB_ISNUMERIC( ::nTry ) IF ::nTry == BLAT_TRY_INFINITE_KEY ::cCommand += " -try " + BLAT_TRY_INFINITE_VALUE ELSEIF ::nTry >= 0 @@ -869,7 +868,7 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // cHostname - IF ISCHARACTER( ::cHostname ) + IF HB_ISSTRING( ::cHostname ) ::cCommand += ' -hostname ' + ::cHostname ENDIF @@ -879,12 +878,12 @@ METHOD PROCEDURE Check() CLASS HBBlat ENDIF // nDelay - IF ISNUMBER( ::nDelay ) .AND. ::nDelay > 0 + IF HB_ISNUMERIC( ::nDelay ) .AND. ::nDelay > 0 ::cCommand += " -delay " + hb_ntos( ::nDelay ) ENDIF // cCommentChar - IF ISCHARACTER( ::cCommentChar ) + IF HB_ISSTRING( ::cCommentChar ) ::cCommand += ' -comment ' + ::cCommentChar ENDIF diff --git a/harbour/contrib/hbblink/blinker.prg b/harbour/contrib/hbblink/blinker.prg index b04f68816c..cf38d61708 100644 --- a/harbour/contrib/hbblink/blinker.prg +++ b/harbour/contrib/hbblink/blinker.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - #include "hbhrb.ch" #include "hbmemory.ch" @@ -69,7 +67,7 @@ THREAD STATIC t_nErrorMaj := 0 THREAD STATIC t_nErrorMin := 0 PROCEDURE HB_BLIVERNUM( cString ) - IF ISCHARACTER( cString ) + IF HB_ISSTRING( cString ) s_cSerialNum := cString ENDIF RETURN @@ -81,7 +79,7 @@ PROCEDURE HB_BLIDEMDTE( dDate ) RETURN PROCEDURE HB_BLIDEMMIN( nValue ) - IF ISNUMBER( nValue ) + IF HB_ISNUMERIC( nValue ) s_nDemoMinutes := nValue ENDIF RETURN @@ -89,7 +87,7 @@ PROCEDURE HB_BLIDEMMIN( nValue ) FUNCTION BLIDBGHAN( nValue ) STATIC s_nDebugHandle := 1 LOCAL nOldValue := s_nDebugHandle - IF ISNUMBER( nValue ) + IF HB_ISNUMERIC( nValue ) s_nDebugHandle := nValue ENDIF RETURN nOldValue @@ -102,7 +100,7 @@ FUNCTION BLIDEMDTEBAS() FUNCTION BLIDEMMIN( nValue ) LOCAL nOldValue := s_nDemoMinutes - IF ISNUMBER( nValue ) + IF HB_ISNUMERIC( nValue ) s_nDemoMinutes := nValue ENDIF RETURN nOldValue @@ -143,7 +141,7 @@ PROCEDURE BLILIBFRE( pLib ) RETURN PROCEDURE BLILIBOVR( lValue ) - IF ISLOGICAL( lValue ) + IF HB_ISLOGICAL( lValue ) s_lLibOverrides := lValue ENDIF RETURN @@ -165,7 +163,7 @@ FUNCTION BLIMEMBLK( nBlockSize ) FUNCTION BLIMEMPAK( nValue ) STATIC s_nGCFrequency := 0 LOCAL nOldValue := s_nDemoMinutes - IF ISNUMBER( nValue ) + IF HB_ISNUMERIC( nValue ) s_nGCFrequency := nValue ENDIF RETURN nOldValue diff --git a/harbour/contrib/hbcomm/comm.prg b/harbour/contrib/hbcomm/comm.prg index c7ddc873fb..bbb6e20a31 100644 --- a/harbour/contrib/hbcomm/comm.prg +++ b/harbour/contrib/hbcomm/comm.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - #include "hbcom.ch" STATIC s_hPort := { => } @@ -69,7 +67,7 @@ FUNCTION INIT_PORT( cPort, nBaud, nData, nParity, nStop, nBufferSize ) compatibility interface. [vszakats] */ nPort := Len( s_hPort ) + 1 - IF ISCHARACTER( cPort ) + IF HB_ISSTRING( cPort ) cOldPortName := hb_comGetDevice( nPort ) hb_comSetDevice( nPort, cPort ) ENDIF @@ -78,12 +76,12 @@ FUNCTION INIT_PORT( cPort, nBaud, nData, nParity, nStop, nBufferSize ) IF hb_comOpen( nPort ) - IF ! ISNUMBER( nBaud ) + IF ! HB_ISNUMERIC( nBaud ) nBaud := 9600 ENDIF cParity := "N" - IF ISNUMBER( nParity ) + IF HB_ISNUMERIC( nParity ) SWITCH nParity CASE 0 ; cParity := "N" ; EXIT CASE 1 ; cParity := "O" ; EXIT @@ -92,7 +90,7 @@ FUNCTION INIT_PORT( cPort, nBaud, nData, nParity, nStop, nBufferSize ) ENDSWITCH ENDIF - IF ! ISNUMBER( nStop ) + IF ! HB_ISNUMERIC( nStop ) nStop := 1 ENDIF @@ -129,7 +127,7 @@ FUNCTION ISWORKING( nPort ) [vszakats] */ /* Fetch chars into */ FUNCTION INCHR( nPort, nCount, /* @ */ cData ) - cData := iif( ISNUMBER( nCount ), Space( nCount ), "" ) + cData := iif( HB_ISNUMERIC( nCount ), Space( nCount ), "" ) RETURN hb_comRecv( nPort, @cData, nCount ) /* Send out characters. Returns .T. if successful. */ diff --git a/harbour/contrib/hbct/ctmisc.prg b/harbour/contrib/hbct/ctmisc.prg index f8a41834d9..d6b15385e1 100644 --- a/harbour/contrib/hbct/ctmisc.prg +++ b/harbour/contrib/hbct/ctmisc.prg @@ -51,7 +51,6 @@ */ #include "color.ch" -#include "common.ch" #include "setcurs.ch" #include "hbmemory.ch" @@ -60,7 +59,7 @@ MEMVAR GetList FUNCTION AlloFree( lMode ) - IF ! ISLOGICAL( lMode ) + IF ! HB_ISLOGICAL( lMode ) lMode := .F. ENDIF @@ -69,18 +68,18 @@ FUNCTION AlloFree( lMode ) FUNCTION CENTER( c, n, p, lMode ) LOCAL cRet - IF ! ISNUMBER( n ) + IF ! HB_ISNUMERIC( n ) n := MaxCol() + 1 - Col() * 2 ENDIF - IF ! ISCHARACTER( c ) + IF ! HB_ISSTRING( c ) c := "" ENDIF - IF ISLOGICAL( p ) + IF HB_ISLOGICAL( p ) lMode := p p := NIL ELSE - IF ! ISLOGICAL( lMode ) + IF ! HB_ISLOGICAL( lMode ) lMode := .F. ENDIF ENDIF @@ -91,7 +90,7 @@ FUNCTION CENTER( c, n, p, lMode ) FUNCTION CSETCURS( l ) - IF ! ISLOGICAL( l ) + IF ! HB_ISLOGICAL( l ) RETURN SetCursor() != SC_NONE ENDIF diff --git a/harbour/contrib/hbct/ctrand.prg b/harbour/contrib/hbct/ctrand.prg index 3b6d10601f..549fa03bf4 100644 --- a/harbour/contrib/hbct/ctrand.prg +++ b/harbour/contrib/hbct/ctrand.prg @@ -50,10 +50,8 @@ * */ -#include "common.ch" - FUNCTION Random( lMode ) - RETURN IIF( ISLOGICAL( lMode ) .AND. lMode, ; + RETURN IIF( HB_ISLOGICAL( lMode ) .AND. lMode, ; HB_RandomInt( -32768, 32767 ), HB_RandomInt( 0, 65535 ) ) FUNCTION Rand( nStart ) diff --git a/harbour/contrib/hbct/cttime.prg b/harbour/contrib/hbct/cttime.prg index 9bc31188d0..9ebbc68b31 100644 --- a/harbour/contrib/hbct/cttime.prg +++ b/harbour/contrib/hbct/cttime.prg @@ -51,15 +51,13 @@ * */ -#include "common.ch" - FUNCTION TIMETOSEC( cTime ) LOCAL nSec := 0 LOCAL nLen, i, aLim, aMod, nInd, n IF cTime == NIL nSec := Seconds() - ELSEIF ISCHARACTER( cTime ) + ELSEIF HB_ISSTRING( cTime ) nLen := Len( cTime ) IF ( nLen + 1 ) % 3 == 0 .AND. nLen <= 11 nInd := 1 @@ -85,9 +83,9 @@ FUNCTION TIMETOSEC( cTime ) FUNCTION SECTOTIME( nSec, lHundr ) LOCAL i, h, n - n := iif( ! ISNUMBER( nSec ), Seconds(), nSec ) + n := iif( ! HB_ISNUMERIC( nSec ), Seconds(), nSec ) - IF ISLOGICAL( lHundr ) .AND. lHundr + IF HB_ISLOGICAL( lHundr ) .AND. lHundr h := ":" + StrZero( ( nSec * 100 ) % 100, 2 ) ELSE h := "" diff --git a/harbour/contrib/hbct/fcopy.prg b/harbour/contrib/hbct/fcopy.prg index f0dd1c8a6f..58a5fb81c8 100644 --- a/harbour/contrib/hbct/fcopy.prg +++ b/harbour/contrib/hbct/fcopy.prg @@ -66,7 +66,6 @@ * */ -#include "common.ch" #include "fileio.ch" #define F_BLOCK 512 @@ -87,7 +86,7 @@ FUNCTION FILECOPY( cSource, cDest, lMode ) LOCAL lDone := .F. LOCAL nSrcBytes, nDstBytes, nTotBytes := 0 - IF ! ISLOGICAL( lMode ) + IF ! HB_ISLOGICAL( lMode ) lMode := .F. ENDIF IF t_hSrcFile != F_ERROR @@ -134,7 +133,7 @@ FUNCTION FILECOPEN() FUNCTION FILECDATI( lNewMode ) LOCAL lOldMode := t_lSetDaTi - IF ISLOGICAL( lNewMode ) + IF HB_ISLOGICAL( lNewMode ) t_lSetDaTi := lNewMode ENDIF diff --git a/harbour/contrib/hbct/getinfo.prg b/harbour/contrib/hbct/getinfo.prg index 4d1c4ef79e..9cbc9f1d19 100644 --- a/harbour/contrib/hbct/getinfo.prg +++ b/harbour/contrib/hbct/getinfo.prg @@ -53,8 +53,6 @@ * */ -#include "common.ch" - MEMVAR GetList FUNCTION SAVEGETS() @@ -74,7 +72,7 @@ FUNCTION CURRENTGET() FUNCTION GETFLDROW( nField ) LOCAL oGet - IF ! ISNUMBER( nField ) + IF ! HB_ISNUMERIC( nField ) oGet := GetActive() ELSEIF nField >= 1 .AND. nField <= LEN( GetList ) oGet := GetList[ nField ] @@ -83,7 +81,7 @@ FUNCTION GETFLDROW( nField ) FUNCTION GETFLDCOL( nField ) LOCAL oGet - IF ! ISNUMBER( nField ) + IF ! HB_ISNUMERIC( nField ) oGet := GetActive() ELSEIF nField >= 1 .AND. nField <= LEN( GetList ) oGet := GetList[ nField ] @@ -92,7 +90,7 @@ FUNCTION GETFLDCOL( nField ) FUNCTION GETFLDVAR( nField ) LOCAL oGet - IF ! ISNUMBER( nField ) + IF ! HB_ISNUMERIC( nField ) oGet := GetActive() ELSEIF nField >= 1 .AND. nField <= LEN( GetList ) oGet := GetList[ nField ] diff --git a/harbour/contrib/hbct/getinput.prg b/harbour/contrib/hbct/getinput.prg index 1dbb5e48e5..ae48bc2737 100644 --- a/harbour/contrib/hbct/getinput.prg +++ b/harbour/contrib/hbct/getinput.prg @@ -53,20 +53,18 @@ * */ -#include "common.ch" - FUNCTION GETINPUT( xVar, nRow, nCol, lSay, xPrompt ) LOCAL nCursorRow := ROW() LOCAL nCursorCol := COL() LOCAL GetList := {} - IF ! ISNUMBER( nRow ) + IF ! HB_ISNUMERIC( nRow ) nRow := nCursorRow ENDIF - IF ! ISNUMBER( nCol ) + IF ! HB_ISNUMERIC( nCol ) nCol := nCursorCol ENDIF - IF ! ISLOGICAL( lSay ) + IF ! HB_ISLOGICAL( lSay ) lSay := .F. ENDIF diff --git a/harbour/contrib/hbct/getsecrt.prg b/harbour/contrib/hbct/getsecrt.prg index 40e134e1af..5217c32f55 100644 --- a/harbour/contrib/hbct/getsecrt.prg +++ b/harbour/contrib/hbct/getsecrt.prg @@ -53,7 +53,6 @@ * */ -#include "common.ch" #include "getexit.ch" FUNCTION GETSECRET( cVar, nRow, nCol, lSay, xPrompt ) @@ -63,13 +62,13 @@ FUNCTION GETSECRET( cVar, nRow, nCol, lSay, xPrompt ) LOCAL _cGetSecret := cVar LOCAL lHide := .T. - IF ! ISNUMBER( nRow ) + IF ! HB_ISNUMERIC( nRow ) nRow := ROW() ENDIF - IF ! ISNUMBER( nCol ) + IF ! HB_ISNUMERIC( nCol ) nCol := COL() ENDIF - IF ! ISLOGICAL( lSay ) + IF ! HB_ISLOGICAL( lSay ) lSay := .F. ENDIF diff --git a/harbour/contrib/hbct/keysec.prg b/harbour/contrib/hbct/keysec.prg index a3363258a3..79c1f687f4 100644 --- a/harbour/contrib/hbct/keysec.prg +++ b/harbour/contrib/hbct/keysec.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - THREAD STATIC t_hIdle FUNCTION KeySec( nKey, nTime, nCounter, lMode ) @@ -62,17 +60,17 @@ FUNCTION KeySec( nKey, nTime, nCounter, lMode ) t_hIdle := NIL ENDIF - IF ISNUMBER( nKey ) - IF ! ISNUMBER( nTime ) + IF HB_ISNUMERIC( nKey ) + IF ! HB_ISNUMERIC( nTime ) nTime := 0 ELSEIF nTime < 0 nTime := -nTime / 18.2 ENDIF nTime *= 1000 - IF ! ISNUMBER( nCounter ) + IF ! HB_ISNUMERIC( nCounter ) nCounter := 1 ENDIF - IF ! ISLOGICAL( lMode ) + IF ! HB_ISLOGICAL( lMode ) lMode := .F. ENDIF diff --git a/harbour/contrib/hbct/keytime.prg b/harbour/contrib/hbct/keytime.prg index 5e1efb5f36..365b19a0f9 100644 --- a/harbour/contrib/hbct/keytime.prg +++ b/harbour/contrib/hbct/keytime.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - THREAD STATIC t_hIdle FUNCTION KeyTime( nKey, cClockTime ) @@ -62,7 +60,7 @@ FUNCTION KeyTime( nKey, cClockTime ) t_hIdle := NIL ENDIF - IF ISNUMBER( nKey ) .AND. ISCHARACTER( cClockTime ) + IF HB_ISNUMERIC( nKey ) .AND. HB_ISSTRING( cClockTime ) nHour := Val( SubStr( cClockTime, 1, 2 ) ) nMin := Val( SubStr( cClockTime, 4, 2 ) ) nSec := Val( SubStr( cClockTime, 7, 2 ) ) diff --git a/harbour/contrib/hbct/kxlat.prg b/harbour/contrib/hbct/kxlat.prg index 68b0b11048..2eabb3a1bc 100644 --- a/harbour/contrib/hbct/kxlat.prg +++ b/harbour/contrib/hbct/kxlat.prg @@ -50,7 +50,6 @@ * */ -#include "common.ch" #include "inkey.ch" #include "hbgtinfo.ch" @@ -324,7 +323,7 @@ STATIC sc_hCnv := {; FUNCTION __hbct_key_c_to_n( cKey ) - IF hb_isString( cKey ) + IF HB_ISSTRING( cKey ) RETURN hb_HGetDef( sc_hCnv, cKey, 0 ) ENDIF @@ -333,7 +332,7 @@ FUNCTION __hbct_key_c_to_n( cKey ) FUNCTION __hbct_key_n_to_c( nKey ) LOCAL hKey - IF hb_isNumeric( nKey ) + IF HB_ISNUMERIC( nKey ) FOR EACH hKey IN sc_hCnv IF hKey:__enumValue() == nKey RETURN hKey:__enumKey() @@ -356,7 +355,7 @@ FUNCTION getkxlat( cKeyValue ) LOCAL xKey := hbct_getkxlat( __hbct_key_c_to_n( cKeyValue ) ) /* doc is unclear. should this return a numeric in these cases? */ - IF hb_isNumeric( xKey ) + IF HB_ISNUMERIC( xKey ) RETURN xKey ENDIF @@ -366,7 +365,7 @@ FUNCTION setkxtab( cTrs ) LOCAL hTrs := { => } LOCAL tmp - IF hb_isString( cTrs ) + IF HB_ISSTRING( cTrs ) FOR tmp := 1 TO hb_BLen( cTrs ) STEP 4 hTrs[ __hbct_key_c_to_n( hb_BSubStr( cTrs, tmp, 2 ) ) ] := __hbct_key_c_to_n( hb_BSubStr( cTrs, tmp + 2, 2 ) ) NEXT @@ -400,7 +399,7 @@ FUNCTION hbct_setkxlat( nOrgKeyValue, nNewKeyValue ) hb_mutexUnlock( s_hMutex ) ENDIF ELSE - IF hb_isNumeric( nOrgKeyValue ) .AND. nOrgKeyValue != 0 + IF HB_ISNUMERIC( nOrgKeyValue ) .AND. nOrgKeyValue != 0 IF hb_mutexLock( s_hMutex ) IF PCount() == 1 IF nOrgKeyValue $ s_hTrs @@ -410,7 +409,7 @@ FUNCTION hbct_setkxlat( nOrgKeyValue, nNewKeyValue ) hb_gtInfo( HB_GTI_INKEYFILTER, NIL ) ENDIF ENDIF - ELSEIF hb_isNumeric( nNewKeyValue ) + ELSEIF HB_ISNUMERIC( nNewKeyValue ) /* refuse overwriting custom HB_GTI_INKEYFILTER */ IF hb_gtInfo( HB_GTI_INKEYFILTER ) == NIL .OR. ! Empty( s_hTrs ) lAccepted := .T. @@ -430,7 +429,7 @@ FUNCTION hbct_setkxlat( nOrgKeyValue, nNewKeyValue ) FUNCTION hbct_getkxlat( nKeyValue ) LOCAL nNewValue := 0 - IF hb_isNumeric( nKeyValue ) + IF HB_ISNUMERIC( nKeyValue ) IF hb_mutexLock( s_hMutex ) IF nKeyValue $ s_hTrs nNewValue := s_hTrs[ nKeyValue ] @@ -447,7 +446,7 @@ FUNCTION hbct_getkxlat( nKeyValue ) FUNCTION hbct_setkxtab( hTrs ) LOCAL lAccepted := .F. - IF hb_isHash( hTrs ) + IF HB_ISHASH( hTrs ) IF hb_mutexLock( s_hMutex ) IF hb_gtInfo( HB_GTI_INKEYFILTER ) == NIL .OR. ! Empty( s_hTrs ) lAccepted := .T. diff --git a/harbour/contrib/hbct/screen3.prg b/harbour/contrib/hbct/screen3.prg index a18d6ec9b6..35e5c88b52 100644 --- a/harbour/contrib/hbct/screen3.prg +++ b/harbour/contrib/hbct/screen3.prg @@ -53,16 +53,14 @@ * */ -#include "common.ch" - FUNCTION CLEAREOL( nRow, nCol, xAttr, xChar ) - IF ! ISNUMBER( nRow ) + IF ! HB_ISNUMERIC( nRow ) nRow := ROW() ENDIF RETURN CLEARWIN( nRow, nCol, nRow, /*MAXCOL()*/, xAttr, xChar ) FUNCTION CLEOL( nRow, nCol ) - IF ! ISNUMBER( nRow ) + IF ! HB_ISNUMERIC( nRow ) nRow := ROW() ENDIF RETURN CLEARWIN( nRow, nCol, nRow, /*MAXCOL()*/, 7 /*"W/N"*/, " " ) diff --git a/harbour/contrib/hbct/scrmark.prg b/harbour/contrib/hbct/scrmark.prg index 2e8d4c06df..d4ef8c32f4 100644 --- a/harbour/contrib/hbct/scrmark.prg +++ b/harbour/contrib/hbct/scrmark.prg @@ -55,24 +55,22 @@ * */ -#include "common.ch" - FUNCTION SCREENMARK( cSearch, xAttr, lUpperLower, lAll, cForward, cTrailing ) LOCAL lFound := .F. LOCAL nCount := 1 LOCAL nAt, nLen, nLast, nRow, nCol, nEnd, nCols LOCAL cScreen - IF ! ISLOGICAL( lUpperLower ) + IF ! HB_ISLOGICAL( lUpperLower ) lUpperLower := .F. ENDIF - IF ! ISLOGICAL( lAll ) + IF ! HB_ISLOGICAL( lAll ) lAll := .F. ENDIF - IF ! ISCHARACTER( cForward ) .OR. cForward == "" + IF ! HB_ISSTRING( cForward ) .OR. cForward == "" cForward := NIL ENDIF - IF ! ISCHARACTER( cTrailing ) .OR. cTrailing == "" + IF ! HB_ISSTRING( cTrailing ) .OR. cTrailing == "" cTrailing := NIL ENDIF diff --git a/harbour/contrib/hbct/showtime.prg b/harbour/contrib/hbct/showtime.prg index 39aeed09e9..6ef4d57749 100644 --- a/harbour/contrib/hbct/showtime.prg +++ b/harbour/contrib/hbct/showtime.prg @@ -51,12 +51,10 @@ * */ -#include "common.ch" - FUNCTION SHOWTIME( nRow, nCol, lNoSec, cColor, l12, lAmPm ) THREAD STATIC t_hTimer := NIL - IF ISNUMBER( nRow ) .AND. nRow >= 0 .AND. nRow <= MAXROW( .T. ) + IF HB_ISNUMERIC( nRow ) .AND. nRow >= 0 .AND. nRow <= MAXROW( .T. ) IF t_hTimer != NIL HB_IDLEDEL( t_hTimer ) ENDIF diff --git a/harbour/contrib/hbct/tempfile.prg b/harbour/contrib/hbct/tempfile.prg index 2423b25fe0..054ebf37b3 100644 --- a/harbour/contrib/hbct/tempfile.prg +++ b/harbour/contrib/hbct/tempfile.prg @@ -50,17 +50,16 @@ * */ -#include "common.ch" #include "fileio.ch" FUNCTION TempFile( cDir, cExt, nAttr ) LOCAL cName LOCAL fhnd - IF ISCHARACTER( cExt ) .AND. !( Left( cExt, 1 ) == "." ) + IF HB_ISSTRING( cExt ) .AND. !( Left( cExt, 1 ) == "." ) cExt := "." + cExt ENDIF - IF ! ISNUMBER( nAttr ) + IF ! HB_ISNUMERIC( nAttr ) nAttr := SetFCreate() ENDIF diff --git a/harbour/contrib/hbfbird/tests/test.prg b/harbour/contrib/hbfbird/tests/test.prg index 1c310b4f98..5fc641b7ce 100644 --- a/harbour/contrib/hbfbird/tests/test.prg +++ b/harbour/contrib/hbfbird/tests/test.prg @@ -2,7 +2,6 @@ * $Id$ */ -#include "common.ch" #include "simpleio.ch" PROCEDURE Main() @@ -36,7 +35,7 @@ PROCEDURE Main() /* Connect rdbms */ db := FBConnect( cServer + cDatabase, cUser, cPass ) - IF ISNUMBER( db ) + IF HB_ISNUMERIC( db ) ? "Error:", db, FBError( db ) QUIT ENDIF @@ -45,7 +44,7 @@ PROCEDURE Main() ? tmp := FBExecute( db, "sldjfs;ldjs;djf", nDialect ), FBError( tmp ) trans := FBStartTransaction( db ) - IF ISNUMBER( trans ) + IF HB_ISNUMERIC( trans ) ? "Error:", trans, FBError( trans ) ELSE ? tmp := FBQuery( db, "create table teste (code smallint)", nDialect, trans ), FBError( tmp ) @@ -54,7 +53,7 @@ PROCEDURE Main() ? "===" trans := FBStartTransaction( db ) - IF ISNUMBER( trans ) + IF HB_ISNUMERIC( trans ) ? "Error:", trans, FBError( trans ) ELSE ? tmp := FBQuery( db, "CREATE TABLE customer( customer VARCHAR(20) )", nDialect, trans ), FBError( tmp ) @@ -63,7 +62,7 @@ PROCEDURE Main() ? "===" trans := FBStartTransaction( db ) - IF ISNUMBER( trans ) + IF HB_ISNUMERIC( trans ) ? "Error:", trans, FBError( trans ) ELSE ? "Status Execute: ", tmp := FBExecute( db, 'insert into customer(customer) values ("test 1")', nDialect, trans ), FBError( tmp ) @@ -71,7 +70,7 @@ PROCEDURE Main() ENDIF trans := FBStartTransaction( db ) - IF ISNUMBER( trans ) + IF HB_ISNUMERIC( trans ) ? "Error:", trans, FBError( trans ) ELSE ? "Status Execute: ", tmp := FBExecute( db, 'insert into customer(customer) values ("test 2")', nDialect, trans ), FBError( tmp ) @@ -83,7 +82,7 @@ PROCEDURE Main() // FIX WINDOWS GPF BELOW qry := FBQuery( db, "SELECT * FROM customer", nDialect ) - IF ISNUMBER( qry ) + IF HB_ISNUMERIC( qry ) ? "Error:", qry, FBError( qry ) ELSE num_cols := qry[ 4 ] diff --git a/harbour/contrib/hbfbird/tfirebrd.prg b/harbour/contrib/hbfbird/tfirebrd.prg index ce26c8b014..0625d7e4c0 100644 --- a/harbour/contrib/hbfbird/tfirebrd.prg +++ b/harbour/contrib/hbfbird/tfirebrd.prg @@ -52,7 +52,6 @@ * */ -#include "common.ch" #include "hbclass.ch" #define SQL_TEXT 452 @@ -106,7 +105,7 @@ ENDCLASS METHOD New( cServer, cUser, cPassword, nDialect ) CLASS TFbServer - IF ! ISNUMBER( nDialect ) + IF ! HB_ISNUMERIC( nDialect ) nDialect := 1 ENDIF @@ -117,7 +116,7 @@ METHOD New( cServer, cUser, cPassword, nDialect ) CLASS TFbServer ::db := FBConnect( cServer, cUser, cPassword ) - IF ISNUMBER( ::db ) + IF HB_ISNUMERIC( ::db ) ::lError := .T. ::nError := ::db ENDIF @@ -130,7 +129,7 @@ METHOD StartTransaction() CLASS TFbServer ::trans := FBStartTransaction( ::db ) - IF ISNUMBER( ::trans ) + IF HB_ISNUMERIC( ::trans ) ::lError := .T. ::nError := ::trans ELSE @@ -218,7 +217,7 @@ METHOD TableExists( cTable ) CLASS TFbServer qry := FBQuery( ::db, cQuery, ::dialect ) - IF ISARRAY( qry ) + IF HB_ISARRAY( qry ) result := ( FBFetch( qry ) == 0 ) FBFree( qry ) @@ -240,7 +239,7 @@ METHOD ListTables() CLASS TFbServer qry := FBQuery( ::db, RemoveSpaces( cQuery ), ::dialect ) - IF ISARRAY( qry ) + IF HB_ISARRAY( qry ) DO WHILE FBFetch( qry ) == 0 AAdd( result, FBGetdata( qry, 1 ) ) ENDDO @@ -272,7 +271,7 @@ METHOD TableStruct( cTable ) CLASS TFbServer qry := FBQuery( ::db, RemoveSpaces( cQuery ), ::dialect ) - IF ISARRAY( qry ) + IF HB_ISARRAY( qry ) DO WHILE FBFetch( qry ) == 0 cField := FBGetData( qry, 1 ) nType := Val( FBGetData( qry, 2 ) ) @@ -365,7 +364,7 @@ METHOD Delete( oRow, cWhere ) CLASS TFbServer aTables := oRow:GetTables() - IF ! ISNUMBER( ::db ) .AND. Len( aTables ) == 1 + IF ! HB_ISNUMERIC( ::db ) .AND. Len( aTables ) == 1 // Cannot delete joined tables IF cWhere == NIL @@ -400,7 +399,7 @@ METHOD Append( oRow ) CLASS TFbServer aTables := oRow:GetTables() - IF ! ISNUMBER( ::db ) .AND. Len( aTables ) == 1 + IF ! HB_ISNUMERIC( ::db ) .AND. Len( aTables ) == 1 // Can insert only one table, not in joined tables cQuery := 'INSERT INTO ' + aTables[ 1 ] + '(' @@ -433,7 +432,7 @@ METHOD Update( oRow, cWhere ) CLASS TFbServer aTables := oRow:GetTables() - IF ! ISNUMBER( ::db ) .AND. Len( aTables ) == 1 + IF ! HB_ISNUMERIC( ::db ) .AND. Len( aTables ) == 1 // Can't insert joined tables IF cWhere == NIL @@ -549,7 +548,7 @@ METHOD Refresh() CLASS TFbQuery qry := FBQuery( ::db, ::query, ::dialect ) - IF ISARRAY( qry ) + IF HB_ISARRAY( qry ) ::numcols := qry[ 4 ] /* TOFIX: This is faulty code. ::aStruct will become zero length, out of sync with ::numcols. */ @@ -914,7 +913,7 @@ STATIC FUNCTION KeyField( aTables, db, dialect ) qry := FBQuery(db, RemoveSpaces(cQuery), dialect) - IF ISARRAY( qry ) + IF HB_ISARRAY( qry ) DO WHILE FBFetch( qry ) == 0 AAdd( aKeys, RTrim( FBGetdata( qry, 1 ) ) ) ENDDO @@ -980,7 +979,7 @@ STATIC FUNCTION StructConvert( aStru, db, dialect ) qry := FBQuery( db, RemoveSpaces( cQuery ), dialect ) - IF ISARRAY( qry ) + IF HB_ISARRAY( qry ) DO WHILE FBFetch( qry ) == 0 AAdd( aDomains, { FBGetdata( qry, 1 ), FBGetdata( qry, 2 ), FBGetdata( qry, 3 ) } ) diff --git a/harbour/contrib/hbgd/gd.prg b/harbour/contrib/hbgd/gd.prg index 7956df76e2..3c4424f73a 100644 --- a/harbour/contrib/hbgd/gd.prg +++ b/harbour/contrib/hbgd/gd.prg @@ -185,7 +185,7 @@ FUNCTION gdImageFromFile( cFile ) FUNCTION gdImageToString( oImage ) LOCAL cString - IF ISOBJECT( oImage ) .AND. ( oImage:ClassName == "GDIMAGE" .OR. oImage:IsDerivedFrom( "GDIMAGE" ) ) + IF HB_ISOBJECT( oImage ) .AND. ( oImage:ClassName == "GDIMAGE" .OR. oImage:IsDerivedFrom( "GDIMAGE" ) ) IF oImage:cType != NIL SWITCH oImage:cType CASE "jpeg" @@ -205,11 +205,11 @@ FUNCTION gdImageToString( oImage ) PROCEDURE gdImageToFile( oImage, cFile ) LOCAL cString, cExt - IF ! ISCHARACTER( cFile ) + IF ! HB_ISSTRING( cFile ) cFile := "image" ENDIF - IF ISOBJECT( oImage ) .AND. ( oImage:ClassName == "GDIMAGE" .OR. oImage:IsDerivedFrom( "GDIMAGE" ) ) + IF HB_ISOBJECT( oImage ) .AND. ( oImage:ClassName == "GDIMAGE" .OR. oImage:IsDerivedFrom( "GDIMAGE" ) ) IF oImage:cType != NIL SWITCH oImage:cType CASE "jpeg" @@ -237,11 +237,11 @@ PROCEDURE gdImageToFile( oImage, cFile ) PROCEDURE gdImageToHandle( oImage, nHandle ) - IF ! ISNUMBER( nHandle ) + IF ! HB_ISNUMERIC( nHandle ) nHandle := 1 ENDIF - IF ISOBJECT( oImage ) .AND. ( oImage:ClassName == "GDIMAGE" .OR. oImage:IsDerivedFrom( "GDIMAGE" ) ) + IF HB_ISOBJECT( oImage ) .AND. ( oImage:ClassName == "GDIMAGE" .OR. oImage:IsDerivedFrom( "GDIMAGE" ) ) IF oImage:cType != NIL SWITCH oImage:cType CASE "jpeg" diff --git a/harbour/contrib/hbgd/gdbar.prg b/harbour/contrib/hbgd/gdbar.prg index c73adc56b3..362cd82c0d 100644 --- a/harbour/contrib/hbgd/gdbar.prg +++ b/harbour/contrib/hbgd/gdbar.prg @@ -294,7 +294,7 @@ METHOD CheckCode() CLASS TBarCode LOCAL i For i := 1 To Len( ::text ) - If ISCHARACTER( ::CheckValInArray( SubStr( ::text, i, 1 ) ) ) + If HB_ISSTRING( ::CheckValInArray( SubStr( ::text, i, 1 ) ) ) ::DrawError("Character "+SubStr( ::text, i, 1 )+" not allowed .") lRet := .F. EndIf diff --git a/harbour/contrib/hbgd/gdbarcod.prg b/harbour/contrib/hbgd/gdbarcod.prg index 8dee67eee3..abe0cc0600 100644 --- a/harbour/contrib/hbgd/gdbarcod.prg +++ b/harbour/contrib/hbgd/gdbarcod.prg @@ -438,7 +438,7 @@ METHOD Draw128( cText, cModeCode ) CLASS TCode ::settext( cText ) If !Empty( cModeCode ) - If ISCHARACTER( cModeCode ) .and. Upper(cModeCode) $'ABC' + If HB_ISSTRING( cModeCode ) .and. Upper(cModeCode) $'ABC' cModeCode := Upper(cModeCode) Else ::DrawError("Code 128 Modes are A,B o C. Character values.") diff --git a/harbour/contrib/hbgd/gdchart.prg b/harbour/contrib/hbgd/gdchart.prg index 53dc115b6d..5c1a9324b4 100644 --- a/harbour/contrib/hbgd/gdchart.prg +++ b/harbour/contrib/hbgd/gdchart.prg @@ -110,13 +110,13 @@ METHOD AddData( hData ) CLASS GDChart RETURN Self METHOD SetData( aData ) CLASS GDChart - IF ISARRAY( aData ) + IF HB_ISARRAY( aData ) ::aDataOfHashes := aData ENDIF RETURN Self METHOD AddDef( cDefKey, xDefVal ) CLASS GDChart - IF ISCHARACTER( cDefKey ) + IF HB_ISSTRING( cDefKey ) HB_hSet( ::hDefs, Upper( cDefKey ), xDefVal ) ENDIF RETURN Self @@ -208,7 +208,7 @@ METHOD PieChart() CLASS GDChart ::SetTile( pTile ) colorp := gdTiled ELSE - if ISARRAY( colorp ) + if HB_ISARRAY( colorp ) colorp := ::SetColor( colorp[1], colorp[2], colorp[3] ) endif ENDIF @@ -422,7 +422,7 @@ METHOD VerticalBarChart() CLASS GDChart ::SetTile( pTile ) colorp := gdTiled ELSE - if ISARRAY( colorp ) + if HB_ISARRAY( colorp ) colorp := ::SetColor( colorp[1], colorp[2], colorp[3] ) endif ENDIF @@ -605,7 +605,7 @@ METHOD HorizontalBarChart() CLASS GDChart ::SetTile( pTile ) colorp := gdTiled ELSE - if ISARRAY( colorp ) + if HB_ISARRAY( colorp ) colorp := ::SetColor( colorp[1], colorp[2], colorp[3] ) endif ENDIF @@ -830,7 +830,7 @@ METHOD LineChart() CLASS GDChart ::SetTile( pTile ) colorp := gdTiled ELSE - if ISARRAY( colorp ) + if HB_ISARRAY( colorp ) colorp := ::SetColor( colorp[1], colorp[2], colorp[3] ) endif ENDIF diff --git a/harbour/contrib/hbmisc/calldll.prg b/harbour/contrib/hbmisc/calldll.prg index 00a312115c..5c2e92f6fc 100644 --- a/harbour/contrib/hbmisc/calldll.prg +++ b/harbour/contrib/hbmisc/calldll.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - #include "hbdyn.ch" STATIC s_hDLL := { => } @@ -75,14 +73,14 @@ FUNCTION CALLDLL32( cFunction, cLibrary, ... ) FUNCTION HB_DYNACALL1( cFunction, cLibrary, nCount, ... ) LOCAL aParams - IF ISCHARACTER( cFunction ) .AND. ; - ISCHARACTER( cLibrary ) + IF HB_ISSTRING( cFunction ) .AND. ; + HB_ISSTRING( cLibrary ) IF !( cLibrary $ s_hDLL ) s_hDLL[ cLibrary ] := hb_LibLoad( cLibrary ) ENDIF - IF ISNUMBER( nCount ) .AND. nCount >= 0 .AND. nCount < PCount() - 3 + IF HB_ISNUMERIC( nCount ) .AND. nCount >= 0 .AND. nCount < PCount() - 3 aParams := ASize( hb_AParams(), nCount ) RETURN hb_dynCall( { cFunction, s_hDLL[ cLibrary ], _DEF_CALLCONV_ }, hb_arrayToParams( aParams ) ) ELSE diff --git a/harbour/contrib/hbmisc/hbedit.prg b/harbour/contrib/hbmisc/hbedit.prg index 54bda7d3e5..0025fb5268 100644 --- a/harbour/contrib/hbmisc/hbedit.prg +++ b/harbour/contrib/hbmisc/hbedit.prg @@ -6,7 +6,6 @@ #include "setcurs.ch" #include "fileio.ch" #include "box.ch" -#include "common.ch" #define IIFNIL( isnil, notnil ) IIF(notnil==NIL, isnil, notnil) @@ -63,7 +62,7 @@ FUNCTION EditorNew( nTop, nLeft, nBottom, nRight, nLength, ; cFrame, cTitle, cColor, nSize, nEscape ) LOCAL pEdit, oEdit - IF ! ISNUMBER( nLength ) + IF ! HB_ISNUMERIC( nLength ) nLength := 80 ENDIF @@ -113,7 +112,7 @@ FUNCTION EditorCargo( oEdit, xCargo ) FUNCTION EditorTitle( oEdit, cTitle ) LOCAL _cTitle := oEdit[ E_TITLE ] - IF ISCHARACTER( cTitle ) + IF HB_ISSTRING( cTitle ) oEdit[ E_TITLE ] := cTitle ENDIF @@ -129,7 +128,7 @@ FUNCTION EditorTitle( oEdit, cTitle ) FUNCTION EditorMode( oEdit, lMode ) LOCAL _lMode := oEdit[ E_MODE ] - IF ISLOGICAL( lMode ) + IF HB_ISLOGICAL( lMode ) oEdit[ E_MODE ] := lMode ENDIF @@ -190,7 +189,7 @@ PROCEDURE EditorInsText( oEdit, cText, nLine ) // FUNCTION EditorGetText( oEdit, nCarret ) - IF ! ISNUMBER( nCarret ) + IF ! HB_ISNUMERIC( nCarret ) nCarret := EDIT_HARD ENDIF @@ -249,11 +248,11 @@ FUNCTION EditorFile( xInput, cOutput, nLineLen, ; LOCAL nHandle, nLen, oEdit, lSaved, lClose := .F. LOCAL nSize - IF ! ISLOGICAL( lSave ) + IF ! HB_ISLOGICAL( lSave ) lSave := .T. ENDIF - IF ISCHARACTER(xInput) + IF HB_ISSTRING(xInput) nHandle := FOPEN( xInput ) lClose := .T. ELSE @@ -326,7 +325,7 @@ FUNCTION EditorEdit( oEdit, lEdit, lFrame ) oEdit[E_INSERT] := SET( _SET_INSERT ) // SayInsert() nCursor := SetCursor( IIF(oEdit[E_INSERT], SC_NORMAL, SC_SPECIAL1) ) - IF ISLOGICAL( lEdit ) + IF HB_ISLOGICAL( lEdit ) oEdit[E_MODE] := lEdit ENDIF lSaveAllowed :=( SETKEY(K_F2) == NIL ) @@ -399,7 +398,7 @@ FUNCTION EditorEdit( oEdit, lEdit, lFrame ) OTHERWISE bKey := SETKEY( nKey ) - IF ISBLOCK( bKey ) + IF HB_ISBLOCK( bKey ) EVAL( bKey, oEdit ) ELSE IF oEdit[E_MODE] diff --git a/harbour/contrib/hbmisc/udpds.prg b/harbour/contrib/hbmisc/udpds.prg index 2a005b5ed5..65d957d484 100644 --- a/harbour/contrib/hbmisc/udpds.prg +++ b/harbour/contrib/hbmisc/udpds.prg @@ -77,7 +77,7 @@ STATIC PROCEDURE UDPDS( hSocket, cName, cVersion ) LOCAL cBuffer, nLen, aAddr cName := hb_StrToUTF8( cName ) - cVersion := iif( hb_isString( cVersion ), hb_StrToUTF8( cVersion ), "" ) + cVersion := iif( HB_ISSTRING( cVersion ), hb_StrToUTF8( cVersion ), "" ) DO WHILE .T. cBuffer := Space( 2000 ) diff --git a/harbour/contrib/hbmysql/tmysql.prg b/harbour/contrib/hbmysql/tmysql.prg index c9e2ec695a..545c136e11 100644 --- a/harbour/contrib/hbmysql/tmysql.prg +++ b/harbour/contrib/hbmysql/tmysql.prg @@ -53,7 +53,6 @@ #include "hbclass.ch" -#include "common.ch" #include "dbstruct.ch" #include "set.ch" @@ -90,10 +89,10 @@ ENDCLASS METHOD New( aRow, aFStruct, cTableName ) CLASS TMySQLRow - IF ! ISCHARACTER( cTableName ) + IF ! HB_ISSTRING( cTableName ) cTableName := "" ENDIF - IF ! ISARRAY( aFStruct ) + IF ! HB_ISARRAY( aFStruct ) aFStruct := {} ENDIF @@ -114,7 +113,7 @@ METHOD New( aRow, aFStruct, cTableName ) CLASS TMySQLRow METHOD FieldGet( cnField ) CLASS TMySQLRow - LOCAL nNum := iif( ISCHARACTER( cnField ), ::FieldPos( cnField ), cnField ) + LOCAL nNum := iif( HB_ISSTRING( cnField ), ::FieldPos( cnField ), cnField ) IF nNum > 0 .AND. nNum <= Len( ::aRow ) @@ -131,14 +130,14 @@ METHOD FieldGet( cnField ) CLASS TMySQLRow METHOD FieldPut( cnField, Value ) CLASS TMySQLRow - LOCAL nNum := iif( ISCHARACTER( cnField ), ::FieldPos( cnField ), cnField ) + LOCAL nNum := iif( HB_ISSTRING( cnField ), ::FieldPos( cnField ), cnField ) IF nNum > 0 .AND. nNum <= Len( ::aRow ) IF Valtype( Value ) == Valtype( ::aRow[ nNum ] ) .OR. ::aRow[ nNum ] == NIL // if it is a char field remove trailing spaces - IF ISCHARACTER( Value ) + IF HB_ISSTRING( Value ) Value := RTrim( Value ) ENDIF @@ -181,7 +180,7 @@ METHOD FieldLen( nNum ) CLASS TMySQLRow */ METHOD FieldDec( nNum, lFormat ) CLASS TMySQLRow - IF ! ISLOGICAL( lFormat ) + IF ! HB_ISLOGICAL( lFormat ) lFormat := .F. ENDIF @@ -416,7 +415,7 @@ METHOD Skip( nRows ) CLASS TMySQLQuery LOCAL lbof // NOTE: MySQL row count starts from 0 - IF ! ISNUMBER( nRows ) + IF ! HB_ISNUMERIC( nRows ) nRows := 1 ENDIF @@ -476,7 +475,7 @@ METHOD GetRow( nRow ) CLASS TMySQLQuery LOCAL i //DAVID: use current row DEFAULT nRow TO 0 - IF ! ISNUMBER( nRow ) + IF ! HB_ISNUMERIC( nRow ) nRow := ::nCurRow ENDIF @@ -646,7 +645,7 @@ METHOD FieldGet( cnField ) CLASS TMySQLQuery LOCAL nNum, Value - IF ISCHARACTER( cnField ) + IF HB_ISSTRING( cnField ) nNum := ::FieldPos( cnField ) ELSE nNum := cnField @@ -682,7 +681,7 @@ METHOD FieldLen( nNum ) CLASS TMySQLQuery */ METHOD FieldDec( nNum, lFormat ) CLASS TMySQLQuery - IF ! ISLOGICAL( lFormat ) + IF ! HB_ISLOGICAL( lFormat ) lFormat := .F. ENDIF @@ -820,11 +819,11 @@ METHOD Update( oRow, lOldRecord, lRefresh ) CLASS TMySQLTable //DAVID: LOCAL ni, cWhere := " WHERE " - IF ! ISLOGICAL( lOldRecord ) + IF ! HB_ISLOGICAL( lOldRecord ) lOldRecord := .F. ENDIF //DAVID: too many ::refresh() can slow some processes, so we can desactivate it by parameter - IF ! ISLOGICAL( lRefresh ) + IF ! HB_ISLOGICAL( lRefresh ) lRefresh := .T. ENDIF @@ -943,11 +942,11 @@ METHOD Delete( oRow, lOldRecord, lRefresh ) CLASS TMySQLTable //DAVID: LOCAL ni, cWhere := " WHERE " - IF ! ISLOGICAL( lOldRecord ) + IF ! HB_ISLOGICAL( lOldRecord ) lOldRecord := .F. ENDIF //DAVID: too many ::refresh() can slow some processes, so we can desactivate it by parameter - IF ! ISLOGICAL( lRefresh ) + IF ! HB_ISLOGICAL( lRefresh ) lRefresh := .T. ENDIF @@ -1041,7 +1040,7 @@ METHOD Append( oRow, lRefresh ) CLASS TMySQLTable LOCAL i //DAVID: too many ::refresh() can slow some processes, so we can desactivate it by parameter - IF ! ISLOGICAL( lRefresh ) + IF ! HB_ISLOGICAL( lRefresh ) lRefresh := .T. ENDIF @@ -1149,7 +1148,7 @@ METHOD GetBlankRow( lSetValues ) CLASS TMySQLTable LOCAL aRow := Array( ::nNumFields ) //DAVID: It is not current row, so do not change it - IF ! ISLOGICAL( lSetValues ) + IF ! HB_ISLOGICAL( lSetValues ) lSetValues := .F. ENDIF @@ -1203,7 +1202,7 @@ METHOD FieldPut( cnField, Value ) CLASS TMySQLTable LOCAL nNum - IF ISCHARACTER( cnField ) + IF HB_ISSTRING( cnField ) nNum := ::FieldPos( cnField ) ELSE nNum := cnField @@ -1215,7 +1214,7 @@ METHOD FieldPut( cnField, Value ) CLASS TMySQLTable IF Valtype( Value ) == Valtype( ::aRow[ nNum ] ) .OR. ::aRow[ nNum ] == NIL // if it is a char field remove trailing spaces - IF ISCHARACTER( Value ) + IF HB_ISSTRING( Value ) Value := RTrim( Value ) ENDIF @@ -1499,7 +1498,7 @@ METHOD CreateIndex( cName, cTable, aFNames, lUnique ) CLASS TMySQLServer LOCAL cCreateQuery := "CREATE " LOCAL i - IF ! ISLOGICAL( lUnique ) + IF ! HB_ISLOGICAL( lUnique ) lUnique := .F. ENDIF @@ -1562,7 +1561,7 @@ METHOD Query( cQuery ) CLASS TMySQLServer LOCAL oQuery, cTableName, i, cUpperQuery, nNumTables, cToken - IF ! ISCHARACTER( cQuery ) + IF ! HB_ISSTRING( cQuery ) cQuery := "" ENDIF diff --git a/harbour/contrib/hbmysql/tsqlbrw.prg b/harbour/contrib/hbmysql/tsqlbrw.prg index 42ba8d4256..d5b12a1c52 100644 --- a/harbour/contrib/hbmysql/tsqlbrw.prg +++ b/harbour/contrib/hbmysql/tsqlbrw.prg @@ -328,13 +328,13 @@ METHOD BrowseTable( lCanEdit, aExitKeys ) CLASS TBrowseSQL LOCAL nKey LOCAL lKeepGoing := .T. - IF ! ISNUMBER( nKey ) + IF ! HB_ISNUMERIC( nKey ) nKey := NIL ENDIF - IF ! ISLOGICAL( lCanEdit ) + IF ! HB_ISLOGICAL( lCanEdit ) lCanEdit := .F. ENDIF - IF ! ISARRAY( aExitKeys ) + IF ! HB_ISARRAY( aExitKeys ) aExitKeys := { K_ESC } ENDIF diff --git a/harbour/contrib/hbodbc/browodbc.prg b/harbour/contrib/hbodbc/browodbc.prg index 1b6ba52021..6bb43ecd7f 100644 --- a/harbour/contrib/hbodbc/browodbc.prg +++ b/harbour/contrib/hbodbc/browodbc.prg @@ -58,7 +58,6 @@ * and fieldbl.prg. Only minor changes were needed to adapt them to ODBC. */ -#include "common.ch" #include "inkey.ch" #include "setcurs.ch" @@ -239,7 +238,7 @@ STATIC FUNCTION Skipped( nRecs, oDataSource ) STATIC FUNCTION ODBCFGet( cFieldName, oDataSource ) - IF ISCHARACTER( cFieldName ) + IF HB_ISSTRING( cFieldName ) // For changing value rather write a decent SQL statement RETURN {| x | iif( x == NIL, oDataSource:FieldByName( cFieldName ):value, NIL ) } ENDIF diff --git a/harbour/contrib/hbodbc/todbc.prg b/harbour/contrib/hbodbc/todbc.prg index 4eb26f6fe7..0fe76d29e6 100644 --- a/harbour/contrib/hbodbc/todbc.prg +++ b/harbour/contrib/hbodbc/todbc.prg @@ -67,7 +67,6 @@ */ #include "hbclass.ch" -#include "common.ch" #include "sql.ch" *+-------------------------------------------------------------------- @@ -179,13 +178,13 @@ METHOD New( cODBCStr, cUserName, cPassword, lCache ) CLASS TODBC LOCAL xBuf LOCAL nRet - IF ISCHARACTER( cUserName ) - IF ! ISCHARACTER( cPassword ) + IF HB_ISSTRING( cUserName ) + IF ! HB_ISSTRING( cPassword ) cPassword := "" ENDIF ENDIF - IF ! ISLOGICAL( lCache ) + IF ! HB_ISLOGICAL( lCache ) lCache := .T. ENDIF @@ -203,7 +202,7 @@ METHOD New( cODBCStr, cUserName, cPassword, lCache ) CLASS TODBC SQLAllocConnect( ::hEnv, @xBuf ) // Allocates SQL Connection ::hDbc := xBuf - IF ISCHARACTER( cUserName ) + IF HB_ISSTRING( cUserName ) IF ! ( ( nRet := SQLConnect( ::hDbc, cODBCStr, cUserName, cPassword ) ) == SQL_SUCCESS .OR. nRet == SQL_SUCCESS_WITH_INFO ) // TODO: Some error here ENDIF @@ -220,7 +219,7 @@ METHOD SetAutocommit( lEnable ) CLASS TODBC LOCAL lOld := ::lAutoCommit - IF ! ISLOGICAL( lEnable ) + IF ! HB_ISLOGICAL( lEnable ) lEnable := .T. ENDIF @@ -452,7 +451,7 @@ METHOD FieldByName( cField ) CLASS TODBC LOCAL nRet LOCAL xRet := NIL - IF ISCHARACTER( cField ) + IF HB_ISSTRING( cField ) nRet := AScan( ::Fields, { | x | Upper( x:FieldName ) == Upper( cField ) } ) IF nRet != 0 diff --git a/harbour/contrib/hbpgsql/tpostgre.prg b/harbour/contrib/hbpgsql/tpostgre.prg index c96b96e74a..c59ea4f04a 100644 --- a/harbour/contrib/hbpgsql/tpostgre.prg +++ b/harbour/contrib/hbpgsql/tpostgre.prg @@ -52,7 +52,6 @@ * */ -#include "common.ch" #include "hbclass.ch" #include "postgres.ch" @@ -104,7 +103,7 @@ ENDCLASS METHOD New( cHost, cDatabase, cUser, cPass, nPort, Schema ) CLASS TPQserver LOCAL res - IF ! ISNUMBER( nPort ) + IF ! HB_ISNUMERIC( nPort ) nPort := 5432 ENDIF @@ -554,10 +553,10 @@ METHOD Refresh( lQuery, lMeta ) CLASS TPQquery LOCAL i LOCAL cType, nDec, nSize - IF ! ISLOGICAL( lQuery ) + IF ! HB_ISLOGICAL( lQuery ) lQuery := .T. ENDIF - IF ! ISLOGICAL( lMeta ) + IF ! HB_ISLOGICAL( lMeta ) lMeta := .T. ENDIF @@ -588,7 +587,7 @@ METHOD Refresh( lQuery, lMeta ) CLASS TPQquery /* Get some information about metadata */ aTemp := PQmetadata( res ) - IF ISARRAY( aTemp ) + IF HB_ISARRAY( aTemp ) FOR i := 1 TO Len( aTemp ) @@ -728,7 +727,7 @@ METHOD Read() CLASS TPQquery METHOD Skip( nrecno ) CLASS TPQquery - IF ! ISNUMBER( nRecno ) + IF ! HB_ISNUMERIC( nRecno ) nRecno := 1 ENDIF @@ -768,7 +767,7 @@ METHOD FieldPos( cField ) CLASS TPQquery METHOD FieldName( nField ) CLASS TPQquery LOCAL result - IF ISCHARACTER( nField ) + IF HB_ISSTRING( nField ) nField := ::Fieldpos( nField ) ELSEIF nField < 1 .OR. nField > Len( ::aStruct ) nField := 0 @@ -783,7 +782,7 @@ METHOD FieldName( nField ) CLASS TPQquery METHOD FieldType( nField ) CLASS TPQquery LOCAL result - IF ISCHARACTER( nField ) + IF HB_ISSTRING( nField ) nField := ::Fieldpos( nField ) ELSEIF nField < 1 .OR. nField > Len( ::aStruct ) nField := 0 @@ -798,7 +797,7 @@ METHOD FieldType( nField ) CLASS TPQquery METHOD FieldLen( nField ) CLASS TPQquery LOCAL result - IF ISCHARACTER( nField ) + IF HB_ISSTRING( nField ) nField := ::Fieldpos( nField ) ELSEIF nField < 1 .OR. nField > Len( ::aStruct ) nField := 0 @@ -813,7 +812,7 @@ METHOD FieldLen( nField ) CLASS TPQquery METHOD FieldDec( nField ) CLASS TPQquery LOCAL result - IF ISCHARACTER( nField ) + IF HB_ISSTRING( nField ) nField := ::Fieldpos( nField ) ELSEIF nField < 1 .OR. nField > Len( ::aStruct ) nField := 0 @@ -990,7 +989,7 @@ METHOD Update( oRow ) CLASS TPQquery METHOD FieldGet( nField, nRow ) CLASS TPQquery LOCAL result - IF ISCHARACTER( nField ) + IF HB_ISSTRING( nField ) nField := ::Fieldpos( nField ) ELSEIF nField < 1 .OR. nField > ::nFields nField := 0 @@ -998,7 +997,7 @@ METHOD FieldGet( nField, nRow ) CLASS TPQquery IF nField > 0 .AND. ::nResultStatus == PGRES_TUPLES_OK - IF ! ISNUMBER( nRow ) + IF ! HB_ISNUMERIC( nRow ) nRow := ::nRecno ENDIF @@ -1048,7 +1047,7 @@ METHOD Getrow( nRow ) CLASS TPQquery LOCAL aOld LOCAL nCol - IF ! ISNUMBER( nRow ) + IF ! HB_ISNUMERIC( nRow ) nRow := ::nRecno ENDIF @@ -1211,7 +1210,7 @@ METHOD new( row, old, struct) CLASS TPQrow METHOD FieldGet( nField ) CLASS TPQrow LOCAL result - IF ISCHARACTER( nField ) + IF HB_ISSTRING( nField ) nField := ::Fieldpos( nField ) ENDIF @@ -1224,7 +1223,7 @@ METHOD FieldGet( nField ) CLASS TPQrow METHOD FieldPut( nField, Value ) CLASS TPQrow LOCAL result - IF ISCHARACTER( nField ) + IF HB_ISSTRING( nField ) nField := ::Fieldpos( nField ) ENDIF @@ -1237,7 +1236,7 @@ METHOD FieldPut( nField, Value ) CLASS TPQrow METHOD FieldName( nField ) CLASS TPQrow LOCAL result - IF ISCHARACTER( nField ) + IF HB_ISSTRING( nField ) nField := ::Fieldpos( nField ) ENDIF @@ -1256,7 +1255,7 @@ METHOD FieldPos( cField ) CLASS TPQrow METHOD FieldType( nField ) CLASS TPQrow LOCAL result - IF ISCHARACTER( nField ) + IF HB_ISSTRING( nField ) nField := ::Fieldpos( nField ) ENDIF @@ -1269,7 +1268,7 @@ METHOD FieldType( nField ) CLASS TPQrow METHOD FieldLen( nField ) CLASS TPQrow LOCAL result - IF ISCHARACTER( nField ) + IF HB_ISSTRING( nField ) nField := ::Fieldpos( nField ) ENDIF @@ -1282,7 +1281,7 @@ METHOD FieldLen( nField ) CLASS TPQrow METHOD FieldDec( nField ) CLASS TPQrow LOCAL result - IF ISCHARACTER( nField ) + IF HB_ISSTRING( nField ) nField := ::Fieldpos( nField ) ENDIF diff --git a/harbour/contrib/hbqt/qtcore/hbqt_misc.prg b/harbour/contrib/hbqt/qtcore/hbqt_misc.prg index 529a45aef9..1053f4a1d7 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_misc.prg +++ b/harbour/contrib/hbqt/qtcore/hbqt_misc.prg @@ -120,12 +120,12 @@ METHOD HbQtObjectHandler:connect( cnEvent, bBlock ) RETURN .f. ENDIF - IF ! hb_isBlock( bBlock ) + IF ! HB_ISBLOCK( bBlock ) RETURN .f. ENDIF IF hb_hHasKey( ::hEvents, cnEvent ) - IF hb_isNumeric( ::hEvents[ cnEvent ] ) + IF HB_ISNUMERIC( ::hEvents[ cnEvent ] ) ::__pEvents:hbDisconnect( Self, cnEvent ) ELSE ::__pSlots:hbDisconnect( Self, cnEvent ) @@ -257,7 +257,7 @@ METHOD HbQtObjectHandler:_destroy() HB_TRACE( HB_TR_DEBUG, " _destroy()", __objDerivedFrom( Self, "QOBJECT" ), "pSlots", valtype( ::__pSlots ), "pEvents", valtype( ::__pEvents ) ) FOR EACH cnEvent IN ::hEvents - IF hb_isNumeric( cnEvent ) .AND. ! empty( ::__pEvents ) + IF HB_ISNUMERIC( cnEvent ) .AND. ! empty( ::__pEvents ) HB_TRACE( HB_TR_DEBUG, " _destroy()", ".....N.....", cnEvent ) ::__pEvents:hbDisconnect( Self, cnEvent ) ELSEIF hb_isChar( cnEvent ) .AND. ! empty( ::__pSlots ) diff --git a/harbour/contrib/hbrun/hbrun.prg b/harbour/contrib/hbrun/hbrun.prg index 894d13886d..89cabb0402 100644 --- a/harbour/contrib/hbrun/hbrun.prg +++ b/harbour/contrib/hbrun/hbrun.prg @@ -52,7 +52,6 @@ */ #include "color.ch" -#include "common.ch" #include "fileio.ch" #include "inkey.ch" #include "setcurs.ch" @@ -360,7 +359,7 @@ STATIC PROCEDURE hbrun_Prompt( aParams, cCommand ) AAdd( s_aHistory, PadR( "quit", HB_LINE_LEN ) ) nHistIndex := Len( s_aHistory ) + 1 - IF ISCHARACTER( cCommand ) + IF HB_ISSTRING( cCommand ) AAdd( s_aHistory, PadR( cCommand, HB_LINE_LEN ) ) hbrun_Info( cCommand ) hbrun_Exec( cCommand ) @@ -576,13 +575,13 @@ STATIC PROCEDURE hbrun_Err( oErr, cCommand ) IF !Empty( oErr:Operation ) cMessage += " " + oErr:Operation ENDIF - IF ISARRAY( oErr:Args ) .AND. Len( oErr:Args ) > 0 + IF HB_ISARRAY( oErr:Args ) .AND. Len( oErr:Args ) > 0 cMessage += ";Arguments:" FOR EACH xArg IN oErr:Args cMessage += ";" + hb_CStr( xArg ) NEXT ENDIF - ELSEIF ISCHARACTER( oErr ) + ELSEIF HB_ISSTRING( oErr ) cMessage += oErr ENDIF cMessage += ";;" + ProcName( 2 ) + "(" + hb_ntos( ProcLine( 2 ) ) + ")" @@ -762,7 +761,7 @@ STATIC FUNCTION win_reg_self( lRegister, lAllUser ) RETURN win_reg_app( lRegister, lAllUser, hb_ProgName() ) STATIC FUNCTION win_reg_app( lRegister, lAllUser, cAppPath ) - LOCAL cHive := iif( hb_isLogical( lAllUser ) .AND. lAllUser, "HKEY_CLASSES_ROOT", "HKEY_CURRENT_USER\Software\Classes" ) + LOCAL cHive := iif( HB_ISLOGICAL( lAllUser ) .AND. lAllUser, "HKEY_CLASSES_ROOT", "HKEY_CURRENT_USER\Software\Classes" ) LOCAL lSuccess := .T. LOCAL tmp diff --git a/harbour/contrib/hbsms/sms.prg b/harbour/contrib/hbsms/sms.prg index 67ae7c82b1..d77a0a7937 100644 --- a/harbour/contrib/hbsms/sms.prg +++ b/harbour/contrib/hbsms/sms.prg @@ -58,19 +58,17 @@ http://www.developershome.com/sms/readSmsByAtCommands.asp [vszakats] */ -#include "common.ch" - STATIC FUNCTION port_send( h, s ) RETURN hb_comSend( h, s ) STATIC FUNCTION port_rece( h, n, t ) LOCAL cString - IF ! ISNUMBER( n ) + IF ! HB_ISNUMERIC( n ) n := 64 ENDIF - IF ! ISNUMBER( t ) + IF ! HB_ISNUMERIC( t ) t := 5 ENDIF @@ -118,10 +116,10 @@ FUNCTION sms_ReceiveAll( cPort, cPIN ) FUNCTION smsctx_New( xPort ) LOCAL smsctx[ _SMSCTX_MAX_ ] - IF ISNUMBER( xPort ) + IF HB_ISNUMERIC( xPort ) smsctx[ _SMSCTX_xHnd ] := xPort smsctx[ _SMSCTX_cPrevName ] := NIL - ELSEIF ISCHARACTER( xPort ) + ELSEIF HB_ISSTRING( xPort ) smsctx[ _SMSCTX_xHnd ] := 1 smsctx[ _SMSCTX_cPrevName ] := hb_comGetDevice( smsctx[ _SMSCTX_xHnd ] ) hb_comSetDevice( smsctx[ _SMSCTX_xHnd ], xPort ) @@ -143,7 +141,7 @@ FUNCTION smsctx_New( xPort ) FUNCTION smsctx_Close( smsctx ) - IF ! ISARRAY( smsctx ) .OR. Len( smsctx ) != _SMSCTX_MAX_ + IF ! HB_ISARRAY( smsctx ) .OR. Len( smsctx ) != _SMSCTX_MAX_ RETURN .F. ENDIF @@ -161,7 +159,7 @@ FUNCTION smsctx_Close( smsctx ) FUNCTION smsctx_Send( smsctx, cPhoneNo, cText, lNotification ) LOCAL tmp - IF ! ISARRAY( smsctx ) .OR. Len( smsctx ) != _SMSCTX_MAX_ + IF ! HB_ISARRAY( smsctx ) .OR. Len( smsctx ) != _SMSCTX_MAX_ RETURN -1 ENDIF @@ -181,7 +179,7 @@ FUNCTION smsctx_Send( smsctx, cPhoneNo, cText, lNotification ) port_send( smsctx[ _SMSCTX_xHnd ], "AT+CMGF=1" + Chr( 13 ) ) IF StripCRLF( port_rece( smsctx[ _SMSCTX_xHnd ] ) ) == "OK" - IF ISLOGICAL( lNotification ) + IF HB_ISLOGICAL( lNotification ) port_send( smsctx[ _SMSCTX_xHnd ], "AT+CSMP?" + Chr( 13 ) ) tmp := GetLines( port_rece( smsctx[ _SMSCTX_xHnd ] ) ) IF Len( tmp ) < 2 @@ -233,7 +231,7 @@ FUNCTION smsctx_Send( smsctx, cPhoneNo, cText, lNotification ) FUNCTION smsctx_Receive( smsctx ) - IF ! ISARRAY( smsctx ) .OR. Len( smsctx ) != _SMSCTX_MAX_ + IF ! HB_ISARRAY( smsctx ) .OR. Len( smsctx ) != _SMSCTX_MAX_ RETURN NIL ENDIF @@ -244,12 +242,12 @@ FUNCTION smsctx_Receive( smsctx ) FUNCTION smsctx_PIN( smsctx, cPIN ) LOCAL cOldValue - IF ! ISARRAY( smsctx ) .OR. Len( smsctx ) != _SMSCTX_MAX_ + IF ! HB_ISARRAY( smsctx ) .OR. Len( smsctx ) != _SMSCTX_MAX_ RETURN NIL ENDIF cOldValue := smsctx[ _SMSCTX_cPIN ] - IF cPIN == NIL .OR. ( ISCHARACTER( cPIN ) .AND. Len( cPIN ) == 4 ) + IF cPIN == NIL .OR. ( HB_ISSTRING( cPIN ) .AND. Len( cPIN ) == 4 ) smsctx[ _SMSCTX_cPIN ] := cPIN ENDIF diff --git a/harbour/contrib/hbsqlit3/hdbcsqlt.prg b/harbour/contrib/hbsqlit3/hdbcsqlt.prg index a946e12dd5..41092bc5a4 100644 --- a/harbour/contrib/hbsqlit3/hdbcsqlt.prg +++ b/harbour/contrib/hbsqlit3/hdbcsqlt.prg @@ -52,7 +52,6 @@ * */ -#include "common.ch" #include "hbclass.ch" #include "error.ch" #include "hbsqlit3.ch" @@ -168,7 +167,7 @@ method executeQuery( cSql ) class hdbcSQLTStatement ::pRes := sqlite3_prepare( ::pDB, cSql ) - if ! hb_isPointer( ::pRes ) + if ! HB_ISPOINTER( ::pRes ) raiseError( sqlite3_errmsg( ::pDb ) ) else ::oRs := hdbcSQLTResultSet():new( ::pDB, Self ) @@ -454,7 +453,7 @@ method findColumn( cField ) class hdbcSQLTResultSet method getString( nField ) class hdbcSQLTResultSet - if ISCHARACTER( nField ) + if HB_ISSTRING( nField ) nField := ::findColumn( nField ) endif @@ -480,7 +479,7 @@ method moveToCurrentRow() class hdbcSQLTResultSet method updateBuffer( nField, xValue, cType ) class hdbcSQLTResultSet - if ISCHARACTER( nField ) + if HB_ISSTRING( nField ) nField := ::findColumn( nField ) endif diff --git a/harbour/contrib/hbtip/cgi.prg b/harbour/contrib/hbtip/cgi.prg index 4bc3d2c03a..ba3952d077 100644 --- a/harbour/contrib/hbtip/cgi.prg +++ b/harbour/contrib/hbtip/cgi.prg @@ -318,7 +318,7 @@ METHOD SessionDecode( cData ) CLASS TIpCgi ::hSession := hb_Deserialize( cData ) - RETURN hb_isHash( ::hSession ) + RETURN HB_ISHASH( ::hSession ) METHOD DestroySession( cID ) CLASS TIpCgi @@ -358,12 +358,12 @@ METHOD ErrHandler( xError ) CLASS TIpCgi cErrMsg += 'SCRIPT NAME:' + GetEnv( "SCRIPT_NAME" ) + '' - IF ISOBJECT( xError ) + IF HB_ISOBJECT( xError ) cErrMsg += 'CRITICAL ERROR:' + xError:Description + '' cErrMsg += 'OPERATION:' + xError:Operation + '' cErrMsg += 'OS ERROR:' + hb_ntos( xError:OsCode ) + ' IN ' + xError:SubSystem + '/' + hb_ntos( xError:SubCode ) + '' cErrMsg += 'FILENAME:' + right( xError:FileName, 40 ) + '' - ELSEIF ISCHARACTER( xError ) + ELSEIF HB_ISSTRING( xError ) cErrMsg += 'ERROR MESSAGE:' + TIP_HTMLSPECIALCHARS( xError ) + '' ENDIF @@ -528,13 +528,13 @@ STATIC FUNCTION HtmlScript( hVal, cKey ) IF ! Empty( hVal ) IF ( nPos := hb_HPos( hVal, cKey ) ) != 0 hTmp := hb_HValueAt( hVal, nPos ) - IF hb_isHash( hTmp ) + IF HB_ISHASH( hTmp ) IF ( nPos := hb_HPos( hTmp, "src" ) ) != 0 cVal := hb_HValueAt( hTmp, nPos ) - IF ISCHARACTER( cVal ) + IF HB_ISSTRING( cVal ) cVal := { cVal } ENDIF - IF ISARRAY( cVal ) + IF HB_ISARRAY( cVal ) cTmp := "" AScan( cVal, {| cFile | cTmp += '' + _CRLF } ) cRet += cTmp @@ -542,10 +542,10 @@ STATIC FUNCTION HtmlScript( hVal, cKey ) ENDIF IF ( nPos := hb_HPos( hTmp, "var" ) ) != 0 cVal := hb_HValueAt( hTmp, nPos ) - IF ISCHARACTER( cVal ) + IF HB_ISSTRING( cVal ) cVal := { cVal } ENDIF - IF ISARRAY( cVal ) + IF HB_ISARRAY( cVal ) cTmp := "" AScan( cVal, {| cVar | cTmp += cVar } ) cRet += '' + _CRLF @@ -571,13 +571,13 @@ STATIC FUNCTION HtmlStyle( hVal, cKey ) IF ! Empty( hVal ) IF ( nPos := hb_HPos( hVal, cKey ) ) != 0 hTmp := hb_HValueAt( hVal, nPos ) - IF hb_isHash( hTmp ) + IF HB_ISHASH( hTmp ) IF ( nPos := hb_HPos( hTmp, "src" ) ) != 0 cVal := hb_HValueAt( hTmp, nPos ) - IF ISCHARACTER( cVal ) + IF HB_ISSTRING( cVal ) cVal := { cVal } ENDIF - IF ISARRAY( cVal ) + IF HB_ISARRAY( cVal ) cTmp := "" AScan( cVal, {| cFile | cTmp += '' + _CRLF } ) cRet += cTmp @@ -585,10 +585,10 @@ STATIC FUNCTION HtmlStyle( hVal, cKey ) ENDIF IF ( nPos := hb_HPos( hTmp, "var" ) ) != 0 cVal := hb_HValueAt( hTmp, nPos ) - IF ISCHARACTER( cVal ) + IF HB_ISSTRING( cVal ) cVal := { cVal } ENDIF - IF ISARRAY( cVal ) + IF HB_ISARRAY( cVal ) cTmp := "" AScan( cVal, {| cVar | cTmp += cVar } ) cRet += '' + _CRLF @@ -614,13 +614,13 @@ STATIC FUNCTION HtmlLinkRel( hVal, cKey ) IF ! Empty( hVal ) IF ( nPos := hb_HPos( hVal, cKey ) ) != 0 hTmp := hb_HValueAt( hVal, nPos ) - IF hb_isHash( hTmp ) + IF HB_ISHASH( hTmp ) IF ( nPos := hb_HPos( hTmp, "rel" ) ) != 0 cVal := hb_HValueAt( hTmp, nPos ) - IF ISCHARACTER( cVal ) + IF HB_ISSTRING( cVal ) cVal := { cVal, cVal } ENDIF - IF ISARRAY( cVal ) + IF HB_ISARRAY( cVal ) cTmp := "" AScan( cVal, {| aVal | cTmp += '' + _CRLF } ) cRet += cTmp diff --git a/harbour/contrib/hbtip/client.prg b/harbour/contrib/hbtip/client.prg index 718cfc0eb1..e2b7d21954 100644 --- a/harbour/contrib/hbtip/client.prg +++ b/harbour/contrib/hbtip/client.prg @@ -192,15 +192,15 @@ METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClient LOCAL aProtoAcceptedSSL := {} #endif - IF ISCHARACTER( xTrace ) .OR. ; - ( ISLOGICAL( xTrace ) .AND. xTrace ) - oLog := tIPLog():New( iif( ISCHARACTER( xTrace ), xTrace, NIL ) ) + IF HB_ISSTRING( xTrace ) .OR. ; + ( HB_ISLOGICAL( xTrace ) .AND. xTrace ) + oLog := tIPLog():New( iif( HB_ISSTRING( xTrace ), xTrace, NIL ) ) ::bTrace := {| cMsg | iif( PCount() > 0, oLog:Add( cMsg ), oLog:Close() ) } - ELSEIF ISBLOCK( xTrace ) + ELSEIF HB_ISBLOCK( xTrace ) ::bTrace := xTrace ENDIF - IF ISCHARACTER( oUrl ) + IF HB_ISSTRING( oUrl ) oUrl := tUrl():New( oUrl ) ENDIF @@ -248,7 +248,7 @@ METHOD Open( cUrl ) CLASS tIPClient LOCAL nPort LOCAL cResp - IF ISCHARACTER( cUrl ) + IF HB_ISSTRING( cUrl ) ::oUrl := tUrl():New( cUrl ) ENDIF @@ -380,7 +380,7 @@ METHOD Close() CLASS tIPClient ::isOpen := .F. ENDIF - IF ISBLOCK( ::bTrace ) + IF HB_ISBLOCK( ::bTrace ) /* Call with no parameter to signal end of logging session */ Eval( ::bTrace ) ENDIF @@ -454,7 +454,7 @@ METHOD ReadToFile( cFile, nMode, nSize ) CLASS tIPClient LOCAL cData LOCAL nSent - IF ! ISNUMBER( nMode ) + IF ! HB_ISNUMERIC( nMode ) nMode := FC_NORMAL ENDIF @@ -603,7 +603,7 @@ METHOD InetSendAll( SocketCon, cData, nLen ) CLASS tIPClient nRet := hb_inetSendAll( SocketCon, cData, nLen ) ENDIF - IF ISBLOCK( ::bTrace ) + IF HB_ISBLOCK( ::bTrace ) ::Log( SocketCon, nlen, cData, nRet ) ENDIF @@ -612,7 +612,7 @@ METHOD InetSendAll( SocketCon, cData, nLen ) CLASS tIPClient METHOD InetCount( SocketCon ) CLASS tIPClient LOCAL nRet := hb_inetCount( SocketCon ) - IF ISBLOCK( ::bTrace ) + IF HB_ISBLOCK( ::bTrace ) ::Log( SocketCon, nRet ) ENDIF @@ -635,7 +635,7 @@ METHOD InetRecv( SocketCon, cStr1, len ) CLASS tIPClient nRet := hb_inetRecv( SocketCon, @cStr1, len ) ENDIF - IF ISBLOCK( ::bTrace ) + IF HB_ISBLOCK( ::bTrace ) ::Log( SocketCon, "", len, iif( nRet >= 0, cStr1, nRet ) ) ENDIF @@ -662,7 +662,7 @@ METHOD InetRecvLine( SocketCon, nRet, size ) CLASS tIPClient cRet := hb_inetRecvLine( SocketCon, @nRet, size ) ENDIF - IF ISBLOCK( ::bTrace ) + IF HB_ISBLOCK( ::bTrace ) ::Log( SocketCon, "", size, cRet ) ENDIF @@ -689,7 +689,7 @@ METHOD InetRecvAll( SocketCon, cRet, size ) CLASS tIPClient nRet := hb_inetRecvAll( SocketCon, @cRet, size ) ENDIF - IF ISBLOCK( ::bTrace ) + IF HB_ISBLOCK( ::bTrace ) ::Log( SocketCon, "", size, iif( nRet >= 0, cRet, nRet ) ) ENDIF @@ -710,7 +710,7 @@ METHOD InetErrorCode( SocketCon ) CLASS tIPClient ::nLastError := nRet - IF ISBLOCK( ::bTrace ) + IF HB_ISBLOCK( ::bTrace ) ::Log( SocketCon, nRet ) ENDIF @@ -757,7 +757,7 @@ METHOD InetConnect( cServer, nPort, SocketCon ) CLASS tIPClient ENDIF #endif - IF ISBLOCK( ::bTrace ) + IF HB_ISBLOCK( ::bTrace ) ::Log( cServer, nPort, SocketCon ) ENDIF @@ -777,10 +777,10 @@ METHOD InetSndBufSize( SocketCon, nSizeBuff ) CLASS tIPClient RETURN hb_inetGetSndBufSize( SocketCon ) METHOD InetTimeOut( SocketCon, nConnTimeout ) CLASS tIPClient - IF ISNUMBER( nConnTimeout ) + IF HB_ISNUMERIC( nConnTimeout ) ::nConnTimeout := nConnTimeout ENDIF - IF ISNUMBER( ::nConnTimeout ) + IF HB_ISNUMERIC( ::nConnTimeout ) RETURN hb_inetTimeout( SocketCon, ::nConnTimeout ) ENDIF RETURN NIL @@ -795,7 +795,7 @@ METHOD Log( ... ) CLASS tIPClient LOCAL xVar LOCAL cMsg - IF ISBLOCK( ::bTrace ) + IF HB_ISBLOCK( ::bTrace ) cMsg := DToS( Date() ) + "-" + Time() + Space( 2 ) + ; SubStr( ProcName( 1 ), RAt( ":", ProcName( 1 ) ) ) +; diff --git a/harbour/contrib/hbtip/encb64.prg b/harbour/contrib/hbtip/encb64.prg index 730b3711b3..a0b5732a87 100644 --- a/harbour/contrib/hbtip/encb64.prg +++ b/harbour/contrib/hbtip/encb64.prg @@ -80,10 +80,10 @@ FUNCTION TIP_BASE64ENCODE( cBinary, nLineLength, cCRLF ) LOCAL cText LOCAL tmp - IF ! hb_isNumeric( nLineLength ) + IF ! HB_ISNUMERIC( nLineLength ) RETURN cTextIn ENDIF - IF ! hb_isString( cCRLF ) + IF ! HB_ISSTRING( cCRLF ) cCRLF := hb_eol() ENDIF diff --git a/harbour/contrib/hbtip/encoder.prg b/harbour/contrib/hbtip/encoder.prg index 92382483cf..f27e177040 100644 --- a/harbour/contrib/hbtip/encoder.prg +++ b/harbour/contrib/hbtip/encoder.prg @@ -60,13 +60,12 @@ #include "hbclass.ch" -#include "common.ch" #include "fileio.ch" FUNCTION TIp_GetEncoder( cModel ) LOCAL oEncoder - IF ! ISCHARACTER( cModel ) + IF ! HB_ISSTRING( cModel ) cModel := "as-is" ENDIF @@ -102,7 +101,7 @@ CREATE CLASS TIPEncoder ENDCLASS METHOD New( cModel ) CLASS TIPEncoder - IF ! ISCHARACTER( cModel ) + IF ! HB_ISSTRING( cModel ) cModel := "as-is" ENDIF ::cName := cModel diff --git a/harbour/contrib/hbtip/ftpcli.prg b/harbour/contrib/hbtip/ftpcli.prg index cad71f65f4..42ce534299 100644 --- a/harbour/contrib/hbtip/ftpcli.prg +++ b/harbour/contrib/hbtip/ftpcli.prg @@ -156,7 +156,7 @@ ENDCLASS METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClientFTP - ::super:new( oUrl, iif( ISLOGICAL( xTrace ) .AND. xTrace, "ftp", xTrace ), oCredentials ) + ::super:new( oUrl, iif( HB_ISLOGICAL( xTrace ) .AND. xTrace, "ftp", xTrace ), oCredentials ) ::nDefaultPort := 21 ::nConnTimeout := 3000 @@ -173,7 +173,7 @@ METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClientFTP METHOD Open( cUrl ) CLASS tIPClientFTP - IF hb_isString( cUrl ) + IF HB_ISSTRING( cUrl ) ::oUrl := tUrl():New( cUrl ) ENDIF @@ -212,7 +212,7 @@ METHOD GetReply() CLASS tIPClientFTP // now, if the reply has a "-" as fourth character, we need to proceed... DO WHILE ! Empty( cRep ) .AND. SubStr( cRep, 4, 1 ) == "-" ::cReply := ::InetRecvLine( ::SocketCon, @nLen, 128 ) - cRep := iif( ISCHARACTER( ::cReply ), ::cReply, "" ) + cRep := iif( HB_ISSTRING( ::cReply ), ::cReply, "" ) ENDDO // 4 and 5 are error codes @@ -596,7 +596,7 @@ METHOD MPUT( cFileSpec, cAttr ) CLASS tIPClientFTP LOCAL cPath, cFile, cExt, aFile LOCAL cStr := "" - IF ! ISCHARACTER( cFileSpec ) + IF ! HB_ISSTRING( cFileSpec ) RETURN 0 ENDIF diff --git a/harbour/contrib/hbtip/httpcli.prg b/harbour/contrib/hbtip/httpcli.prg index 86a1146e9a..56cb40dc56 100644 --- a/harbour/contrib/hbtip/httpcli.prg +++ b/harbour/contrib/hbtip/httpcli.prg @@ -93,7 +93,7 @@ ENDCLASS METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClientHTTP - ::super:new( oUrl, iif( ISLOGICAL( xTrace ) .AND. xTrace, "http", xTrace ), oCredentials ) + ::super:new( oUrl, iif( HB_ISLOGICAL( xTrace ) .AND. xTrace, "http", xTrace ), oCredentials ) ::nDefaultPort := iif( ::oUrl:cProto == "https", 443, 80 ) ::nConnTimeout := 5000 @@ -105,7 +105,7 @@ METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClientHTTP METHOD Get( cQuery ) CLASS tIPClientHTTP - IF ! hb_isString( cQuery ) + IF ! HB_ISSTRING( cQuery ) cQuery := ::oUrl:BuildQuery() ENDIF @@ -121,7 +121,7 @@ METHOD Get( cQuery ) CLASS tIPClientHTTP METHOD Post( xPostData, cQuery ) CLASS tIPClientHTTP LOCAL cData, nI, cTmp, y - IF hb_isHash( xPostData ) + IF HB_ISHASH( xPostData ) cData := "" y := Len( xPostData ) FOR nI := 1 TO y @@ -133,7 +133,7 @@ METHOD Post( xPostData, cQuery ) CLASS tIPClientHTTP cData += "&" ENDIF NEXT - ELSEIF hb_isArray( xPostData ) + ELSEIF HB_ISARRAY( xPostData ) cData := "" y := Len( xPostData ) FOR nI := 1 TO y @@ -145,13 +145,13 @@ METHOD Post( xPostData, cQuery ) CLASS tIPClientHTTP cData += "&" ENDIF NEXT - ELSEIF hb_isString( xPostData ) + ELSEIF HB_ISSTRING( xPostData ) cData := xPostData ELSE RETURN .F. ENDIF - IF ! hb_isString( cQuery ) + IF ! HB_ISSTRING( cQuery ) cQuery := ::oUrl:BuildQuery() ENDIF @@ -504,7 +504,7 @@ METHOD PostMultiPart( xPostData, cQuery ) CLASS tIPClientHTTP LOCAL nFile, cBuf, nBuf, nRead IF Empty( xPostData ) - ELSEIF hb_isHash( xPostData ) + ELSEIF HB_ISHASH( xPostData ) y := Len( xPostData ) FOR nI := 1 TO y cTmp := tip_URLEncode( AllTrim( hb_CStr( hb_HKeyAt( xPostData, nI ) ) ) ) @@ -512,7 +512,7 @@ METHOD PostMultiPart( xPostData, cQuery ) CLASS tIPClientHTTP cTmp := tip_URLEncode( AllTrim( hb_CStr( hb_HValueAt( xPostData, nI ) ) ) ) cData += cTmp + cCrLf NEXT - ELSEIF hb_isArray( xPostData ) + ELSEIF HB_ISARRAY( xPostData ) y := Len( xPostData ) FOR nI := 1 TO y cTmp := tip_URLEncode( AllTrim( hb_CStr( xPostData[ nI, 1 ] ) ) ) @@ -521,7 +521,7 @@ METHOD PostMultiPart( xPostData, cQuery ) CLASS tIPClientHTTP cData += cTmp + cCrLf NEXT - ELSEIF hb_isString( xPostData ) + ELSEIF HB_ISSTRING( xPostData ) cData := xPostData ENDIF @@ -562,7 +562,7 @@ METHOD PostMultiPart( xPostData, cQuery ) CLASS tIPClientHTTP cData += cCrlf NEXT cData += cBound + "--" + cCrlf - IF ! hb_isString( cQuery ) + IF ! HB_ISSTRING( cQuery ) cQuery := ::oUrl:BuildQuery() ENDIF diff --git a/harbour/contrib/hbtip/log.prg b/harbour/contrib/hbtip/log.prg index 6ae85edc67..1d12dd97da 100644 --- a/harbour/contrib/hbtip/log.prg +++ b/harbour/contrib/hbtip/log.prg @@ -52,7 +52,6 @@ #include "hbclass.ch" -#include "common.ch" #include "fileio.ch" CREATE CLASS TIPLOG @@ -72,7 +71,7 @@ ENDCLASS METHOD New( cFileName ) CLASS TIPLOG LOCAL cExt - IF ! ISCHARACTER( cFileName ) + IF ! HB_ISSTRING( cFileName ) cFileName := "hbtip" ENDIF diff --git a/harbour/contrib/hbtip/mail.prg b/harbour/contrib/hbtip/mail.prg index 31760711fb..7476b8d486 100644 --- a/harbour/contrib/hbtip/mail.prg +++ b/harbour/contrib/hbtip/mail.prg @@ -61,8 +61,6 @@ #include "hbclass.ch" -#include "common.ch" - CREATE CLASS TipMail VAR hHeaders // received fields may be more than once. @@ -87,7 +85,7 @@ CREATE CLASS TipMail METHOD GetFieldOption( cPart, cOption ) METHOD SetFieldPart( cPart, cValue ) METHOD SetFieldOption( cPart, cOption, cValue ) - METHOD SetCharset( cCharset ) INLINE ::cCharset := iif( ISCHARACTER( cCharset ), cCharset, "ISO-8859-1" ) + METHOD SetCharset( cCharset ) INLINE ::cCharset := iif( HB_ISSTRING( cCharset ), cCharset, "ISO-8859-1" ) METHOD GetContentType() INLINE ::GetFieldPart( "Content-Type" ) METHOD GetCharEncoding() INLINE ::GetFieldOption( "Content-Type", "encoding" ) @@ -138,7 +136,7 @@ METHOD New( cBody, oEncoder ) CLASS TipMail RETURN Self METHOD SetEncoder( cEncoder ) CLASS TipMail - IF hb_isString( cEncoder ) + IF HB_ISSTRING( cEncoder ) ::oEncoder := TIp_GetEncoder( cEncoder ) ELSE ::oEncoder := cEncoder @@ -242,7 +240,7 @@ METHOD SetFieldOption( cPart, cOption, cValue ) CLASS TipMail METHOD Attach( oSubPart ) CLASS TipMail - IF hb_isObject( oSubPart ) .AND. oSubPart:ClassName == "TIPMAIL" + IF HB_ISOBJECT( oSubPart ) .AND. oSubPart:ClassName == "TIPMAIL" // reset wrong content-type IF At( "multipart/", Lower( ::GetFieldPart( "Content-Type" ) ) ) == 0 ::hHeaders[ "Content-Type" ] := "multipart/mixed" @@ -386,7 +384,7 @@ METHOD FromString( cMail, cBoundary, nPos ) CLASS TipMail ENDIF // Part 1: parsing header - IF ! ISNUMBER( nPos ) + IF ! HB_ISNUMERIC( nPos ) nPos := 1 ENDIF @@ -519,17 +517,17 @@ METHOD setHeader( cSubject, cFrom, xTo, xCC, xBCC ) CLASS TipMail LOCAL aTo, aCC, aBCC, i, imax LOCAL cTo, cCC, cBCC - IF ! ISCHARACTER( cSubject ) + IF ! HB_ISSTRING( cSubject ) cSubject := "" ENDIF - IF ! ISCHARACTER( cFrom ) + IF ! HB_ISSTRING( cFrom ) RETURN .F. ENDIF - IF ISCHARACTER( xTo ) + IF HB_ISSTRING( xTo ) aTo := { xTo } - ELSEIF ISARRAY( xTo ) + ELSEIF HB_ISARRAY( xTo ) aTo := xTo ENDIF @@ -537,15 +535,15 @@ METHOD setHeader( cSubject, cFrom, xTo, xCC, xBCC ) CLASS TipMail RETURN .F. ENDIF - IF ISCHARACTER( xCC ) + IF HB_ISSTRING( xCC ) aCC := { xCC } - ELSEIF ISARRAY( xCC ) + ELSEIF HB_ISARRAY( xCC ) aCC := xCC ENDIF - IF ISCHARACTER( xBCC ) + IF HB_ISSTRING( xBCC ) aBCC := { xBCC } - ELSEIF ISARRAY( xBCC ) + ELSEIF HB_ISARRAY( xBCC ) aBCC := xBCC ENDIF @@ -638,7 +636,7 @@ METHOD detachFile( cPath ) CLASS TipMail RETURN .F. ENDIF - IF ISCHARACTER( cPath ) + IF HB_ISSTRING( cPath ) cFileName := StrTran( cPath + cDelim + cFileName, cDelim + cDelim, cDelim ) ENDIF @@ -663,7 +661,7 @@ METHOD getMultiParts( aParts ) CLASS TipMail ::resetAttachment() - IF ! ISARRAY( aParts ) + IF ! HB_ISARRAY( aParts ) aParts := {} ENDIF diff --git a/harbour/contrib/hbtip/popcli.prg b/harbour/contrib/hbtip/popcli.prg index 04b4d333ae..4bebda2bf9 100644 --- a/harbour/contrib/hbtip/popcli.prg +++ b/harbour/contrib/hbtip/popcli.prg @@ -56,7 +56,6 @@ */ #include "hbclass.ch" -#include "common.ch" /** * Inet service manager: pop3 @@ -86,7 +85,7 @@ ENDCLASS METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClientPOP - ::super:new( oUrl, iif( ISLOGICAL( xTrace ) .AND. xTrace, "pop3", xTrace ), oCredentials ) + ::super:new( oUrl, iif( HB_ISLOGICAL( xTrace ) .AND. xTrace, "pop3", xTrace ), oCredentials ) ::nDefaultPort := iif( ::oUrl:cProto == "pop3s" .OR. ::oUrl:cProto == "pops", 995, 110 ) ::nConnTimeout := 10000 @@ -146,7 +145,7 @@ METHOD OpenDigest( cUrl ) CLASS tIPClientPOP METHOD Close( lAutoQuit ) CLASS tIPClientPOP - IF ! ISLOGICAL( lAutoQuit ) + IF ! HB_ISLOGICAL( lAutoQuit ) lAutoQuit := .t. ENDIF @@ -362,7 +361,7 @@ METHOD Read( nLen ) CLASS tIPClientPOP METHOD retrieveAll( lDelete ) LOCAL aMails, i, imax, cMail - IF ! ISLOGICAL( lDelete ) + IF ! HB_ISLOGICAL( lDelete ) lDelete := .F. ENDIF diff --git a/harbour/contrib/hbtip/sendmail.prg b/harbour/contrib/hbtip/sendmail.prg index f246840de1..fe706a19ca 100644 --- a/harbour/contrib/hbtip/sendmail.prg +++ b/harbour/contrib/hbtip/sendmail.prg @@ -51,8 +51,6 @@ * */ -#include "common.ch" - #translate ( LIKE ) => ( hb_regexLike( (), () ) ) FUNCTION hb_SendMail( cServer, nPort, cFrom, xTo, xCC, xBCC, cBody, cSubject, ; @@ -102,36 +100,36 @@ FUNCTION hb_SendMail( cServer, nPort, cFrom, xTo, xCC, xBCC, cBody, cSubject, ; LOCAL lConnect := .T. LOCAL oPop - IF ! ISCHARACTER( cServer ) .OR. Empty( cServer ) + IF ! HB_ISSTRING( cServer ) .OR. Empty( cServer ) cServer := "localhost" ENDIF - IF ! ISCHARACTER( cUser ) + IF ! HB_ISSTRING( cUser ) cUser := "" ENDIF - IF ! ISCHARACTER( cPass ) + IF ! HB_ISSTRING( cPass ) cPass := "" ENDIF - IF ! ISNUMBER( nPort ) .OR. Empty( nPort ) + IF ! HB_ISNUMERIC( nPort ) .OR. Empty( nPort ) nPort := 25 ENDIF - IF ! ISLOGICAL( lPopAuth ) + IF ! HB_ISLOGICAL( lPopAuth ) lPopAuth := .T. ENDIF - IF ! ISLOGICAL( lNoAuth ) + IF ! HB_ISLOGICAL( lNoAuth ) lNoAuth := .F. ENDIF - IF ! ISNUMBER( nTimeOut ) + IF ! HB_ISNUMERIC( nTimeOut ) nTimeOut := 10000 ENDIF - IF ! ISLOGICAL( lTLS ) + IF ! HB_ISLOGICAL( lTLS ) lTLS := .F. ENDIF - IF ! ISCHARACTER( cSMTPPass ) + IF ! HB_ISSTRING( cSMTPPass ) cSMTPPass := cPass ENDIF // cTo - IF ISARRAY( xTo ) + IF HB_ISARRAY( xTo ) FOR tmp := Len( xTo ) TO 1 STEP -1 IF Empty( xTo[ tmp ] ) hb_ADel( xTo, tmp, .T. ) @@ -151,13 +149,13 @@ FUNCTION hb_SendMail( cServer, nPort, cFrom, xTo, xCC, xBCC, cBody, cSubject, ; IF Len( cTmp ) > 0 cTo += "," + cTmp ENDIF - ELSEIF ISCHARACTER( xTo ) + ELSEIF HB_ISSTRING( xTo ) cTo := tip_GetRawEMail( AllTrim( xTo ) ) ENDIF // CC (Carbon Copy) - IF ISARRAY( xCC ) + IF HB_ISARRAY( xCC ) FOR tmp := Len( xCC ) TO 1 STEP -1 IF Empty( xCC[ tmp ] ) hb_ADel( xCC, tmp, .T. ) @@ -170,13 +168,13 @@ FUNCTION hb_SendMail( cServer, nPort, cFrom, xTo, xCC, xBCC, cBody, cSubject, ; NEXT cCC := SubStr( cCC, 1, Len( cCC ) - 1 ) ENDIF - ELSEIF ISCHARACTER( xCC ) + ELSEIF HB_ISSTRING( xCC ) cCC := tip_GetRawEMail( AllTrim( xCC ) ) ENDIF // BCC (Blind Carbon Copy) - IF ISARRAY( xBCC ) + IF HB_ISARRAY( xBCC ) FOR tmp := Len( xBCC ) TO 1 STEP -1 IF Empty( xBCC[ tmp ] ) hb_ADel( xBCC, tmp, .T. ) @@ -189,7 +187,7 @@ FUNCTION hb_SendMail( cServer, nPort, cFrom, xTo, xCC, xBCC, cBody, cSubject, ; NEXT cBCC := SubStr( cBCC, 1, Len( cBCC ) - 1 ) ENDIF - ELSEIF ISCHARACTER( xBCC ) + ELSEIF HB_ISSTRING( xBCC ) cBCC := tip_GetRawEMail( AllTrim( xBCC ) ) ENDIF @@ -355,22 +353,22 @@ FUNCTION hb_MailAssemble( cFrom, xTo, xCC, cBody, cSubject, ; LOCAL cFext LOCAL cData - IF ! ISARRAY( aFiles ) + IF ! HB_ISARRAY( aFiles ) aFiles := {} ENDIF - IF ! ISNUMBER( nPriority ) + IF ! HB_ISNUMERIC( nPriority ) nPriority := 3 ENDIF - IF ! ISLOGICAL( lRead ) + IF ! HB_ISLOGICAL( lRead ) lRead := .F. ENDIF - IF ! ISCHARACTER( cReplyTo ) + IF ! HB_ISSTRING( cReplyTo ) cReplyTo := "" ENDIF - IF ! ISCHARACTER( cCharset ) + IF ! HB_ISSTRING( cCharset ) cCharset := "ISO-8859-1" ENDIF - IF ! ISCHARACTER( cEncoding ) + IF ! HB_ISSTRING( cEncoding ) cEncoding := "quoted-printable" ENDIF @@ -418,18 +416,18 @@ FUNCTION hb_MailAssemble( cFrom, xTo, xCC, cBody, cSubject, ; FOR EACH aThisFile IN aFiles - IF ISCHARACTER( aThisFile ) + IF HB_ISSTRING( aThisFile ) cFile := aThisFile cData := hb_MemoRead( cFile ) - ELSEIF ISARRAY( aThisFile ) .AND. Len( aThisFile ) >= 2 + ELSEIF HB_ISARRAY( aThisFile ) .AND. Len( aThisFile ) >= 2 cFile := aThisFile[ 1 ] - IF ISCHARACTER( aThisFile[ 2 ] ) + IF HB_ISSTRING( aThisFile[ 2 ] ) cData := aThisFile[ 2 ] - IF ! ISCHARACTER( cFile ) + IF ! HB_ISSTRING( cFile ) cFile := "unnamed" ENDIF ELSE - IF ! ISCHARACTER( cFile ) + IF ! HB_ISSTRING( cFile ) LOOP /* No filename and no content. */ ELSE cData := hb_MemoRead( cFile ) diff --git a/harbour/contrib/hbtip/smtpcli.prg b/harbour/contrib/hbtip/smtpcli.prg index d4b1040123..f2537c474e 100644 --- a/harbour/contrib/hbtip/smtpcli.prg +++ b/harbour/contrib/hbtip/smtpcli.prg @@ -57,8 +57,6 @@ #include "hbclass.ch" -#include "common.ch" - #include "tip.ch" CREATE CLASS tIPClientSMTP FROM tIPClient @@ -90,7 +88,7 @@ ENDCLASS METHOD New( oUrl, xTrace, oCredentials, cClientHost ) CLASS tIPClientSMTP - ::super:new( oUrl, iif( ISLOGICAL( xTrace ) .AND. xTrace, "smtp", xTrace ), oCredentials ) + ::super:new( oUrl, iif( HB_ISLOGICAL( xTrace ) .AND. xTrace, "smtp", xTrace ), oCredentials ) ::nDefaultPort := iif( ::oUrl:cProto == "smtps", 465, 25 ) ::nConnTimeout := 50000 @@ -109,7 +107,7 @@ METHOD Open( cUrl, lTLS ) CLASS tIPClientSMTP RETURN .F. ENDIF - IF ! ISLOGICAL( lTLS ) + IF ! HB_ISLOGICAL( lTLS ) lTLS := .F. ENDIF @@ -134,7 +132,7 @@ METHOD OpenSecure( cUrl, lTLS ) CLASS tIPClientSMTP RETURN .F. ENDIF - IF ! ISLOGICAL( lTLS ) + IF ! HB_ISLOGICAL( lTLS ) lTLS := .F. ENDIF @@ -152,7 +150,7 @@ METHOD OpenSecure( cUrl, lTLS ) CLASS tIPClientSMTP METHOD GetOk() CLASS tIPClientSMTP ::cReply := ::InetRecvLine( ::SocketCon,, 512 ) - IF ::InetErrorCode( ::SocketCon ) != 0 .OR. ! ISCHARACTER( ::cReply ) .OR. Left( ::cReply, 1 ) == "5" + IF ::InetErrorCode( ::SocketCon ) != 0 .OR. ! HB_ISSTRING( ::cReply ) .OR. Left( ::cReply, 1 ) == "5" RETURN .F. ENDIF diff --git a/harbour/contrib/hbtip/thtml.prg b/harbour/contrib/hbtip/thtml.prg index 83980ffe3c..976f24051d 100644 --- a/harbour/contrib/hbtip/thtml.prg +++ b/harbour/contrib/hbtip/thtml.prg @@ -49,7 +49,6 @@ * */ -#include "common.ch" #include "error.ch" #include "hbclass.ch" #include "thtml.ch" @@ -145,7 +144,7 @@ METHOD new( cHtmlString ) CLASS THtmlDocument ' ' + hb_eol() + ; '' - IF ! ISCHARACTER( cHtmlString ) + IF ! HB_ISSTRING( cHtmlString ) ::root := THtmlNode():new( cEmptyHtmlDoc ) ELSE IF ! " build new tree of objects IF Chr( 9 ) $ oParent oParent := StrTran( oParent, Chr( 9 ), Chr( 32 ) ) @@ -651,11 +650,11 @@ METHOD new( oParent, cTagName, cAttrib, cContent ) CLASS THtmlNode ::htmlTagType := THtmlTagType( "_root_" ) ::htmlContent := {} ::parseHtml( P_PARSER( oParent ) ) - ELSEIF ISOBJECT( oParent ) + ELSEIF HB_ISOBJECT( oParent ) // a HTML object is passed -> we are in the course of building an object tree ::root := oParent:root ::parent := oParent - IF ISCHARACTER( cAttrib ) + IF HB_ISSTRING( cAttrib ) IF Right( cAttrib, 1 ) == "/" cAttrib := Stuff( cAttrib, Len( cAttrib ), 1, " " ) ::htmlEndTagName := "/" @@ -709,11 +708,11 @@ METHOD isOptional() CLASS THtmlNode METHOD isNode() CLASS THtmlNode - RETURN ISARRAY( ::htmlContent ) .AND. Len( ::htmlContent ) > 0 + RETURN HB_ISARRAY( ::htmlContent ) .AND. Len( ::htmlContent ) > 0 // checks if this is a block node that must be closed with an ending tag: eg:
,
    -METHOD isBlock() CLASS THtmlNode +METHOD HB_ISBLOCK() CLASS THtmlNode RETURN hb_bitAnd( ::htmlTagType[ 2 ], CM_BLOCK ) > 0 @@ -960,7 +959,7 @@ METHOD insertBefore( oTHtmlNode ) CLASS THtmlNode ::root:_document:changed := .T. ENDIF - IF ISARRAY( ::parent:htmlContent ) + IF HB_ISARRAY( ::parent:htmlContent ) hb_AIns( ::parent:htmlContent, 1, oTHtmlNode, .T. ) ENDIF @@ -1007,7 +1006,7 @@ METHOD Delete() CLASS THtmlNode ::root:_document:changed := .T. ENDIF - IF ISARRAY( ::parent:htmlContent ) + IF HB_ISARRAY( ::parent:htmlContent ) nPos := AScan( ::parent:htmlContent, Self ) hb_ADel( ::parent:htmlContent, nPos, .T. ) ENDIF @@ -1021,7 +1020,7 @@ METHOD Delete() CLASS THtmlNode METHOD firstNode( lRoot ) CLASS THtmlNode - IF ! ISLOGICAL( lRoot ) + IF ! HB_ISLOGICAL( lRoot ) lRoot := .F. ENDIF @@ -1039,7 +1038,7 @@ METHOD lastNode( lRoot ) CLASS THtmlNode LOCAL aNodes - IF ! ISLOGICAL( lRoot ) + IF ! HB_ISLOGICAL( lRoot ) lRoot := .F. ENDIF @@ -1123,7 +1122,7 @@ METHOD toString( nIndent ) CLASS THtmlNode ENDIF ENDIF - IF ISARRAY( ::htmlContent ) + IF HB_ISARRAY( ::htmlContent ) FOR EACH oNode IN ::htmlContent IF ! oNode:isInline() .OR. oNode:htmlTagName == "!--" @@ -1132,7 +1131,7 @@ METHOD toString( nIndent ) CLASS THtmlNode cHtml += oNode:toString( nIndent + 1 ) NEXT - ELSEIF ISCHARACTER( ::htmlContent ) + ELSEIF HB_ISSTRING( ::htmlContent ) cHtml += ::htmlContent ENDIF @@ -1159,7 +1158,7 @@ METHOD attrToString() CLASS THtmlNode IF ::htmlAttributes == NIL cAttr := "" - ELSEIF ISCHARACTER( ::htmlAttributes ) + ELSEIF HB_ISSTRING( ::htmlAttributes ) cAttr := " " + ::htmlAttributes ELSE @@ -1232,7 +1231,7 @@ METHOD getText( cEOL ) CLASS THtmlNode LOCAL cText := "" LOCAL oNode - IF ! ISCHARACTER( cEOL ) + IF ! HB_ISSTRING( cEOL ) cEOL := hb_eol() ENDIF @@ -1258,7 +1257,7 @@ METHOD getAttribute( cName ) CLASS THtmlNode LOCAL hHash := ::getAttributes() LOCAL cValue - IF ! hb_isHash( hHash ) + IF ! HB_ISHASH( hHash ) RETURN hHash ENDIF @@ -1286,7 +1285,7 @@ METHOD getAttributes() CLASS THtmlNode ::htmlAttributes := { => } hb_HCaseMatch( ::htmlAttributes, .F. ) - ELSEIF ISCHARACTER( ::htmlAttributes ) + ELSEIF HB_ISSTRING( ::htmlAttributes ) IF ::htmlAttributes == "/" ::htmlAttributes := { => } hb_HCaseMatch( ::htmlAttributes, .F. ) @@ -1404,7 +1403,7 @@ METHOD setAttribute( cName, cValue ) CLASS THtmlNode LOCAL nType LOCAL hHash := ::getAttributes() - IF ! hb_isHash( hHash ) + IF ! HB_ISHASH( hHash ) // Tag doesn't have any attribute RETURN ::error( "Invalid HTML attribute for: <" + ::htmlTagName + ">", ::className(), cName, EG_ARG, { cName, cValue } ) ENDIF @@ -1550,7 +1549,7 @@ METHOD findNodesByTagName( cName, nOrdinal ) CLASS THtmlNode ENDIF NEXT - IF ISNUMBER( nOrdinal ) + IF HB_ISNUMERIC( nOrdinal ) IF nOrdinal < 1 .OR. nOrdinal > Len( aRet ) RETURN NIL ENDIF @@ -1674,7 +1673,7 @@ STATIC FUNCTION CutStr( cCut, cString ) FUNCTION THtmlInit( lInit ) - IF ISLOGICAL( lInit ) .AND. ! lInit + IF HB_ISLOGICAL( lInit ) .AND. ! lInit t_aHtmlAttr := NIL t_hTagTypes := NIL t_aHtmlAnsiEntities := NIL diff --git a/harbour/contrib/hbtip/url.prg b/harbour/contrib/hbtip/url.prg index e8f34a4652..209118f58d 100644 --- a/harbour/contrib/hbtip/url.prg +++ b/harbour/contrib/hbtip/url.prg @@ -204,7 +204,7 @@ METHOD AddGetForm( xPostData ) LOCAL y LOCAL cRet - IF hb_isHash( xPostData ) + IF HB_ISHASH( xPostData ) y := Len( xPostData ) FOR nI := 1 TO y cData += tip_URLEncode( AllTrim( hb_CStr( hb_HKeyAt( xPostData, nI ) ) ) ) + "=" @@ -213,7 +213,7 @@ METHOD AddGetForm( xPostData ) cData += "&" ENDIF NEXT - ELSEIF hb_isArray( xPostData ) + ELSEIF HB_ISARRAY( xPostData ) y := Len( xPostData ) FOR nI := 1 TO y cData += tip_URLEncode( AllTrim( hb_CStr( xPostData[ nI, 1 ] ) ) ) + "=" @@ -222,7 +222,7 @@ METHOD AddGetForm( xPostData ) cData += "&" ENDIF NEXT - ELSEIF hb_isString( xPostData ) + ELSEIF HB_ISSTRING( xPostData ) cData := xPostData ENDIF diff --git a/harbour/contrib/hbtpathy/telepath.prg b/harbour/contrib/hbtpathy/telepath.prg index 3a3553ece7..97071135a1 100644 --- a/harbour/contrib/hbtpathy/telepath.prg +++ b/harbour/contrib/hbtpathy/telepath.prg @@ -58,7 +58,6 @@ so you can always retrieve them (see CVS docs on how to) */ -#include "common.ch" #include "telepath.ch" #include "hbcom.ch" @@ -81,7 +80,7 @@ THREAD STATIC t_nErrorCode := 0 // Error code from last operation, 0 if no FUNCTION tp_baud( nPort, nNewBaud ) - IF ! ISNUMBER( nNewBaud ) + IF ! HB_ISNUMERIC( nNewBaud ) nNewBaud := 0 ENDIF @@ -115,7 +114,7 @@ FUNCTION tp_idle( lNewval ) PROCEDURE tp_delay( nTime ) - IF ! ISNUMBER( nTime ) + IF ! HB_ISNUMERIC( nTime ) nTime := 0 ENDIF @@ -131,7 +130,7 @@ PROCEDURE tp_delay( nTime ) FUNCTION tp_close( nPort, nTimeout ) - IF ! ISNUMBER( nTimeout ) + IF ! HB_ISNUMERIC( nTimeout ) nTimeout := 0 ENDIF @@ -180,25 +179,25 @@ FUNCTION tp_open( nPort, nInSize, nOutSize, nBaud, nData, cParity, nStop, cPortn RETURN TE_NOPORT ENDIF - IF ! ISNUMBER( nInSize ) + IF ! HB_ISNUMERIC( nInSize ) nInSize := 1536 ENDIF - IF ! ISNUMBER( nOutSize ) + IF ! HB_ISNUMERIC( nOutSize ) nOutSize := 1536 ENDIF - IF ! ISNUMBER( nBaud ) + IF ! HB_ISNUMERIC( nBaud ) nBaud := 1200 ENDIF - IF ! ISNUMBER( nData ) + IF ! HB_ISNUMERIC( nData ) nData := 8 ENDIF - IF ! ISCHARACTER( cParity ) + IF ! HB_ISSTRING( cParity ) cParity := "N" ENDIF - IF ! ISNUMBER( nStop ) + IF ! HB_ISNUMERIC( nStop ) nStop := 1 ENDIF - IF ISCHARACTER( cPortname ) + IF HB_ISSTRING( cPortname ) hb_comSetDevice( nPort, cPortname ) ENDIF @@ -242,10 +241,10 @@ FUNCTION tp_recv( nPort, nLength, nTimeout ) LOCAL nDone LOCAL cRet - IF ! ISNUMBER( nLength ) + IF ! HB_ISNUMERIC( nLength ) nLength := t_aPorts[ nPort, TPFP_INBUF_SIZE ] ENDIF - IF ! ISNUMBER( nTimeout ) + IF ! HB_ISNUMERIC( nTimeout ) nTimeout := 0 ENDIF @@ -275,10 +274,10 @@ FUNCTION tp_recv( nPort, nLength, nTimeout ) FUNCTION tp_send( nPort, cString, nTimeout ) - IF ! ISCHARACTER( cString ) + IF ! HB_ISSTRING( cString ) cString := "" ENDIF - IF ! ISNUMBER( nTimeout ) + IF ! HB_ISNUMERIC( nTimeout ) nTimeout := 0 ENDIF IF ! isopenport( nPort ) @@ -293,10 +292,10 @@ FUNCTION tp_send( nPort, cString, nTimeout ) FUNCTION tp_sendsub( nPort, cString, nStart, nLength, nTimeout ) - IF ! ISNUMBER( nStart ) + IF ! HB_ISNUMERIC( nStart ) nStart := 1 ENDIF - IF ! ISNUMBER( nLength ) + IF ! HB_ISNUMERIC( nLength ) nLength := Len( cString ) ENDIF @@ -314,14 +313,14 @@ FUNCTION tp_recvto( nPort, cDelim, nMaxlen, nTimeout ) RETURN "" ENDIF - IF ! ISCHARACTER( cDelim ) .OR. Len( cDelim ) == 0 + IF ! HB_ISSTRING( cDelim ) .OR. Len( cDelim ) == 0 RETURN "" ENDIF - IF ! ISNUMBER( nMaxlen ) + IF ! HB_ISNUMERIC( nMaxlen ) nMaxlen := 64999 /* dos telepathy def. on xharbour could be higher */ ENDIF - IF ! ISNUMBER( nTimeout ) + IF ! HB_ISNUMERIC( nTimeout ) nTimeout := 0 ENDIF @@ -469,10 +468,10 @@ FUNCTION tp_waitfor( ... ) RETURN 0 ENDIF - // IF ! ISNUMBER( nTimeout ) + // IF ! HB_ISNUMERIC( nTimeout ) // nTimeout := -1 // ENDIF - // IF ! ISLOGICAL( lIgnorecase ) + // IF ! HB_ISLOGICAL( lIgnorecase ) // lIgnorecase := .F. // ENDIF @@ -536,7 +535,7 @@ FUNCTION tp_ctrlcts( nPort, nNewCtrl ) IF hb_comFlowControl( t_aPorts[ nPort, TPFP_HANDLE ], @nCurValue ) nFlag := hb_bitOr( HB_COM_FLOW_IRTSCTS, HB_COM_FLOW_ORTSCTS ) - IF ISNUMBER( nNewCtrl ) + IF HB_ISNUMERIC( nNewCtrl ) IF nNewCtrl == 0 nNewCtrl := hb_bitAnd( nCurValue, hb_bitNot( nFlag ) ) ELSE @@ -570,7 +569,7 @@ FUNCTION tp_ctrldtr( nPort, nNewCtrl ) IF hb_comFlowControl( t_aPorts[ nPort, TPFP_HANDLE ], @nCurValue ) nFlag := hb_bitOr( HB_COM_FLOW_IDTRDSR, HB_COM_FLOW_ODTRDSR ) - IF ISNUMBER( nNewCtrl ) + IF HB_ISNUMERIC( nNewCtrl ) IF nNewCtrl == 0 nNewCtrl := hb_bitAnd( nCurValue, hb_bitNot( nFlag ) ) ELSE @@ -632,7 +631,7 @@ FUNCTION tp_flush( nPort, nTimeout ) LOCAL nDone - IF ! ISNUMBER( nTimeout ) + IF ! HB_ISNUMERIC( nTimeout ) nTimeout := -1 ENDIF @@ -681,7 +680,7 @@ STATIC FUNCTION isopenport( nPort ) STATIC FUNCTION isport( nPort ) - IF ! ISNUMBER( nPort ) .OR. nPort < 1 .OR. nPort > TP_MAXPORTS + IF ! HB_ISNUMERIC( nPort ) .OR. nPort < 1 .OR. nPort > TP_MAXPORTS RETURN .F. ENDIF diff --git a/harbour/contrib/hbwin/tests/testprn.prg b/harbour/contrib/hbwin/tests/testprn.prg index 55a6fa7d54..b8a379b7c9 100644 --- a/harbour/contrib/hbwin/tests/testprn.prg +++ b/harbour/contrib/hbwin/tests/testprn.prg @@ -2,7 +2,6 @@ * $Id$ */ -#include "common.ch" #include "hbwin.ch" PROCEDURE Main( cPar1 ) @@ -26,7 +25,7 @@ PROCEDURE Main( cPar1 ) @ 2, 0 TO MaxRow(), MaxCol() nPrn := AChoice( 3, 1, MaxRow() - 1, MaxCol() - 1, aPrn, .T.,, nPrn ) IF nPrn != 0 - PrnTest( aPrn[ nPrn ], cBMPFile, iif( ISCHARACTER( cPar1 ) .AND. Lower( cPar1 ) == "ask", .T., NIL ) ) + PrnTest( aPrn[ nPrn ], cBMPFile, iif( HB_ISSTRING( cPar1 ) .AND. Lower( cPar1 ) == "ask", .T., NIL ) ) ENDIF ENDDO @@ -43,7 +42,7 @@ STATIC PROCEDURE PrnTest( cPrinter, cBMPFile, lAsk ) oPrinter:Landscape := .F. oPrinter:FormType := WIN_DMPAPER_A4 oPrinter:Copies := 1 - IF ISLOGICAL( lAsk ) + IF HB_ISLOGICAL( lAsk ) oPrinter:AskProperties := lAsk ENDIF diff --git a/harbour/contrib/hbwin/wce_sim.prg b/harbour/contrib/hbwin/wce_sim.prg index 91950cadf1..1f137f04d0 100644 --- a/harbour/contrib/hbwin/wce_sim.prg +++ b/harbour/contrib/hbwin/wce_sim.prg @@ -52,8 +52,6 @@ #include "hbclass.ch" -#include "common.ch" - #include "hbsim.ch" CREATE CLASS wce_sim @@ -113,7 +111,7 @@ METHOD lNumberOfPhoneBookEntries( nType, /* @ */ nTotal, /* @ */ nUsed ) CLASS w RETURN .F. ENDIF - IF ! ISNUMBER( nType ) + IF ! HB_ISNUMERIC( nType ) nType := SIM_PBSTORAGE_SIM ENDIF @@ -136,10 +134,10 @@ METHOD aGetAllPhoneBookEntries( nType ) CLASS wce_sim RETURN .F. ENDIF - IF ! ISNUMBER( nType ) + IF ! HB_ISNUMERIC( nType ) nType := SIM_PBSTORAGE_SIM ENDIF - IF ! ISARRAY( aEntries ) + IF ! HB_ISARRAY( aEntries ) aEntries := {} ENDIF @@ -172,7 +170,7 @@ METHOD lGetSimPhoneEntry( nPos, nType, /* @ */ aEntry ) CLASS wce_sim RETURN .F. ENDIF - IF ! ISNUMBER( nType ) + IF ! HB_ISNUMERIC( nType ) nType := SIM_PBSTORAGE_SIM ENDIF @@ -192,10 +190,10 @@ METHOD lSetSimPhoneEntry( nPos, nType, cNumber, cName, nPlan, nAddrType ) CLASS RETURN .F. ENDIF - IF ! ISNUMBER( nType ) + IF ! HB_ISNUMERIC( nType ) nPos := SIM_PBINDEX_FIRSTAVAILABLE ENDIF - IF ! ISNUMBER( nType ) + IF ! HB_ISNUMERIC( nType ) nType := SIM_PBSTORAGE_SIM ENDIF @@ -213,7 +211,7 @@ METHOD lDelSimPhoneEntry( nPos, nType ) CLASS wce_sim RETURN .F. ENDIF - IF ! ISNUMBER( nType ) + IF ! HB_ISNUMERIC( nType ) nType := SIM_PBSTORAGE_SIM ENDIF diff --git a/harbour/contrib/hbwin/win_os.prg b/harbour/contrib/hbwin/win_os.prg index 6e2f4b6d72..833667273e 100644 --- a/harbour/contrib/hbwin/win_os.prg +++ b/harbour/contrib/hbwin/win_os.prg @@ -60,7 +60,6 @@ * and if the correct patch file is found - run it. */ -#include "common.ch" #include "directry.ch" #include "hbwin.ch" @@ -72,10 +71,10 @@ FUNCTION WIN_OSNETREGOK( lSetIt, lDoVista ) LOCAL cKeySrv LOCAL cKeyWks - IF ! ISLOGICAL( lSetIt ) + IF ! HB_ISLOGICAL( lSetIt ) lSetIt := .F. ENDIF - IF ! ISLOGICAL( lDoVista ) + IF ! HB_ISLOGICAL( lDoVista ) lDoVista := .T. ENDIF diff --git a/harbour/contrib/hbwin/win_reg.prg b/harbour/contrib/hbwin/win_reg.prg index 0f528984a6..e7b59a6fc0 100644 --- a/harbour/contrib/hbwin/win_reg.prg +++ b/harbour/contrib/hbwin/win_reg.prg @@ -51,7 +51,6 @@ * */ -#include "common.ch" #include "hbwin.ch" /* ------------------------------------------------------------------- */ @@ -132,7 +131,7 @@ FUNCTION win_regDelete( cRegPath, nRegSam ) IF Empty( cEntry ) lRetVal := win_regDeleteKey( nHKEY, cKey ) ELSE - IF ! hb_isNumeric( nRegSam ) + IF ! HB_ISNUMERIC( nRegSam ) nRegSam := 0 ENDIF @@ -152,7 +151,7 @@ FUNCTION win_regQuery( nHKEY, cKeyName, cEntryName, xValue, lSetIt, nRegSam ) LOCAL cValType := ValType( xValue ) LOCAL lRetVal - IF ! ISLOGICAL( lSetIt ) + IF ! HB_ISLOGICAL( lSetIt ) lSetIt := .F. ENDIF @@ -180,7 +179,7 @@ FUNCTION win_regGet( nHKEY, cKeyName, cEntryName, xDefault, nRegSam ) LOCAL pKeyHandle LOCAL nValueType - IF ! hb_isNumeric( nRegSam ) + IF ! HB_ISNUMERIC( nRegSam ) nRegSam := 0 ENDIF @@ -190,7 +189,7 @@ FUNCTION win_regGet( nHKEY, cKeyName, cEntryName, xDefault, nRegSam ) win_regQueryValueEx( pKeyHandle, cEntryName, 0, @nValueType, @xRetVal ) - IF ISCHARACTER( xRetVal ) + IF HB_ISSTRING( xRetVal ) DO CASE CASE nValueType == WIN_REG_DWORD .OR. ; nValueType == WIN_REG_DWORD_LITTLE_ENDIAN @@ -223,7 +222,7 @@ FUNCTION win_regSet( nHKEY, cKeyName, cEntryName, xValue, nValueType, nRegSam ) LOCAL lRetVal := .F. LOCAL pKeyHandle - IF ! hb_isNumeric( nRegSam ) + IF ! HB_ISNUMERIC( nRegSam ) nRegSam := 0 ENDIF @@ -240,7 +239,7 @@ FUNCTION win_regSet( nHKEY, cKeyName, cEntryName, xValue, nValueType, nRegSam ) cName := DToS( xValue ) EXIT CASE "N" - IF ! hb_isNumeric( nValueType ) .OR. ; + IF ! HB_ISNUMERIC( nValueType ) .OR. ; !( nValueType == WIN_REG_DWORD .OR. ; nValueType == WIN_REG_DWORD_LITTLE_ENDIAN .OR. ; nValueType == WIN_REG_DWORD_BIG_ENDIAN .OR. ; @@ -252,7 +251,7 @@ FUNCTION win_regSet( nHKEY, cKeyName, cEntryName, xValue, nValueType, nRegSam ) EXIT CASE "C" CASE "M" - IF ! hb_isNumeric( nValueType ) .OR. ; + IF ! HB_ISNUMERIC( nValueType ) .OR. ; !( nValueType == WIN_REG_SZ .OR. ; nValueType == WIN_REG_EXPAND_SZ .OR. ; nValueType == WIN_REG_MULTI_SZ ) diff --git a/harbour/contrib/hbwin/win_tbmp.prg b/harbour/contrib/hbwin/win_tbmp.prg index a136597c54..c972ddc15f 100644 --- a/harbour/contrib/hbwin/win_tbmp.prg +++ b/harbour/contrib/hbwin/win_tbmp.prg @@ -51,7 +51,6 @@ */ #include "hbclass.ch" -#include "common.ch" #include "hbwin.ch" @@ -89,7 +88,7 @@ METHOD LoadFile( cFileName, aDimXY ) CLASS WIN_BMP ::DimXY := { 0, 0 } ELSE ::Type := win_bitmapType( ::Bitmap ) - IF ISARRAY( aDimXY ) + IF HB_ISARRAY( aDimXY ) ::DimXY := aDimXY ELSEIF ! win_BitMapDimensions( ::Bitmap, @::DimXY[ 1 ], @::DimXY[ 2 ] ) ::DimXY := { 1, 1 } // Driver may use the original dimensions @@ -107,7 +106,7 @@ METHOD IsSupported( oPrn, /* @ */ nError ) CLASS WIN_BMP RETURN ( nError := win_BitmapIsSupported( oPrn:hPrinterDc, ::Bitmap ) ) == 0 METHOD Draw( oPrn, aRectangle, /* @ */ nError ) CLASS WIN_BMP // Pass a WIN_PRN object reference & Rectangle array - IF ISARRAY( aRectangle ) + IF HB_ISARRAY( aRectangle ) ::Rect := aRectangle ENDIF RETURN iif( ::IsSupported( oPrn, @nError ), oPrn:DrawBitMap( Self ), .F. ) diff --git a/harbour/contrib/hbwin/win_tprn.prg b/harbour/contrib/hbwin/win_tprn.prg index 3ae174f2a6..91759399bc 100644 --- a/harbour/contrib/hbwin/win_tprn.prg +++ b/harbour/contrib/hbwin/win_tprn.prg @@ -67,7 +67,6 @@ */ #include "hbclass.ch" -#include "common.ch" #include "hbwin.ch" @@ -304,7 +303,7 @@ METHOD PROCEDURE Destruct() CLASS WIN_PRN METHOD StartDoc( cDocName ) CLASS WIN_PRN LOCAL lResult - IF ! ISCHARACTER( cDocName ) + IF ! HB_ISSTRING( cDocName ) cDocName := hb_ArgV( 0 ) + " [" + DToC( Date() ) + " - " + Time() + "]" ENDIF @@ -319,7 +318,7 @@ METHOD StartDoc( cDocName ) CLASS WIN_PRN METHOD EndDoc( lAbortDoc ) CLASS WIN_PRN IF ::HavePrinted - IF ! ISLOGICAL( lAbortDoc ) + IF ! HB_ISLOGICAL( lAbortDoc ) lAbortDoc := .F. ENDIF ELSE @@ -401,7 +400,7 @@ METHOD CheckPage() CLASS WIN_PRN METHOD EndPage( lStartNewPage ) CLASS WIN_PRN - IF ! ISLOGICAL( lStartNewPage ) + IF ! HB_ISLOGICAL( lStartNewPage ) lStartNewPage := .T. ENDIF @@ -427,7 +426,7 @@ METHOD NewLine() CLASS WIN_PRN METHOD NewPage( lDelay ) CLASS WIN_PRN - IF ! ISLOGICAL( lDelay ) + IF ! HB_ISLOGICAL( lDelay ) lDelay := .F. ENDIF @@ -604,13 +603,13 @@ METHOD TextOut( cString, lNewLine, lUpdatePosX, nAlign ) CLASS WIN_PRN IF cString != NIL .AND. ::CheckPage() - IF ! ISLOGICAL( lNewLine ) + IF ! HB_ISLOGICAL( lNewLine ) lNewLine := .F. ENDIF - IF ! ISLOGICAL( lUpdatePosX ) + IF ! HB_ISLOGICAL( lUpdatePosX ) lUpdatePosX := .T. ENDIF - IF ! ISNUMBER( nAlign ) + IF ! HB_ISNUMERIC( nAlign ) nAlign := HB_BITOR( WIN_TA_BOTTOM, WIN_TA_LEFT ) ENDIF @@ -641,7 +640,7 @@ METHOD TextAtFont( nPosX, nPosY, cString, cFont, nPointSize, nWidth, nBold, lUnd IF ::CheckPage() - IF ! ISNUMBER( nPointSize ) + IF ! HB_ISNUMERIC( nPointSize ) nPointSize := ::FontPointSize ENDIF diff --git a/harbour/contrib/hbxbp/hbpprocess.prg b/harbour/contrib/hbxbp/hbpprocess.prg index 8c8d17aa0b..a7b2f50775 100644 --- a/harbour/contrib/hbxbp/hbpprocess.prg +++ b/harbour/contrib/hbxbp/hbpprocess.prg @@ -157,7 +157,7 @@ METHOD HbpProcess:workingPath( cPath ) METHOD HbpProcess:finished( bBlock ) - IF hb_isBlock( bBlock ) + IF HB_ISBLOCK( bBlock ) ::bFinish := bBlock ENDIF @@ -167,7 +167,7 @@ METHOD HbpProcess:finished( bBlock ) METHOD HbpProcess:output( bBlock ) - IF hb_isBlock( bBlock ) + IF HB_ISBLOCK( bBlock ) ::bOutput := bBlock ENDIF @@ -282,7 +282,7 @@ METHOD HbpProcess:outputMe( cLine, nMode ) HB_SYMBOL_UNUSED( nMode ) - IF hb_isBlock( ::bOutput ) .AND. !empty( cLine ) + IF HB_ISBLOCK( ::bOutput ) .AND. !empty( cLine ) eval( ::bOutput, trim( cLine ), NIL, Self ) ENDIF @@ -305,7 +305,7 @@ METHOD HbpProcess:finish() ::qProcess:disconnect( "readyReadStandardError()" ) ::qProcess:disconnect( "finished(int,QProcess::ExitStatus)" ) - IF hb_isBlock( ::bFinish ) + IF HB_ISBLOCK( ::bFinish ) eval( ::bFinish, ::nExitCode, ::nExitStatus, Self ) ENDIF diff --git a/harbour/contrib/hbxbp/xbp3state.prg b/harbour/contrib/hbxbp/xbp3state.prg index 4471c3eff5..fa27e63928 100644 --- a/harbour/contrib/hbxbp/xbp3state.prg +++ b/harbour/contrib/hbxbp/xbp3state.prg @@ -194,9 +194,9 @@ METHOD Xbp3State:setCaption( xCaption ) METHOD Xbp3State:selected( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_lbClick := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_lbClick ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, a_[ 1 ], NIL, Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpbrowse.prg b/harbour/contrib/hbxbp/xbpbrowse.prg index de951c2a00..983e21e760 100644 --- a/harbour/contrib/hbxbp/xbpbrowse.prg +++ b/harbour/contrib/hbxbp/xbpbrowse.prg @@ -1221,13 +1221,13 @@ METHOD XbpBrowse:handleEvent( nEvent, mp1, mp2 ) METHOD XbpBrowse:navigate( p1, p2 ) - IF hb_isBlock( p1 ) + IF HB_ISBLOCK( p1 ) ::sl_xbeBRW_Navigate := p1 - ELSEIF hb_isNumeric( p1 ) + ELSEIF HB_ISNUMERIC( p1 ) /* ::handleEvent( xbeBRW_Navigate, p1, p2 ) */ - IF hb_isBlock( ::sl_xbeBRW_Navigate ) + IF HB_ISBLOCK( ::sl_xbeBRW_Navigate ) eval( ::sl_xbeBRW_Navigate, p1, p2, self ) ENDIF ENDIF @@ -1354,9 +1354,9 @@ METHOD XbpBrowse:fetchColumnInfo( nCall, nRole, nArea, nRow, nCol ) SWITCH ( nRole ) CASE Qt_ForegroundRole - IF hb_isBlock( oCol:colorBlock ) + IF HB_ISBLOCK( oCol:colorBlock ) aColor := eval( oCol:colorBlock, ::cellValueA( nRow, nCol ) ) - IF hb_isArray( aColor ) .and. hb_isNumeric( aColor[ 1 ] ) + IF HB_ISARRAY( aColor ) .and. HB_ISNUMERIC( aColor[ 1 ] ) RETURN ::compatColor( hbxbp_ConvertAFactFromXBP( "Color", aColor[ 1 ] ) ) ELSE RETURN ::compatColor( oCol:dFgColor ) @@ -1366,9 +1366,9 @@ METHOD XbpBrowse:fetchColumnInfo( nCall, nRole, nArea, nRow, nCol ) ENDIF CASE Qt_BackgroundRole - IF hb_isBlock( oCol:colorBlock ) + IF HB_ISBLOCK( oCol:colorBlock ) aColor := eval( oCol:colorBlock, ::cellValueA( nRow, nCol ) ) - IF hb_isArray( aColor ) .and. hb_isNumeric( aColor[ 2 ] ) + IF HB_ISARRAY( aColor ) .and. HB_ISNUMERIC( aColor[ 2 ] ) RETURN ::compatColor( hbxbp_ConvertAFactFromXBP( "Color", aColor[ 2 ] ) ) ELSE RETURN ::compatColor( oCol:dBgColor ) @@ -1459,7 +1459,7 @@ METHOD XbpBrowse:setVertScrollBarRange( lPageStep ) DEFAULT lPageStep TO .f. - IF hb_isNumeric( nMin := eval( ::bFirstPosBlock ) ) .and. hb_isNumeric( nMax := eval( ::bLastPosBlock ) ) + IF HB_ISNUMERIC( nMin := eval( ::bFirstPosBlock ) ) .and. HB_ISNUMERIC( nMax := eval( ::bLastPosBlock ) ) ::oVScrollBar:setMinimum( nMin - 1 ) ::oVScrollBar:setMaximum( nMax - 1 ) ::oVScrollBar:setSingleStep( 1 ) @@ -1488,7 +1488,7 @@ METHOD XbpBrowse:setHorzScrollBarRange( lPageStep ) METHOD XbpBrowse:updatePosition() - IF hb_isBlock( ::goPosBlock ) + IF HB_ISBLOCK( ::goPosBlock ) eval( ::goPosBlock, ::oVScrollBar:value() + 1 ) ::refreshAll() ::forceStable() @@ -1528,10 +1528,10 @@ METHOD XbpBrowse:setCurrentIndex( lReset ) IF lReset ::oDbfModel:reset() /* Important */ // - IF hb_isObject( ::oLeftDbfModel ) + IF HB_ISOBJECT( ::oLeftDbfModel ) ::oLeftDbfModel:reset() ENDIF - IF hb_isObject( ::oRightDbfModel ) + IF HB_ISOBJECT( ::oRightDbfModel ) ::oRightDbfModel:reset() ENDIF ENDIF @@ -1543,7 +1543,7 @@ METHOD XbpBrowse:setCurrentIndex( lReset ) METHOD XbpBrowse:hScroll( lYes ) - IF hb_isLogical( lYes ) + IF HB_ISLOGICAL( lYes ) ::lHScroll := lYes ::setUnstable() ::configure( 128 ) @@ -1555,7 +1555,7 @@ METHOD XbpBrowse:hScroll( lYes ) METHOD XbpBrowse:vScroll( lYes ) - IF hb_isLogical( lYes ) + IF HB_ISLOGICAL( lYes ) ::lVScroll := lYes ::setUnstable() ::configure( 128 ) @@ -1567,7 +1567,7 @@ METHOD XbpBrowse:vScroll( lYes ) METHOD XbpBrowse:sizeCols( lYes ) - IF hb_isLogical( lYes ) + IF HB_ISLOGICAL( lYes ) ::lSizeCols := lYes ::setUnstable() ::configure( 128 ) @@ -1579,7 +1579,7 @@ METHOD XbpBrowse:sizeCols( lYes ) METHOD XbpBrowse:cursorMode( nMode ) - IF hb_isNumeric( nMode ) + IF HB_ISNUMERIC( nMode ) ::nCursorMode := nMode ::setUnstable() ::configure( 128 ) @@ -1592,7 +1592,7 @@ METHOD XbpBrowse:cursorMode( nMode ) METHOD XbpBrowse:setRightFrozen( aColFrozens ) LOCAL aFrozen := aclone( ::aRightFrozen ) - IF hb_isArray( aColFrozens ) + IF HB_ISARRAY( aColFrozens ) ::aRightFrozen := aColFrozens ::nRightFrozen := len( ::aRightFrozen ) ::setUnstable() @@ -1607,7 +1607,7 @@ METHOD XbpBrowse:setRightFrozen( aColFrozens ) METHOD XbpBrowse:setLeftFrozen( aColFrozens ) LOCAL aFrozen := aclone( ::aLeftFrozen ) - IF hb_isArray( aColFrozens ) + IF HB_ISARRAY( aColFrozens ) ::aLeftFrozen := aColFrozens ::nLeftFrozen := len( ::aLeftFrozen ) ::setUnstable() @@ -1894,17 +1894,17 @@ METHOD XbpBrowse:doConfigure() ENDIF - IF ::nLeftFrozen == 0 .AND. hb_isObject( ::oLeftView ) + IF ::nLeftFrozen == 0 .AND. HB_ISOBJECT( ::oLeftView ) ::oLeftView:hide() ::oLeftFooterView:hide() - ELSEIF ::nLeftFrozen > 0 .AND. hb_isObject( ::oLeftView ) + ELSEIF ::nLeftFrozen > 0 .AND. HB_ISOBJECT( ::oLeftView ) ::oLeftView:show() ::oLeftFooterView:show() ENDIF - IF ::nRightFrozen == 0 .AND. hb_isObject( ::oRightView ) + IF ::nRightFrozen == 0 .AND. HB_ISOBJECT( ::oRightView ) ::oRightView:hide() ::oRightFooterView:hide() - ELSEIF ::nRightFrozen > 0 .AND. hb_isObject( ::oRightView ) + ELSEIF ::nRightFrozen > 0 .AND. HB_ISOBJECT( ::oRightView ) ::oRightView:show() ::oRightFooterView:show() ENDIF @@ -1971,11 +1971,11 @@ METHOD XbpBrowse:doConfigure() /* Tell Qt to Reload Everything */ ::oDbfModel:reset() // - IF hb_isObject( ::oLeftDbfModel ) + IF HB_ISOBJECT( ::oLeftDbfModel ) //::oLeftDbfModel:hbSetRowColumns( ::rowCount - 1, ::nLeftFrozen - 1 ) // Dangling code ::oLeftDbfModel:reset() ENDIF - IF hb_isObject( ::oRightDbfModel ) + IF HB_ISOBJECT( ::oRightDbfModel ) //::oRightDbfModel:hbSetRowColumns( ::rowCount - 1, ::nRightFrozen - 1 ) ::oRightDbfModel:reset() ENDIF @@ -1985,10 +1985,10 @@ METHOD XbpBrowse:doConfigure() /*----------------------------------------------------------------------*/ METHOD XbpBrowse:footerRbDown( p1, p2 ) - IF hb_isBlock( p1 ) + IF HB_ISBLOCK( p1 ) ::sl_xbeBRW_FooterRbDown := p1 ENDIF - IF hb_isArray( p1 ) .and. hb_isBlock( ::sl_xbeBRW_FooterRbDown ) + IF HB_ISARRAY( p1 ) .and. HB_ISBLOCK( ::sl_xbeBRW_FooterRbDown ) eval( ::sl_xbeBRW_FooterRbDown, p1, p2, self ) ENDIF RETURN Self @@ -1996,10 +1996,10 @@ METHOD XbpBrowse:footerRbDown( p1, p2 ) /*----------------------------------------------------------------------*/ METHOD XbpBrowse:headerRbDown( p1, p2 ) - IF hb_isBlock( p1 ) + IF HB_ISBLOCK( p1 ) ::sl_xbeBRW_HeaderRbDown := p1 ENDIF - IF hb_isArray( p1 ) .and. hb_isBlock( ::sl_xbeBRW_HeaderRbDown ) + IF HB_ISARRAY( p1 ) .and. HB_ISBLOCK( ::sl_xbeBRW_HeaderRbDown ) eval( ::sl_xbeBRW_HeaderRbDown, p1, p2, self ) ENDIF RETURN Self @@ -2007,10 +2007,10 @@ METHOD XbpBrowse:headerRbDown( p1, p2 ) /*----------------------------------------------------------------------*/ METHOD XbpBrowse:itemMarked( p1 ) - IF hb_isBlock( p1 ) + IF HB_ISBLOCK( p1 ) ::sl_xbeBRW_ItemMarked := p1 ENDIF - IF hb_isArray( p1 ) .and. hb_isBlock( ::sl_xbeBRW_ItemMarked ) + IF HB_ISARRAY( p1 ) .and. HB_ISBLOCK( ::sl_xbeBRW_ItemMarked ) eval( ::sl_xbeBRW_ItemMarked, p1, NIL, self ) ENDIF RETURN Self @@ -2018,10 +2018,10 @@ METHOD XbpBrowse:itemMarked( p1 ) /*----------------------------------------------------------------------*/ METHOD XbpBrowse:itemRbDown( p1, p2 ) - IF hb_isBlock( p1 ) + IF HB_ISBLOCK( p1 ) ::sl_xbeBRW_ItemRbDown := p1 ENDIF - IF hb_isArray( p1 ) .and. hb_isBlock( ::sl_xbeBRW_ItemRbDown ) + IF HB_ISARRAY( p1 ) .and. HB_ISBLOCK( ::sl_xbeBRW_ItemRbDown ) eval( ::sl_xbeBRW_ItemRbDown, p1, p2, self ) ENDIF RETURN Self @@ -2030,10 +2030,10 @@ METHOD XbpBrowse:itemRbDown( p1, p2 ) METHOD XbpBrowse:itemSelected( p1 ) - IF hb_isBlock( p1 ) + IF HB_ISBLOCK( p1 ) ::sl_xbeBRW_ItemSelected := p1 - ELSEIF hb_isBlock( ::sl_xbeBRW_ItemSelected ) + ELSEIF HB_ISBLOCK( ::sl_xbeBRW_ItemSelected ) eval( ::sl_xbeBRW_ItemSelected, NIL, NIL, self ) ENDIF @@ -2044,13 +2044,13 @@ METHOD XbpBrowse:itemSelected( p1 ) METHOD XbpBrowse:pan( p1 ) - IF hb_isBlock( p1 ) + IF HB_ISBLOCK( p1 ) ::sl_xbeBRW_Pan := p1 - ELSEIF hb_isNumeric( p1 ) + ELSEIF HB_ISNUMERIC( p1 ) ::handleEvent( xbeBRW_Pan, p1, NIL ) - IF hb_isBlock( ::sl_xbeBRW_Pan ) + IF HB_ISBLOCK( ::sl_xbeBRW_Pan ) eval( ::sl_xbeBRW_Pan, p1, NIL, self ) ENDIF ENDIF @@ -2060,13 +2060,13 @@ METHOD XbpBrowse:pan( p1 ) /*----------------------------------------------------------------------*/ STATIC FUNCTION _SKIP_RESULT( xResult ) - RETURN iif( ISNUMBER( xResult ), Int( xResult ), 0 ) + RETURN iif( HB_ISNUMERIC( xResult ), Int( xResult ), 0 ) /*----------------------------------------------------------------------*/ METHOD XbpBrowse:configure( nMode ) - IF !ISNUMBER( nMode ) .OR. nMode == 0 .OR. nMode > _TBR_CONF_ALL + IF !HB_ISNUMERIC( nMode ) .OR. nMode == 0 .OR. nMode > _TBR_CONF_ALL nMode := _TBR_CONF_ALL ENDIF ::nConfigure := HB_BITOR( ::nConfigure, nMode ) @@ -2174,7 +2174,7 @@ METHOD XbpBrowse:stabilize() ENDIF IF ::lStable - IF hb_isBlock( ::bStableBlock ) + IF HB_ISBLOCK( ::bStableBlock ) eval( ::bStableBlock( Self ) ) ENDIF ENDIF @@ -2230,7 +2230,7 @@ METHOD XbpBrowse:setPosition() ELSE /* nMoved == 0 */ IF nMoveOffset > 0 IF nMoveOffset != 0 .AND. ::nBufferPos == ::nRowPos - IF hb_isBlock( ::bHitBottomBlock ) + IF HB_ISBLOCK( ::bHitBottomBlock ) eval( ::bHitBottomBlock, Self ) ENDIF ::lHitBottom := .T. @@ -2239,7 +2239,7 @@ METHOD XbpBrowse:setPosition() AFill( ::aCellStatus, .F., ::nLastRow + 1 ) ELSEIF nMoveOffset < 0 IF nMoveOffset != 0 .AND. ::nBufferPos == ::nRowPos - IF hb_isBlock( ::bHitTopBlock ) + IF HB_ISBLOCK( ::bHitTopBlock ) eval( ::bHitTopBlock, Self ) ENDIF ::lHitTop := .T. @@ -2789,7 +2789,7 @@ STATIC FUNCTION _DECODE_FH( cName, nHeight, nWidth ) LOCAL i nHeight := nWidth := 0 - IF ISCHARACTER( cName ) + IF HB_ISSTRING( cName ) IF Len( cName ) > 0 /* When last character of heading/footing is ';' then CA-Cl*pper @@ -2951,7 +2951,7 @@ METHOD XbpBrowse:colorValue( nColorIndex ) ::doConfigure() ENDIF - IF ISNUMBER( nColorIndex ) + IF HB_ISNUMERIC( nColorIndex ) IF nColorIndex >= 1 .AND. nColorIndex <= Len( ::aColors ) RETURN ::aColors[ nColorIndex ] ELSEIF nColorIndex == 0 @@ -2999,10 +2999,10 @@ STATIC FUNCTION _COLDEFCOLORS( aDefColorsIdx, nMaxColorIndex ) LOCAL nColorIndex LOCAL nPos - IF ISARRAY( aDefColorsIdx ) + IF HB_ISARRAY( aDefColorsIdx ) FOR nPos := 1 TO _TBC_CLR_MAX IF nPos <= Len( aDefColorsIdx ) .AND. ; - ISNUMBER( nColorIndex := aDefColorsIdx[ nPos ] ) .AND. ; + HB_ISNUMERIC( nColorIndex := aDefColorsIdx[ nPos ] ) .AND. ; ( nColorIndex := Int( nColorIndex ) ) >= 0 .AND. ; nColorIndex <= nMaxColorIndex @@ -3022,11 +3022,11 @@ STATIC FUNCTION _CELLCOLORS( aCol, xValue, nMaxColorIndex ) LOCAL nColorIndex LOCAL nPos, nMax - IF ISARRAY( xColor ) + IF HB_ISARRAY( xColor ) nMax := Min( Len( xColor ), 2 ) FOR nPos := 1 TO nMax nColorIndex := xColor[ nPos ] - IF ISNUMBER( nColorIndex ) + IF HB_ISNUMERIC( nColorIndex ) nColorIndex := Int( nColorIndex ) IF nColorIndex >= 0 .AND. nColorIndex <= nMaxColorIndex aColors[ nPos ] := nColorIndex @@ -3083,7 +3083,7 @@ METHOD XbpBrowse:colWidth( nColumn ) ::doConfigure() ENDIF - IF ISNUMBER( nColumn ) .AND. nColumn >= 1 .AND. nColumn <= ::colCount + IF HB_ISNUMERIC( nColumn ) .AND. nColumn >= 1 .AND. nColumn <= ::colCount RETURN ::aColData[ nColumn ][ _TBCI_COLWIDTH ] ENDIF RETURN 0 @@ -3103,7 +3103,7 @@ METHOD XbpBrowse:freeze( nColumns ) ::doConfigure() ENDIF - IF ISNUMBER( nColumns ) + IF HB_ISNUMERIC( nColumns ) nCols := Int( nColumns ) IF _MAXFREEZE( nCols, ::aColData, _TBR_COORD( ::n_Right ) - _TBR_COORD( ::n_Left ) + 1 ) == nCols @@ -3136,7 +3136,7 @@ METHOD XbpBrowse:rowCount() METHOD XbpBrowse:setRowPos( nRowPos ) LOCAL nRow LOCAL nRowCount := ::rowCount - IF ISNUMBER( nRowPos ) + IF HB_ISNUMERIC( nRowPos ) nRow := Int( nRowPos ) ::nRowPos := iif( nRow > nRowCount, nRowCount, ; iif( nRow < 1, 1, nRow ) ) @@ -3157,7 +3157,7 @@ METHOD XbpBrowse:setColPos( nColPos ) IF ::nConfigure != 0 ::doConfigure() ENDIF - IF ISNUMBER( nColPos ) + IF HB_ISNUMERIC( nColPos ) ::nColPos := nColPos ELSE ::nColPos := 0 @@ -3180,7 +3180,7 @@ METHOD XbpBrowse:setTopFlag( lTop ) IF ::nConfigure != 0 ::doConfigure() ENDIF - IF !ISLOGICAL( lTop ) + IF !HB_ISLOGICAL( lTop ) RETURN .T. ENDIF ::lHitTop := lTop @@ -3196,7 +3196,7 @@ METHOD XbpBrowse:setBottomFlag( lBottom ) IF ::nConfigure != 0 ::doConfigure() ENDIF - IF !ISLOGICAL( lBottom ) + IF !HB_ISLOGICAL( lBottom ) RETURN .T. ENDIF ::lHitBottom := lBottom @@ -3212,7 +3212,7 @@ METHOD XbpBrowse:setAutoLite( lAutoLite ) IF ::nConfigure != 0 ::doConfigure() ENDIF - IF !ISLOGICAL( lAutoLite ) + IF !HB_ISLOGICAL( lAutoLite ) RETURN .T. ENDIF ::lAutoLite := lAutoLite @@ -3228,7 +3228,7 @@ METHOD XbpBrowse:setStableFlag( lStable ) IF ::nConfigure != 0 ::doConfigure() ENDIF - IF !ISLOGICAL( lStable ) + IF !HB_ISLOGICAL( lStable ) RETURN .T. ENDIF ::lStable := lStable @@ -3533,7 +3533,7 @@ METHOD XbpBrowse:setStyle( nStyle, lNewValue ) ASize( ::styles, nStyle ) ENDIF - IF ISLOGICAL( lNewValue ) + IF HB_ISLOGICAL( lNewValue ) ::styles[ nStyle ] := lNewValue ENDIF @@ -3739,7 +3739,7 @@ METHOD XbpColumn:setStyle( nStyle, lNewValue ) ASize( ::aSetStyle, nStyle ) ENDIF - IF ISLOGICAL( lNewValue ) + IF HB_ISLOGICAL( lNewValue ) ::aSetStyle[ nStyle ] := lNewValue ENDIF diff --git a/harbour/contrib/hbxbp/xbpcheckbox.prg b/harbour/contrib/hbxbp/xbpcheckbox.prg index c9c0b5587a..145438ce2b 100644 --- a/harbour/contrib/hbxbp/xbpcheckbox.prg +++ b/harbour/contrib/hbxbp/xbpcheckbox.prg @@ -193,9 +193,9 @@ METHOD XbpCheckBox:setCaption( xCaption ) METHOD XbpCheckBox:selected( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_lbClick := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_lbClick ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, a_[ 1 ], NIL, Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpcombobox.prg b/harbour/contrib/hbxbp/xbpcombobox.prg index 73b990076c..07e5e42e5e 100644 --- a/harbour/contrib/hbxbp/xbpcombobox.prg +++ b/harbour/contrib/hbxbp/xbpcombobox.prg @@ -200,9 +200,9 @@ METHOD XbpComboBox:execSlot( cSlot, p ) METHOD XbpComboBox:itemMarked( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_itemMarked := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_itemMarked ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_itemMarked ) eval( ::sl_itemMarked, NIL, NIL, Self ) ENDIF RETURN Self @@ -211,9 +211,9 @@ METHOD XbpComboBox:itemMarked( ... ) METHOD XbpComboBox:itemSelected( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_itemSelected := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_itemSelected ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_itemSelected ) eval( ::sl_itemSelected, NIL, NIL, Self ) ENDIF RETURN Self @@ -222,9 +222,9 @@ METHOD XbpComboBox:itemSelected( ... ) METHOD XbpComboBox:drawItem( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_xbePDrawItem := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_xbePDrawItem ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_xbePDrawItem ) eval( ::sl_xbePDrawItem, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpcrt.prg b/harbour/contrib/hbxbp/xbpcrt.prg index eb4bf5614b..9ab97cf47e 100644 --- a/harbour/contrib/hbxbp/xbpcrt.prg +++ b/harbour/contrib/hbxbp/xbpcrt.prg @@ -361,7 +361,7 @@ METHOD XbpCrt:destroy() ::oMDI := NIL - IF hb_isObject( ::oMenu ) + IF HB_ISOBJECT( ::oMenu ) ::oMenu:destroy() ENDIF @@ -492,7 +492,7 @@ METHOD XbpCrt:lockUpdate() METHOD XbpCrt:menuBar() - IF !( hb_isObject( ::oMenu ) ) + IF !( HB_ISOBJECT( ::oMenu ) ) ::oMenu := XbpMenuBar():New( self ):create() ENDIF @@ -582,7 +582,7 @@ METHOD XbpCrt:setPresParam() METHOD XbpCrt:setSize( aSize, lPaint ) - if hb_isArray( aSize ) + if HB_ISARRAY( aSize ) DEFAULT lPaint TO .T. hb_gtInfo( HB_GTI_SCREENHEIGHT, aSize[ 1 ] ) @@ -636,12 +636,12 @@ METHOD XbpCrt:winDevice() METHOD XbpCrt:enter( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_enter ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_enter ) eval( ::sl_enter, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_enter := xParam RETURN NIL endif @@ -652,12 +652,12 @@ METHOD XbpCrt:enter( xParam ) METHOD XbpCrt:leave( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_leave ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_leave ) eval( ::sl_leave, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_leave := xParam RETURN NIL endif @@ -668,12 +668,12 @@ METHOD XbpCrt:leave( xParam ) METHOD XbpCrt:lbClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_lbClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbClick := xParam RETURN NIL endif @@ -684,12 +684,12 @@ METHOD XbpCrt:lbClick( xParam ) METHOD XbpCrt:lbDblClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_lbDblClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_lbDblClick ) eval( ::sl_lbDblClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbDblClick := xParam RETURN NIL endif @@ -700,12 +700,12 @@ METHOD XbpCrt:lbDblClick( xParam ) METHOD XbpCrt:lbDown( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_lbDown ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_lbDown ) eval( ::sl_lbDown, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbDown := xParam RETURN NIL endif @@ -716,12 +716,12 @@ METHOD XbpCrt:lbDown( xParam ) METHOD XbpCrt:lbUp( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_lbUp ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_lbUp ) eval( ::sl_lbUp, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_lbUp := xParam RETURN NIL endif @@ -732,12 +732,12 @@ METHOD XbpCrt:lbUp( xParam ) METHOD XbpCrt:mbClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_mbClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_mbClick ) eval( ::sl_mbClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_mbClick := xParam RETURN NIL endif @@ -748,12 +748,12 @@ METHOD XbpCrt:mbClick( xParam ) METHOD XbpCrt:mbDblClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_mbDblClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_mbDblClick ) eval( ::sl_mbDblClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_mbDblClick := xParam RETURN NIL endif @@ -764,12 +764,12 @@ METHOD XbpCrt:mbDblClick( xParam ) METHOD XbpCrt:mbDown( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_mbDown ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_mbDown ) eval( ::sl_mbDown, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_mbDown := xParam RETURN NIL endif @@ -780,12 +780,12 @@ METHOD XbpCrt:mbDown( xParam ) METHOD XbpCrt:mbUp( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_mbUp ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_mbUp ) eval( ::sl_mbUp, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_mbUp := xParam RETURN NIL endif @@ -796,12 +796,12 @@ METHOD XbpCrt:mbUp( xParam ) METHOD XbpCrt:motion( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_motion ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_motion ) eval( ::sl_motion, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_motion := xParam RETURN NIL endif @@ -812,12 +812,12 @@ METHOD XbpCrt:motion( xParam ) METHOD XbpCrt:rbClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_rbClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_rbClick ) eval( ::sl_rbClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_rbClick := xParam RETURN NIL endif @@ -828,12 +828,12 @@ METHOD XbpCrt:rbClick( xParam ) METHOD XbpCrt:rbDblClick( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_rbDblClick ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_rbDblClick ) eval( ::sl_rbDblClick, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_rbDblClick := xParam RETURN NIL endif @@ -844,12 +844,12 @@ METHOD XbpCrt:rbDblClick( xParam ) METHOD XbpCrt:rbDown( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_rbDown ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_rbDown ) eval( ::sl_rbDown, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_rbDown := xParam RETURN NIL endif @@ -860,12 +860,12 @@ METHOD XbpCrt:rbDown( xParam ) METHOD XbpCrt:rbUp( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_rbUp ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_rbUp ) eval( ::sl_rbUp, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_rbUp := xParam RETURN NIL endif @@ -876,12 +876,12 @@ METHOD XbpCrt:rbUp( xParam ) METHOD XbpCrt:wheel( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_wheel ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_wheel ) eval( ::sl_wheel, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_wheel := xParam RETURN NIL endif @@ -894,12 +894,12 @@ METHOD XbpCrt:wheel( xParam ) METHOD XbpCrt:close( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_close ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_close ) eval( ::sl_close, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_close := xParam RETURN NIL endif @@ -910,12 +910,12 @@ METHOD XbpCrt:close( xParam ) METHOD XbpCrt:helpRequest( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_helpRequest ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_helpRequest ) eval( ::sl_helpRequest, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_helpRequest := xParam RETURN NIL endif @@ -926,12 +926,12 @@ METHOD XbpCrt:helpRequest( xParam ) METHOD XbpCrt:keyboard( xParam ) - if hb_isNumeric( xParam ) .and. hb_isBlock( ::sl_keyboard ) + if HB_ISNUMERIC( xParam ) .and. HB_ISBLOCK( ::sl_keyboard ) eval( ::sl_keyboard, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_keyboard := xParam RETURN NIL endif @@ -942,12 +942,12 @@ METHOD XbpCrt:keyboard( xParam ) METHOD XbpCrt:killDisplayFocus( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_killDisplayFocus ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_killDisplayFocus ) eval( ::sl_killDisplayFocus, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_killDisplayFocus := xParam RETURN NIL endif @@ -958,12 +958,12 @@ METHOD XbpCrt:killDisplayFocus( xParam ) METHOD XbpCrt:killInputFocus( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_killInputFocus ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_killInputFocus ) eval( ::sl_killInputFocus, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_killInputFocus := xParam RETURN NIL endif @@ -974,12 +974,12 @@ METHOD XbpCrt:killInputFocus( xParam ) METHOD XbpCrt:move( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_move ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_move ) eval( ::sl_move, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_move := xParam RETURN NIL endif @@ -990,12 +990,12 @@ METHOD XbpCrt:move( xParam ) METHOD XbpCrt:paint( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_paint ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_paint ) eval( ::sl_paint, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_paint := xParam RETURN NIL endif @@ -1006,12 +1006,12 @@ METHOD XbpCrt:paint( xParam ) METHOD XbpCrt:quit( xParam, xParam1 ) - if hb_isNumeric( xParam ) .and. hb_isBlock( ::sl_quit ) + if HB_ISNUMERIC( xParam ) .and. HB_ISBLOCK( ::sl_quit ) eval( ::sl_quit, xParam, xParam1, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_quit := xParam RETURN NIL endif @@ -1022,7 +1022,7 @@ METHOD XbpCrt:quit( xParam, xParam1 ) METHOD XbpCrt:resize( xParam ) - if hb_isBlock( xParam )/* .or. hb_isNil( xParam ) */ + if HB_ISBLOCK( xParam )/* .or. HB_ISNIL( xParam ) */ ::sl_resize := xParam RETURN NIL endif @@ -1036,12 +1036,12 @@ METHOD XbpCrt:resize( xParam ) METHOD XbpCrt:setDisplayFocus( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::setDisplayFocus ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::setDisplayFocus ) eval( ::setDisplayFocus, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::setDisplayFocus := xParam RETURN NIL endif @@ -1052,12 +1052,12 @@ METHOD XbpCrt:setDisplayFocus( xParam ) METHOD XbpCrt:setInputFocus( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_setInputFocus ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_setInputFocus ) eval( ::sl_setInputFocus, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_setInputFocus := xParam RETURN NIL endif @@ -1068,12 +1068,12 @@ METHOD XbpCrt:setInputFocus( xParam ) METHOD XbpCrt:dragEnter( xParam, xParam1 ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_dragEnter ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_dragEnter ) eval( ::sl_dragEnter, xParam, xParam1, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_dragEnter := xParam RETURN NIL endif @@ -1084,12 +1084,12 @@ METHOD XbpCrt:dragEnter( xParam, xParam1 ) METHOD XbpCrt:dragMotion( xParam ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_dragMotion ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_dragMotion ) eval( ::sl_dragMotion, xParam, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_dragMotion := xParam RETURN NIL endif @@ -1100,12 +1100,12 @@ METHOD XbpCrt:dragMotion( xParam ) METHOD XbpCrt:dragLeave( xParam ) - if hb_isNil( xParam ) .and. hb_isBlock( ::sl_dragLeave ) + if HB_ISNIL( xParam ) .and. HB_ISBLOCK( ::sl_dragLeave ) eval( ::sl_dragLeave, NIL, NIL, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_dragLeave := xParam RETURN NIL endif @@ -1116,12 +1116,12 @@ METHOD XbpCrt:dragLeave( xParam ) METHOD XbpCrt:dragDrop( xParam, xParam1 ) - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_dragDrop ) + if HB_ISARRAY( xParam ) .and. HB_ISBLOCK( ::sl_dragDrop ) eval( ::sl_dragDrop, xParam, xParam1, Self ) RETURN Self endif - if hb_isBlock( xParam ) .or. hb_isNil( xParam ) + if HB_ISBLOCK( xParam ) .or. HB_ISNIL( xParam ) ::sl_dragDrop := xParam RETURN NIL endif diff --git a/harbour/contrib/hbxbp/xbpdataref.prg b/harbour/contrib/hbxbp/xbpdataref.prg index ee604a0dbe..685fac6b3c 100644 --- a/harbour/contrib/hbxbp/xbpdataref.prg +++ b/harbour/contrib/hbxbp/xbpdataref.prg @@ -127,7 +127,7 @@ METHOD DataRef:getData() ENDCASE - IF hb_isBlock( ::dataLink ) + IF HB_ISBLOCK( ::dataLink ) eval( ::dataLink, ::sl_editBuffer ) ENDIF @@ -142,7 +142,7 @@ METHOD DataRef:setData( xValue, mp2 ) //HB_TRACE( HB_TR_DEBUG, cClass +' '+ ::cargo +"..."+ IIF(empty(xValue)," empty ",valtype(xValue)) ) - IF hb_isBlock( ::dataLink ) + IF HB_ISBLOCK( ::dataLink ) ::sl_editBuffer := eval( ::dataLink, xValue ) ELSEIF xValue != NIL @@ -183,12 +183,12 @@ METHOD DataRef:setData( xValue, mp2 ) ENDIF #endif CASE cClass == "XBPSPINBUTTON" - IF hb_isNumeric( ::sl_editBuffer ) + IF HB_ISNUMERIC( ::sl_editBuffer ) ::oWidget:setValue( ::sl_editBuffer ) ENDIF CASE cClass == "XBPSCROLLBAR" - IF hb_isNumeric( ::sl_editBuffer ) + IF HB_ISNUMERIC( ::sl_editBuffer ) ::oWidget:setValue( ::sl_editBuffer ) ENDIF @@ -206,9 +206,9 @@ METHOD DataRef:undo() METHOD DataRef:validate( xParam ) - IF PCount() == 0 .AND. hb_isBlock( ::sl_validate ) + IF PCount() == 0 .AND. HB_ISBLOCK( ::sl_validate ) RETURN eval( ::sl_validate, self ) - ELSEIF hb_isBlock( xParam ) + ELSEIF HB_ISBLOCK( xParam ) ::sl_validate := xParam ENDIF diff --git a/harbour/contrib/hbxbp/xbpdialog.prg b/harbour/contrib/hbxbp/xbpdialog.prg index a3d2cda56e..679dbeb8ac 100644 --- a/harbour/contrib/hbxbp/xbpdialog.prg +++ b/harbour/contrib/hbxbp/xbpdialog.prg @@ -150,7 +150,7 @@ METHOD XbpDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) hbxbp_InitializeEventBuffer() IF !empty( ::qtObject ) - IF hb_isObject( ::qtObject ) + IF HB_ISOBJECT( ::qtObject ) ::isViaQtObject := .t. ::oWidget := ::qtObject:oWidget ::qtObject := NIL @@ -325,7 +325,7 @@ METHOD XbpDialog:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible METHOD XbpDialog:maxSize( aSize ) - IF hb_isArray( aSize ) .AND. len( aSize ) == 2 .AND. hb_isNumeric( aSize[ 1 ] ) .AND. hb_isNumeric( aSize[ 2 ] ) + IF HB_ISARRAY( aSize ) .AND. len( aSize ) == 2 .AND. HB_ISNUMERIC( aSize[ 1 ] ) .AND. HB_ISNUMERIC( aSize[ 2 ] ) ::aMaxSize := aSize ::oWidget:setMaximumWidth( aSize[ 1 ] ) ::oWidget:setMaximumHeight( aSize[ 2 ] ) @@ -337,7 +337,7 @@ METHOD XbpDialog:maxSize( aSize ) METHOD XbpDialog:minSize( aSize ) - IF hb_isArray( aSize ) .AND. len( aSize ) == 2 .AND. hb_isNumeric( aSize[ 1 ] ) .AND. hb_isNumeric( aSize[ 2 ] ) + IF HB_ISARRAY( aSize ) .AND. len( aSize ) == 2 .AND. HB_ISNUMERIC( aSize[ 1 ] ) .AND. HB_ISNUMERIC( aSize[ 2 ] ) ::aMinSize := aSize ::oWidget:setMinimumWidth( aSize[ 1 ] ) ::oWidget:setMinimumHeight( aSize[ 2 ] ) @@ -381,7 +381,7 @@ METHOD XbpDialog:showModal() METHOD XbpDialog:setFrameState( nState ) LOCAL lSuccess := .T. LOCAL nCurState := ::getFrameState() - LOCAL oWidget := iif( hb_isObject( ::oMdi ), ::oMdi, ::oWidget ) + LOCAL oWidget := iif( HB_ISOBJECT( ::oMdi ), ::oMdi, ::oWidget ) DO CASE CASE nState == XBPDLG_FRAMESTAT_MINIMIZED @@ -407,7 +407,7 @@ METHOD XbpDialog:setFrameState( nState ) /*----------------------------------------------------------------------*/ METHOD XbpDialog:getFrameState() - LOCAL nState := iif( hb_isObject( ::oMdi ), ::oMdi, ::oWidget ):windowState() + LOCAL nState := iif( HB_ISOBJECT( ::oMdi ), ::oMdi, ::oWidget ):windowState() IF ( hb_bitAnd( nState, Qt_WindowMinimized ) == Qt_WindowMinimized ) RETURN XBPDLG_FRAMESTAT_MINIMIZED @@ -421,7 +421,7 @@ METHOD XbpDialog:getFrameState() METHOD XbpDialog:menuBar() - IF !( hb_isObject( ::oMenu ) ) + IF !( HB_ISOBJECT( ::oMenu ) ) XbpMenuBar():New( self ):create() ENDIF diff --git a/harbour/contrib/hbxbp/xbpfiledialog.prg b/harbour/contrib/hbxbp/xbpfiledialog.prg index 13e7bf8d75..75a058bd29 100644 --- a/harbour/contrib/hbxbp/xbpfiledialog.prg +++ b/harbour/contrib/hbxbp/xbpfiledialog.prg @@ -192,7 +192,7 @@ METHOD XbpFileDialog:execSlot( cSlot, p ) DO CASE CASE cSlot == "rejected()" - IF hb_isBlock( ::sl_quit ) + IF HB_ISBLOCK( ::sl_quit ) nRet := eval( ::sl_quit, 0, 0, Self ) ENDIF IF nRet == XBP_REJECT @@ -219,7 +219,7 @@ METHOD XbpFileDialog:open( cDefaultFile, lCenter, lAllowMultiple, lCreateNewFile DEFAULT lAllowMultiple TO .F. - IF !( hb_isLogical( lCenter ) ) + IF !( HB_ISLOGICAL( lCenter ) ) lCenter := ::center ENDIF @@ -257,7 +257,7 @@ METHOD XbpFileDialog:open( cDefaultFile, lCenter, lAllowMultiple, lCreateNewFile ENDIF ENDIF - IF hb_isLogical( ::openReadOnly ) + IF HB_ISLOGICAL( ::openReadOnly ) ::oWidget:setOption( QFileDialog_ReadOnly, .T. ) ENDIF @@ -280,7 +280,7 @@ METHOD XbpFileDialog:saveAs( cDefaultFile, lFileList, lCenter ) DEFAULT lFileList TO .T. - IF !( hb_isLogical( lCenter ) ) + IF !( HB_ISLOGICAL( lCenter ) ) lCenter := ::center ENDIF diff --git a/harbour/contrib/hbxbp/xbpfontdialog.prg b/harbour/contrib/hbxbp/xbpfontdialog.prg index 405ce85331..fe719faaa6 100644 --- a/harbour/contrib/hbxbp/xbpfontdialog.prg +++ b/harbour/contrib/hbxbp/xbpfontdialog.prg @@ -214,7 +214,7 @@ METHOD XbpFontDialog:execSlot( cSlot, p ) ::activateOk( ::XbpFontObject() ) CASE cSlot == "rejected()" - IF hb_isBlock( ::sl_quit ) + IF HB_ISBLOCK( ::sl_quit ) nRet := eval( ::sl_quit, 0, 0, Self ) ENDIF IF nRet == XBP_REJECT @@ -273,9 +273,9 @@ METHOD XbpFontDialog:destroy() METHOD XbpFontDialog:activateApply( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_activateApply := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_activateApply ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_activateApply ) eval( ::sl_activateApply, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -284,9 +284,9 @@ METHOD XbpFontDialog:activateApply( ... ) METHOD XbpFontDialog:activateCancel( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_activateCancel := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_activateCancel ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_activateCancel ) eval( ::sl_activateCancel, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -295,9 +295,9 @@ METHOD XbpFontDialog:activateCancel( ... ) METHOD XbpFontDialog:activateOk( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_activateOk := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_activateOk ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_activateOk ) eval( ::sl_activateOk, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -306,9 +306,9 @@ METHOD XbpFontDialog:activateOk( ... ) METHOD XbpFontDialog:activateReset( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_activateReset := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_activateReset ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_activateReset ) eval( ::sl_activateReset, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpgeneric.prg b/harbour/contrib/hbxbp/xbpgeneric.prg index 25a12f4d3c..682a1ab010 100644 --- a/harbour/contrib/hbxbp/xbpgeneric.prg +++ b/harbour/contrib/hbxbp/xbpgeneric.prg @@ -106,7 +106,7 @@ EXIT PROCEDURE hbxbp_End() t_oAppWindow := NIL - IF hb_isObject( s_oDeskTop ) + IF HB_ISOBJECT( s_oDeskTop ) s_oDeskTop:oWidget := NIL ENDIF @@ -143,7 +143,7 @@ FUNCTION hbxbp_SetEventLoop( oELoop ) LOCAL oLoop := t_oEventLoop IF PCount() == 1 - IF hb_isObject( oELoop ) .OR. oELoop == NIL + IF HB_ISOBJECT( oELoop ) .OR. oELoop == NIL t_oEventLoop := oELoop ENDIF ENDIF @@ -344,7 +344,7 @@ FUNCTION AppEvent( mp1, mp2, oXbp, nTimeout ) FUNCTION SetAppWindow( oXbp ) LOCAL oldAppWindow := t_oAppWindow - IF hb_isObject( oXbp ) + IF HB_ISOBJECT( oXbp ) t_oAppWindow := oXbp ENDIF @@ -357,7 +357,7 @@ FUNCTION SetAppFocus( oXbp ) oldXbpInFocus := t_oXbpInFocus - IF hb_isObject( oXbp ) + IF HB_ISOBJECT( oXbp ) t_oXbpInFocus := oXbp oXbp:setFocus() ENDIF @@ -388,7 +388,7 @@ FUNCTION MsgBox( cMsg, cTitle ) oMB := QMessageBox() oMB:setText( /* "" + */ cMsg /* + "" */ ) oMB:setIcon( QMessageBox_Information ) - IF hb_isObject( SetAppWindow() ) + IF HB_ISOBJECT( SetAppWindow() ) oMB:setParent( SetAppWindow():oWidget ) ENDIF oMB:setWindowFlags( Qt_Dialog ) @@ -565,7 +565,7 @@ FUNCTION ConfirmBox( oOwner, cMessage, cTitle, nButtons, nStyle, nStartBtn ) oMB:setIcon( QMessageBox_Critical ) ENDIF - IF hb_isObject( oOwner ) + IF HB_ISOBJECT( oOwner ) oMB:setParent( oOwner:oWidget ) ENDIF oMB:setWindowFlags( Qt_Dialog ) diff --git a/harbour/contrib/hbxbp/xbpgra.prg b/harbour/contrib/hbxbp/xbpgra.prg index 08345b960e..156a426abb 100644 --- a/harbour/contrib/hbxbp/xbpgra.prg +++ b/harbour/contrib/hbxbp/xbpgra.prg @@ -184,10 +184,10 @@ FUNCTION GraLine( oPS, aStartPoint, aEndPoint ) FUNCTION GraMakeRGBColor( aRGB ) LOCAL nRGB - IF hb_isArray( aRGB ) .AND. Len( aRGB ) == 3 - IF hb_isNumeric( aRGB[ 1 ] ) .AND. ( aRGB[ 1 ] >= 0 ) .AND. ( aRGB[ 1 ] <= 255 ) - IF hb_isNumeric( aRGB[ 2 ] ) .AND. ( aRGB[ 2 ] >= 0 ) .AND. ( aRGB[ 2 ] <= 255 ) - IF hb_isNumeric( aRGB[ 3 ] ) .AND. ( aRGB[ 3 ] >= 0 ) .AND. ( aRGB[ 3 ] <= 255 ) + IF HB_ISARRAY( aRGB ) .AND. Len( aRGB ) == 3 + IF HB_ISNUMERIC( aRGB[ 1 ] ) .AND. ( aRGB[ 1 ] >= 0 ) .AND. ( aRGB[ 1 ] <= 255 ) + IF HB_ISNUMERIC( aRGB[ 2 ] ) .AND. ( aRGB[ 2 ] >= 0 ) .AND. ( aRGB[ 2 ] <= 255 ) + IF HB_ISNUMERIC( aRGB[ 3 ] ) .AND. ( aRGB[ 3 ] >= 0 ) .AND. ( aRGB[ 3 ] <= 255 ) nRGB := ( aRGB[ 1 ] + ( aRGB[ 2 ] * 256 ) + ( aRGB[ 3 ] * 256 * 256 ) ) + ( 256 * 256 * 256 ) ENDIF ENDIF diff --git a/harbour/contrib/hbxbp/xbphtmlviewer.prg b/harbour/contrib/hbxbp/xbphtmlviewer.prg index e5967fe904..605bc46048 100644 --- a/harbour/contrib/hbxbp/xbphtmlviewer.prg +++ b/harbour/contrib/hbxbp/xbphtmlviewer.prg @@ -206,21 +206,21 @@ METHOD XbpHTMLViewer:execSlot( cSlot, p ) DO CASE CASE cSlot == "iconChanged()" - IF hb_isBlock( ::sl_beforeNavigate ) + IF HB_ISBLOCK( ::sl_beforeNavigate ) eval( ::sl_beforeNavigate, /*cURL*/, NIL, Self ) ENDIF CASE cSlot == "linkClicked(QUrl)" CASE cSlot == "loadFinished(bool)" - IF hb_isBlock( ::sl_documentComplete ) + IF HB_ISBLOCK( ::sl_documentComplete ) eval( ::sl_documentComplete, /*cURI*/, p, Self ) ENDIF CASE cSlot == "loadProgress(int)" - IF hb_isBlock( ::sl_progressChange ) + IF HB_ISBLOCK( ::sl_progressChange ) eval( ::sl_progressChange, p, 100, Self ) ENDIF CASE cSlot == "loadStarted()" CASE cSlot == "titleChanged(QString)" - IF hb_isBlock( ::sl_titleChange ) + IF HB_ISBLOCK( ::sl_titleChange ) eval( ::sl_titleChange, p, NIL, Self ) ENDIF CASE cSlot == "urlChanged(QUrl)" @@ -228,7 +228,7 @@ METHOD XbpHTMLViewer:execSlot( cSlot, p ) ::cSelectedText := ::oWidget:selectedText() HB_TRACE( HB_TR_DEBUG, ::cSelectedText ) CASE cSlot == "statusBarMessage(QString)" - IF hb_isBlock( ::sl_statusTextChange ) + IF HB_ISBLOCK( ::sl_statusTextChange ) eval( ::sl_statusTextChange, p, NIL, Self ) ENDIF ENDCASE diff --git a/harbour/contrib/hbxbp/xbplistbox.prg b/harbour/contrib/hbxbp/xbplistbox.prg index b3559cf33f..c3cc9e24c1 100644 --- a/harbour/contrib/hbxbp/xbplistbox.prg +++ b/harbour/contrib/hbxbp/xbplistbox.prg @@ -259,7 +259,7 @@ METHOD XbpListBox:execSlot( cSlot, p ) LOCAL qPos, qItm, nIndex, n, qPt IF cSlot == "customContextMenuRequested(QPoint)" - IF hb_isBlock( ::hb_contextMenu ) + IF HB_ISBLOCK( ::hb_contextMenu ) qPos := p IF ( qItm := ::oWidget:itemAt( qPos ) ):hasValidPointer() IF ( n := ascan( ::aItems, {|o| hbqt_IsEqual( o, qItm ) } ) ) > 0 @@ -271,7 +271,7 @@ METHOD XbpListBox:execSlot( cSlot, p ) RETURN Self ENDIF - IF hb_isObject( p ) + IF HB_ISOBJECT( p ) IF ( nIndex := ::getItemIndex( p ) ) > 0 qItm := ::aItems[ nIndex ] ENDIF @@ -379,7 +379,7 @@ METHOD XbpListBox:addItem( cItem ) METHOD XbpListBox:delItem( nIndex ) - IF hb_isNumeric( nIndex ) .AND. nIndex > 0 .AND. nIndex <= len( ::aItems ) + IF HB_ISNUMERIC( nIndex ) .AND. nIndex > 0 .AND. nIndex <= len( ::aItems ) ::aItems[ nIndex ] := NIL hb_adel( ::aItems, nIndex, .t. ) ENDIF @@ -390,7 +390,7 @@ METHOD XbpListBox:delItem( nIndex ) METHOD XbpListBox:getItem( nIndex ) - IF hb_isNumeric( nIndex ) .AND. nIndex > 0 .AND. nIndex <= len( ::aItems ) + IF HB_ISNUMERIC( nIndex ) .AND. nIndex > 0 .AND. nIndex <= len( ::aItems ) RETURN ::aItems[ nIndex ]:text() ENDIF @@ -403,7 +403,7 @@ METHOD XbpListBox:insItem( nIndex, cItem ) qItm:setText( cItem ) - IF hb_isNumeric( nIndex ) .AND. nIndex > 0 .AND. nIndex <= len( ::aItems ) + IF HB_ISNUMERIC( nIndex ) .AND. nIndex > 0 .AND. nIndex <= len( ::aItems ) ::oWidget:insertItem( nIndex - 1, qItm ) hb_aIns( ::aItems, qItm, .t. ) ELSE @@ -418,7 +418,7 @@ METHOD XbpListBox:insItem( nIndex, cItem ) METHOD XbpListBox:setItem( nIndex, cItem ) LOCAL cText := "" - IF hb_isNumeric( nIndex ) .AND. nIndex > 0 .AND. nIndex <= len( ::aItems ) + IF HB_ISNUMERIC( nIndex ) .AND. nIndex > 0 .AND. nIndex <= len( ::aItems ) cText := ::aItems[ nIndex ]:text() ::aItems[ nIndex ]:setText( cItem ) ENDIF @@ -440,7 +440,7 @@ METHOD XbpListBox:setVisible( cItem ) METHOD XbpListBox:setItemColorFG( nIndex, aRGB ) - IF hb_isNumeric( nIndex ) .AND. nIndex > 0 .AND. nIndex <= len( ::aItems ) + IF HB_ISNUMERIC( nIndex ) .AND. nIndex > 0 .AND. nIndex <= len( ::aItems ) IF ::nOldIndex > 0 .AND. ::nOldIndex <= len( ::aItems ) ::aItems[ ::nOldIndex ]:setForeGround( QBrush( QColor( 0,0,0 ) ) ) ENDIF @@ -462,9 +462,9 @@ METHOD XbpListBox:setItemColorFG( nIndex, aRGB ) METHOD XbpListBox:itemMarked( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_itemMarked := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_itemMarked ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_itemMarked ) eval( ::sl_itemMarked, NIL, NIL, Self ) ENDIF RETURN Self @@ -473,9 +473,9 @@ METHOD XbpListBox:itemMarked( ... ) METHOD XbpListBox:itemSelected( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_itemSelected := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_itemSelected ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_itemSelected ) eval( ::sl_itemSelected, NIL, NIL, Self ) ENDIF RETURN Self @@ -484,9 +484,9 @@ METHOD XbpListBox:itemSelected( ... ) METHOD XbpListBox:drawItem( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_xbePDrawItem := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_xbePDrawItem ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_xbePDrawItem ) eval( ::sl_xbePDrawItem, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -495,9 +495,9 @@ METHOD XbpListBox:drawItem( ... ) METHOD XbpListBox:measureItem( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_measureItem := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_measureItem ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_measureItem ) eval( ::sl_measureItem, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -506,9 +506,9 @@ METHOD XbpListBox:measureItem( ... ) METHOD XbpListBox:hScroll( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_hScroll := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_hScroll ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_hScroll ) eval( ::sl_hScroll, NIL, NIL, Self ) ENDIF RETURN Self @@ -517,9 +517,9 @@ METHOD XbpListBox:hScroll( ... ) METHOD XbpListBox:vScroll( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_vScroll := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_vScroll ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_vScroll ) eval( ::sl_vScroll, NIL, NIL, Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpmenubar.prg b/harbour/contrib/hbxbp/xbpmenubar.prg index 35c19c5340..d8315ef246 100644 --- a/harbour/contrib/hbxbp/xbpmenubar.prg +++ b/harbour/contrib/hbxbp/xbpmenubar.prg @@ -218,7 +218,7 @@ METHOD xbpMenuBar:delAllItems() METHOD xbpMenuBar:delItem( aItem ) LOCAL n, oAction - IF hb_isNumeric( aItem ) + IF HB_ISNUMERIC( aItem ) n := aItem aItem := ::aMenuItems[ n ] /* Will polish later */ hb_adel( ::aMenuItems, n, .t. ) @@ -227,7 +227,7 @@ METHOD xbpMenuBar:delItem( aItem ) oAction := aItem[ 5 ] aItem := NIL - IF hb_isObject( oAction ) .AND. __ObjGetClsName( oAction ) == "QACTION" + IF HB_ISOBJECT( oAction ) .AND. __ObjGetClsName( oAction ) == "QACTION" IF !( oAction:isSeparator() ) oAction:disConnect( "triggered(bool)" ) oAction:disConnect( "hovered()" ) @@ -382,7 +382,7 @@ METHOD xbpMenuBar:placeItem( xCaption, bAction, nStyle, nAttrb, nMode, nPos ) METHOD xbpMenuBar:addItem( aItem ) LOCAL xCaption, bAction, nStyle, nAttrib - IF PCount() == 1 .AND. hb_isArray( aItem ) + IF PCount() == 1 .AND. HB_ISARRAY( aItem ) ASize( aItem, 4 ) xCaption := aItem[ 1 ] @@ -403,7 +403,7 @@ METHOD xbpMenuBar:addItem( aItem ) METHOD xbpMenuBar:insItem( nItemIndex, aItem ) LOCAL xCaption, bAction, nStyle, nAttrib - IF nItemIndex > 0 .and. nItemIndex <= ::numItems .and. hb_isArray( aItem ) + IF nItemIndex > 0 .and. nItemIndex <= ::numItems .and. HB_ISARRAY( aItem ) ASize( aItem, 4 ) xCaption := aItem[ 1 ] @@ -514,9 +514,9 @@ METHOD xbpMenuBar:selectItem( nItemIndex ) METHOD xbpMenuBar:execSlot( cSlot, p ) LOCAL nIndex - IF ! empty( p ) .AND. ( nIndex := ascan( ::aMenuItems, {|e_| iif( hb_isNumeric( e_[ 2 ] ), e_[ 2 ] == p, .f. ) } ) ) > 0 + IF ! empty( p ) .AND. ( nIndex := ascan( ::aMenuItems, {|e_| iif( HB_ISNUMERIC( e_[ 2 ] ), e_[ 2 ] == p, .f. ) } ) ) > 0 IF cSlot == "triggered(bool)" - IF hb_isBlock( ::aMenuItems[ nIndex,4 ] ) + IF HB_ISBLOCK( ::aMenuItems[ nIndex,4 ] ) eval( ::aMenuItems[ nIndex,4 ], nIndex, NIL, Self ) ELSE @@ -538,9 +538,9 @@ METHOD xbpMenuBar:execSlot( cSlot, p ) METHOD xbpMenuBar:beginMenu( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_beginMenu := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_beginMenu ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_beginMenu ) eval( ::sl_beginMenu, NIL, NIL, Self ) ENDIF RETURN Self @@ -549,9 +549,9 @@ METHOD xbpMenuBar:beginMenu( ... ) METHOD XbpMenuBar:endMenu( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_endMenu := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_endMenu ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_endMenu ) eval( ::sl_endMenu, NIL, NIL, Self ) ENDIF RETURN Self @@ -560,9 +560,9 @@ METHOD XbpMenuBar:endMenu( ... ) METHOD XbpMenuBar:itemMarked( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_itemMarked := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_itemMarked ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_itemMarked ) eval( ::sl_itemMarked, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -571,9 +571,9 @@ METHOD XbpMenuBar:itemMarked( ... ) METHOD XbpMenuBar:itemSelected( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_itemSelected := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_itemSelected ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_itemSelected ) eval( ::sl_itemSelected, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -582,9 +582,9 @@ METHOD XbpMenuBar:itemSelected( ... ) METHOD XbpMenuBar:drawItem( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_drawItem := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_drawItem ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_drawItem ) eval( ::sl_drawItem, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -593,9 +593,9 @@ METHOD XbpMenuBar:drawItem( ... ) METHOD XbpMenuBar:measureItem( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_measureItem := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_measureItem ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_measureItem ) eval( ::sl_measureItem, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -604,9 +604,9 @@ METHOD XbpMenuBar:measureItem( ... ) METHOD XbpMenuBar:onMenuKey( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_onMenuKey := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_onMenuKey ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_onMenuKey ) eval( ::sl_onMenuKey, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -667,8 +667,8 @@ CLASS xbpMenu INHERIT xbpMenuBar METHOD popUp( oXbp, aPos, nDefaultItem, nControl ) METHOD setStyle() METHOD normalize( cCaption ) - METHOD show() INLINE iif( hb_isObject( ::oAction ), ::oAction:setVisible( .t. ), NIL ) - METHOD hide() INLINE iif( hb_isObject( ::oAction ), ::oAction:setVisible( .f. ), NIL ) + METHOD show() INLINE iif( HB_ISOBJECT( ::oAction ), ::oAction:setVisible( .t. ), NIL ) + METHOD hide() INLINE iif( HB_ISOBJECT( ::oAction ), ::oAction:setVisible( .f. ), NIL ) ENDCLASS @@ -693,7 +693,7 @@ METHOD xbpMenu:create( oParent, aPresParams, lVisible ) ::oWidget := QMenu() ::oWidget:setTitle( ::normalize( ::title ) ) - IF hb_isObject( ::oParent ) + IF HB_ISOBJECT( ::oParent ) ::oAction := ::oParent:oWidget:addMenu( ::oWidget ) ::oParent:addChild( self ) ::oAction:setVisible( ::visible ) diff --git a/harbour/contrib/hbxbp/xbpmle.prg b/harbour/contrib/hbxbp/xbpmle.prg index 94f586c8a2..74dfa5e0bc 100644 --- a/harbour/contrib/hbxbp/xbpmle.prg +++ b/harbour/contrib/hbxbp/xbpmle.prg @@ -174,7 +174,7 @@ METHOD XbpMLE:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::show() ENDIF - IF hb_isBlock( ::datalink ) + IF HB_ISBLOCK( ::datalink ) eval( ::datalink ) ENDIF @@ -294,7 +294,7 @@ METHOD XbpMLE:setFirstChar( nBufferPos ) METHOD XbpMLE:setMarked( aStartEnd ) LOCAL qCursor, cText - IF hb_isArray( aStartEnd ) .AND. len( aStartEnd ) == 2 .AND. aStartEnd[ 1 ] >= 0 .AND. aStartEnd[ 2 ] > aStartEnd[ 1 ] + IF HB_ISARRAY( aStartEnd ) .AND. len( aStartEnd ) == 2 .AND. aStartEnd[ 1 ] >= 0 .AND. aStartEnd[ 2 ] > aStartEnd[ 1 ] qCursor := ::oWidget:textCursor() qCursor:setPosition( aStartEnd[ 1 ] ) qCursor:movePosition( QTextCursor_Right, QTextCursor_KeepAnchor, aStartEnd[ 2 ] - aStartEnd[ 1 ] ) @@ -314,7 +314,7 @@ METHOD XbpMLE:insert( nPos, cString ) IF hb_isChar( cString ) qCursor := ::oWidget:textCursor() - IF hb_isNumeric( nPos ) .AND. nPos >= 0 + IF HB_ISNUMERIC( nPos ) .AND. nPos >= 0 qCursor:setPosition( nPos ) ENDIF qCursor:insertText( cString ) @@ -330,7 +330,7 @@ METHOD XbpMLE:charFromLine( nLine ) LOCAL qCursor, nPos qCursor := ::oWidget:textCursor() - IF hb_isNumeric( nLine ) + IF HB_ISNUMERIC( nLine ) qCursor:movePosition( QTextCursor_Start ) qCursor:movePosition( QTextCursor_Down, QTextCursor_MoveAnchor, nLine ) nPos := qCursor:position() @@ -347,7 +347,7 @@ METHOD XbpMLE:lineFromChar( nPos ) LOCAL qCursor, nLine qCursor := ::oWidget:textCursor() - IF hb_isNumeric( nPos ) + IF HB_ISNUMERIC( nPos ) qCursor:setPosition( nPos ) nLine := qCursor:blockNumber() ELSE @@ -365,9 +365,9 @@ METHOD XbpMLE:pos() METHOD XbpMLE:hScroll( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_hScroll := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_hScroll ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_hScroll ) eval( ::sl_hScroll, NIL, NIL, Self ) ENDIF RETURN Self @@ -376,9 +376,9 @@ METHOD XbpMLE:hScroll( ... ) METHOD XbpMLE:vScroll( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_vScroll := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_vScroll ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_vScroll ) eval( ::sl_vScroll, NIL, NIL, Self ) ENDIF RETURN Self @@ -387,9 +387,9 @@ METHOD XbpMLE:vScroll( ... ) METHOD XbpMLE:undo( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_undo := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_undo ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_undo ) eval( ::sl_undo, a_[ 1 ], NIL, Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpparthandler.prg b/harbour/contrib/hbxbp/xbpparthandler.prg index 3b3262841c..d90b27d127 100644 --- a/harbour/contrib/hbxbp/xbpparthandler.prg +++ b/harbour/contrib/hbxbp/xbpparthandler.prg @@ -128,7 +128,7 @@ METHOD XbpPartHandler:create( oParent, oOwner ) ::oParent := oParent ::oOwner := oOwner - IF hb_isObject( ::oOwner ) + IF HB_ISOBJECT( ::oOwner ) ::oOwner:addAsOwned( Self ) ENDIF @@ -177,7 +177,7 @@ METHOD XbpPartHandler:handleEvent( hEvent, mp1, mp2 ) METHOD XbpPartHandler:status( nStatus ) LOCAL nOldStatus := ::nStatus - IF hb_isNumeric( nStatus ) + IF HB_ISNUMERIC( nStatus ) ::nStatus := nStatus ENDIF diff --git a/harbour/contrib/hbxbp/xbppresspace.prg b/harbour/contrib/hbxbp/xbppresspace.prg index 6162b74fe7..666e8beaa4 100644 --- a/harbour/contrib/hbxbp/xbppresspace.prg +++ b/harbour/contrib/hbxbp/xbppresspace.prg @@ -167,10 +167,10 @@ METHOD XbpPresSpace:create( oDevice, aPageSize, nUnits ) DEFAULT nUnits TO GRA_PU_PIXEL - IF hb_isObject( oDevice ) + IF HB_ISOBJECT( oDevice ) ::oDevice := oDevice ENDIF - IF hb_isArray( aPageSize ) .AND. len( aPageSize ) == 2 + IF HB_ISARRAY( aPageSize ) .AND. len( aPageSize ) == 2 ::aPageSize := aPageSize ENDIF @@ -183,7 +183,7 @@ METHOD XbpPresSpace:create( oDevice, aPageSize, nUnits ) METHOD XbpPresSpace:drawMode( nDrawMode ) LOCAL nOldMode := ::nDrawMode - IF hb_isNumeric( nDrawMode ) .AND. nDrawMode >= GRA_DM_DRAW .AND. nDrawMode <= GRA_DM_DRAWANDRETAIN + IF HB_ISNUMERIC( nDrawMode ) .AND. nDrawMode >= GRA_DM_DRAW .AND. nDrawMode <= GRA_DM_DRAWANDRETAIN ::nDrawMode := nDrawMode ENDIF @@ -207,7 +207,7 @@ METHOD XbpPresSpace:mapPoint( aPoint, lMapToDevice ) DEFAULT lMapToDevice TO .t. - IF hb_isArray( aPoint ) + IF HB_ISARRAY( aPoint ) IF lMapToDevice aPoint := { 0,0 } ENDIF @@ -241,7 +241,7 @@ METHOD XbpPresSpace:setAttrArea( aAttributes ) LOCAL v LOCAL aOldAttr := ::aGRA_AA_ATTR - IF hb_isArray( aAttributes ) .AND. len( aAttributes ) == GRA_AA_COUNT + IF HB_ISARRAY( aAttributes ) .AND. len( aAttributes ) == GRA_AA_COUNT FOR EACH v IN aAttributes IF !empty( v ) ::aGRA_AA_ATTR[ v:__enumIndex() ] := v @@ -257,7 +257,7 @@ METHOD XbpPresSpace:setAttrLine( aAttributes ) LOCAL v LOCAL aOldAttr := ::aGRA_AL_ATTR - IF hb_isArray( aAttributes ) .AND. len( aAttributes ) == GRA_AL_COUNT + IF HB_ISARRAY( aAttributes ) .AND. len( aAttributes ) == GRA_AL_COUNT FOR EACH v IN aAttributes IF !empty( v ) ::aGRA_AL_ATTR[ v:__enumIndex() ] := v @@ -273,7 +273,7 @@ METHOD XbpPresSpace:setAttrMarker( aAttributes ) LOCAL v LOCAL aOldAttr := ::aGRA_AM_ATTR - IF hb_isArray( aAttributes ) .AND. len( aAttributes ) == GRA_AM_COUNT + IF HB_ISARRAY( aAttributes ) .AND. len( aAttributes ) == GRA_AM_COUNT FOR EACH v IN aAttributes IF !empty( v ) ::aGRA_AM_ATTR[ v:__enumIndex() ] := v @@ -289,7 +289,7 @@ METHOD XbpPresSpace:setAttrString( aAttributes ) LOCAL v LOCAL aOldAttr := ::aGRA_AS_ATTR - IF hb_isArray( aAttributes ) .AND. len( aAttributes ) == GRA_AS_COUNT + IF HB_ISARRAY( aAttributes ) .AND. len( aAttributes ) == GRA_AS_COUNT FOR EACH v IN aAttributes IF !empty( v ) ::aGRA_AS_ATTR[ v:__enumIndex() ] := v @@ -319,10 +319,10 @@ METHOD XbpPresSpace:setColorIndex( nColorIndex, aRGB ) LOCAL a_ LOCAL aOldAttr := {} - IF hb_isNumeric( nColorIndex ) .AND. nColorIndex > 15 .AND. nColorIndex <= 255 .AND. nColorIndex < len( ::aPalette ) + IF HB_ISNUMERIC( nColorIndex ) .AND. nColorIndex > 15 .AND. nColorIndex <= 255 .AND. nColorIndex < len( ::aPalette ) aOldAttr := ::aPalette[ nColorIndex ] - IF hb_isArray( aRGB ) - IF hb_isArray( aRGB[ 1 ] ) + IF HB_ISARRAY( aRGB ) + IF HB_ISARRAY( aRGB[ 1 ] ) FOR EACH a_ IN aRGB ::aPalette[ nColorIndex + a_:__enumIndex() - 1 ] := a_ NEXT @@ -339,7 +339,7 @@ METHOD XbpPresSpace:setColorIndex( nColorIndex, aRGB ) METHOD XbpPresSpace:setFont( oXbpFont ) LOCAL oOldFont := ::oXbpFont - IF hb_isObject( oXbpFont ) + IF HB_ISOBJECT( oXbpFont ) ::oXbpFont := oXbpFont ENDIF @@ -352,7 +352,7 @@ METHOD XbpPresSpace:setGraTransform( aMatrix, nMode ) DEFAULT nMode TO GRA_TRANSFORM_REPLACE - IF hb_isArray( aMatrix ) + IF HB_ISARRAY( aMatrix ) IF nMode == GRA_TRANSFORM_REPLACE ::aMatrix := aMatrix ELSE @@ -367,10 +367,10 @@ METHOD XbpPresSpace:setGraTransform( aMatrix, nMode ) METHOD XbpPresSpace:setPageSize( aPageSize, nUnits ) LOCAL aOldSize := ::aPageSize - IF hb_isArray( aPageSize ) .AND. len( aPageSize ) == 2 + IF HB_ISARRAY( aPageSize ) .AND. len( aPageSize ) == 2 ::aPageSize := aPageSize ENDIF - IF hb_isNumeric( nUnits ) + IF HB_ISNUMERIC( nUnits ) ::nUnits := nUnits ENDIF @@ -381,7 +381,7 @@ METHOD XbpPresSpace:setPageSize( aPageSize, nUnits ) METHOD XbpPresSpace:setViewPort( aViewPort ) LOCAL aOldViewPort := ::aViewPort - IF hb_isArray( aViewPort ) + IF HB_ISARRAY( aViewPort ) ::aViewPort := aViewPort ENDIF diff --git a/harbour/contrib/hbxbp/xbpprintdialog.prg b/harbour/contrib/hbxbp/xbpprintdialog.prg index 492e657f46..553210d3af 100644 --- a/harbour/contrib/hbxbp/xbpprintdialog.prg +++ b/harbour/contrib/hbxbp/xbpprintdialog.prg @@ -134,7 +134,7 @@ METHOD XbpPrintDialog:destroy() METHOD XbpPrintDialog:display( oXbpPrinter ) LOCAL nResult, nOpt, n - IF hb_isObject( oXbpPrinter ) + IF HB_ISOBJECT( oXbpPrinter ) // Parameters be based onto that ENDIF @@ -162,7 +162,7 @@ METHOD XbpPrintDialog:display( oXbpPrinter ) nResult := ::oWidget:exec() IF nResult == QDialog_Accepted - IF !hb_isObject( oXbpPrinter ) + IF !HB_ISOBJECT( oXbpPrinter ) oXbpPrinter := XbpPrinter():new() oXbpPrinter:oWidget := QPrinter() ENDIF diff --git a/harbour/contrib/hbxbp/xbpprinter.prg b/harbour/contrib/hbxbp/xbpprinter.prg index bd92ff02b9..89afd2bc5a 100644 --- a/harbour/contrib/hbxbp/xbpprinter.prg +++ b/harbour/contrib/hbxbp/xbpprinter.prg @@ -227,7 +227,7 @@ METHOD XbpPrinter:resolution() METHOD XbpPrinter:setCollationMode( nMode ) LOCAL nModeOld := IIF( ::oWidget:collateCopies(), XBPPRN_COLLATIONMODE_ON, XBPPRN_COLLATIONMODE_OFF ) - IF hb_isNumeric( nMode ) + IF HB_ISNUMERIC( nMode ) ::oWidget:setCollateCopies( IIF( nMode == XBPPRN_COLLATIONMODE_ON, .t., .f. ) ) ENDIF @@ -238,7 +238,7 @@ METHOD XbpPrinter:setCollationMode( nMode ) METHOD XbpPrinter:setColorMode( nMode ) LOCAL nModeOld := IIF( ::oWidget:colorMode() == QPrinter_Color, XBPPRN_COLORMODE_ON, XBPPRN_COLORMODE_OFF ) - IF hb_isNumeric( nMode ) + IF HB_ISNUMERIC( nMode ) ::oWidget:setColorMode( IIF( nMode == XBPPRN_COLORMODE_ON, QPrinter_Color, QPrinter_GrayScale ) ) ENDIF @@ -257,7 +257,7 @@ METHOD XbpPrinter:setDuplexMode( nMode ) nModeOld := XBPPRN_DUPLEXMODE_BOOK ENDIF - IF hb_isNumeric( nMode ) + IF HB_ISNUMERIC( nMode ) IF nMode == XBPPRN_DUPLEXMODE_MEMO nMode := QPrinter_DuplexLongSide ELSEIF nMode == XBPPRN_DUPLEXMODE_BOOK @@ -377,7 +377,7 @@ METHOD XbpPrinter:setFormSize( nFormID ) XBPPRN_FORM_A3_EXTRA_TRANS #endif - IF hb_isNumeric( nFormID ) + IF HB_ISNUMERIC( nFormID ) ::oWidget:setPaperSize( nFormID ) ENDIF //::oWidget:setPaperSize( const QSizeF & paperSize, Unit unit ) @@ -390,7 +390,7 @@ METHOD XbpPrinter:setNumCopies( nNumCopies ) //LOCAL nOldNumCopies := ::oWidget:numCopies() LOCAL nOldNumCopies := ::getEngineProperty( QPrintEngine_PPK_NumberOfCopies ) - IF hb_isNumeric( nNumCopies ) + IF HB_ISNUMERIC( nNumCopies ) ::oWidget:setNumCopies( nNumCopies ) ENDIF @@ -401,7 +401,7 @@ METHOD XbpPrinter:setNumCopies( nNumCopies ) METHOD XbpPrinter:setOrientation( nOrientation ) LOCAL nOldOrientation := IIF( ::oWidget:orientation() == QPrinter_Landscape, XBPPRN_ORIENT_LANDSCAPE, XBPPRN_ORIENT_PORTRAIT ) - IF hb_isNumeric( nOrientation ) + IF HB_ISNUMERIC( nOrientation ) ::oWidget:setOrientation( iif( nOrientation == XBPPRN_ORIENT_LANDSCAPE, QPrinter_Landscape, QPrinter_Portrait ) ) ENDIF @@ -448,7 +448,7 @@ METHOD XbpPrinter:setPaperBin( nBin ) nOldBin := x_[ ascan( q_, nOldBin ) ] - IF hb_isNumeric( nBin ) + IF HB_ISNUMERIC( nBin ) nBin := q_[ ascan( x_, nBin ) ] ::oWidget:setPaperSource( nBin ) ENDIF @@ -471,8 +471,8 @@ METHOD XbpPrinter:setPrintFile( cFileName ) METHOD XbpPrinter:setResolution( anResolution ) LOCAL aOldResolution := { ::getEngineProperty( QPrintEngine_PPK_Resolution ), ::oWidget:resolution() } - IF hb_isNumeric( anResolution ) .or. hb_isArray( anResolution ) - ::oWidget:setResolution( IIF( hb_isNumeric( anResolution ), anResolution, anResolution[ 1 ] ) ) + IF HB_ISNUMERIC( anResolution ) .or. HB_ISARRAY( anResolution ) + ::oWidget:setResolution( IIF( HB_ISNUMERIC( anResolution ), anResolution, anResolution[ 1 ] ) ) ENDIF RETURN aOldResolution diff --git a/harbour/contrib/hbxbp/xbppushbutton.prg b/harbour/contrib/hbxbp/xbppushbutton.prg index aa132f8ec0..4b0dfc14aa 100644 --- a/harbour/contrib/hbxbp/xbppushbutton.prg +++ b/harbour/contrib/hbxbp/xbppushbutton.prg @@ -239,9 +239,9 @@ METHOD XbpPushButton:setCaption( xCaption, cDll ) METHOD XbpPushButton:activate( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_lbClick := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_lbClick ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, NIL, NIL, Self ) ENDIF RETURN Self @@ -250,9 +250,9 @@ METHOD XbpPushButton:activate( ... ) METHOD XbpPushButton:draw( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_draw := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_draw ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_draw ) eval( ::sl_draw, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpradiobutton.prg b/harbour/contrib/hbxbp/xbpradiobutton.prg index b9b9fe334c..adbfbe313b 100644 --- a/harbour/contrib/hbxbp/xbpradiobutton.prg +++ b/harbour/contrib/hbxbp/xbpradiobutton.prg @@ -191,9 +191,9 @@ METHOD XbpRadioButton:setCaption( xCaption ) METHOD XbpRadioButton:selected( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_lbClick := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_lbClick ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, a_[ 1 ], NIL, Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbprtf.prg b/harbour/contrib/hbxbp/xbprtf.prg index fb8851305d..4a89daf89f 100644 --- a/harbour/contrib/hbxbp/xbprtf.prg +++ b/harbour/contrib/hbxbp/xbprtf.prg @@ -361,11 +361,11 @@ METHOD XbpRtf:paste() METHOD XbpRtf:print( oXbpPrinter, lOnlySelection ) - IF !hb_isObject( oXbpPrinter ) + IF !HB_ISOBJECT( oXbpPrinter ) oXbpPrinter := XbpPrinter():new():create() ENDIF - IF hb_isLogical( lOnlySelection ) .and. lOnlySelection + IF HB_ISLOGICAL( lOnlySelection ) .and. lOnlySelection ::oWidget:print( oXbpPrinter:oWidget ) ELSE ::oWidget:print( oXbpPrinter:oWidget ) @@ -406,9 +406,9 @@ METHOD XbpRtf:span( cCharacters, bForward, bExclude ) METHOD XbpRtf:change( ... ) LOCAL aP := hb_aParams() - IF len( aP ) >= 1 .and. hb_isBlock( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISBLOCK( aP[ 1 ] ) ::sl_xbeRTF_Change := aP[ 1 ] - ELSEIF hb_isBlock( ::sl_xbeRTF_Change ) + ELSEIF HB_ISBLOCK( ::sl_xbeRTF_Change ) asize( aP, 2 ) eval( ::sl_xbeRTF_Change, aP[ 1 ], aP[ 2 ], Self ) ENDIF @@ -420,9 +420,9 @@ METHOD XbpRtf:change( ... ) METHOD XbpRtf:selChange( ... ) LOCAL aP := hb_aParams() - IF len( aP ) >= 1 .and. hb_isBlock( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISBLOCK( aP[ 1 ] ) ::sl_xbeRTF_SelChange := aP[ 1 ] - ELSEIF hb_isBlock( ::sl_xbeRTF_SelChange ) + ELSEIF HB_ISBLOCK( ::sl_xbeRTF_SelChange ) asize( aP, 2 ) eval( ::sl_xbeRTF_SelChange, aP[ 1 ], aP[ 2 ], Self ) ENDIF @@ -436,7 +436,7 @@ METHOD XbpRtf:selAlignment( ... ) // XBPRTF_ALIGN_LEFT LOCAL aP := hb_aParams() LOCAL oTBFormat - IF len( aP ) >= 1 .and. hb_isNumeric( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISNUMERIC( aP[ 1 ] ) oTBFormat := ::oCurCursor:blockFormat() xRet := oTBFormat:alignment() oTBFormat:setAlignment( hbxbp_ConvertAFactFromXBP( "RTFSELALIGNMENT", aP[ 1 ] ) ) @@ -450,7 +450,7 @@ METHOD XbpRtf:selBold( ... ) // .F. LOCAL xRet := .f. LOCAL aP := hb_aParams() - IF len( aP ) >= 1 .and. hb_isLogical( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISLOGICAL( aP[ 1 ] ) ::oTextCharFormat := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() ::oTextCharFormat:setFontWeight( QFont_Bold ) @@ -478,7 +478,7 @@ METHOD XbpRtf:selCharOffset( ... ) // 0 LOCAL xRet := 0, nAlign LOCAL aP := hb_aParams() - IF len( aP ) >= 1 .and. hb_isNumeric( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISNUMERIC( aP[ 1 ] ) ::oTextCharFormat := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() nAlign := IIF( aP[ 1 ] < 0, -1, IIF( aP[ 1 ] > 0, 1, 0 ) ) @@ -496,7 +496,7 @@ METHOD XbpRtf:selColor( ... ) LOCAL oBrush, nColor, oColor LOCAL aP := hb_aParams() - IF len( aP ) >= 1 .AND. hb_isNumeric( aP[ 1 ] ) + IF len( aP ) >= 1 .AND. HB_ISNUMERIC( aP[ 1 ] ) ::oTextCharFormat := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() xRet := ::oTextCharFormat:foreground() @@ -516,7 +516,7 @@ METHOD XbpRtf:selFont( ... ) // "" LOCAL xRet := NIL LOCAL aP := hb_aParams() - IF len( aP ) >= 1 .and. hb_isObject( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISOBJECT( aP[ 1 ] ) ::oTextCharFormat := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() ::oTextCharFormat:setFont( aP[ 1 ]:oWidget ) @@ -550,7 +550,7 @@ METHOD XbpRtf:selFontSize( ... ) // 0 ::oTextCharFormat := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() xRet := ::oTextCharFormat:fontPointSize() - IF len( aP ) >= 1 .and. hb_isNumeric( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISNUMERIC( aP[ 1 ] ) ::oTextCharFormat:setFontPointSize( aP[ 1 ] ) ::oCurCursor:setCharFormat( ::oTextCharFormat ) ENDIF @@ -585,7 +585,7 @@ METHOD XbpRtf:selItalic( ... ) // .F. LOCAL xRet := .f. LOCAL aP := hb_aParams() - IF len( aP ) >= 1 .and. hb_isLogical( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISLOGICAL( aP[ 1 ] ) ::oTextCharFormat := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() ::oTextCharFormat:setFontItalic( aP[ 1 ] ) @@ -600,7 +600,7 @@ METHOD XbpRtf:selLength( ... ) // 0 LOCAL xRet := 0 LOCAL aP := hb_aParams() - IF len( aP ) >= 1 .and. hb_isNumeric( ap[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISNUMERIC( ap[ 1 ] ) ::oCurCursor:movePosition( QTextCursor_NextCharacter, QTextCursor_KeepAnchor, aP[ 1 ] ) ENDIF RETURN xRet @@ -622,7 +622,7 @@ METHOD XbpRtf:selStart( ... ) // 0 LOCAL xRet := 0 LOCAL aP := hb_aParams() - IF len( aP ) >= 1 .and. hb_isNumeric( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISNUMERIC( aP[ 1 ] ) ::oTextCursor := ::oWidget:textCursor() ::oCurCursor := ::oTextCursor xRet := ::oCurCursor:position() @@ -636,7 +636,7 @@ METHOD XbpRtf:selStrikeThru( ... ) // .F. LOCAL xRet := .f. LOCAL aP := hb_aParams() - IF len( aP ) >= 1 .and. hb_isLogical( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISLOGICAL( aP[ 1 ] ) ::oTextCharFormat := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() ::oTextCharFormat:setFontStrikeOut( aP[ 1 ] ) @@ -688,7 +688,7 @@ METHOD XbpRtf:selUnderline( ... ) // .F. LOCAL xRet := .f. LOCAL aP := hb_aParams() - IF len( aP ) >= 1 .and. hb_isLogical( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISLOGICAL( aP[ 1 ] ) ::oTextCharFormat := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() ::oTextCharFormat:setFontUnderline( aP[ 1 ] ) diff --git a/harbour/contrib/hbxbp/xbpscrollbar.prg b/harbour/contrib/hbxbp/xbpscrollbar.prg index fb5c6d5197..01079d5b27 100644 --- a/harbour/contrib/hbxbp/xbpscrollbar.prg +++ b/harbour/contrib/hbxbp/xbpscrollbar.prg @@ -137,7 +137,7 @@ METHOD XbpScrollBar:execSlot( cSlot, p ) HB_SYMBOL_UNUSED( cSlot ) - IF !hb_isBlock( ::sl_xbeSB_Scroll ) + IF !HB_ISBLOCK( ::sl_xbeSB_Scroll ) RETURN NIL ENDIF @@ -207,9 +207,9 @@ METHOD XbpScrollBar:destroy() METHOD XbpScrollBar:scroll( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_xbeSB_Scroll := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_xbeSB_Scroll ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_xbeSB_Scroll ) eval( ::sl_xbeSB_Scroll, a_[ 1 ], NIL, Self ) ENDIF RETURN self diff --git a/harbour/contrib/hbxbp/xbpsle.prg b/harbour/contrib/hbxbp/xbpsle.prg index b7248aa531..bab39c4d23 100644 --- a/harbour/contrib/hbxbp/xbpsle.prg +++ b/harbour/contrib/hbxbp/xbpsle.prg @@ -154,7 +154,7 @@ METHOD XbpSLE:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::show() ENDIF - IF hb_isBlock( ::datalink ) + IF HB_ISBLOCK( ::datalink ) eval( ::datalink ) ENDIF @@ -253,9 +253,9 @@ METHOD XbpSLE:handleEvent( nEvent, mp1, mp2 ) METHOD XbpSLE:returnPressed( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_returnPressed := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_returnPressed ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_returnPressed ) eval( ::sl_returnPressed, NIL, NIL, Self ) ENDIF RETURN Self @@ -264,9 +264,9 @@ METHOD XbpSLE:returnPressed( ... ) METHOD XbpSLE:hScroll( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_hScroll := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_hScroll ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_hScroll ) eval( ::sl_hScroll, NIL, NIL, Self ) ENDIF RETURN Self @@ -275,9 +275,9 @@ METHOD XbpSLE:hScroll( ... ) METHOD XbpSLE:typeOut( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_typeOut := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_typeOut ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_typeOut ) eval( ::sl_typeOut, NIL, NIL, Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpspinbutton.prg b/harbour/contrib/hbxbp/xbpspinbutton.prg index e7051078d4..95963c9e42 100644 --- a/harbour/contrib/hbxbp/xbpspinbutton.prg +++ b/harbour/contrib/hbxbp/xbpspinbutton.prg @@ -240,9 +240,9 @@ METHOD XbpSpinButton:destroy() METHOD XbpSpinButton:down( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_xbeSpinDown := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_xbeSpinDown ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_xbeSpinDown ) eval( ::sl_xbeSpinDown, NIL, NIL, Self ) ENDIF RETURN Self @@ -251,9 +251,9 @@ METHOD XbpSpinButton:down( ... ) METHOD XbpSpinButton:up( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_xbeSpinUp := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_xbeSpinUp ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_xbeSpinUp ) eval( ::sl_xbeSpinUp, NIL, NIL, Self ) ENDIF RETURN Self @@ -262,9 +262,9 @@ METHOD XbpSpinButton:up( ... ) METHOD XbpSpinButton:endSpin( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_xbeSpinEndSpin := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_xbeSpinEndSpin ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_xbeSpinEndSpin ) eval( ::sl_xbeSpinEndSpin, NIL, NIL, Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpstatic.prg b/harbour/contrib/hbxbp/xbpstatic.prg index 04621761d5..c845ec7c66 100644 --- a/harbour/contrib/hbxbp/xbpstatic.prg +++ b/harbour/contrib/hbxbp/xbpstatic.prg @@ -290,7 +290,7 @@ METHOD XbpStatic:setCaption( xCaption, cDll ) ::oWidget:setText( ::caption ) CASE ::type == XBPSTATIC_TYPE_BITMAP - IF hb_isObject( ::caption ) /* XbpBitmap() */ + IF HB_ISOBJECT( ::caption ) /* XbpBitmap() */ IF ::options == XBPSTATIC_BITMAP_SCALED ::oWidget:setScaledContents( .t. ) ENDIF diff --git a/harbour/contrib/hbxbp/xbpstatusbar.prg b/harbour/contrib/hbxbp/xbpstatusbar.prg index cc8dadae5b..b9a795ad40 100644 --- a/harbour/contrib/hbxbp/xbpstatusbar.prg +++ b/harbour/contrib/hbxbp/xbpstatusbar.prg @@ -205,9 +205,9 @@ METHOD XbpStatusBar:addItem( cCaption, xImage, cDLL, nStyle, cKey, nMode ) METHOD XbpStatusBar:delItem( nItemORcKey ) LOCAL nIndex := 0 - IF hb_isNumeric( nItemORcKey ) + IF HB_ISNUMERIC( nItemORcKey ) nIndex := ascan( ::aItems, {|o| o:key == nItemORcKey } ) - ELSEIF hb_isNumeric( nItemORcKey ) + ELSEIF HB_ISNUMERIC( nItemORcKey ) nIndex := nItemORcKey ENDIF @@ -227,7 +227,7 @@ METHOD XbpStatusBar:getItem( nItemORcKey ) IF hb_isChar( nItemORcKey ) nIndex := ascan( ::aItems, {|o| o:key == nItemORcKey } ) - ELSEIF hb_isNumeric( nItemORcKey ) + ELSEIF HB_ISNUMERIC( nItemORcKey ) nIndex := nItemORcKey ENDIF @@ -250,9 +250,9 @@ METHOD XbpStatusBar:clear() METHOD XbpStatusBar:panelClick( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_lbClick := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_lbClick ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -261,9 +261,9 @@ METHOD XbpStatusBar:panelClick( ... ) METHOD XbpStatusBar:panelDblClick( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_lbDblClick := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_lbDblClick ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_lbDblClick ) eval( ::sl_lbDblClick, a_[ 1 ], NIL, Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpstyle.prg b/harbour/contrib/hbxbp/xbpstyle.prg index 7c22b45236..c63fa6b066 100644 --- a/harbour/contrib/hbxbp/xbpstyle.prg +++ b/harbour/contrib/hbxbp/xbpstyle.prg @@ -105,7 +105,7 @@ METHOD XbpStyle:create() IF !empty( ::colorFG ) s += 'color: ' - IF hb_isNumeric( ::colorFG ) + IF HB_ISNUMERIC( ::colorFG ) s += hb_ntos( ::colorFG ) ELSE s += ::colorFG @@ -115,7 +115,7 @@ METHOD XbpStyle:create() IF !empty( ::colorBG ) s += 'background-color: ' - IF hb_isNumeric( ::colorBG ) + IF HB_ISNUMERIC( ::colorBG ) s += hb_ntos( ::colorBG ) ELSE s += ::colorBG diff --git a/harbour/contrib/hbxbp/xbptabpage.prg b/harbour/contrib/hbxbp/xbptabpage.prg index dc17e2230d..4c6a891efc 100644 --- a/harbour/contrib/hbxbp/xbptabpage.prg +++ b/harbour/contrib/hbxbp/xbptabpage.prg @@ -179,7 +179,7 @@ METHOD XbpTabPage:execSlot( cSlot, p ) HB_SYMBOL_UNUSED( cSlot ) IF iIndex >= 0 .and. len( ::oParent:aTabs ) > 0 - IF hb_isBlock( ::oParent:aTabs[ iIndex+1 ]:sl_tabActivate ) + IF HB_ISBLOCK( ::oParent:aTabs[ iIndex+1 ]:sl_tabActivate ) eval( ::oParent:aTabs[ iIndex+1 ]:sl_tabActivate, NIL, NIL, ::oParent:aTabs[ iIndex+1 ] ) ENDIF ENDIF @@ -199,9 +199,9 @@ METHOD XbpTabPage:handleEvent( nEvent, mp1, mp2 ) METHOD XbpTabPage:tabActivate( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_tabActivate := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_tabActivate ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_tabActivate ) eval( ::sl_tabActivate, NIL, NIL, Self ) ENDIF RETURN self @@ -210,9 +210,9 @@ METHOD XbpTabPage:tabActivate( ... ) METHOD XbpTabPage:closeRequested( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_closeRequested := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_closeRequested ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_closeRequested ) eval( ::sl_closeRequested, NIL, NIL, Self ) ENDIF RETURN self @@ -319,7 +319,7 @@ METHOD XbpTabWidget:destroy() METHOD XbpTabWidget:execSlot( cSlot, p ) LOCAL qTab, nIndex, oTab, qWidget, qPoint, iIndex - IF hb_isObject( p ) + IF HB_ISOBJECT( p ) qPoint := ::oWidget:mapToGlobal( p ) qWidget := QApplication():widgetAt( qPoint ) diff --git a/harbour/contrib/hbxbp/xbptoolbar.prg b/harbour/contrib/hbxbp/xbptoolbar.prg index 3b5467791c..8e20b94f95 100644 --- a/harbour/contrib/hbxbp/xbptoolbar.prg +++ b/harbour/contrib/hbxbp/xbptoolbar.prg @@ -231,7 +231,7 @@ METHOD XbpToolbar:sendToolbarMessage() METHOD XbpToolbar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nStyle, cKey, nMapRGB ) LOCAL oBtn - LOCAL isAction := hb_isObject( cCaption ) .AND. __ObjGetClsName( cCaption ) == "QACTION" + LOCAL isAction := HB_ISOBJECT( cCaption ) .AND. __ObjGetClsName( cCaption ) == "QACTION" HB_SYMBOL_UNUSED( xDisabledImage ) HB_SYMBOL_UNUSED( xHotImage ) @@ -345,9 +345,9 @@ METHOD XbpToolbar:setSize() METHOD XbpToolbar:buttonClick( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_lbClick := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_lbClick ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -356,9 +356,9 @@ METHOD XbpToolbar:buttonClick( ... ) METHOD XbpToolbar:change( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_change := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_change ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_change ) eval( ::sl_change, NIL, NIL, Self ) ENDIF RETURN Self @@ -367,9 +367,9 @@ METHOD XbpToolbar:change( ... ) METHOD XbpToolbar:buttonMenuClick( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_buttonMenuClick := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_buttonMenuClick ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_buttonMenuClick ) eval( ::sl_buttonMenuClick, NIL, NIL, Self ) ENDIF RETURN Self @@ -378,9 +378,9 @@ METHOD XbpToolbar:buttonMenuClick( ... ) METHOD XbpToolbar:buttonDropDown( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_buttonDropDown := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_buttonDropDown ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_buttonDropDown ) eval( ::sl_buttonDropDown, NIL, NIL, Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbptreeview.prg b/harbour/contrib/hbxbp/xbptreeview.prg index 7914c41340..d50a3d1595 100644 --- a/harbour/contrib/hbxbp/xbptreeview.prg +++ b/harbour/contrib/hbxbp/xbptreeview.prg @@ -117,7 +117,7 @@ CLASS XbpTreeView INHERIT XbpWindow, DataRef METHOD setColorBG( nRGB ) INLINE WVG_TreeView_SetBkColor( ::hWnd, nRGB ) METHOD setColorLines( nRGB ) INLINE WVG_TreeView_SetLineColor( ::hWnd, nRGB ) METHOD showExpanded( lExpanded, nLevels ) INLINE Wvg_TreeView_ShowExpanded( ::hWnd, ; - IF( hb_isNil( lExpanded ), .f., lExpanded ), nLevels ) + IF( HB_ISNIL( lExpanded ), .f., lExpanded ), nLevels ) #endif ENDCLASS @@ -190,7 +190,7 @@ METHOD XbpTreeView:execSlot( cSlot, p ) CASE cSlot == "itemEntered(QTreeWidgetItem*,int)" ::oWidget:setToolTip( iif( empty( oItem:tooltipText ), oItem:caption, oItem:tooltipText ) ) CASE cSlot == "customContextMenuRequested(QPoint)" - IF hb_isBlock( ::hb_contextMenu ) + IF HB_ISBLOCK( ::hb_contextMenu ) qPos := QPoint( p ) IF ( qItem := ::oWidget:itemAt( qPos ) ):hasValidPointer() IF ( n := ascan( ::aItems, {|o| hbqt_IsEqual( o:oWidget, qItem ) } ) ) > 0 @@ -302,9 +302,9 @@ METHOD XbpTreeView:itemFromPos( aPos ) METHOD XbpTreeView:itemCollapsed( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_itemCollapsed := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_itemCollapsed ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_itemCollapsed ) eval( ::sl_itemCollapsed, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -313,9 +313,9 @@ METHOD XbpTreeView:itemCollapsed( ... ) METHOD XbpTreeView:itemExpanded( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_itemExpanded := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_itemExpanded ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_itemExpanded ) eval( ::sl_itemExpanded, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -324,9 +324,9 @@ METHOD XbpTreeView:itemExpanded( ... ) METHOD XbpTreeView:itemMarked( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_itemMarked := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_itemMarked ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_itemMarked ) eval( ::sl_itemMarked, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -335,9 +335,9 @@ METHOD XbpTreeView:itemMarked( ... ) METHOD XbpTreeView:itemSelected( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_itemSelected := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_itemSelected ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_itemSelected ) eval( ::sl_itemSelected, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg index 8c1469fdb5..1e8b3b6935 100644 --- a/harbour/contrib/hbxbp/xbpwindow.prg +++ b/harbour/contrib/hbxbp/xbpwindow.prg @@ -811,7 +811,7 @@ METHOD XbpWindow:onError( ... ) METHOD XbpWindow:captureMouse( lCapture ) LOCAL lSuccess := .f. - IF hb_isLogical( lCapture ) + IF HB_ISLOGICAL( lCapture ) IF lCapture ::oWidget:grabMouse() ELSE @@ -844,7 +844,7 @@ METHOD XbpWindow:enable() METHOD XbpWindow:hide() - IF hb_isObject( ::oWidget ) + IF HB_ISOBJECT( ::oWidget ) ::oWidget:hide() ENDIF ::is_hidden := ::oWidget:isHidden() @@ -969,7 +969,7 @@ METHOD XbpWindow:getCSS( nAttr, xValue ) METHOD XbpWindow:setColorBG( nRGB ) LOCAL oldRGB := hbxbp_SetPresParam( ::aPresParams, XBP_PP_BGCLR ) - IF hb_isNumeric( nRGB ) + IF HB_ISNUMERIC( nRGB ) hbxbp_SetPresParam( ::aPresParams, XBP_PP_BGCLR, nRGB ) ::setCSSAttribute( "XBP_PP_BGCLR", ::getCSS( XBP_PP_BGCLR, nRGB ) ) ::setStyleSheet() @@ -982,7 +982,7 @@ METHOD XbpWindow:setColorBG( nRGB ) METHOD XbpWindow:setColorFG( nRGB ) LOCAL oldRGB := hbxbp_SetPresParam( ::aPresParams, XBP_PP_FGCLR ) - IF hb_isNumeric( nRGB ) + IF HB_ISNUMERIC( nRGB ) hbxbp_SetPresParam( ::aPresParams, XBP_PP_FGCLR, nRGB ) ::setCSSAttribute( "XBP_PP_FGCLR", ::getCSS( XBP_PP_FGCLR, nRGB ) ) ::setStyleSheet() @@ -1012,7 +1012,7 @@ METHOD XbpWindow:setFont( oFont ) METHOD XbpWindow:setFontCompoundName( xFont ) LOCAL cOldFont := hbxbp_SetPresParam( ::aPresParams, XBP_PP_COMPOUNDNAME ) - IF ! hb_isNumeric( xFont ) + IF ! HB_ISNUMERIC( xFont ) IF ! empty( xFont ) ::setCSSAttribute( "XBP_PP_COMPOUNDNAME", ::getCSS( XBP_PP_COMPOUNDNAME, xFont ) ) ::setStyleSheet() @@ -1139,7 +1139,7 @@ METHOD XbpWindow:setPointer( cDllName, xResID, nType ) METHOD XbpWindow:setTrackPointer( lTrack ) LOCAL lRet := .f. - IF hb_isLogical( lTrack ) + IF HB_ISLOGICAL( lTrack ) ::lTrack := lTrack lRet := .T. ENDIF @@ -1170,7 +1170,7 @@ METHOD XbpWindow:setPos( aPos, lPaint ) DEFAULT aPos TO ::aPos - IF hb_isArray( aPos ) + IF HB_ISARRAY( aPos ) DEFAULT lPaint TO .T. ::oWidget:move( aPos[ 1 ], aPos[ 2 ] ) ENDIF @@ -1185,7 +1185,7 @@ METHOD XbpWindow:setPosAndSize( aPos, aSize, lPaint ) DEFAULT aPos TO ::aPos DEFAULT aSize TO ::aSize - IF hb_isArray( aPos ) .and. hb_isArray( aSize ) + IF HB_ISARRAY( aPos ) .and. HB_ISARRAY( aSize ) DEFAULT lPaint TO .T. ::oWidget:move( aPos[ 1 ], aPos[ 2 ] ) @@ -1201,7 +1201,7 @@ METHOD XbpWindow:setSize( aSize, lPaint ) DEFAULT aSize TO ::aSize - IF hb_isArray( aSize ) + IF HB_ISARRAY( aSize ) DEFAULT lPaint TO .T. ::oWidget:resize( aSize[ 1 ], aSize[ 2 ] ) @@ -1219,14 +1219,14 @@ METHOD XbpWindow:isDerivedFrom( cClassORoObject ) IF hb_isChar( cClassORoObject ) RETURN __clsParent( Self:classH, cClassORoObject ) - ELSEIF hb_isObject( cClassORoObject ) + ELSEIF HB_ISOBJECT( cClassORoObject ) IF upper( substr( cClassORoObject:className,4 ) ) == upper( substr( cCls,4 ) ) lTrue := .t. ENDIF ENDIF IF !( lTrue ) - IF hb_isObject( ::oParent ) + IF HB_ISOBJECT( ::oParent ) lTrue := ::oParent:isDerivedFrom( cClassORoObject ) ENDIF ENDIF @@ -1281,7 +1281,7 @@ METHOD XbpWindow:winDevice() METHOD XbpWindow:setPresParam( aPPNew ) LOCAL i - IF hb_isArray( aPPNew ) + IF HB_ISARRAY( aPPNew ) FOR i := 1 TO len( aPPNew ) hbxbp_SetPresParam( ::aPresParams, aPPNew[ i,1 ], aPPNew[ i,2 ] ) NEXT @@ -1337,7 +1337,7 @@ METHOD XbpWindow:title( cTitle ) IF hb_isChar( cTitle ) ::cTitle := cTitle - IF hb_isObject( ::oWidget ) + IF HB_ISOBJECT( ::oWidget ) ::oWidget:setWindowTitle( ::cTitle ) ENDIF ENDIF @@ -1350,9 +1350,9 @@ METHOD XbpWindow:title( cTitle ) METHOD XbpWindow:enter( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_enter := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_enter ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_enter ) eval( ::sl_enter, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1361,9 +1361,9 @@ METHOD XbpWindow:enter( ... ) METHOD XbpWindow:leave( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_leave := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_leave ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_leave ) eval( ::sl_leave, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1372,9 +1372,9 @@ METHOD XbpWindow:leave( ... ) METHOD XbpWindow:lbClick( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_lbClick := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_lbClick ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_lbClick ) eval( ::sl_lbClick, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1383,9 +1383,9 @@ METHOD XbpWindow:lbClick( ... ) METHOD XbpWindow:lbDblClick( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_lbDblClick := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_lbDblClick ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_lbDblClick ) eval( ::sl_lbDblClick, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1394,9 +1394,9 @@ METHOD XbpWindow:lbDblClick( ... ) METHOD XbpWindow:lbDown( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_lbDown := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_lbDown ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_lbDown ) eval( ::sl_lbDown, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1405,9 +1405,9 @@ METHOD XbpWindow:lbDown( ... ) METHOD XbpWindow:lbUp( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_lbUp := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_lbUp ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_lbUp ) eval( ::sl_lbUp, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1416,9 +1416,9 @@ METHOD XbpWindow:lbUp( ... ) METHOD XbpWindow:mbClick( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_mbClick := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_mbClick ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_mbClick ) eval( ::sl_mbClick, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1427,9 +1427,9 @@ METHOD XbpWindow:mbClick( ... ) METHOD XbpWindow:mbDblClick( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_mbDblClick := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_mbDblClick ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_mbDblClick ) eval( ::sl_mbDblClick, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1438,9 +1438,9 @@ METHOD XbpWindow:mbDblClick( ... ) METHOD XbpWindow:mbDown( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_mbDown := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_mbDown ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_mbDown ) eval( ::sl_mbDown, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1449,9 +1449,9 @@ METHOD XbpWindow:mbDown( ... ) METHOD XbpWindow:mbUp( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_mbUp := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_mbUp ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_mbUp ) eval( ::sl_mbUp, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1460,9 +1460,9 @@ METHOD XbpWindow:mbUp( ... ) METHOD XbpWindow:motion( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_motion := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_motion ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_motion ) eval( ::sl_motion, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1471,9 +1471,9 @@ METHOD XbpWindow:motion( ... ) METHOD XbpWindow:rbClick( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_rbClick := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_rbClick ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_rbClick ) eval( ::sl_rbClick, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1482,9 +1482,9 @@ METHOD XbpWindow:rbClick( ... ) METHOD XbpWindow:rbDblClick( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_rbDblClick := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_rbDblClick ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_rbDblClick ) eval( ::sl_rbDblClick, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1493,9 +1493,9 @@ METHOD XbpWindow:rbDblClick( ... ) METHOD XbpWindow:rbDown( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_rbDown := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_rbDown ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_rbDown ) eval( ::sl_rbDown, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1504,9 +1504,9 @@ METHOD XbpWindow:rbDown( ... ) METHOD XbpWindow:rbUp( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_rbUp := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_rbUp ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_rbUp ) eval( ::sl_rbUp, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1515,9 +1515,9 @@ METHOD XbpWindow:rbUp( ... ) METHOD XbpWindow:wheel( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_wheel := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_wheel ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_wheel ) eval( ::sl_wheel, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -1528,9 +1528,9 @@ METHOD XbpWindow:wheel( ... ) METHOD XbpWindow:close( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_close := a_[ 1 ] - ELSEIF len( a_ ) == 0 .AND. hb_isBlock( ::sl_close ) + ELSEIF len( a_ ) == 0 .AND. HB_ISBLOCK( ::sl_close ) eval( ::sl_close, NIL, NIL, Self ) ENDIF RETURN Self @@ -1539,9 +1539,9 @@ METHOD XbpWindow:close( ... ) METHOD XbpWindow:helpRequest( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_helpRequest := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_helpRequest ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_helpRequest ) eval( ::sl_helpRequest, NIL, NIL, Self ) ENDIF RETURN Self @@ -1550,9 +1550,9 @@ METHOD XbpWindow:helpRequest( ... ) METHOD XbpWindow:keyboard( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_keyboard := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_keyboard ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_keyboard ) eval( ::sl_keyboard, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1561,9 +1561,9 @@ METHOD XbpWindow:keyboard( ... ) METHOD XbpWindow:killDisplayFocus( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_killDisplayFocus := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_killDisplayFocus ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_killDisplayFocus ) eval( ::sl_killDisplayFocus, NIL, NIL, Self ) ENDIF RETURN Self @@ -1572,9 +1572,9 @@ METHOD XbpWindow:killDisplayFocus( ... ) METHOD XbpWindow:killInputFocus( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_killInputFocus := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_killInputFocus ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_killInputFocus ) eval( ::sl_killInputFocus, NIL, NIL, Self ) ENDIF RETURN Self @@ -1583,9 +1583,9 @@ METHOD XbpWindow:killInputFocus( ... ) METHOD XbpWindow:move( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_move := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_move ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_move ) eval( ::sl_move, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1594,9 +1594,9 @@ METHOD XbpWindow:move( ... ) METHOD XbpWindow:paint( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_paint := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_paint ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_paint ) eval( ::sl_paint, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1605,9 +1605,9 @@ METHOD XbpWindow:paint( ... ) METHOD XbpWindow:quit( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_quit := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_quit ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_quit ) eval( ::sl_quit, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -1616,9 +1616,9 @@ METHOD XbpWindow:quit( ... ) METHOD XbpWindow:resize( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_resize := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_resize ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_resize ) eval( ::sl_resize, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -1627,9 +1627,9 @@ METHOD XbpWindow:resize( ... ) METHOD XbpWindow:setDisplayFocus( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_setDisplayFocus := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_setDisplayFocus ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_setDisplayFocus ) eval( ::sl_setDisplayFocus, NIL, NIL, Self ) ENDIF RETURN Self @@ -1638,9 +1638,9 @@ METHOD XbpWindow:setDisplayFocus( ... ) METHOD XbpWindow:setInputFocus( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_setInputFocus := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_setInputFocus ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_setInputFocus ) eval( ::sl_setInputFocus, NIL, NIL, Self ) ENDIF RETURN Self @@ -1649,9 +1649,9 @@ METHOD XbpWindow:setInputFocus( ... ) METHOD XbpWindow:dragEnter( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_dragEnter := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_dragEnter ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_dragEnter ) eval( ::sl_dragEnter, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -1660,9 +1660,9 @@ METHOD XbpWindow:dragEnter( ... ) METHOD XbpWindow:dragMotion( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_dragMotion := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::sl_dragMotion ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::sl_dragMotion ) eval( ::sl_dragMotion, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1671,9 +1671,9 @@ METHOD XbpWindow:dragMotion( ... ) METHOD XbpWindow:dragLeave( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_dragLeave := a_[ 1 ] - ELSEIF len( a_ ) >= 0 .AND. hb_isBlock( ::sl_dragLeave ) + ELSEIF len( a_ ) >= 0 .AND. HB_ISBLOCK( ::sl_dragLeave ) eval( ::sl_dragLeave, NIL, NIL, Self ) ENDIF RETURN Self @@ -1682,9 +1682,9 @@ METHOD XbpWindow:dragLeave( ... ) METHOD XbpWindow:dragDrop( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::sl_dragDrop := a_[ 1 ] - ELSEIF len( a_ ) >= 2 .AND. hb_isBlock( ::sl_dragDrop ) + ELSEIF len( a_ ) >= 2 .AND. HB_ISBLOCK( ::sl_dragDrop ) eval( ::sl_dragDrop, a_[ 1 ], a_[ 2 ], Self ) ENDIF RETURN Self @@ -1693,9 +1693,9 @@ METHOD XbpWindow:dragDrop( ... ) METHOD XbpWindow:hbContextMenu( ... ) LOCAL a_:= hb_aParams() - IF len( a_ ) == 1 .AND. hb_isBlock( a_[ 1 ] ) + IF len( a_ ) == 1 .AND. HB_ISBLOCK( a_[ 1 ] ) ::hb_contextMenu := a_[ 1 ] - ELSEIF len( a_ ) >= 1 .AND. hb_isBlock( ::hb_contextMenu ) + ELSEIF len( a_ ) >= 1 .AND. HB_ISBLOCK( ::hb_contextMenu ) eval( ::hb_contextMenu, a_[ 1 ], NIL, Self ) ENDIF RETURN Self @@ -1742,7 +1742,7 @@ METHOD XbpWindow:hbLayout( nTypeLayout ) oldLayout := ::nLayout - IF hb_isNumeric( nTypeLayout ) .AND. nTypeLayout > 0 .AND. nTypeLayout <= HBPLAYOUT_TYPE_MAX + IF HB_ISNUMERIC( nTypeLayout ) .AND. nTypeLayout > 0 .AND. nTypeLayout <= HBPLAYOUT_TYPE_MAX ::nLayout := nTypeLayout lApply := .t. ELSEIF !empty( ::nLayout ) diff --git a/harbour/contrib/hbxpp/dbfuncsx.prg b/harbour/contrib/hbxpp/dbfuncsx.prg index 61c76ce9aa..0622ea8fe1 100644 --- a/harbour/contrib/hbxpp/dbfuncsx.prg +++ b/harbour/contrib/hbxpp/dbfuncsx.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - FUNCTION _dbExport( cFile, aFields, bFor, bWhile, nNext, nRecord, lRest, cXPP_Driver, cDelimiter ) DO CASE @@ -71,8 +69,8 @@ FUNCTION xpp_dbUseArea( lNewArea, cDriver, cName, xcAlias, lShared, lReadonly ) LOCAL nOldArea LOCAL nArea - IF ISLOGICAL( lNewArea ) .AND. lNewArea - IF ! ISCHARACTER( xcAlias ) + IF HB_ISLOGICAL( lNewArea ) .AND. lNewArea + IF ! HB_ISSTRING( xcAlias ) xcAlias := "" ENDIF @@ -80,7 +78,7 @@ FUNCTION xpp_dbUseArea( lNewArea, cDriver, cName, xcAlias, lShared, lReadonly ) xcAlias := cName ENDIF - IF ISCHARACTER( xcAlias ) + IF HB_ISSTRING( xcAlias ) nOldArea := Select() IF ( nArea := Select( xcAlias ) ) > 0 xcAlias += "_" + hb_ntos( nArea ) diff --git a/harbour/contrib/hbxpp/runshell.prg b/harbour/contrib/hbxpp/runshell.prg index e633f215f3..731835b8cf 100644 --- a/harbour/contrib/hbxpp/runshell.prg +++ b/harbour/contrib/hbxpp/runshell.prg @@ -50,14 +50,12 @@ * */ -#include "common.ch" - FUNCTION RunShell( cCommand, cProgram, lAsync, lBackground ) /* Not supported (yet?) */ HB_SYMBOL_UNUSED( lBackground ) - IF ! ISCHARACTER( cProgram ) + IF ! HB_ISSTRING( cProgram ) #if defined( __PLATFORM__UNIX ) cProgram := hb_getenv( "SHELL" ) #elif defined( __PLATFORM__OS2 ) @@ -82,7 +80,7 @@ FUNCTION RunShell( cCommand, cProgram, lAsync, lBackground ) ENDIF ENDIF - IF ISCHARACTER( cCommand ) + IF HB_ISSTRING( cCommand ) cProgram += " " + cCommand ENDIF diff --git a/harbour/contrib/hbxpp/thfuncx.prg b/harbour/contrib/hbxpp/thfuncx.prg index cee4e084d4..0507f643bf 100644 --- a/harbour/contrib/hbxpp/thfuncx.prg +++ b/harbour/contrib/hbxpp/thfuncx.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - FUNCTION ThreadID() RETURN hb_threadId() @@ -69,14 +67,14 @@ FUNCTION ThreadWait( aThreads, nTimeOut ) apThIDs := {} FOR EACH th IN aThreads - IF ISOBJECT( th ) + IF HB_ISOBJECT( th ) AAdd( apThIDs, th:threadSelf ) ELSE AAdd( apThIDs, th ) ENDIF NEXT - nPos := hb_threadWait( apThIDs, iif( ISNUMBER( nTimeOut ) .AND. nTimeOut != 0, ; + nPos := hb_threadWait( apThIDs, iif( HB_ISNUMERIC( nTimeOut ) .AND. nTimeOut != 0, ; nTimeOut / 100, ) ) IF nPos != 0 xResult := aThreads[ nPos ] @@ -90,14 +88,14 @@ FUNCTION ThreadWaitAll( aThreads, nTimeOut ) apThIDs := {} FOR EACH th IN aThreads - IF ISOBJECT( th ) + IF HB_ISOBJECT( th ) AAdd( apThIDs, th:threadSelf ) ELSE AAdd( apThIDs, th ) ENDIF NEXT - RETURN hb_threadWait( apThIDs, iif( ISNUMBER( nTimeOut ) .AND. nTimeOut != 0, ; + RETURN hb_threadWait( apThIDs, iif( HB_ISNUMERIC( nTimeOut ) .AND. nTimeOut != 0, ; nTimeOut / 100, ), .T. ) == Len( apThIDs ) /* TODO: ThreadInfo() */ diff --git a/harbour/contrib/hbxpp/tthreadx.prg b/harbour/contrib/hbxpp/tthreadx.prg index f6d8d8eee4..6ca8ef7243 100644 --- a/harbour/contrib/hbxpp/tthreadx.prg +++ b/harbour/contrib/hbxpp/tthreadx.prg @@ -53,7 +53,6 @@ * */ -#include "common.ch" #include "hbclass.ch" #include "hbthread.ch" @@ -139,7 +138,7 @@ METHOD new( ... ) CLASS THREAD IF PCount() == 1 nMaxStackSize := hb_PValue( 1 ) - IF ISNUMBER( nMaxStackSize ) + IF HB_ISNUMERIC( nMaxStackSize ) ::maxStackSize := nMaxStackSize ENDIF /* TODO: Create new thread here and suspend its execution @@ -162,7 +161,7 @@ METHOD quit( xResult, nRestart ) CLASS THREAD IF PCOUNT() > 0 ::result := xResult ENDIF - IF !ISNUMBER( nRestart ) .OR. nRestart != QUIT_RESTART + IF !HB_ISNUMERIC( nRestart ) .OR. nRestart != QUIT_RESTART ::interval := NIL ENDIF QUIT @@ -170,7 +169,7 @@ METHOD quit( xResult, nRestart ) CLASS THREAD RETURN NIL METHOD setInterval( nHSeconds ) CLASS THREAD - IF ISNUMBER( nHSeconds ) .AND. Int( nHSeconds ) >= 0 + IF HB_ISNUMERIC( nHSeconds ) .AND. Int( nHSeconds ) >= 0 ::interval := Int( nHSeconds ) ELSEIF PCount() > 0 .OR. nHSeconds == NIL ::interval := NIL @@ -182,13 +181,13 @@ METHOD setInterval( nHSeconds ) CLASS THREAD METHOD setPriority( nPriority ) CLASS THREAD /* TODO: add thread priority setting */ - IF ISNUMBER( nPriority ) + IF HB_ISNUMERIC( nPriority ) ::priority := nPriority ENDIF RETURN .F. METHOD setStartTime( nSeconds ) CLASS THREAD - IF ISNUMBER( nSeconds ) + IF HB_ISNUMERIC( nSeconds ) IF nSeconds < 0 .OR. nSeconds > 86400 RETURN .F. ENDIF @@ -216,7 +215,7 @@ METHOD start( xAction, ... ) CLASS THREAD ::active := .T. ::startCount++ - IF ISNUMBER( ::startTime ) + IF HB_ISNUMERIC( ::startTime ) nTime := ::startTime - Seconds() IF nTime < 0 nTime += 86400 @@ -252,7 +251,7 @@ METHOD start( xAction, ... ) CLASS THREAD * it can be resumed */ - IF !ISNUMBER( ::interval ) + IF !HB_ISNUMERIC( ::interval ) EXIT ENDIF @@ -284,7 +283,7 @@ METHOD synchronize( nTimeOut ) CLASS THREAD IF hb_threadSelf() != pThreadID RETURN hb_threadWait( pThreadID, ; - iif( ISNUMBER( nTimeOut ) .AND. nTimeOut != 0, ; + iif( HB_ISNUMERIC( nTimeOut ) .AND. nTimeOut != 0, ; nTimeOut / 100, ) ) ENDIF RETURN .F. diff --git a/harbour/contrib/xhb/cstruct.prg b/harbour/contrib/xhb/cstruct.prg index 2850783d0c..78b3961545 100644 --- a/harbour/contrib/xhb/cstruct.prg +++ b/harbour/contrib/xhb/cstruct.prg @@ -51,7 +51,6 @@ */ #include "cstruct.ch" -#include "common.ch" #include "hboo.ch" #include "error.ch" @@ -106,10 +105,10 @@ FUNCTION __ActiveStructure( cStructure, nAlign ) // In most cases we can simply ignore the redefinition, by returning a FAKED Structure Array! //TraceLog( "Redefinition of C Structure: " + cStructure ) - RETURN t_aActiveStructure := { cStructure, NIL, {}, {}, iif( ISNUMBER( nAlign ), nAlign, 8 ) } + RETURN t_aActiveStructure := { cStructure, NIL, {}, {}, iif( HB_ISNUMERIC( nAlign ), nAlign, 8 ) } ENDIF - aAdd( s_aClasses, { cStructure, NIL, {}, {}, iif( ISNUMBER( nAlign ), nAlign, 8 ) } ) + aAdd( s_aClasses, { cStructure, NIL, {}, {}, iif( HB_ISNUMERIC( nAlign ), nAlign, 8 ) } ) //TraceLog( "Registered: " + cStructure, s_aClasses[-1][5] ) t_aActiveStructure := atail(s_aClasses) @@ -525,7 +524,7 @@ STATIC FUNCTION Reset() //---------------------------------------------------------------------------// STATIC FUNCTION Buffer( Buffer, lAdopt ) - IF ISCHARACTER( Buffer ) + IF HB_ISSTRING( Buffer ) IF Len( Buffer ) < QSelf():SizeOf //TraceLog( Buffer ) Buffer := PadR( Buffer, QSelf():SizeOf, Chr(0) ) @@ -535,7 +534,7 @@ STATIC FUNCTION Buffer( Buffer, lAdopt ) QSelf():DeValue( lAdopt ) ENDIF - IF ! ISCHARACTER( QSelf():InternalBuffer ) + IF ! HB_ISSTRING( QSelf():InternalBuffer ) QSelf():InternalBuffer := QSelf():Value() ENDIF @@ -569,7 +568,7 @@ STATIC FUNCTION DeValue( lAdopt ) //aEval( QSelf(), {|xVal| aAdd( aValues, xVal ) }, 1, Len( QSelf() ) - CLASS_PROPERTIES ) - IF ! ISCHARACTER( Buffer ) .OR. Len( Buffer ) == 0 + IF ! HB_ISSTRING( Buffer ) .OR. Len( Buffer ) == 0 //TraceLog( "EMPTY Buffer passed to " + ProcName() ) ELSEIF Len( Buffer ) < QSelf():SizeOf //TraceLog( "Should have been caught at ::Buffer()!!!", Buffer ) diff --git a/harbour/contrib/xhb/dbgfx.prg b/harbour/contrib/xhb/dbgfx.prg index 52efac80e9..d5eedc6851 100644 --- a/harbour/contrib/xhb/dbgfx.prg +++ b/harbour/contrib/xhb/dbgfx.prg @@ -59,7 +59,7 @@ STATIC s_lEmptyLogFile := .T. FUNCTION HB_ToOutDebugOnOff( lOnOff ) LOCAL lOld := s_lToOutDebug - IF hb_isLogical( lOnOff ) + IF HB_ISLOGICAL( lOnOff ) s_lToOutDebug := lOnOff ENDIF RETURN lOld @@ -72,14 +72,14 @@ RETURN FUNCTION HB_ToLogFileOnOff( lOnOff ) LOCAL lOld := s_lToLogFile - IF hb_isLogical( lOnOff ) + IF HB_ISLOGICAL( lOnOff ) s_lToLogFile := lOnOff ENDIF RETURN lOld FUNCTION HB_EmptyLogFileOnOff( lOnOff ) LOCAL lOld := s_lEmptyLogFile - IF hb_isLogical( lOnOff ) + IF HB_ISLOGICAL( lOnOff ) s_lEmptyLogFile := lOnOff ENDIF RETURN lOld diff --git a/harbour/contrib/xhb/dirrec.prg b/harbour/contrib/xhb/dirrec.prg index 03f08ec74d..b084262291 100644 --- a/harbour/contrib/xhb/dirrec.prg +++ b/harbour/contrib/xhb/dirrec.prg @@ -70,8 +70,6 @@ * [druzus] */ -#include "common.ch" - FUNCTION DirectoryRecurse( cPath, cAttr ) LOCAL aResult @@ -79,7 +77,7 @@ FUNCTION DirectoryRecurse( cPath, cAttr ) hb_FNameSplit( cPath, @cFilePath, @cMask, @cExt ) cMask += cExt - IF ! ISCHARACTER( cAttr ) + IF ! HB_ISSTRING( cAttr ) cAttr := "" ENDIF /* The trick with StrTran() below if for strict xHarbour diff --git a/harbour/contrib/xhb/dumpvar.prg b/harbour/contrib/xhb/dumpvar.prg index 585a514bc5..094157628a 100644 --- a/harbour/contrib/xhb/dumpvar.prg +++ b/harbour/contrib/xhb/dumpvar.prg @@ -51,7 +51,6 @@ */ #include "hbclass.ch" - #include "common.ch" /* @@ -94,8 +93,8 @@ STATIC FUNCTION __HB_DumpVar( xVar, lAssocAsObj, lRecursive, nIndent, nRecursion LOCAL cString := "", cKey LOCAL nEolLen - DEFAULT lAssocAsObj TO FALSE - DEFAULT lRecursive TO FALSE + DEFAULT lAssocAsObj TO .F. + DEFAULT lRecursive TO .F. //TraceLog( "Recursion: xVar, nRecursionLevel, nMaxRecursionLevel", xVar, nRecursionLevel, nMaxRecursionLevel ) @@ -174,7 +173,7 @@ STATIC FUNCTION DShowProperties( oVar, nScope, lRecursive, nIndent, nRecursionLe DEFAULT nIndent TO 0 - IF ISOBJECT( oVar ) + IF HB_ISOBJECT( oVar ) // lOldScope := __SetClassScope( .F. ) aMethods := __objGetMsgFullList( oVar, .F., HB_MSGLISTALL, nScope ) aProps := __objGetValueFullList( oVar, NIL, nScope ) @@ -213,7 +212,7 @@ STATIC FUNCTION DShowArray( aVar, lRecursive, nIndent, nRecursionLevel, nMaxRecu //TraceLog( "DShowArray: aVar, lRecursive", aVar, lRecursive ) - IF ISARRAY( aVar ) + IF HB_ISARRAY( aVar ) nEolLen := Len( hb_eol() ) nChar := Len( LTrim( Str( Len( aVar ) ) ) ) // return number of chars to display that value // i.e. if Len( aVar ) == 99, then nChar := 2 @@ -362,15 +361,15 @@ STATIC FUNCTION __objGetMsgFullList( oObject, lData, nRange, nScope, nNoScope ) LOCAL aReturn LOCAL nFirstProperty, aMsg - IF ! ISOBJECT( oObject ) + IF ! HB_ISOBJECT( oObject ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName() ) ENDIF - IF ! ISLOGICAL( lData ) + IF ! HB_ISLOGICAL( lData ) lData := .T. ENDIF - IF ! ISNUMBER( nNoScope ) + IF ! HB_ISNUMERIC( nNoScope ) nNoScope := 0 ENDIF @@ -406,11 +405,11 @@ STATIC FUNCTION __objGetValueFullList( oObject, aExcept, nScope, nNoScope ) LOCAL aReturn LOCAL aVar - IF ! ISOBJECT( oObject ) + IF ! HB_ISOBJECT( oObject ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF - IF ! ISARRAY( aExcept ) + IF ! HB_ISARRAY( aExcept ) aExcept := {} ENDIF diff --git a/harbour/contrib/xhb/hbcomprs.prg b/harbour/contrib/xhb/hbcomprs.prg index 36dc40026e..f65eb1a067 100644 --- a/harbour/contrib/xhb/hbcomprs.prg +++ b/harbour/contrib/xhb/hbcomprs.prg @@ -50,7 +50,6 @@ * */ -#include "common.ch" #include "error.ch" #include "hbzlib.ch" @@ -73,7 +72,7 @@ FUNCTION HB_COMPRESS( xPar1, xPar2, xPar3, xPar4, xPar5 ) LOCAL oError - IF ISNUMBER( xPar1 ) + IF HB_ISNUMERIC( xPar1 ) nComprFactor := xPar1 cSource := xPar2 nSourceLen := xPar3 @@ -87,7 +86,7 @@ FUNCTION HB_COMPRESS( xPar1, xPar2, xPar3, xPar4, xPar5 ) lReturnByRef := PCount() >= 3 ENDIF - IF ! ISCHARACTER( cSource ) + IF ! HB_ISSTRING( cSource ) oError := ErrorNew() oError:severity := ES_ERROR @@ -100,24 +99,24 @@ FUNCTION HB_COMPRESS( xPar1, xPar2, xPar3, xPar4, xPar5 ) RETURN NIL ENDIF - IF ! ISNUMBER( nDestLen ) + IF ! HB_ISNUMERIC( nDestLen ) nDestLen := NIL ENDIF - IF ISNUMBER( nSourceLen ) .AND. nSourceLen >= 0 .AND. nSourceLen < Len( cSource ) + IF HB_ISNUMERIC( nSourceLen ) .AND. nSourceLen >= 0 .AND. nSourceLen < Len( cSource ) cSource := Left( cSource, nSourceLen ) ENDIF IF lReturnByRef - IF ISNUMBER( xPar1 ) + IF HB_ISNUMERIC( xPar1 ) xPar4 := HB_ZCOMPRESS( cSource, nDestLen, @s_nLastError, nComprFactor ) - IF ! ISCHARACTER( xPar4 ) + IF ! HB_ISSTRING( xPar4 ) xPar4 := "" ENDIF xPar5 := Len( xPar4 ) ELSE xPar3 := HB_ZCOMPRESS( cSource, nDestLen, @s_nLastError, nComprFactor ) - IF ! ISCHARACTER( xPar3 ) + IF ! HB_ISSTRING( xPar3 ) xPar3 := "" ENDIF xPar4 := Len( xPar3 ) @@ -134,8 +133,8 @@ FUNCTION HB_COMPRESS( xPar1, xPar2, xPar3, xPar4, xPar5 ) FUNCTION HB_UNCOMPRESS( nDestLen, cSource, nSourceLen, /* @ */ cDest ) LOCAL oError - IF ! ISNUMBER( nDestLen ) .OR. ; - ! ISCHARACTER( cSource ) + IF ! HB_ISNUMERIC( nDestLen ) .OR. ; + ! HB_ISSTRING( cSource ) oError := ErrorNew() @@ -149,7 +148,7 @@ FUNCTION HB_UNCOMPRESS( nDestLen, cSource, nSourceLen, /* @ */ cDest ) RETURN NIL ENDIF - IF ISNUMBER( nSourceLen ) .AND. nSourceLen >= 0 .AND. nSourceLen < Len( cSource ) + IF HB_ISNUMERIC( nSourceLen ) .AND. nSourceLen >= 0 .AND. nSourceLen < Len( cSource ) cSource := Left( cSource, nSourceLen ) ENDIF @@ -178,7 +177,7 @@ FUNCTION HB_COMPRESSERRORDESC( nError ) FUNCTION HB_COMPRESSBUFLEN( nSrcLen ) LOCAL nRet - IF ! ISNUMBER( nSrcLen ) + IF ! HB_ISNUMERIC( nSrcLen ) nSrcLen := 0 ENDIF diff --git a/harbour/contrib/xhb/hblog.prg b/harbour/contrib/xhb/hblog.prg index e2f0cd8eb2..7ba79b733e 100644 --- a/harbour/contrib/xhb/hblog.prg +++ b/harbour/contrib/xhb/hblog.prg @@ -50,7 +50,6 @@ */ #include "hbclass.ch" -#include "common.ch" #include "hblog.ch" #include "fileio.ch" @@ -188,9 +187,9 @@ FUNCTION HB_BldLogMsg( ... ) LOCAL cMsg := "" FOR EACH xVar IN HB_aParams() - IF ISNUMBER( xVar ) + IF HB_ISNUMERIC( xVar ) cMsg += AllTrim( HB_CStr( xVar ) ) - ELSEIF ! ISCHARACTER( xVar ) + ELSEIF ! HB_ISSTRING( xVar ) cMsg += HB_CStr( xVar ) ELSE cMsg += xVar @@ -612,7 +611,7 @@ METHOD New( nLevel, cDBFName, cIndexName, aStruct, cDriver ) CLASS HB_LogDbf LOCAL cPath, cName, cExt, cDrive ::Super:New( nLevel ) - IF ISCHARACTER( cDBFName ) + IF HB_ISSTRING( cDBFName ) HB_FnameSplit( cDBFName, @cPath, @cName, @cExt, @cDrive ) IF Empty( cExt ) cExt := "dbf" @@ -623,7 +622,7 @@ METHOD New( nLevel, cDBFName, cIndexName, aStruct, cDriver ) CLASS HB_LogDbf //__OutDebug( "::cDBFName", ::cDBFName ) ENDIF - IF ISCHARACTER( cIndexName ) + IF HB_ISSTRING( cIndexName ) HB_FnameSplit( cIndexName, @cPath, @cName, @cExt, @cDrive ) IF Empty( cExt ) cExt := "cdx" diff --git a/harbour/contrib/xhb/hjwindow.prg b/harbour/contrib/xhb/hjwindow.prg index f4ade4214e..31d127bcf2 100644 --- a/harbour/contrib/xhb/hjwindow.prg +++ b/harbour/contrib/xhb/hjwindow.prg @@ -300,7 +300,7 @@ METHOD Put() CLASS TJsWindow ::setFeatures() ENDIF - IF ! ISCHARACTER( ::name ) + IF ! HB_ISSTRING( ::name ) ::name := "newWin" ENDIF diff --git a/harbour/contrib/xhb/hterrsys.prg b/harbour/contrib/xhb/hterrsys.prg index 72d11c811a..b9d8d5b988 100644 --- a/harbour/contrib/xhb/hterrsys.prg +++ b/harbour/contrib/xhb/hterrsys.prg @@ -44,7 +44,6 @@ * */ -#include "common.ch" #include "error.ch" #include "cgi.ch" @@ -80,7 +79,7 @@ STATIC FUNC xhb_cgi_DefError( e ) ENDIF IF e:genCode == EG_CORRUPTION - IF ISBLOCK( s_bFixCorrupt ) + IF HB_ISBLOCK( s_bFixCorrupt ) Eval( s_bFixCorrupt, e ) RETURN .F. ELSE @@ -184,7 +183,7 @@ RETURN .F. FUNCTION SetCorruptFunc( bFunc ) - IF ISBLOCK( bFunc ) + IF HB_ISBLOCK( bFunc ) s_bFixCorrupt := bFunc ENDIF @@ -207,21 +206,21 @@ STATIC FUNC ErrorMessage( e ) cMessage += IF( e:severity > ES_WARNING, "Error ", "Warning " ) // add subsystem name if available - IF ISCHARACTER( e:subsystem ) + IF HB_ISSTRING( e:subsystem ) cMessage += e:subsystem() ELSE cMessage += "???" ENDIF // add subsystem's error code if available - IF ISNUMBER( e:subCode ) + IF HB_ISNUMERIC( e:subCode ) cMessage += "/" + hb_ntos( e:subCode ) ELSE cMessage += "/???" ENDIF // add error description if available - IF ISCHARACTER( e:description ) + IF HB_ISSTRING( e:description ) cMessage += "
    " + e:description ENDIF diff --git a/harbour/contrib/xhb/htmutil.prg b/harbour/contrib/xhb/htmutil.prg index 4abb911b91..67851a1095 100644 --- a/harbour/contrib/xhb/htmutil.prg +++ b/harbour/contrib/xhb/htmutil.prg @@ -115,7 +115,7 @@ FUNCTION PutCounter( oHtm, nNumber, cDir, nDigits, nWidth, bgColor, nBorder ) DEFAULT nBorder TO 1 DEFAULT BGCOLOR TO "black" - IF ISNUMBER( nNumber ) + IF HB_ISNUMERIC( nNumber ) cStr := Strzero( nNumber, nDigits ) ENDIF @@ -554,7 +554,7 @@ METHOD Put() Class JWindow ::setFeatures() ENDIF - IF ! ISCHARACTER( ::name ) + IF ! HB_ISSTRING( ::name ) ::name := "newWin" ENDIF diff --git a/harbour/contrib/xhb/sprintf.prg b/harbour/contrib/xhb/sprintf.prg index 1ad695ef8d..063b992f7a 100644 --- a/harbour/contrib/xhb/sprintf.prg +++ b/harbour/contrib/xhb/sprintf.prg @@ -51,8 +51,6 @@ * */ -#include "common.ch" - FUNCTION sprintf( ... ) LOCAL aPar, cReturn, nPar, nPos, cTok LOCAL nLen := 0, lUnsigned, l0 := .F., lSign := .F., nDec, xVal @@ -150,7 +148,7 @@ FUNCTION sprintf( ... ) CASE "f" CASE "i" xVal := aPar[nPar++] - IF !ISNUMBER( xVal ) + IF !HB_ISNUMERIC( xVal ) xVal := 0 ENDIF IF nLen != 0 diff --git a/harbour/contrib/xhb/tedit.prg b/harbour/contrib/xhb/tedit.prg index 5ea804b832..1379a18e41 100644 --- a/harbour/contrib/xhb/tedit.prg +++ b/harbour/contrib/xhb/tedit.prg @@ -488,7 +488,7 @@ CLASS THtmlForm METHOD setwidth( c ) INLINE ::width := c - METHOD AddControl( o ) INLINE IIF( ISOBJECT( o ), ( o:nH := ::nH, o:Form := Self ), ),; + METHOD AddControl( o ) INLINE IIF( HB_ISOBJECT( o ), ( o:nH := ::nH, o:Form := Self ), ),; Aadd( ::aControls, o ) METHOD PutControls() INLINE Aeval( ::aControls, { | e | e:Put() } ) @@ -544,19 +544,19 @@ METHOD Put( lPutControls ) CLASS THtmlForm DEFAULT lPutControls TO .F. - IF ! ISNUMBER( ::width ) + IF ! HB_ISNUMERIC( ::width ) ::width := 90 ENDIF - IF ! ISCHARACTER( ::color ) + IF ! HB_ISSTRING( ::color ) ::Color := "#9196A0" ENDIF - IF ! ISCHARACTER( ::fontColor ) + IF ! HB_ISSTRING( ::fontColor ) ::fontColor := "black" ENDIF - IF ! ISCHARACTER( ::CaptionColor ) + IF ! HB_ISSTRING( ::CaptionColor ) ::CaptionColor := "black" ENDIF @@ -681,7 +681,7 @@ METHOD Put( lPutControls ) CLASS THtmlForm // Fwrite( ::nH, ::cOutput ) ::oHtm:cStr += ::cOutput IF lPutControls - Aeval( ::aControls, { | e | IIF( ISOBJECT( e ), ; + Aeval( ::aControls, { | e | IIF( HB_ISOBJECT( e ), ; e:Put(), ::oHtm:cStr += e ) } ) ENDIF diff --git a/harbour/contrib/xhb/tframe.prg b/harbour/contrib/xhb/tframe.prg index 6f80ccdd6d..f36d8038bd 100644 --- a/harbour/contrib/xhb/tframe.prg +++ b/harbour/contrib/xhb/tframe.prg @@ -80,7 +80,7 @@ METHOD New( cFName, cTitle ) CLASS THtmlFrameSet ::FName := cFName ::Title := cTitle - IF ISCHARACTER( ::FName ) + IF HB_ISSTRING( ::FName ) cStr := "" ::nH := FCreate( ::FName ) ELSE @@ -104,7 +104,7 @@ METHOD StartSet( aRows, aCols, onLoad, onUnload ) CLASS THtmlFrameSet cStr := CRLF() + " " ELSEIF ISDATE( xVal ) xRet := Dtoc( xVal ) - ELSEIF ISLOGICAL( xVal ) + ELSEIF HB_ISLOGICAL( xVal ) xRet := iif( xVal, "T", "F" ) - ELSEIF ISBLOCK( xVal ) + ELSEIF HB_ISBLOCK( xVal ) xRet := "{||...}" ELSEIF Valtype( xVal ) == NIL diff --git a/harbour/contrib/xhb/trpc.prg b/harbour/contrib/xhb/trpc.prg index b3c4d3e1bf..73cc7bd95f 100644 --- a/harbour/contrib/xhb/trpc.prg +++ b/harbour/contrib/xhb/trpc.prg @@ -199,8 +199,6 @@ #include "hbrpc.ch" -#include "common.ch" - /************************************ * RPC FUNCTION *************************************/ @@ -287,7 +285,7 @@ RETURN Self METHOD SetCallable( oExec, oMeth ) CLASS tRPCFunction // If the callable is an object, we need to store the method - IF ISOBJECT( oExec ) + IF HB_ISOBJECT( oExec ) ::aCall := Array( Len( ::aParameters ) + 3 ) ::aCall[2] := oMeth ELSE @@ -305,7 +303,7 @@ METHOD Run( aParams, oClient ) CLASS tRPCFunction RETURN NIL ENDIF - nStart := IIF( ISOBJECT( ::aCall[1] ), 3, 2 ) + nStart := IIF( HB_ISOBJECT( ::aCall[1] ), 3, 2 ) FOR nCount := 1 TO Len( aParams ) ::aCall[ nStart ] := aParams[ nCount ] @@ -329,7 +327,7 @@ RETURN .T. METHOD CheckTypes( aParams ) CLASS tRPCFunction LOCAL oElem, i := 0 - IF ! ISARRAY( aParams ) + IF ! HB_ISARRAY( aParams ) RETURN .F. ENDIF @@ -964,7 +962,7 @@ METHOD FunctionRunner( cFuncName, oFunc, nMode, aParams, aDesc ) CLASS tRPCServe CASE nMode == 1 // run in loop aSubst := AClone( aParams ) - nSubstPos := AScan( aParams, {|x| ISCHARACTER( x ) .and. x == "$."} ) + nSubstPos := AScan( aParams, {|x| HB_ISSTRING( x ) .and. x == "$."} ) SWITCH aDesc[1] CASE 'A' // all results @@ -1017,7 +1015,7 @@ METHOD FunctionRunner( cFuncName, oFunc, nMode, aParams, aDesc ) CLASS tRPCServe CASE nMode == 2 // Run in a foreach loop aSubst := AClone( aParams ) - nSubstPos := AScan( aParams, {|x| ISCHARACTER( x ) .and. x == "$."} ) + nSubstPos := AScan( aParams, {|x| HB_ISSTRING( x ) .and. x == "$."} ) SWITCH aDesc[1] CASE 'A' // all results @@ -1261,7 +1259,7 @@ METHOD Add( xFunction, cVersion, nLevel, oExec, oMethod ) LOCAL nElem, lRet := .F. LOCAL oFunction - IF ISCHARACTER( xFunction ) + IF HB_ISSTRING( xFunction ) oFunction := TRpcFunction():New( xFunction, cVersion, nLevel, oExec, oMethod ) ELSE oFunction := xFunction diff --git a/harbour/contrib/xhb/trpccli.prg b/harbour/contrib/xhb/trpccli.prg index 57fdc5b423..2a846079da 100644 --- a/harbour/contrib/xhb/trpccli.prg +++ b/harbour/contrib/xhb/trpccli.prg @@ -55,8 +55,6 @@ #include "hbrpc.ch" -#include "common.ch" - CLASS tRPCClient DATA aServers @@ -546,7 +544,7 @@ METHOD SetLoopMode( nMethod, xData, nEnd, nStep ) CLASS tRPCClient RETURN .T. ENDIF - IF ISARRAY( xData ) + IF HB_ISARRAY( xData ) ::aLoopData := xData ELSE IF ValType( xData ) == "NI" @@ -599,7 +597,7 @@ METHOD Call( ... ) CLASS tRPCClient ENDIF oCalling := hb_PValue( 1 ) - IF ISARRAY( oCalling ) + IF HB_ISARRAY( oCalling ) cFunction := oCalling[1] ADel( oCalling, 1 ) ASize( oCalling, Len( oCalling ) -1 ) @@ -657,7 +655,7 @@ METHOD SetPeriodCallback( ... ) CLASS tRPCClient ::nTimeLimit := hb_PValue( 2 ) caCalling := hb_PValue( 3 ) - IF ! ISARRAY( caCalling ) + IF ! HB_ISARRAY( caCalling ) caCalling := Array( Pcount() -2 ) FOR nCount := 3 TO Pcount() caCalling[nCount - 2] := hb_PValue( nCount ) @@ -955,7 +953,7 @@ RETURN lContinue METHOD GetFunctionName( xId ) CLASS tRpcClient LOCAL cData, nPos - IF ISARRAY( xID ) + IF HB_ISARRAY( xID ) cData := xId[3] ELSEIF Len( ::aFunctions ) > 0 cData := ::aFunctions[xId][3] @@ -974,7 +972,7 @@ RETURN cData METHOD GetServerName( xId ) CLASS tRpcClient LOCAL cData - IF ISARRAY( xID ) + IF HB_ISARRAY( xID ) cData := xId[2] ELSE IF Len( ::aFunctions ) > 0 @@ -991,7 +989,7 @@ RETURN cData METHOD GetServerAddress( xId ) CLASS tRpcClient LOCAL cData - IF ISARRAY( xID ) + IF HB_ISARRAY( xID ) cData := xId[1] ELSE IF ! Empty( ::aFunctions ) diff --git a/harbour/contrib/xhb/ttable.prg b/harbour/contrib/xhb/ttable.prg index f65260ec2e..145ddd3af2 100644 --- a/harbour/contrib/xhb/ttable.prg +++ b/harbour/contrib/xhb/ttable.prg @@ -151,7 +151,7 @@ FUNCTION NetLock( nType, lReleaseLocks, nSeconds ) LOCAL nCh LOCAL cWord - IF ! ISNUMBER( nType ) .or. ; + IF ! HB_ISNUMERIC( nType ) .or. ; ( ( nType != 1 ) .and. ; ( nType != 2 ) .and. ; ( nType != 3 ) ) @@ -289,7 +289,7 @@ FUNCTION NetOpenFiles( aFiles ) ENDIF IF NetDbUse( xFile[ 1 ], xFile[ 2 ], snNetDelay, "DBFCDX" ) - IF ISARRAY( xFile[ 3 ] ) + IF HB_ISARRAY( xFile[ 3 ] ) FOR EACH cIndex IN xFile[ 3 ] IF hb_FileExists( cIndex ) ORDLISTADD( cIndex ) diff --git a/harbour/contrib/xhb/xcstr.prg b/harbour/contrib/xhb/xcstr.prg index cc0eec3a4b..3ec88b7611 100644 --- a/harbour/contrib/xhb/xcstr.prg +++ b/harbour/contrib/xhb/xcstr.prg @@ -49,7 +49,6 @@ * */ -#include "common.ch" #include "error.ch" #include "hbclass.ch" @@ -258,7 +257,7 @@ RETURN &( cExp ) //--------------------------------------------------------------// FUNCTION ValToArray( xVal ) - IF ISARRAY( xVal ) + IF HB_ISARRAY( xVal ) RETURN xVal ENDIF @@ -267,7 +266,7 @@ RETURN { xVal } //--------------------------------------------------------------// FUNCTION ValToBlock( xVal ) - IF ISBLOCK( xVal ) + IF HB_ISBLOCK( xVal ) RETURN xVal ENDIF @@ -323,7 +322,7 @@ RETURN hb_SToD() //--------------------------------------------------------------// FUNCTION ValToHash( xVal ) - IF hb_IsHash( xVal ) + IF HB_ISHASH( xVal ) RETURN xVal ENDIF diff --git a/harbour/contrib/xhb/xdbmodst.prg b/harbour/contrib/xhb/xdbmodst.prg index ca58614517..499ac138d8 100644 --- a/harbour/contrib/xhb/xdbmodst.prg +++ b/harbour/contrib/xhb/xdbmodst.prg @@ -50,7 +50,6 @@ * */ -#include "common.ch" #include "dbstruct.ch" #include "dbinfo.ch" @@ -192,14 +191,14 @@ FUNCTION dbMerge( xSource, lAppend ) // Validate args //-------------------------------------------------------------// - IF ISCHARACTER( xSource ) + IF HB_ISSTRING( xSource ) nArea := Select() USE ( xSource ) ALIAS MergeSource EXCLUSIVE NEW nSource := Select() SELECT ( nArea ) - ELSEIF ISNUMBER( xSource ) + ELSEIF HB_ISNUMERIC( xSource ) nSource := xSource ELSE RETURN .F. diff --git a/harbour/contrib/xhb/xhberr.prg b/harbour/contrib/xhb/xhberr.prg index cba547aa18..b68c4266a7 100644 --- a/harbour/contrib/xhb/xhberr.prg +++ b/harbour/contrib/xhb/xhberr.prg @@ -81,10 +81,10 @@ STATIC s_lErrorLogAppend := .F. FUNCTION xhb_ErrorLog( cErrorLog, lErrorLogAppend ) LOCAL aValueOld := { s_cErrorLog, s_lErrorLogAppend } - IF hb_isString( cErrorLog ) + IF HB_ISSTRING( cErrorLog ) s_cErrorLog := cErrorLog ENDIF - IF hb_isLogical( lErrorLogAppend ) + IF HB_ISLOGICAL( lErrorLogAppend ) s_lErrorLogAppend := lErrorLogAppend ENDIF @@ -164,7 +164,7 @@ STATIC FUNCTION xhb_DefError( oError ) Endif - If ISARRAY( oError:Args ) + If HB_ISARRAY( oError:Args ) cMessage += " Arguments: (" + Arguments( oError ) + ")" Endif @@ -253,21 +253,21 @@ STATIC FUNCTION ErrorMessage( oError ) cMessage := Iif( oError:severity > ES_WARNING, "Error", "Warning" ) + " " // add subsystem name if available - If Ischaracter( oError:subsystem ) + If HB_ISSTRING( oError:subsystem ) cMessage += oError:subsystem() Else cMessage += "???" Endif // add subsystem's error code if available - If Isnumber( oError:subCode ) + If HB_ISNUMERIC( oError:subCode ) cMessage += "/" + Ltrim( Str( oError:subCode ) ) Else cMessage += "/???" Endif // add error description if available - If Ischaracter( oError:description ) + If HB_ISSTRING( oError:description ) cMessage += " " + oError:description Endif @@ -538,7 +538,7 @@ STATIC FUNCTION LogError( oerr ) FWriteLine( nHandle, "" ) FWriteLine( nHandle, "" ) - IF ISCHARACTER( cScreen ) + IF HB_ISSTRING( cScreen ) FWriteLine( nHandle, Padc( " Video Screen Dump ", nCols, "#" ) ) FWriteLine( nHandle, "" ) //FWriteLine( nHandle, "" ) @@ -667,7 +667,7 @@ STATIC FUNCTION Arguments( oErr ) LOCAL xArg, cArguments := "" - IF ISARRAY( oErr:Args ) + IF HB_ISARRAY( oErr:Args ) FOR EACH xArg IN oErr:Args cArguments += " [" + Str( xArg:__EnumIndex(), 2 ) + "] = Type: " + ValType( xArg ) @@ -691,24 +691,24 @@ PROCEDURE __MinimalErrorHandler( oError ) LOCAL xData cError := "Error" - IF ISNUMBER( oError:SubCode ) + IF HB_ISNUMERIC( oError:SubCode ) cError += ": " + hb_ntos( oError:SubCode ) ENDIF cError += "!" + hb_eol() - IF ISCHARACTER( oError:Operation ) + IF HB_ISSTRING( oError:Operation ) cError += "Operation: " + oError:Operation + hb_eol() ENDIF - IF ISCHARACTER( oError:Description ) + IF HB_ISSTRING( oError:Description ) cError += "Description: " + oError:Description + hb_eol() ENDIF - IF ISCHARACTER( xData := err_ModuleName( oError ) ) + IF HB_ISSTRING( xData := err_ModuleName( oError ) ) cError += "Source: " + xData + hb_eol() ENDIF - IF ISCHARACTER( xData := err_ProcName( oError ) ) + IF HB_ISSTRING( xData := err_ProcName( oError ) ) cError += "Procedure: " + xData + hb_eol() ENDIF - IF ISNUMBER( xData := err_ProcLine( oError ) ) + IF HB_ISNUMERIC( xData := err_ProcLine( oError ) ) cError += "Line: " + hb_ntos( xData ) + hb_eol() ENDIF @@ -725,27 +725,27 @@ FUNCTION xhb_ErrorNew( cSubSystem, nGenCode, nSubCode, ; LOCAL oError := ErrorNew() LOCAL aStack, n - IF ISCHARACTER( cSubSystem ) + IF HB_ISSTRING( cSubSystem ) oError:SubSystem := cSubSystem ENDIF - IF ISNUMBER( nGenCode ) + IF HB_ISNUMERIC( nGenCode ) oError:GenCode := nGenCode ENDIF - IF ISNUMBER( nSubCode ) + IF HB_ISNUMERIC( nSubCode ) oError:SubCode := nSubCode ENDIF - IF ISCHARACTER( cOperation ) + IF HB_ISSTRING( cOperation ) oError:Operation := cOperation ENDIF - IF ISCHARACTER( cDescription ) + IF HB_ISSTRING( cDescription ) oError:Description := cDescription ENDIF - IF ISARRAY( aArgs ) + IF HB_ISARRAY( aArgs ) oError:Args := aArgs ENDIF IF __objHasMsg( oError, "MODULENAME" ) - IF ISCHARACTER( cModuleName ) + IF HB_ISSTRING( cModuleName ) oError:ModuleName := cModuleName ELSE oError:ModuleName := ProcFile( 1 ) @@ -753,7 +753,7 @@ FUNCTION xhb_ErrorNew( cSubSystem, nGenCode, nSubCode, ; ENDIF IF __objHasMsg( oError, "PROCNAME" ) - IF ISCHARACTER( cProcName ) + IF HB_ISSTRING( cProcName ) oError:ProcName := cProcName ELSE oError:ProcName := ProcName( 1 ) @@ -761,7 +761,7 @@ FUNCTION xhb_ErrorNew( cSubSystem, nGenCode, nSubCode, ; ENDIF IF __objHasMsg( oError, "PROCLINE" ) - IF ISNUMBER( nProcLine ) + IF HB_ISNUMERIC( nProcLine ) oError:ProcLine := nProcLine ELSE oError:ProcLine := ProcLine( 1 ) diff --git a/harbour/contrib/xhb/xhbmemo.prg b/harbour/contrib/xhb/xhbmemo.prg index 8f4e9bb257..9e8afc610a 100644 --- a/harbour/contrib/xhb/xhbmemo.prg +++ b/harbour/contrib/xhb/xhbmemo.prg @@ -74,7 +74,7 @@ CREATE CLASS XHB_TMemoEditor FROM XHBEditor METHOD Edit() // Calls ::Super:Edit(nKey) but is needed to handle configurable keys METHOD KeyboardHook( nKey ) // Gets called every time there is a key not handled directly by HBEditor - METHOD ExistUdf() INLINE HB_IsString( ::xUserFunction ) + METHOD ExistUdf() INLINE HB_ISSTRING( ::xUserFunction ) METHOD HandleUdf( nKey, nUdfReturn, lEdited ) // Handles requests returned to MemoEdit() by udf METHOD CallUdf( nMode ) // Call user function. ( old xDo ) @@ -446,43 +446,43 @@ FUNCTION xhb_MemoEdit( cString,; // 2006/JUL/22 - E.F. Check argument types. // - IF !HB_IsNil( cString ) .AND. ! HB_IsString( cString ) .AND. ! HB_IsMemo( cString ) + IF !HB_ISNIL( cString ) .AND. ! HB_ISSTRING( cString ) .AND. ! HB_IsMemo( cString ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF - IF !HB_IsNil( nTop ) .AND. !HB_IsNumeric( nTop ) + IF !HB_ISNIL( nTop ) .AND. !HB_ISNUMERIC( nTop ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF - IF !HB_IsNil( nLeft ) .AND. !HB_IsNumeric( nLeft ) + IF !HB_ISNIL( nLeft ) .AND. !HB_ISNUMERIC( nLeft ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF - IF !HB_IsNil( nRight ) .AND. !HB_IsNumeric( nRight ) + IF !HB_ISNIL( nRight ) .AND. !HB_ISNUMERIC( nRight ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF - IF !HB_IsNil( nBottom ) .AND. !HB_IsNumeric( nBottom ) + IF !HB_ISNIL( nBottom ) .AND. !HB_ISNUMERIC( nBottom ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF - IF !HB_IsNil( lEditMode ) .AND. !HB_IsLogical( lEditMode ) + IF !HB_ISNIL( lEditMode ) .AND. !HB_ISLOGICAL( lEditMode ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF - IF !HB_IsNil( xUDF ) .AND. ( !HB_IsString( xUDF ) .AND. !HB_IsLogical( xUDF ) ) + IF !HB_ISNIL( xUDF ) .AND. ( !HB_ISSTRING( xUDF ) .AND. !HB_ISLOGICAL( xUDF ) ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF - IF !HB_IsNil( nLineLength ) .AND. !HB_IsNumeric( nLineLength ) + IF !HB_ISNIL( nLineLength ) .AND. !HB_ISNUMERIC( nLineLength ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF - IF !HB_IsNil( nTabSize ) .AND. !HB_IsNumeric( nTabSize ) + IF !HB_ISNIL( nTabSize ) .AND. !HB_ISNUMERIC( nTabSize ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF - IF !HB_IsNil( nTextBuffRow ) .AND. !HB_IsNumeric( nTextBuffRow ) + IF !HB_ISNIL( nTextBuffRow ) .AND. !HB_ISNUMERIC( nTextBuffRow ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF - IF !HB_IsNil( nTextBuffColumn ) .AND. !HB_IsNumeric( nTextBuffColumn ) + IF !HB_ISNIL( nTextBuffColumn ) .AND. !HB_ISNUMERIC( nTextBuffColumn ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF - IF !HB_IsNil( nWindowRow ) .AND. !HB_IsNumeric( nWindowRow ) + IF !HB_ISNIL( nWindowRow ) .AND. !HB_ISNUMERIC( nWindowRow ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF - IF !HB_IsNil( nWindowColumn ) .AND. !HB_IsNumeric( nWindowColumn ) + IF !HB_ISNIL( nWindowColumn ) .AND. !HB_ISNUMERIC( nWindowColumn ) Throw( ErrorNew( "BASE", 0, 1127, " Argument type error", Procname() ) ) ENDIF @@ -492,7 +492,7 @@ FUNCTION xhb_MemoEdit( cString,; Throw( ErrorNew( "BASE", 0, 1127, " Argument error", Procname() ) ) ENDIF - IF HB_IsString( xUDF ) .AND. Empty( xUDF ) + IF HB_ISSTRING( xUDF ) .AND. Empty( xUDF ) xUDF := NIL ENDIF @@ -517,7 +517,7 @@ FUNCTION xhb_MemoEdit( cString,; // 2006/AUG/06 - E.F. Clipper's in .T. or. F. is samething. // - IF !Hb_IsLogical( xUDF ) //.OR. cUserFunction == .T. + IF !HB_ISLOGICAL( xUDF ) //.OR. cUserFunction == .T. oEd:Edit() diff --git a/harbour/contrib/xhb/xhbmt.prg b/harbour/contrib/xhb/xhbmt.prg index 92f3ed3b9b..341c86f01c 100644 --- a/harbour/contrib/xhb/xhbmt.prg +++ b/harbour/contrib/xhb/xhbmt.prg @@ -50,14 +50,12 @@ * */ -#include "common.ch" - /* real functions used as wrappers in above translations */ function StartThread( p1, p2, ... ) if PCount() < 2 return hb_threadStart( p1 ) - elseif ISOBJECT( p1 ) .and. ISCHARACTER( p2 ) + elseif HB_ISOBJECT( p1 ) .and. HB_ISSTRING( p2 ) return hb_threadStart( {|...| p1:&p2( ... ) }, ... ) endif return hb_threadStart( p1, p2, ... ) @@ -66,7 +64,7 @@ function StartThread( p1, p2, ... ) function Subscribe( mtx, nTimeOut, lSubscribed ) local xSubscribed lSubscribed := hb_mutexSubscribe( mtx, ; - iif( ISNUMBER( nTimeOut ), nTimeOut / 1000, ), ; + iif( HB_ISNUMERIC( nTimeOut ), nTimeOut / 1000, ), ; @xSubscribed ) return xSubscribed @@ -74,7 +72,7 @@ function Subscribe( mtx, nTimeOut, lSubscribed ) function SubscribeNow( mtx, nTimeOut, lSubscribed ) local xSubscribed lSubscribed := hb_mutexSubscribeNow( mtx, ; - iif( ISNUMBER( nTimeOut ), nTimeOut / 1000, ), ; + iif( HB_ISNUMERIC( nTimeOut ), nTimeOut / 1000, ), ; @xSubscribed ) return xSubscribed @@ -116,7 +114,7 @@ function hb_MutexTryLock( mtx ) function hb_MutexTimeOutLock( mtx, nTimeOut ) - return hb_mutexLock( mtx, IIF( hb_isNumeric( nTimeOut ), nTimeOut / 1000, 0 ) ) + return hb_mutexLock( mtx, IIF( HB_ISNUMERIC( nTimeOut ), nTimeOut / 1000, 0 ) ) function GetSystemThreadId( pThID ) diff --git a/harbour/contrib/xhb/xhbtedit.prg b/harbour/contrib/xhb/xhbtedit.prg index 9f4c5116c4..1c642e9b32 100644 --- a/harbour/contrib/xhb/xhbtedit.prg +++ b/harbour/contrib/xhb/xhbtedit.prg @@ -162,7 +162,7 @@ // READINSERT(), ::lInsert must check in it. // DATA lInsert INIT .F. // Is editor in Insert mode or in Overstrike one? Default : Overstrike - Clipper METHOD lInsert() BLOCK { | | Set( _SET_INSERT ) } - METHOD _lInsert( lInsert ) BLOCK { | Self, lInsert | HB_SYMBOL_UNUSED( Self ), iif( ISLOGICAL( lInsert ), Set( _SET_INSERT, lInsert ), Set( _SET_INSERT ) ) } + METHOD _lInsert( lInsert ) BLOCK { | Self, lInsert | HB_SYMBOL_UNUSED( Self ), iif( HB_ISLOGICAL( lInsert ), Set( _SET_INSERT, lInsert ), Set( _SET_INSERT ) ) } METHOD New( cString, nTop, nLeft, nBottom, ; // Converts a string to an array of strings splitting input string at EOL boundaries nRight, lEditMode, nLineLength, nTabSize, nTextRow, nTextCol, nWndRow, nWndCol ) @@ -303,7 +303,7 @@ METHOD New( cString, nTop, nLeft, nBottom, nRight, lEditMode, nLineLength, nTabS // 2006/AUG/18 - E.F. Adjusted nLineLenght in accordance with Clipper's // memoedit. - IF !Hb_IsNumeric( nLineLength ) + IF !HB_ISNUMERIC( nLineLength ) nLineLength := ::nNumCols ELSE IF nLineLength < 0 @@ -2367,7 +2367,7 @@ METHOD SetPos( nRow, nCol ) CLASS XHBEditor METHOD InsertState( lInsState ) CLASS XHBEditor // 2006/JUL/22 - E.F. - Insert only in edit mode. - IF ::lEditAllow .AND. ISLOGICAL( lInsState ) .AND. ::lInsert != lInsState + IF ::lEditAllow .AND. HB_ISLOGICAL( lInsState ) .AND. ::lInsert != lInsState ::lInsert := lInsState @@ -3065,7 +3065,7 @@ STATIC FUNCTION Text2Array( cString, nWordWrapCol ) ENDIF nRetLen += Len( cLine ) + nEOLLen - IF HB_IsNumeric( nWordWrapCol ) .AND. Len( cLine ) > nWordWrapCol + IF HB_ISNUMERIC( nWordWrapCol ) .AND. Len( cLine ) > nWordWrapCol DO WHILE .T. // Split line at nWordWrapCol boundary IF Len( cLine ) > nWordWrapCol diff --git a/harbour/contrib/xhb/xhbver.prg b/harbour/contrib/xhb/xhbver.prg index 9c93710f59..1d4ebaf5d0 100644 --- a/harbour/contrib/xhb/xhbver.prg +++ b/harbour/contrib/xhb/xhbver.prg @@ -50,7 +50,6 @@ * */ -#include "common.ch" #include "hbver.ch" #include "xhbver.ch" @@ -113,4 +112,4 @@ FUNCTION hb_buildinfo( n ) v[ _HB_ARRAY_MODE ] := 0 /* Emulate xhb */ v[ _HB_CREDITS ] := { "See 'harbour -credits'" } - RETURN iif( ISNUMBER( n ), iif( n <= Len( v ), v[ n ], NIL ), v ) + RETURN iif( HB_ISNUMERIC( n ), iif( n <= Len( v ), v[ n ], NIL ), v ) diff --git a/harbour/examples/guestbk/inifiles.prg b/harbour/examples/guestbk/inifiles.prg index 55e908fce4..db814c6359 100644 --- a/harbour/examples/guestbk/inifiles.prg +++ b/harbour/examples/guestbk/inifiles.prg @@ -2,8 +2,6 @@ * $Id$ */ -#include "common.ch" - function TIniFile() static oClass @@ -116,7 +114,7 @@ static function ReadString(cSection, cIdent, cDefault) if Empty(cSection) cFind := lower(cIdent) - j := AScan( ::Contents, {|x| ISCHARACTER(x[1]) .and. lower(x[1]) == cFind .and. ISCHARACTER(x[2]) } ) + j := AScan( ::Contents, {|x| HB_ISSTRING(x[1]) .and. lower(x[1]) == cFind .and. HB_ISSTRING(x[2]) } ) if j > 0 cResult := ::Contents[j][2] @@ -124,11 +122,11 @@ static function ReadString(cSection, cIdent, cDefault) else cFind := lower(cSection) - i := AScan( ::Contents, {|x| ISCHARACTER(x[1]) .and. lower(x[1]) == cFind} ) + i := AScan( ::Contents, {|x| HB_ISSTRING(x[1]) .and. lower(x[1]) == cFind} ) if i > 0 cFind := lower(cIdent) - j := AScan( ::Contents[i][2], {|x| ISCHARACTER(x[1]) .and. lower(x[1]) == cFind} ) + j := AScan( ::Contents[i][2], {|x| HB_ISSTRING(x[1]) .and. lower(x[1]) == cFind} ) if j > 0 cResult := ::Contents[i][2][j][2] @@ -146,7 +144,7 @@ static procedure WriteString(cSection, cIdent, cString) elseif Empty(cSection) cFind := lower(cIdent) - j := AScan( ::Contents, {|x| ISCHARACTER(x[1]) .and. lower(x[1]) == cFind .and. ISCHARACTER(x[2]) } ) + j := AScan( ::Contents, {|x| HB_ISSTRING(x[1]) .and. lower(x[1]) == cFind .and. HB_ISSTRING(x[2]) } ) if j > 0 ::Contents[j][2] := cString @@ -159,9 +157,9 @@ static procedure WriteString(cSection, cIdent, cString) else cFind := lower(cSection) - if (i := AScan( ::Contents, {|x| ISCHARACTER(x[1]) .and. lower(x[1]) == cFind .and. ISARRAY(x[2]) })) > 0 + if (i := AScan( ::Contents, {|x| HB_ISSTRING(x[1]) .and. lower(x[1]) == cFind .and. HB_ISARRAY(x[2]) })) > 0 cFind := lower(cIdent) - j := AScan( ::Contents[i][2], {|x| ISCHARACTER(x[1]) .and. lower(x[1]) == cFind} ) + j := AScan( ::Contents[i][2], {|x| HB_ISSTRING(x[1]) .and. lower(x[1]) == cFind} ) if j > 0 ::Contents[i][2][j][2] := cString @@ -213,11 +211,11 @@ static procedure DeleteKey(cSection, cIdent) local i, j cSection := lower(cSection) - i := AScan( ::Contents, {|x| ISCHARACTER(x[1]) .and. lower(x[1]) == cSection} ) + i := AScan( ::Contents, {|x| HB_ISSTRING(x[1]) .and. lower(x[1]) == cSection} ) if i > 0 cIdent := lower(cIdent) - j := AScan( ::Contents[i][2], {|x| ISCHARACTER(x[1]) .and. lower(x[1]) == cIdent} ) + j := AScan( ::Contents[i][2], {|x| HB_ISSTRING(x[1]) .and. lower(x[1]) == cIdent} ) ADel( ::Contents[i][2], j ) ASize( ::Contents[i][2], Len(::Contents[i][2]) - 1 ) @@ -229,14 +227,14 @@ static procedure EraseSection(cSection) local i if Empty(cSection) - while (i := AScan( ::Contents, {|x| ISCHARACTER(x[1]) .and. ISCHARACTER(x[2]) })) > 0 + while (i := AScan( ::Contents, {|x| HB_ISSTRING(x[1]) .and. HB_ISSTRING(x[2]) })) > 0 ADel( ::Contents, i ) ASize( ::Contents, len(::Contents) - 1 ) end else cSection := lower(cSection) - if (i := AScan( ::Contents, {|x| ISCHARACTER(x[1]) .and. lower(x[1]) == cSection .and. ISARRAY(x[2]) })) > 0 + if (i := AScan( ::Contents, {|x| HB_ISSTRING(x[1]) .and. lower(x[1]) == cSection .and. HB_ISARRAY(x[2]) })) > 0 ADel( ::Contents, i ) ASize( ::Contents, Len(::Contents) - 1 ) endif @@ -249,14 +247,14 @@ static function ReadSection(cSection) if Empty(cSection) for i := 1 to len(::Contents) - if ISCHARACTER(::Contents[i][1]) .and. ISCHARACTER(::Contents[i][2]) + if HB_ISSTRING(::Contents[i][1]) .and. HB_ISSTRING(::Contents[i][2]) aadd(aSection, ::Contents[i][1]) endif next else cSection := lower(cSection) - if (i := AScan( ::Contents, {|x| ISCHARACTER(x[1]) .and. x[1] == cSection .and. ISARRAY(x[2]) })) > 0 + if (i := AScan( ::Contents, {|x| HB_ISSTRING(x[1]) .and. x[1] == cSection .and. HB_ISARRAY(x[2]) })) > 0 for j := 1 to Len(::Contents[i][2]) @@ -274,7 +272,7 @@ static function ReadSections() for i := 1 to Len(::Contents) - if ISARRAY(::Contents[i][2]) + if HB_ISARRAY(::Contents[i][2]) AAdd(aSections, ::Contents[i][1]) endif next @@ -290,7 +288,7 @@ static procedure UpdateFile() if ::Contents[i][1] == NIL fwrite(hFile, ::Contents[i][2] + Chr(13) + Chr(10)) - elseif ISARRAY(::Contents[i][2]) + elseif HB_ISARRAY(::Contents[i][2]) fwrite(hFile, "[" + ::Contents[i][1] + "]" + Chr(13) + Chr(10)) for j := 1 to Len(::Contents[i][2]) @@ -303,7 +301,7 @@ static procedure UpdateFile() next fwrite(hFile, Chr(13) + Chr(10)) - elseif ISCHARACTER(::Contents[i][2]) + elseif HB_ISSTRING(::Contents[i][2]) fwrite(hFile, ::Contents[i][1] + "=" + ::Contents[i][2] + Chr(13) + Chr(10)) endif diff --git a/harbour/examples/hbdoc2/genhtml.prg b/harbour/examples/hbdoc2/genhtml.prg index f742df44e1..a601629a50 100644 --- a/harbour/examples/hbdoc2/genhtml.prg +++ b/harbour/examples/hbdoc2/genhtml.prg @@ -159,7 +159,7 @@ HB_SYMBOL_UNUSED( cFilename ) RETURN self METHOD AddReference( oEntry, cReference, cSubReference ) CLASS GenerateHTML - IF HB_IsObject( oEntry ) .AND. oEntry:ClassName == "ENTRY" + IF HB_ISOBJECT( oEntry ) .AND. oEntry:ClassName == "ENTRY" ::OpenTag( "a", "href", ::TargetFilename + ::cExtension + "#" + oEntry:Filename ):Append( oEntry:Name ):CloseTag( "a" ):Append( oEntry:OneLiner ):Newline() ELSE IF cSubReference == NIL diff --git a/harbour/examples/hbdoc2/hbdoc2.prg b/harbour/examples/hbdoc2/hbdoc2.prg index 58614e8a4c..aac623ff50 100644 --- a/harbour/examples/hbdoc2/hbdoc2.prg +++ b/harbour/examples/hbdoc2/hbdoc2.prg @@ -711,12 +711,12 @@ STATIC PROCEDURE FileEval( acFile, bBlock, nMaxLine ) DEFAULT nMaxLine TO 256 - IF ISCHARACTER( acFile ) + IF HB_ISSTRING( acFile ) lCloseFile := .T. IF ( aHandle[ 1 ] := FOpen( acFile ) ) < 0 RETURN ENDIF - ELSEIF ISNUMBER( acFile ) + ELSEIF HB_ISNUMERIC( acFile ) aHandle[ 1 ] := acFile ELSE aHandle := acFile @@ -724,7 +724,7 @@ STATIC PROCEDURE FileEval( acFile, bBlock, nMaxLine ) DO WHILE FReadLn( @aHandle, @cBuffer, nMaxLine ) xResult := Eval( bBlock, cBuffer ) - IF xResult != NIL .AND. ISLOGICAL( ValType( xResult ) ) .AND. ! xResult + IF xResult != NIL .AND. HB_ISLOGICAL( ValType( xResult ) ) .AND. ! xResult EXIT ENDIF ENDDO @@ -905,11 +905,11 @@ PROCEDURE ShowSubHelp( xLine, nMode, nIndent, n ) IF xLine != NIL DO CASE - CASE ISNUMBER( xLine ) + CASE HB_ISNUMERIC( xLine ) nMode := xLine - CASE ISBLOCK( xLine ) + CASE HB_ISBLOCK( xLine ) Eval( xLine ) - CASE ISARRAY( xLine ) + CASE HB_ISARRAY( xLine ) IF nMode == 2 OutStd( cIndent + Space( 2 ) ) ENDIF diff --git a/harbour/examples/hbvpdf/hbvpdf.prg b/harbour/examples/hbvpdf/hbvpdf.prg index 54c548f5ae..bb721c3ec7 100644 --- a/harbour/examples/hbvpdf/hbvpdf.prg +++ b/harbour/examples/hbvpdf/hbvpdf.prg @@ -2424,7 +2424,7 @@ RETURN ( nLength ) static function Array2File(cFile,aRay,nDepth,hFile) local nBytes := 0 local i -nDepth := iif(ISNUMBER(nDepth),nDepth,0) +nDepth := iif(HB_ISNUMERIC(nDepth),nDepth,0) if hFile == NIL if (hFile := fCreate(cFile,FC_NORMAL)) == -1 return nBytes @@ -2432,7 +2432,7 @@ if hFile == NIL endif nDepth++ nBytes += WriteData(hFile,aRay) -if ISARRAY(aRay) +if HB_ISARRAY(aRay) for i := 1 to len(aRay) nBytes += Array2File(cFile,aRay[i],nDepth,hFile) next @@ -2445,15 +2445,15 @@ return nBytes static function WriteData(hFile,xData) local cData := valtype(xData) - if ISCHARACTER(xData) + if HB_ISSTRING(xData) cData += i2bin(len(xData))+xData - elseif ISNUMBER(xData) + elseif HB_ISNUMERIC(xData) cData += i2bin(len(alltrim(str(xData))) )+alltrim(str(xData)) elseif ISDATE(xData) cData += i2bin(8)+dtos(xData) - elseif ISLOGICAL(xData) + elseif HB_ISLOGICAL(xData) cData += i2bin(1)+iif(xData,'T','F') - elseif ISARRAY(xData) + elseif HB_ISARRAY(xData) cData += i2bin(len(xData)) else cData += i2bin(0) // NIL diff --git a/harbour/examples/hbvpdf/hbvpdft.prg b/harbour/examples/hbvpdf/hbvpdft.prg index 87d86cbeb3..7a3b173599 100644 --- a/harbour/examples/hbvpdf/hbvpdft.prg +++ b/harbour/examples/hbvpdf/hbvpdft.prg @@ -2505,7 +2505,7 @@ local nBytes := 0 local i local lOpen := ( hFile != nil ) -nDepth := iif( ISNUMBER( nDepth ), nDepth, 0 ) +nDepth := iif( HB_ISNUMERIC( nDepth ), nDepth, 0 ) //if hFile == NIL if !lOpen if ( hFile := fCreate( cFile,FC_NORMAL ) ) == -1 @@ -2514,7 +2514,7 @@ if !lOpen endif nDepth++ nBytes += WriteData( hFile,aRay ) -if ISARRAY( aRay ) +if HB_ISARRAY( aRay ) for i := 1 to len( aRay ) nBytes += Array2File( cFile,aRay[i],nDepth,hFile ) next @@ -2532,15 +2532,15 @@ return nBytes static function WriteData(hFile,xData) local cData := valtype(xData) - if ISCHARACTER(xData) + if HB_ISSTRING(xData) cData += i2bin( len( xData ) ) + xData - elseif ISNUMBER(xData) + elseif HB_ISNUMERIC(xData) cData += i2bin( len( alltrim( str( xData ) ) ) ) + alltrim( str( xData ) ) elseif ISDATE( xData ) cData += i2bin( 8 )+dtos(xData) - elseif ISLOGICAL(xData) + elseif HB_ISLOGICAL(xData) cData += i2bin( 1 )+iif( xData,"T","F" ) - elseif ISARRAY( xData ) + elseif HB_ISARRAY( xData ) cData += i2bin( len( xData ) ) else cData += i2bin( 0 ) // NIL diff --git a/harbour/examples/httpsrv/uhttpd.prg b/harbour/examples/httpsrv/uhttpd.prg index f94adc761b..9b0102f25e 100644 --- a/harbour/examples/httpsrv/uhttpd.prg +++ b/harbour/examples/httpsrv/uhttpd.prg @@ -2285,7 +2285,7 @@ STATIC FUNCTION ParseIni( cConfig ) //hb_ToOutDebug( "hSect = %s\n\r", hb_ValToExp( hSect ) ) - IF HB_IsHash( hSect ) + IF HB_ISHASH( hSect ) FOR EACH cKey IN hSect:Keys // Please, below check values MUST be uppercase @@ -2534,21 +2534,21 @@ STATIC FUNCTION ErrorMessage( oError ) LOCAL cMessage := iif( oError:severity > ES_WARNING, "Error", "Warning" ) + " " // add subsystem name if available - IF ISCHARACTER( oError:subsystem ) + IF HB_ISSTRING( oError:subsystem ) cMessage += oError:subsystem() ELSE cMessage += "???" ENDIF // add subsystem's error code if available - IF ISNUMBER( oError:subCode ) + IF HB_ISNUMERIC( oError:subCode ) cMessage += "/" + hb_NToS( oError:subCode ) ELSE cMessage += "/???" ENDIF // add error description if available - IF ISCHARACTER( oError:description ) + IF HB_ISSTRING( oError:description ) cMessage += " " + oError:description ENDIF diff --git a/harbour/examples/rddado/adordd.prg b/harbour/examples/rddado/adordd.prg index a2e4034602..1b65ce9fab 100644 --- a/harbour/examples/rddado/adordd.prg +++ b/harbour/examples/rddado/adordd.prg @@ -1598,7 +1598,7 @@ PROCEDURE HB_AdoSetPassword( cPassword ) PROCEDURE HB_AdoSetQuery( cQuery ) - IF ! ISCHARACTER( cQuery ) + IF ! HB_ISSTRING( cQuery ) cQuery := "SELECT * FROM " ENDIF @@ -1631,7 +1631,7 @@ STATIC FUNCTION SQLTranslate( cExpr ) FUNCTION HB_AdoRddGetConnection( nWA ) - IF ! ISNUMBER( nWA ) + IF ! HB_ISNUMERIC( nWA ) nWA := Select() ENDIF @@ -1639,7 +1639,7 @@ FUNCTION HB_AdoRddGetConnection( nWA ) FUNCTION HB_AdoRddGetCatalog( nWA ) - IF ! ISNUMBER( nWA ) + IF ! HB_ISNUMERIC( nWA ) nWA := Select() ENDIF @@ -1649,7 +1649,7 @@ FUNCTION HB_AdoRddGetRecordSet( nWA ) LOCAL aWAData - IF ! ISNUMBER( nWA ) + IF ! HB_ISNUMERIC( nWA ) nWA := Select() ENDIF