From b14824f3bd6c8b213630f998b51b3c32566a6470 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 3 Jun 2012 08:01:37 +0000 Subject: [PATCH] 2012-06-03 10:01 UTC+0200 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg + added ${hb_verstr} macro returning: "3.2.0dev" + added ${hb_ver} macro returning: "030200" (in hex like __HARBOUR__ constant) --- harbour/ChangeLog | 39 ++++++++++++++++++++--------------- harbour/utils/hbmk2/hbmk2.prg | 4 ++++ 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d059a69ada..905c5e3aad 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-03 10:01 UTC+0200 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.prg + + added ${hb_verstr} macro returning: "3.2.0dev" + + added ${hb_ver} macro returning: "030200" (in hex like __HARBOUR__ constant) + 2012-06-02 15:43 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/qth/QChildEvent.qth * contrib/hbqt/qtcore/qth/QEvent.qth @@ -66,10 +71,10 @@ * contrib/hbqt/qtgui/qth/QRadioButton.qth * contrib/hbqt/qtgui/qth/QSpacerItem.qth ! Fixed: constructors. - This has been a tidious process and I could have - broken something in the process, though, all demoes + This has been a tidious process and I could have + broken something in the process, though, all demoes and hbIDE is working fine. If you find some inconsistency, - please shout. Also if someone can overlook the .qth's + please shout. Also if someone can overlook the .qth's for remaining files yet needs the constructors reworked, it will be a great help. @@ -80,8 +85,8 @@ * contrib/hbide/idethemes.prg ! Changed: a little to pass correct parameters to methods as per the changes in constructors. - - ; NOTE: now hbIDE neither throws any GPF on exit nor reports + + ; NOTE: now hbIDE neither throws any GPF on exit nor reports "object destructure failure : reference to freed block" 2012-06-01 17:14 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -129,7 +134,7 @@ * contrib/hbqt/qtgui/qth/QStatusBar.qth * contrib/hbqt/qtgui/qth/QTextDocument.qth * contrib/hbqt/qtgui/qth/QTreeWidgetItem.qth - ! Fixed: constructors for few more classes. + ! Fixed: constructors for few more classes. Now contrib/hbxbp/demoxbp.prg shows up at least. 2012-05-31 23:32 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -142,7 +147,7 @@ * contrib/hbqt/qtgui/qth/QTableView.qth * contrib/hbqt/qtgui/qth/QVBoxLayout.qth * contrib/hbqt/qtgui/qth/QWizard.qth - ! Fixed: constructors which was basically wrong way to get a + ! Fixed: constructors which was basically wrong way to get a class object. This became visible only when QPointer< QClass > guard is eliminated which was hiding this wrong way. @@ -157,22 +162,22 @@ This can be invoked by uncommenting #define __HBQT_REVAMP__ directive in hbqt.h and hbmk2_qt.hb and recompiling hbQT. - ; NOTE: all demo tests in contrib/hbqt/tests/* are working ok with new - revamped engine, which, I hope will be matured with time, and + ; NOTE: all demo tests in contrib/hbqt/tests/* are working ok with new + revamped engine, which, I hope will be matured with time, and only if Przemek will revive his interest in this project. - The demos are working ok with a GPF on exit. I did not + The demos are working ok with a GPF on exit. I did not tried hard to track but hopefully will be a minor issue. This implementation is not taking use of QPointer<> guard and is operational on pure pointers, it has discovered a fundamental flaw in some of the .qth where constructors - were not adhering to primary rules. It may take me a while + were not adhering to primary rules. It may take me a while to visit all the classes and make the correction. Today's implementation has fixes for those classes which are used in demo programs. - This commit became essential in the wake of divided thoughts - about having two implementations in parallel. This commit - shows the way that we do not need that, just few changes in + This commit became essential in the wake of divided thoughts + about having two implementations in parallel. This commit + shows the way that we do not need that, just few changes in core engine will establish the solid foundation. 2012-05-31 13:58 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) @@ -195,9 +200,9 @@ 2012-05-24 12:15 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/hbqt_pointer.cpp - + Added: HB_FUNC( SIGNAL2SLOT ) which simulates exactly Qt's way - of signal/slot mechanism. Now hbQT has yet another way to - mimic signal/slots. + + Added: HB_FUNC( SIGNAL2SLOT ) which simulates exactly Qt's way + of signal/slot mechanism. Now hbQT has yet another way to + mimic signal/slots. + contrib/hbqt/tests/signalslots.prg + Added: deno program to demonstrate Qt's way of signal/slot diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 7a76c679d8..cd5f37d8e5 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -10287,6 +10287,10 @@ STATIC FUNCTION MacroGet( hbmk, cMacro, cFileName ) cMacro := hbmk_DYNSUFFIX( hbmk ) ; EXIT CASE "HB_DYNEXT" cMacro := hbmk[ _HBMK_cDynLibExt ] ; EXIT + CASE "HB_VER" + cMacro := hb_NumToHex( hb_Version( HB_VERSION_MAJOR ), 2 ) + hb_NumToHex( hb_Version( HB_VERSION_MINOR ), 2 ) + hb_NumToHex( hb_Version( HB_VERSION_RELEASE ), 2 ) ; EXIT + CASE "HB_VERSTR" + cMacro := hb_ntos( hb_Version( HB_VERSION_MAJOR ) ) + "." + hb_ntos( hb_Version( HB_VERSION_MINOR ) ) + "." + hb_ntos( hb_Version( HB_VERSION_RELEASE ) ) + hb_Version( HB_VERSION_STATUS ) ; EXIT CASE "HB_MAJOR" cMacro := hb_ntos( hb_Version( HB_VERSION_MAJOR ) ) ; EXIT CASE "HB_MINOR"