From ee2a5a67379e5ffcdd4c6ae5fd4bfa65b32286d0 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 17 Jan 2010 22:09:09 +0000 Subject: [PATCH] 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. --- harbour/ChangeLog | 8 ++++++++ harbour/contrib/hbqt/hbqt.ch | 4 ---- harbour/contrib/hbqt/hbqt.h | 5 ----- harbour/contrib/hbqt/hbqt_destruct.cpp | 15 --------------- .../contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp | 15 ++------------- harbour/contrib/hbqt/tests/demoqt.prg | 3 --- 6 files changed, 10 insertions(+), 40 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 339116347e..83fbd92aa8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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 diff --git a/harbour/contrib/hbqt/hbqt.ch b/harbour/contrib/hbqt/hbqt.ch index c1c30ab74f..6b5f2624f7 100644 --- a/harbour/contrib/hbqt/hbqt.ch +++ b/harbour/contrib/hbqt/hbqt.ch @@ -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). diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h index f69b97b6ac..99c16aa7d7 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/hbqt.h @@ -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 ); diff --git a/harbour/contrib/hbqt/hbqt_destruct.cpp b/harbour/contrib/hbqt/hbqt_destruct.cpp index ea1b27abef..95de79161d 100644 --- a/harbour/contrib/hbqt/hbqt_destruct.cpp +++ b/harbour/contrib/hbqt/hbqt_destruct.cpp @@ -61,8 +61,6 @@ #include -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 ) ); diff --git a/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp b/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp index dc3e40dbad..acee3436f9 100644 --- a/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp +++ b/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp @@ -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 { diff --git a/harbour/contrib/hbqt/tests/demoqt.prg b/harbour/contrib/hbqt/tests/demoqt.prg index dd349622ba..8ce1671413 100644 --- a/harbour/contrib/hbqt/tests/demoqt.prg +++ b/harbour/contrib/hbqt/tests/demoqt.prg @@ -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 -------------------" ) )