diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9a0244063e..24b822abdc 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-20 07:15 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbqt/hbqt.ch + + Added some more constants. + + * contrib/hbqt/hbqt_slots.cpp + * contrib/hbqt/hbqt_slots.h + ! Further cleanup of QWebKit elimination. + 2009-11-20 15:04 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * include/hbdefs.h * Removed reliance on old type when defining some new types. diff --git a/harbour/contrib/hbqt/hbqt.ch b/harbour/contrib/hbqt/hbqt.ch index 6ad238e6f5..e0f0bbc4a3 100644 --- a/harbour/contrib/hbqt/hbqt.ch +++ b/harbour/contrib/hbqt/hbqt.ch @@ -2140,6 +2140,12 @@ #define QTextEdit_FixedPixelWidth 2 #define QTextEdit_FixedColumnWidth 3 +#define QDockWidget_DockWidgetClosable 0x01 // The dock widget can be closed. On some systems the dock widget always has a close button when it's floating (for example on MacOS 10.5). +#define QDockWidget_DockWidgetMovable 0x02 // The dock widget can be moved between docks by the user. +#define QDockWidget_DockWidgetFloatable 0x04 // The dock widget can be detached from the main window, and floated as an independent window. +#define QDockWidget_DockWidgetVerticalTitleBar 0x08 // The dock widget displays a vertical title bar on its left side. This can be used to increase the amount of vertical space in a QMainWindow. +#define QDockWidget_NoDockWidgetFeatures 0x00 // The dock widget cannot be closed, moved, or floated. + /*----------------------------------------------------------------------*/ #define _HBQT_CH diff --git a/harbour/contrib/hbqt/hbqt_slots.cpp b/harbour/contrib/hbqt/hbqt_slots.cpp index 39938d56c2..674c4811b7 100644 --- a/harbour/contrib/hbqt/hbqt_slots.cpp +++ b/harbour/contrib/hbqt/hbqt_slots.cpp @@ -247,6 +247,23 @@ static void SlotsExecIntIntIntInt( QObject* object, char* event, int iValue1, in } } +static void SlotsExecString( QObject* object, char* event, const QString & string ) +{ + if( object ) + { + Slots * s_s = qt_getEventSlots(); + int i = object->property( event ).toInt(); + if( i > 0 && i <= s_s->listBlock.size() && hb_vmRequestReenter() ) + { + PHB_ITEM pObject = hb_itemPutPtr( NULL, object ); + PHB_ITEM pString = hb_itemPutC( NULL, string.toAscii().data() ); + hb_vmEvalBlockV( s_s->listBlock.at( i - 1 ), 2, pObject, pString ); + hb_itemRelease( pObject ); + hb_itemRelease( pString ); + } + } +} +#if 0 static void SlotsExecIntIntRect( QObject* object, char* event, int iValue1, int iValue2, const QRect & rect ) { if( object ) @@ -269,23 +286,6 @@ static void SlotsExecIntIntRect( QObject* object, char* event, int iValue1, int } } -static void SlotsExecString( QObject* object, char* event, const QString & string ) -{ - if( object ) - { - Slots * s_s = qt_getEventSlots(); - int i = object->property( event ).toInt(); - if( i > 0 && i <= s_s->listBlock.size() && hb_vmRequestReenter() ) - { - PHB_ITEM pObject = hb_itemPutPtr( NULL, object ); - PHB_ITEM pString = hb_itemPutC( NULL, string.toAscii().data() ); - hb_vmEvalBlockV( s_s->listBlock.at( i - 1 ), 2, pObject, pString ); - hb_itemRelease( pObject ); - hb_itemRelease( pString ); - } - } -} -#if 0 static void SlotsExecString2( QObject* object, char* event, const QString & s1, const QString & s2 ) { if( object ) @@ -304,7 +304,7 @@ static void SlotsExecString2( QObject* object, char* event, const QString & s1, } } } -#endif + static void SlotsExecString3( QObject* object, char* event, const QString & s1, const QString & s2, const QString & s3 ) { if( object ) @@ -326,24 +326,6 @@ static void SlotsExecString3( QObject* object, char* event, const QString & s1, } } -static void SlotsExecModel( QObject* object, char* event, const QModelIndex & index ) -{ - if( object ) - { - Slots * s_s = qt_getEventSlots(); - int i = object->property( event ).toInt(); - if( i > 0 && i <= s_s->listBlock.size() && hb_vmRequestReenter() ) - { - PHB_ITEM pObject = hb_itemPutPtr( NULL, object ); - PHB_ITEM pState = hb_itemPutPtr( NULL, ( QModelIndex * ) new QModelIndex( index ) ); - hb_vmEvalBlockV( s_s->listBlock.at( i - 1 ), 2, pObject, pState ); - hb_itemRelease( pObject ); - delete ( ( QModelIndex * ) hb_itemGetPtr( pState ) ); - hb_itemRelease( pState ); - } - } -} - static void SlotsExecRect( QObject* object, char* event, const QRect & rect ) { if( object ) @@ -379,6 +361,24 @@ static void SlotsExecUrl( QObject* object, char* event, const QUrl & url ) } } } +#endif +static void SlotsExecModel( QObject* object, char* event, const QModelIndex & index ) +{ + if( object ) + { + Slots * s_s = qt_getEventSlots(); + int i = object->property( event ).toInt(); + if( i > 0 && i <= s_s->listBlock.size() && hb_vmRequestReenter() ) + { + PHB_ITEM pObject = hb_itemPutPtr( NULL, object ); + PHB_ITEM pState = hb_itemPutPtr( NULL, ( QModelIndex * ) new QModelIndex( index ) ); + hb_vmEvalBlockV( s_s->listBlock.at( i - 1 ), 2, pObject, pState ); + hb_itemRelease( pObject ); + delete ( ( QModelIndex * ) hb_itemGetPtr( pState ) ); + hb_itemRelease( pState ); + } + } +} static void SlotsExecTextCharFormat( QObject* object, char* event, const QTextCharFormat & f ) { @@ -433,7 +433,7 @@ static void SlotsExecStringList( QObject* object, char* event, const QStringList } } } - +#if 0 static void SlotsExecNetworkRequest( QObject* object, char* event, const QNetworkRequest & request ) { if( object ) @@ -451,7 +451,7 @@ static void SlotsExecNetworkRequest( QObject* object, char* event, const QNetwor } } } - +#endif static void SlotsExecPointer( QObject* object, char* event, void * p1 ) { if( object ) @@ -468,7 +468,7 @@ static void SlotsExecPointer( QObject* object, char* event, void * p1 ) } } } - +#if 0 static void SlotsExecPointerString( QObject* object, char* event, void * p1, QString s1 ) { if( object ) @@ -487,7 +487,7 @@ static void SlotsExecPointerString( QObject* object, char* event, void * p1, QSt } } } - +#endif static void SlotsExecPointerInt( QObject* object, char* event, void * p1, int iInt ) { if( object ) diff --git a/harbour/contrib/hbqt/hbqt_slots.h b/harbour/contrib/hbqt/hbqt_slots.h index 82d0ba23a7..a2d72eab3b 100644 --- a/harbour/contrib/hbqt/hbqt_slots.h +++ b/harbour/contrib/hbqt/hbqt_slots.h @@ -69,7 +69,7 @@ #include #include #include -#include +//#include #include #include #include