diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 776aaf286c..d86f623f21 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,21 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-31 12:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbct/files.c + * 0 -> HB_FA_ALL. + + * utils/hbmk2/hbmk2.pt_BR.po + * utils/hbmk2/hbmk2.hu_HU.po + * utils/hbmk2/hbmk2.prg + + Added verbose information when hbmk2 is run from outside Harbour tree + and HB_INSTALL_PREFIX is not set either. Just a wild guess what might + cause difficulty for some users when trying to use hbmk2. + + * src/rtl/fssize.c + * contrib/hbqt/hbqt_hbevents.cpp + * Formatting. + 2010-01-30 19:28 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/generator/qt45.qtp * contrib/hbqt/hbqt_garbage.h @@ -66,33 +81,33 @@ * contrib/hbide/ideprojmanager.prg * contrib/hbide/idethemes.prg - ! This commit has cleaned Qt wrappers not to - hold any GC collectible pointer inside. Events + ! This commit has cleaned Qt wrappers not to + hold any GC collectible pointer inside. Events and Slots protocol is completely re-structured. - - % Improved HB_TRACE() logs. Now Qt wrappers can be - generated with relevant filter if env variable - HBQT_BUILD_TR_LEVEL=HB_TR_ALWAYS|ERROR|etc - defalt being TR_LEVEL_DEBUG. The formatting is + + % Improved HB_TRACE() logs. Now Qt wrappers can be + generated with relevant filter if env variable + HBQT_BUILD_TR_LEVEL=HB_TR_ALWAYS|ERROR|etc + defalt being TR_LEVEL_DEBUG. The formatting is also improved. - % Signals are fired with exact same parametres + % Signals are fired with exact same parametres found in Qt documentation. Eearlier first parameter was object pointer followed by slots's parameters. This facilitates for the speed and better code maintenance. ! Intensive debugging has shown that - operator new() - - is always called from cpp stub generated by hbMK2 + is always called from cpp stub generated by hbMK2 but for operater delete(), behavior is inconsistent. All classes derived from QObject() never call delete() - in the stub, some classes, which Qt defines as "on the + in the stub, some classes, which Qt defines as "on the stack" call our stub and hence memory is released. Perhaps this is the main reason, I cannot get back all the momory if another dialog is opened and closed. All claases which are derived from Qt class, viz., HbQ* - are released properly. Looking at this behavior it - comes to mind if all classes are sub-classed? A very + are released properly. Looking at this behavior it + comes to mind if all classes are sub-classed? A very huge job nevertheless which I may take later. * contrib/hbqt/qtcore/*.cpp diff --git a/harbour/contrib/hbct/files.c b/harbour/contrib/hbct/files.c index e4cb44ceb2..5ac66f855b 100644 --- a/harbour/contrib/hbct/files.c +++ b/harbour/contrib/hbct/files.c @@ -124,7 +124,7 @@ static PHB_FFIND _hb_fileStart( HB_BOOL fNext, HB_FATTR ulAttr ) szFile = hb_fsNameConv( szFile, &pszFree ); if( HB_ISNUM( 2 ) ) ulAttr = ( HB_FATTR ) hb_parnl( 2 ); - pFFData->ulAttr = hb_parl( 3 ) ? ulAttr : 0; + pFFData->ulAttr = hb_parl( 3 ) ? ulAttr : HB_FA_ALL; pFFData->ffind = hb_fsFindFirst( szFile, ulAttr ); if( pszFree ) hb_xfree( pszFree ); diff --git a/harbour/contrib/hbqt/hbqt_hbevents.cpp b/harbour/contrib/hbqt/hbqt_hbevents.cpp index 728a031114..8989f22e2b 100644 --- a/harbour/contrib/hbqt/hbqt_hbevents.cpp +++ b/harbour/contrib/hbqt/hbqt_hbevents.cpp @@ -201,7 +201,7 @@ HB_FUNC( QT_EVENTS_CONNECT ) hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", type, "P" ); /* Make it a unique identifier */ int i = object->property( prop ).toInt(); - if ( i == 0 ) /* No Duplicates of same event with same object - it is a design decision - never alter */ + if( i == 0 ) /* No Duplicates of same event with same object - it is a design decision - never alter */ { PHB_ITEM codeblock = hb_itemNew( hb_param( 4, HB_IT_BLOCK | HB_IT_BYREF ) ); diff --git a/harbour/src/rtl/fssize.c b/harbour/src/rtl/fssize.c index bb2aa9fc18..025550f0fc 100644 --- a/harbour/src/rtl/fssize.c +++ b/harbour/src/rtl/fssize.c @@ -132,9 +132,7 @@ HB_FOFFSET hb_fsFSize( const char * pszFileName, HB_BOOL bUseDirEntry ) if( hFileHandle != FS_ERROR ) { - HB_FOFFSET ulPos; - - ulPos = hb_fsSeekLarge( hFileHandle, 0, FS_END ); + HB_FOFFSET ulPos = hb_fsSeekLarge( hFileHandle, 0, FS_END ); hb_fsClose( hFileHandle ); return ulPos; } diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po index c771ac505e..6f0bb2546a 100644 --- a/harbour/utils/hbmk2/hbmk2.hu_HU.po +++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po @@ -409,8 +409,8 @@ msgstr "" #: hbmk2.prg:1105 #, c-format -msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect." -msgstr "Hiba: HB_INSTALL_PREFIX nincs megadva, automata detektálás nem járt sikerrel." +msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\\nPlease run this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory." +msgstr "Hiba: HB_INSTALL_PREFIX nincs megadva, automata detektálás nem járt sikerrel.\\nKérem, futtassa ezt a programot a Harbour könyvtárán belüli eredeti helyéről vagy állítsa be a HB_INSTALL_PREFIX környezeti változót a Harbour gyökér könyvtárára." #: hbmk2.prg:2096 #, c-format diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 5e1f2134f0..99e6862673 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1153,7 +1153,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) CASE hb_FileExists( DirAddPathSep( hb_DirBase() ) + ".." + hb_osPathSeparator() + ".." + hb_osPathSeparator() + ".." + hb_osPathSeparator() + "bin" + hb_osPathSeparator() + cBin_CompPRG + cCCEXT ) l_cHB_INSTALL_PREFIX := DirAddPathSep( hb_DirBase() ) + ".." + hb_osPathSeparator() + ".." + hb_osPathSeparator() + ".." OTHERWISE - hbmk_OutErr( I_( "Error: HB_INSTALL_PREFIX not set, failed to autodetect." ) ) + hbmk_OutErr( I_( "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\nPlease run this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory." ) ) RETURN 3 ENDCASE ENDIF @@ -1412,9 +1412,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) IF Empty( l_cHB_LIB_INSTALL ) /* Autodetect multi-compiler/platform lib structure */ IF hb_DirExists( tmp := PathNormalize( DirAddPathSep( l_cHB_INSTALL_PREFIX ) ) + "lib" +; - hb_osPathSeparator() + hbmk[ _HBMK_cPLAT ] +; - hb_osPathSeparator() + hbmk[ _HBMK_cCOMP ] +; - iif( Empty( hbmk[ _HBMK_cBUILD ] ), "", PathSepToTarget( hbmk, hbmk[ _HBMK_cBUILD ] ) ) ) + hb_osPathSeparator() + hbmk[ _HBMK_cPLAT ] +; + hb_osPathSeparator() + hbmk[ _HBMK_cCOMP ] +; + iif( Empty( hbmk[ _HBMK_cBUILD ] ), "", PathSepToTarget( hbmk, hbmk[ _HBMK_cBUILD ] ) ) ) l_cHB_LIB_INSTALL := tmp ELSE l_cHB_LIB_INSTALL := PathNormalize( DirAddPathSep( l_cHB_INSTALL_PREFIX ) + "lib" ) diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po index 511da79713..c0b6032553 100644 --- a/harbour/utils/hbmk2/hbmk2.pt_BR.po +++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po @@ -52,7 +52,7 @@ msgstr "for #: hbmk2.prg:1104 #, c-format -msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect." +msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\\nPlease run this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory." msgstr "Erro: HB_INSTALL_PREFIX năo definido, falha na detecçăo automática." #: hbmk2.prg:953