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

2011-03-09 17:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbqt/qtgui/hbqt_init.cpp
  * contrib/hbqt/qtcore/hbqt_init.cpp
    ! QWidget related event moved to hbqtgui to avoid build breakage.
This commit is contained in:
Viktor Szakats
2011-03-09 16:51:24 +00:00
parent d1e2430c60
commit 609bfd674f
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-03-09 17:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/qtgui/hbqt_init.cpp
* contrib/hbqt/qtcore/hbqt_init.cpp
! QWidget related event moved to hbqtgui to avoid build breakage.
2011-03-09 17:17 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/hbmk2_qt.hbs
! Fixed scope of generate HB_EXTERN section.

13
harbour/contrib/hbqt/qtcore/hbqt_init.cpp
View File

@@ -75,13 +75,11 @@
#include <QtCore/QModelIndex>
#include <QtCore/QRectF>
#include <QtCore/QObject>
#include <QtGui/QWidget>
#include <QtCore/QStringList>
HB_EXTERN_BEGIN
extern void * hbqt_gcAllocate_QObject( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWidget( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTime( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSize( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSizeF( void * pObj, bool bNew );
@@ -365,16 +363,6 @@ static void hbqt_SlotsExecQObject( PHB_ITEM * codeBlock, void ** arguments, QStr
hb_vmSend( 1 );
}
static void hbqt_SlotsExecQWidget( PHB_ITEM * codeBlock, void ** arguments, QStringList pList )
{
Q_UNUSED( pList );
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QWidget( ( *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) ), false ), "hb_QWidget" ) );
hb_vmSend( 1 );
}
/*----------------------------------------------------------------------*/
HB_FUNC_EXTERN( HB_QEVENT );
@@ -415,7 +403,6 @@ static void hbqt_registerCallbacks( void )
hbqt_slots_register_callback( "QTime" , hbqt_SlotsExecQTime );
hbqt_slots_register_callback( "QUrl" , hbqt_SlotsExecQUrl );
hbqt_slots_register_callback( "QObject*" , hbqt_SlotsExecQObject );
hbqt_slots_register_callback( "QWidget*" , hbqt_SlotsExecQWidget );
hbqt_events_register_createobj( QEvent::Timer , "hb_QEvent" );
}

12
harbour/contrib/hbqt/qtgui/hbqt_init.cpp
View File

@@ -288,6 +288,16 @@ static void hbqt_SlotsExecQTreeWidgetItemQTreeWidgetItem( PHB_ITEM * codeBlock,
hb_vmSend( 2 );
}
static void hbqt_SlotsExecQWidget( PHB_ITEM * codeBlock, void ** arguments, QStringList pList )
{
Q_UNUSED( pList );
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QWidget( ( *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) ), false ), "hb_QWidget" ) );
hb_vmSend( 1 );
}
static void hbqt_SlotsExecQWidgetQWidget( PHB_ITEM * codeBlock, void ** arguments, QStringList pList )
{
Q_UNUSED( pList );
@@ -311,7 +321,6 @@ static void hbqt_SlotsExecQWidgetInt( PHB_ITEM * codeBlock, void ** arguments, Q
}
HB_FUNC_EXTERN( HB_QABSTRACTBUTTON );
HB_FUNC_EXTERN( HB_QACTION );
HB_FUNC_EXTERN( HB_QMDISUBWINDOW );
@@ -412,6 +421,7 @@ static void hbqt_registerCallbacks( void )
hbqt_slots_register_callback( "QWidget*$QWidget*" , hbqt_SlotsExecQWidgetQWidget );
hbqt_slots_register_callback( "QTreeWidgetItem*" , hbqt_SlotsExecQTreeWidgetItem );
hbqt_slots_register_callback( "QListWidgetItem*" , hbqt_SlotsExecQListWidgetItem );
hbqt_slots_register_callback( "QWidget*" , hbqt_SlotsExecQWidget );
hbqt_events_register_createobj( QEvent::MouseButtonPress , "hb_QMouseEvent" );
hbqt_events_register_createobj( QEvent::MouseButtonRelease , "hb_QMouseEvent" );