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

2010-10-29 00:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbqt/qtcore/hbqt_hbqslots.cpp
    * __HBQT_SLOTS_DISCONNECT() - Fixed a variable name
      to match real content (slot -> pszSignal)
    % __HBQT_SLOTS_CONNECT() - Synced with disconnect,
      added local variable to avoid double hb_parcx() calls.
This commit is contained in:
Viktor Szakats
2010-10-28 22:52:23 +00:00
parent 7b9b7433c4
commit fd7fafe596
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -16,6 +16,13 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-10-29 00:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/qtcore/hbqt_hbqslots.cpp
* __HBQT_SLOTS_DISCONNECT() - Fixed a variable name
to match real content (slot -> pszSignal)
% __HBQT_SLOTS_CONNECT() - Synced with disconnect,
added local variable to avoid double hb_parcx() calls.
2010-10-29 00:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/win_os.prg
* Reverted 2010-10-22 19:08 UTC+0200

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

@@ -207,10 +207,12 @@ HB_FUNC( __HBQT_SLOTS_CONNECT )
PHB_ITEM pBlock = hb_itemNew( hb_param( 4, HB_IT_BLOCK ) ); /* get codeblock */
if( pBlock )
{
int i = object->property( hb_parcx( 3 ) ).toInt();
const char * pszSignal = hb_parcx( 3 );
int i = object->property( pszSignal ).toInt();
if( i == 0 )
{
QString signal = hb_parcx( 3 );
QString signal = pszSignal;
QByteArray theSignal = QMetaObject::normalizedSignature( signal.toAscii() );
if( QMetaObject::checkConnectArgs( theSignal, theSignal ) )
@@ -273,15 +275,14 @@ HB_FUNC( __HBQT_SLOTS_DISCONNECT )
QObject * object = ( QObject * ) hbqt_pPtrFromObj( 2 );
if( object )
{
const char * slot = hb_parcx( 3 );
int i = object->property( slot ).toInt();
const char * pszSignal = hb_parcx( 3 );
int i = object->property( pszSignal ).toInt();
if( i > 0 && i <= t_slots->listBlock.size() )
{
object->setProperty( slot, QVariant() );
object->setProperty( pszSignal, QVariant() );
QString signal = ( QString ) slot;
QString signal = pszSignal;
QByteArray theSignal = signal.toAscii();
int signalId = object->metaObject()->indexOfSignal( QMetaObject::normalizedSignature( theSignal ) );