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

2012-06-21 22:43 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* 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
       <pList> in constructors.
This commit is contained in:
Pritpal Bedi
2012-06-21 17:45:38 +00:00
parent 5e763216ee
commit c465edaeed
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -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
<pList> in constructors.
2012-06-21 12:22 UTC+0200 Viktor Szakats (harbour syenar.net)
+ tests/ipclnt.prg
+ tests/ipsvr.prg

4
harbour/contrib/hbide/idedocks.prg
View File

@@ -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" ) } )

15
harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp
View File

@@ -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() ) );
}
}