diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3ad5120286..f80efda9d9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,22 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-26 21:58 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/idedocks.prg + % An important arti-fix. + + * contrib/hbqt/qtcore/doc/en/class_qobject.txt + * contrib/hbqt/qtcore/g/QObject.cpp + * contrib/hbqt/qtcore/g/TQObject.prg + * contrib/hbqt/qtcore/qth/QObject.qth + * contrib/hbqt/qtgui/THbQtUI.prg + + * contrib/hbxbp/xbpbrowse.prg + * contrib/hbxbp/xbpdialog.prg + * contrib/hbxbp/xbpwindow.prg + + % First regression fix - ::connect() was defined in more classes than required. + 2010-08-26 18:15 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) - contrib/hbide/idereportsmanager.prg - contrib/hbide/idetoolbar.prg diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index fc2695d490..5c14d3709e 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -364,13 +364,8 @@ METHOD IdeDocks:buildDialog() ENDIF ENDIF - #if 1 ::oDlg:oWidget:connect( QEvent_WindowStateChange, {|e| ::execEvent( "QEvent_WindowStateChange", e ) } ) ::oDlg:oWidget:connect( QEvent_Hide , {|e| ::execEvent( "QEvent_Hide" , e ) } ) - #else - ::oDlg:oWidget:connect( QEvent_WindowStateChange, {|e| ::execEvent( "QEvent_WindowStateChange", e ) } ) - ::oDlg:oWidget:connect( QEvent_Hide , {|e| ::execEvent( "QEvent_Hide" , e ) } ) - #endif ::buildSystemTray() @@ -825,7 +820,9 @@ METHOD IdeDocks:restPanelsGeometry() LOCAL a_, n FOR EACH a_ IN ::aViewsInfo IF ( n := ascan( ::oIde:aMdies, {|o| o:objectName() == a_[ 1 ] } ) ) > 0 - ::oIde:aMdies[ n ]:setGeometry( a_[ 2 ] ) + IF hb_isObject( a_[ 2 ] ) + ::oIde:aMdies[ n ]:setGeometry( a_[ 2 ] ) + ENDIF ENDIF NEXT RETURN Self diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qobject.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qobject.txt index d9f1dceab8..e516f0e981 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qobject.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qobject.txt @@ -27,9 +27,6 @@ * An instance of the object of type QObject * $METHODS$ * :blockSignals( lBlock ) -> lBool - * :connect( pSender, pSignal, pMethod, nType ) -> lBool - * :disconnect( pSignal, pReceiver, pMethod ) -> lBool - * :disconnect_1( pReceiver, pMethod ) -> lBool * :dumpObjectInfo() -> NIL * :dumpObjectTree() -> NIL * :dynamicPropertyNames() -> pQList @@ -49,8 +46,6 @@ * :signalsBlocked() -> lBool * :startTimer( nInterval ) -> nInt * :thread() -> pQThread - * :connect_1( pSender, pSignal, pReceiver, pMethod, nType ) -> lBool - * :disconnect_2( pSender, pSignal, pReceiver, pMethod ) -> lBool * :tr( pSourceText, pDisambiguation, nN ) -> cQString * :trUtf8( pSourceText, pDisambiguation, nN ) -> cQString * :deleteLater() -> NIL diff --git a/harbour/contrib/hbqt/qtcore/g/QObject.cpp b/harbour/contrib/hbqt/qtcore/g/QObject.cpp index afce7d0362..6e0ec088a1 100644 --- a/harbour/contrib/hbqt/qtcore/g/QObject.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QObject.cpp @@ -66,7 +66,7 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 29/35 [ 82.86% ] ] + * Constructed[ 24/35 [ 68.57% ] ] * * *** Unconvered Prototypes *** * ----------------------------- @@ -78,8 +78,13 @@ * *** Commented out protos which construct fine but do not compile *** * * // const QObjectList & children () const + * // bool connect ( const QObject * sender, const char * signal, const char * method, Qt::ConnectionType type = Qt::AutoConnection ) const + * // bool disconnect ( const char * signal = 0, const QObject * receiver = 0, const char * method = 0 ) + * // bool disconnect ( const QObject * receiver, const char * method = 0 ) * //T findChild ( const QString & name = QString() ) const * //virtual const QMetaObject * metaObject () const + * // bool connect ( const QObject * sender, const char * signal, const QObject * receiver, const char * method, Qt::ConnectionType type = Qt::AutoConnection ) + * // bool disconnect ( const QObject * sender, const char * signal, const QObject * receiver, const char * method ) */ #include @@ -180,48 +185,6 @@ HB_FUNC( QT_QOBJECT_BLOCKSIGNALS ) } } -/* - * bool connect ( const QObject * sender, const char * signal, const char * method, Qt::ConnectionType type = Qt::AutoConnection ) const - */ -HB_FUNC( QT_QOBJECT_CONNECT ) -{ - QObject * p = hbqt_par_QObject( 1 ); - if( p ) - hb_retl( ( p )->connect( hbqt_par_QObject( 2 ), hbqt_par_char( 3 ), hbqt_par_char( 4 ), ( HB_ISNUM( 5 ) ? ( Qt::ConnectionType ) hb_parni( 5 ) : ( Qt::ConnectionType ) Qt::AutoConnection ) ) ); - else - { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QOBJECT_CONNECT FP=hb_retl( ( p )->connect( hbqt_par_QObject( 2 ), hbqt_par_char( 3 ), hbqt_par_char( 4 ), ( HB_ISNUM( 5 ) ? ( Qt::ConnectionType ) hb_parni( 5 ) : ( Qt::ConnectionType ) Qt::AutoConnection ) ) ); p is NULL" ) ); - } -} - -/* - * bool disconnect ( const char * signal = 0, const QObject * receiver = 0, const char * method = 0 ) - */ -HB_FUNC( QT_QOBJECT_DISCONNECT ) -{ - QObject * p = hbqt_par_QObject( 1 ); - if( p ) - hb_retl( ( p )->disconnect( hbqt_par_char( 2 ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ) ) ); - else - { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QOBJECT_DISCONNECT FP=hb_retl( ( p )->disconnect( hbqt_par_char( 2 ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ) ) ); p is NULL" ) ); - } -} - -/* - * bool disconnect ( const QObject * receiver, const char * method = 0 ) - */ -HB_FUNC( QT_QOBJECT_DISCONNECT_1 ) -{ - QObject * p = hbqt_par_QObject( 1 ); - if( p ) - hb_retl( ( p )->disconnect( hbqt_par_QObject( 2 ), hbqt_par_char( 3 ) ) ); - else - { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QOBJECT_DISCONNECT_1 FP=hb_retl( ( p )->disconnect( hbqt_par_QObject( 2 ), hbqt_par_char( 3 ) ) ); p is NULL" ) ); - } -} - /* * void dumpObjectInfo () */ @@ -502,34 +465,6 @@ HB_FUNC( QT_QOBJECT_THREAD ) } } -/* - * bool connect ( const QObject * sender, const char * signal, const QObject * receiver, const char * method, Qt::ConnectionType type = Qt::AutoConnection ) - */ -HB_FUNC( QT_QOBJECT_CONNECT_1 ) -{ - QObject * p = hbqt_par_QObject( 1 ); - if( p ) - hb_retl( ( p )->connect( hbqt_par_QObject( 2 ), hbqt_par_char( 3 ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), ( HB_ISNUM( 6 ) ? ( Qt::ConnectionType ) hb_parni( 6 ) : ( Qt::ConnectionType ) Qt::AutoConnection ) ) ); - else - { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QOBJECT_CONNECT_1 FP=hb_retl( ( p )->connect( hbqt_par_QObject( 2 ), hbqt_par_char( 3 ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), ( HB_ISNUM( 6 ) ? ( Qt::ConnectionType ) hb_parni( 6 ) : ( Qt::ConnectionType ) Qt::AutoConnection ) ) ); p is NULL" ) ); - } -} - -/* - * bool disconnect ( const QObject * sender, const char * signal, const QObject * receiver, const char * method ) - */ -HB_FUNC( QT_QOBJECT_DISCONNECT_2 ) -{ - QObject * p = hbqt_par_QObject( 1 ); - if( p ) - hb_retl( ( p )->disconnect( hbqt_par_QObject( 2 ), hbqt_par_char( 3 ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ) ) ); - else - { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QOBJECT_DISCONNECT_2 FP=hb_retl( ( p )->disconnect( hbqt_par_QObject( 2 ), hbqt_par_char( 3 ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ) ) ); p is NULL" ) ); - } -} - /* * QString tr ( const char * sourceText, const char * disambiguation = 0, int n = -1 ) */ diff --git a/harbour/contrib/hbqt/qtcore/g/TQObject.prg b/harbour/contrib/hbqt/qtcore/g/TQObject.prg index dd2d51871e..78db8dc34a 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQObject.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQObject.prg @@ -68,9 +68,6 @@ CREATE CLASS QObject INHERIT HbQtObjectHandler METHOD new( ... ) METHOD blockSignals( lBlock ) - METHOD connect( pSender, pSignal, pMethod, nType ) - METHOD disconnect( pSignal, pReceiver, pMethod ) - METHOD disconnect_1( pReceiver, pMethod ) METHOD dumpObjectInfo() METHOD dumpObjectTree() METHOD dynamicPropertyNames() @@ -91,8 +88,6 @@ CREATE CLASS QObject INHERIT HbQtObjectHandler METHOD signalsBlocked() METHOD startTimer( nInterval ) METHOD thread() - METHOD connect_1( pSender, pSignal, pReceiver, pMethod, nType ) - METHOD disconnect_2( pSender, pSignal, pReceiver, pMethod ) METHOD tr( pSourceText, pDisambiguation, nN ) METHOD trUtf8( pSourceText, pDisambiguation, nN ) METHOD deleteLater() @@ -113,18 +108,6 @@ METHOD QObject:blockSignals( lBlock ) RETURN Qt_QObject_blockSignals( ::pPtr, lBlock ) -METHOD QObject:connect( pSender, pSignal, pMethod, nType ) - RETURN Qt_QObject_connect( ::pPtr, hbqt_ptr( pSender ), hbqt_ptr( pSignal ), hbqt_ptr( pMethod ), nType ) - - -METHOD QObject:disconnect( pSignal, pReceiver, pMethod ) - RETURN Qt_QObject_disconnect( ::pPtr, hbqt_ptr( pSignal ), hbqt_ptr( pReceiver ), hbqt_ptr( pMethod ) ) - - -METHOD QObject:disconnect_1( pReceiver, pMethod ) - RETURN Qt_QObject_disconnect_1( ::pPtr, hbqt_ptr( pReceiver ), hbqt_ptr( pMethod ) ) - - METHOD QObject:dumpObjectInfo() RETURN Qt_QObject_dumpObjectInfo( ::pPtr ) @@ -205,14 +188,6 @@ METHOD QObject:thread() RETURN Qt_QObject_thread( ::pPtr ) -METHOD QObject:connect_1( pSender, pSignal, pReceiver, pMethod, nType ) - RETURN Qt_QObject_connect_1( ::pPtr, hbqt_ptr( pSender ), hbqt_ptr( pSignal ), hbqt_ptr( pReceiver ), hbqt_ptr( pMethod ), nType ) - - -METHOD QObject:disconnect_2( pSender, pSignal, pReceiver, pMethod ) - RETURN Qt_QObject_disconnect_2( ::pPtr, hbqt_ptr( pSender ), hbqt_ptr( pSignal ), hbqt_ptr( pReceiver ), hbqt_ptr( pMethod ) ) - - METHOD QObject:tr( pSourceText, pDisambiguation, nN ) RETURN Qt_QObject_tr( ::pPtr, hbqt_ptr( pSourceText ), hbqt_ptr( pDisambiguation ), nN ) diff --git a/harbour/contrib/hbqt/qtcore/qth/QObject.qth b/harbour/contrib/hbqt/qtcore/qth/QObject.qth index 7bf9083959..5b968bb35a 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QObject.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QObject.qth @@ -76,9 +76,9 @@ HB_FUNC( QT_QOBJECT ) bool blockSignals ( bool block ) // const QObjectList & children () const -bool connect ( const QObject * sender, const char * signal, const char * method, Qt::ConnectionType type = Qt::AutoConnection ) const -bool disconnect ( const char * signal = 0, const QObject * receiver = 0, const char * method = 0 ) -bool disconnect ( const QObject * receiver, const char * method = 0 ) +// bool connect ( const QObject * sender, const char * signal, const char * method, Qt::ConnectionType type = Qt::AutoConnection ) const +// bool disconnect ( const char * signal = 0, const QObject * receiver = 0, const char * method = 0 ) +// bool disconnect ( const QObject * receiver, const char * method = 0 ) void dumpObjectInfo () void dumpObjectTree () QList dynamicPropertyNames () const @@ -107,8 +107,8 @@ int startTimer ( int interval ) QThread * thread () const -bool connect ( const QObject * sender, const char * signal, const QObject * receiver, const char * method, Qt::ConnectionType type = Qt::AutoConnection ) -bool disconnect ( const QObject * sender, const char * signal, const QObject * receiver, const char * method ) +// bool connect ( const QObject * sender, const char * signal, const QObject * receiver, const char * method, Qt::ConnectionType type = Qt::AutoConnection ) +// bool disconnect ( const QObject * sender, const char * signal, const QObject * receiver, const char * method ) const QMetaObject staticMetaObject QString tr ( const char * sourceText, const char * disambiguation = 0, int n = -1 ) QString trUtf8 ( const char * sourceText, const char * disambiguation = 0, int n = -1 ) diff --git a/harbour/contrib/hbqt/qtgui/THbQtUI.prg b/harbour/contrib/hbqt/qtgui/THbQtUI.prg index ca5477beeb..cf6663c10e 100644 --- a/harbour/contrib/hbqt/qtgui/THbQtUI.prg +++ b/harbour/contrib/hbqt/qtgui/THbQtUI.prg @@ -100,7 +100,6 @@ CLASS HbQtUI METHOD event( cWidget, nEvent, bBlock ) METHOD signal( cWidget, cSignal, bBlock ) - METHOD connect( cWidget, cSignal, bBlock ) METHOD loadWidgets() METHOD loadContents( cUiFull ) METHOD loadUI( cUiFull, qParent ) @@ -200,12 +199,6 @@ METHOD HbQtUI:event( cWidget, nEvent, bBlock ) /*----------------------------------------------------------------------*/ -METHOD HbQtUI:connect( cWidget, cSignal, bBlock ) - - RETURN ::signal( cWidget, cSignal, bBlock ) - -/*----------------------------------------------------------------------*/ - METHOD HbQtUI:signal( cWidget, cSignal, bBlock ) IF hb_hHasKey( ::qObj, cWidget ) diff --git a/harbour/contrib/hbxbp/xbpbrowse.prg b/harbour/contrib/hbxbp/xbpbrowse.prg index 55f105549e..16b589dc8c 100644 --- a/harbour/contrib/hbxbp/xbpbrowse.prg +++ b/harbour/contrib/hbxbp/xbpbrowse.prg @@ -719,11 +719,11 @@ METHOD XbpBrowse:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) /* .DBF Manipulation Model */ ::oDbfModel := HBQAbstractItemModel():new( {|t,role,x,y| ::supplyInfo( 141, t, role, x, y ) } ) -HB_TRACE( HB_TR_ALWAYS, "20000 9" ) +HB_TRACE( HB_TR_DEBUG, "20000 9" ) /* Attach Model with the View */ ::oTableView:setModel( ::oDbfModel ) -HB_TRACE( HB_TR_ALWAYS, "20000 10" ) +HB_TRACE( HB_TR_DEBUG, "20000 10" ) /* Horizontal Footer */ ::oFooterView := QHeaderView():new( Qt_Horizontal ) // diff --git a/harbour/contrib/hbxbp/xbpdialog.prg b/harbour/contrib/hbxbp/xbpdialog.prg index eb71fb4470..a648077aa2 100644 --- a/harbour/contrib/hbxbp/xbpdialog.prg +++ b/harbour/contrib/hbxbp/xbpdialog.prg @@ -156,7 +156,7 @@ METHOD XbpDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ENDIF ::oWidget:setMouseTracking( .t. ) ELSE - //#define __QMAINWINDOW__ + #define __QMAINWINDOW__ #ifdef __QMAINWINDOW__ ::oWidget := QMainWindow():new() #else diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg index 42fbbeedf6..e502e2f862 100644 --- a/harbour/contrib/hbxbp/xbpwindow.prg +++ b/harbour/contrib/hbxbp/xbpwindow.prg @@ -417,7 +417,7 @@ HB_TRACE( HB_TR_DEBUG, hb_threadId(),"Destroy[ B ] "+pad(cCls,12)+ cMsg, memory ::oParent := NIL ::oOwner := NIL - ::disconnect() + //::oWidget:disconnect() IF len( ::aEConnections ) > 0 #if 0 @@ -1041,66 +1041,66 @@ METHOD XbpWindow:setPointer( cDllName, xResID, nType ) CASE xResID == XBPSTATIC_SYSICON_DEFAULT // Default mouse pointer CASE xResID == XBPSTATIC_SYSICON_ARROW // Normal arrow - ::oWidget:setCursor( QCursor():new( Qt_ArrowCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_ArrowCursor ) ) CASE xResID == XBPSTATIC_SYSICON_WAIT // Hour glass or clock - ::oWidget:setCursor( QCursor():new( Qt_WaitCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_WaitCursor ) ) CASE xResID == XBPSTATIC_SYSICON_MOVE // Move the window - ::oWidget:setCursor( QCursor():new( Qt_OpenHandCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_OpenHandCursor ) ) CASE xResID == XBPSTATIC_SYSICON_SIZE // Change size (all directions) - ::oWidget:setCursor( QCursor():new( Qt_SizeAllCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_SizeAllCursor ) ) CASE xResID == XBPSTATIC_SYSICON_SIZENWSE // Change size (North west-South east) - ::oWidget:setCursor( QCursor():new( Qt_SizeFDiagCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_SizeFDiagCursor ) ) CASE xResID == XBPSTATIC_SYSICON_SIZENESW // Change size (North east-South west) - ::oWidget:setCursor( QCursor():new( Qt_SizeBDiagCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_SizeBDiagCursor ) ) CASE xResID == XBPSTATIC_SYSICON_SIZEWE // Change size (West-East) - ::oWidget:setCursor( QCursor():new( Qt_SizeHorCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_SizeHorCursor ) ) CASE xResID == XBPSTATIC_SYSICON_SIZENS // Change size (North-South) - ::oWidget:setCursor( QCursor():new( Qt_SizeVerCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_SizeVerCursor ) ) /* Possible Harbour-QT extensions - #deines yet to be finalized */ CASE xResID == Qt_UpArrowCursor - ::oWidget:setCursor( QCursor():new( Qt_UpArrowCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_UpArrowCursor ) ) CASE xResID == Qt_CrossCursor - ::oWidget:setCursor( QCursor():new( Qt_CrossCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_CrossCursor ) ) CASE xResID == Qt_IBeamCursor - ::oWidget:setCursor( QCursor():new( Qt_IBeamCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_IBeamCursor ) ) CASE xResID == Qt_BlankCursor - ::oWidget:setCursor( QCursor():new( Qt_BlankCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_BlankCursor ) ) CASE xResID == Qt_SplitVCursor - ::oWidget:setCursor( QCursor():new( Qt_SplitVCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_SplitVCursor ) ) CASE xResID == Qt_SplitHCursor - ::oWidget:setCursor( QCursor():new( Qt_SplitHCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_SplitHCursor ) ) CASE xResID == Qt_PointingHandCursor ::oWidget:setCursor( QCursor():new( Qt_PointingHandCursor ) ) CASE xResID == Qt_ForbiddenCursor - ::oWidget:setCursor( QCursor():new( Qt_ForbiddenCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_ForbiddenCursor ) ) CASE xResID == Qt_ClosedHandCursor - ::oWidget:setCursor( QCursor():new( Qt_ClosedHandCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_ClosedHandCursor ) ) CASE xResID == Qt_WhatsThisCursor - ::oWidget:setCursor( QCursor():new( Qt_WhatsThisCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_WhatsThisCursor ) ) CASE xResID == Qt_BusyCursor - ::oWidget:setCursor( QCursor():new( Qt_BusyCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_BusyCursor ) ) CASE xResID == Qt_BitmapCursor - ::oWidget:setCursor( QCursor():new( Qt_BitmapCursor ) ) + ::oWidget:setCursor( QCursor():new( Qt_BitmapCursor ) ) ENDCASE