From c465edaeed3825bba933490ac35f81a76ccc7b7b Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Thu, 21 Jun 2012 17:45:38 +0000 Subject: [PATCH] 2012-06-21 22:43 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/idedocks.prg ! Fixed: one more QIcon() regression, though not used. * contrib/hbqt/qtcore/hbqt_hbqslots.cpp ! Fixed: to pass correct class name for some type of slots in constructors. --- harbour/ChangeLog | 8 ++++++++ harbour/contrib/hbide/idedocks.prg | 4 ++-- harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp | 15 +++++++++++---- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8314002613..4738fb96e9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-21 22:43 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/idedocks.prg + ! Fixed: one more QIcon() regression, though not used. + + * contrib/hbqt/qtcore/hbqt_hbqslots.cpp + ! Fixed: to pass correct class name for some type of slots + in constructors. + 2012-06-21 12:22 UTC+0200 Viktor Szakats (harbour syenar.net) + tests/ipclnt.prg + tests/ipsvr.prg diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index be341e2d61..4fec7f651a 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -545,9 +545,9 @@ METHOD IdeDocks:buildSystemTray() ::oSys:connect( "activated(QSystemTrayIcon::ActivationReason)", {|p| ::execEvent( "qSystemTrayIcon_activated", p ) } ) ::oIde:oSysMenu := QMenu() - ::qAct1 := ::oSysMenu:addAction( hbide_image( "fullscreen" ), "&Show" ) + ::qAct1 := ::oSysMenu:addAction( QIcon( hbide_image( "fullscreen" ) ), "&Show" ) ::oSysMenu:addSeparator() - ::qAct2 := ::oSysMenu:addAction( hbide_image( "exit" ), "&Exit" ) + ::qAct2 := ::oSysMenu:addAction( QIcon( hbide_image( "exit" ) ), "&Exit" ) ::qAct1:connect( "triggered(bool)", {|| ::execEvent( "qSystemTrayIcon_show" ) } ) ::qAct2:connect( "triggered(bool)", {|| ::execEvent( "qSystemTrayIcon_close" ) } ) diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp index 91e23c02c9..36047777fc 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp @@ -241,15 +241,22 @@ int HBQSlots::qt_metacall( QMetaObject::Call c, int id, void ** arguments ) for( int i = 0; i < parameterCount; i++ ) { - if( arrayOfTypes.at( i ).contains( "::" ) ) + QByteArray s = arrayOfTypes.at( i ).trimmed(); + if( s.contains( "::" ) ) { parList += "int"; pList += "int"; } + else if( s.endsWith( "*" ) ) + { + parList += s; + s.chop( 1 ); + pList += "HB_" + s.toUpper(); + } else { - parList += arrayOfTypes.at( i ).trimmed() ; - pList += "HB_" + arrayOfTypes.at( i ).trimmed().toUpper(); + parList += s; + pList += "HB_" + s.toUpper(); } } paramString = parList.join( "$" ).toAscii(); @@ -257,7 +264,7 @@ int HBQSlots::qt_metacall( QMetaObject::Call c, int id, void ** arguments ) object->setProperty( szPList, pList ); - HB_TRACE( HB_TR_DEBUG, ( " SlotsProxy parList %s ", ( char * ) paramString.data() ) ); + HB_TRACE( HB_TR_DEBUG, ( " %p SlotsProxy pList %s ", object, ( char * ) pList.join( "$" ).toAscii().data() ) ); } }