fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-01-17 23:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* hbqt/hbqt.h
  * hbqt/hbqt.ch
  * hbqt/hbqt_destruct.cpp
  * hbqt/hbqt_hbqsyntaxhighlighter.cpp
  * contrib/hbqt/tests/demoqt.prg
    - Deleted unused remains of memory release method selection.
This commit is contained in:
Viktor Szakats
2010-01-17 22:09:09 +00:00
parent f36decdc53
commit ee2a5a6737
6 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -17,6 +17,14 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-17 23:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* hbqt/hbqt.h
* hbqt/hbqt.ch
* hbqt/hbqt_destruct.cpp
* hbqt/hbqt_hbqsyntaxhighlighter.cpp
* contrib/hbqt/tests/demoqt.prg
- Deleted unused remains of memory release method selection.
2010-01-17 22:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/hbwin.ch
+ Added HB_WINFONT_* constants for WIN_ENUMFONTS() returned

4
harbour/contrib/hbqt/hbqt.ch
View File

@@ -80,10 +80,6 @@
/*----------------------------------------------------------------------*/
#define HBQT_RELEASE_WITH_DELETE 0 // Release the QObject with delete operator
#define HBQT_RELEASE_WITH_DESTRUTOR 1 // Release the QObject with his destructor
#define HBQT_RELEASE_WITH_DELETE_LATER 2 // Release the QObject with deleteLater() slot
#define QEvent_None 0 // Not an event.
#define QEvent_Timer 1 // Regular timer events (QTimerEvent).
#define QEvent_MouseButtonPress 2 // Mouse press (QMouseEvent).

5
harbour/contrib/hbqt/hbqt.h
View File

@@ -74,11 +74,6 @@ typedef struct
QT_G_FUNC_PTR func;
} QGC_POINTER;
extern int hbqt_get_object_release_method();
#define HBQT_RELEASE_WITH_DELETE 0
#define HBQT_RELEASE_WITH_DESTRUTOR 1
#define HBQT_RELEASE_WITH_DELETE_LATER 2
HB_GARBAGE_FUNC( Q_release );
extern void * hbqt_gcpointer( int iParam );

15
harbour/contrib/hbqt/hbqt_destruct.cpp
View File

@@ -61,8 +61,6 @@
#include <QTextCodec>
static int s_iObjectReleaseMethod = HBQT_RELEASE_WITH_DELETE_LATER;
/*----------------------------------------------------------------------*/
HB_GARBAGE_FUNC( Q_release )
@@ -114,19 +112,6 @@ void * hbqt_pPtrFromObj( int iParam )
return NULL;
}
int hbqt_get_object_release_method()
{
return s_iObjectReleaseMethod;
}
HB_FUNC( HBQT_SET_RELEASE_METHOD )
{
hb_retni( s_iObjectReleaseMethod );
if( HB_ISNUM( 1 ) && hb_parni( 1 ) >= 0 && hb_parni( 1 ) <= HBQT_RELEASE_WITH_DELETE_LATER )
s_iObjectReleaseMethod = hb_parni( 1 );
}
HB_FUNC( HBQT_SETCODECFORCSTRINGS )
{
QTextCodec * codec = QTextCodec::codecForName( ( char * ) hb_parc( 1 ) );

15
harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
View File

@@ -210,20 +210,9 @@ static QT_G_FUNC( release_HBQSyntaxHighlighter )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
switch( hbqt_get_object_release_method() )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( HBQSyntaxHighlighter * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( HBQSyntaxHighlighter * ) p->ph )->~HBQSyntaxHighlighter();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( HBQSyntaxHighlighter * ) p->ph )->deleteLater();
break;
}
p->ph = NULL;
delete ( ( HBQSyntaxHighlighter * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "release_HBQSyntaxHighlighter Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{

3
harbour/contrib/hbqt/tests/demoqt.prg
View File

@@ -168,9 +168,6 @@ HB_TRACE( HB_TR_ALWAYS, ( "-----------------b-----------------" ) )
HB_TRACE( HB_TR_ALWAYS, ( "----------------- qApp:exec -----------------" ) )
//HbQt_Set_Release_Method( HBQT_RELEASE_WITH_DELETE )
//HB_TRACE( HB_TR_ALWAYS, ( "HbQt_Set_Release_Method SET : HBQT_RELEASE_WITH_DELETE" ) )
xReleaseMemory( { oBtn, oLabel, oProg, oSBar, aGrid, aList, aMenu, aTool, aTabs, oDA, oWnd } )
HB_TRACE( HB_TR_ALWAYS, ( "-------------------- exit -------------------" ) )