From d4e28fc89532611e82cb94906bfc8b179cff72cb Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 21 Dec 2009 22:16:37 +0000 Subject: [PATCH] 2009-12-21 13:07 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/qtgui/QMenuBar.cpp * contrib/hbqt/qth/QMenuBar.qth ! Fixed one remaining warning at auto generation level. --- harbour/ChangeLog | 5 +++++ harbour/contrib/hbqt/qtgui/QMenuBar.cpp | 28 +++++++------------------ harbour/contrib/hbqt/qth/QMenuBar.qth | 2 +- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 32cc7a9f0c..d7a7efd948 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-21 13:07 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbqt/qtgui/QMenuBar.cpp + * contrib/hbqt/qth/QMenuBar.qth + ! Fixed one remaining warning at auto generation level. + 2009-12-21 22:33 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * ChangeLog ! Fixed UTF offset for my commits from last week. diff --git a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp b/harbour/contrib/hbqt/qtgui/QMenuBar.cpp index 029b5e155e..cb1185cc4a 100644 --- a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QMenuBar.cpp @@ -66,20 +66,6 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ -/* - * Constructed[ 14/17 [ 82.35% ] ] - * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * OSMenuRef macMenu () - * - * *** Commented out protos which construct fine but do not compile *** - * - * // QAction * defaultAction () const - * // void setDefaultAction ( QAction * act ) - */ - #include #include @@ -97,12 +83,12 @@ typedef struct QPointer< QMenuBar > pq; } QGC_POINTER_QMenuBar; -QT_G_FUNC( hbqt_gcRelease_QMenuBar ) +QT_G_FUNC( release_QMenuBar ) { QGC_POINTER_QMenuBar * p = ( QGC_POINTER_QMenuBar * ) Cargo; - HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QMenuBar p=%p", p)); - HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QMenuBar ph=%p pq=%p", p->ph, (void *)(p->pq))); + HB_TRACE( HB_TR_DEBUG, ( "release_QMenuBar p=%p", p)); + HB_TRACE( HB_TR_DEBUG, ( "release_QMenuBar ph=%p pq=%p", p->ph, (void *)(p->pq))); if( p && p->ph && p->pq ) { @@ -122,16 +108,16 @@ QT_G_FUNC( hbqt_gcRelease_QMenuBar ) break; } p->ph = NULL; - HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QMenuBar Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + HB_TRACE( HB_TR_DEBUG, ( "release_QMenuBar Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); } else { - HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QMenuBar Object Name Missing!" ) ); + HB_TRACE( HB_TR_DEBUG, ( "NO release_QMenuBar Object Name Missing!" ) ); } } else { - HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QMenuBar Object Already deleted!" ) ); + HB_TRACE( HB_TR_DEBUG, ( "DEL release_QMenuBar Object Already deleted!" ) ); } } @@ -140,7 +126,7 @@ void * hbqt_gcAllocate_QMenuBar( void * pObj ) QGC_POINTER_QMenuBar * p = ( QGC_POINTER_QMenuBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QMenuBar ), hbqt_gcFuncs() ); p->ph = pObj; - p->func = hbqt_gcRelease_QMenuBar; + p->func = release_QMenuBar; new( & p->pq ) QPointer< QMenuBar >( ( QMenuBar * ) pObj ); HB_TRACE( HB_TR_DEBUG, ( " new_QMenuBar %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); return( p ); diff --git a/harbour/contrib/hbqt/qth/QMenuBar.qth b/harbour/contrib/hbqt/qth/QMenuBar.qth index 1a37f382f0..8dbd2a5599 100644 --- a/harbour/contrib/hbqt/qth/QMenuBar.qth +++ b/harbour/contrib/hbqt/qth/QMenuBar.qth @@ -87,7 +87,7 @@ void clear () QAction * insertMenu ( QAction * before, QMenu * menu ) QAction * insertSeparator ( QAction * before ) bool isDefaultUp () const -OSMenuRef macMenu () +// OSMenuRef macMenu () void setActiveAction ( QAction * act ) // void setDefaultAction ( QAction * act ) void setDefaultUp ( bool )