diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3611a149ee..5320beaccc 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-05 11:52 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/hbqt/qtgui/hbqt_errorsys.prg + ! HB_ISCHAR() -> HB_ISSTRING(). Never use HB_ISCHAR() in + Harbour SVN, it won't accept memo type. + 2012-06-05 02:49 UTC+0200 Viktor Szakats (harbour syenar.net) * src/debug/debugger.prg * src/rdd/dbstrux.prg @@ -50,7 +55,7 @@ * converted 'DEFAULT ... TO ...' to a) __defaultNIL() where bug compatibility is desired b) IF ... == NIL ... where default value had execution cost - c) hb_default() where above side-effect were not in play + c) hb_default() where above side-effects were not in play % deleted '#include "common.ch"' * minor formatting diff --git a/harbour/contrib/hbqt/qtgui/hbqt_errorsys.prg b/harbour/contrib/hbqt/qtgui/hbqt_errorsys.prg index 1546d4e58a..b65a9f7d7f 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_errorsys.prg +++ b/harbour/contrib/hbqt/qtgui/hbqt_errorsys.prg @@ -171,7 +171,7 @@ STATIC FUNCTION ErrorMessage( oError ) LOCAL cMessage := iif( oError:severity > ES_WARNING, "Error", "Warning" ) + " " // add subsystem name if available - IF HB_ISCHAR( oError:subsystem ) + IF HB_ISSTRING( oError:subsystem ) cMessage += oError:subsystem() ELSE cMessage += "???" @@ -185,7 +185,7 @@ STATIC FUNCTION ErrorMessage( oError ) ENDIF // add error description if available - IF HB_ISCHAR( oError:description ) + IF HB_ISSTRING( oError:description ) cMessage += " " + oError:description ENDIF