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

2010-10-28 01:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbqt/qtcore/hbqt_misc.prg
    ! Debug stuff left in.
This commit is contained in:
Viktor Szakats
2010-10-27 23:09:18 +00:00
parent 5813401685
commit 7feeb42ba8
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -16,6 +16,10 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-10-28 01:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/qtcore/hbqt_misc.prg
! Debug stuff left in.
2010-10-28 00:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/qtcore/hbqt_pointer.cpp
+ __HBQT_ERROR() accepts error code.

32
harbour/contrib/hbqt/qtcore/hbqt_misc.prg
View File

@@ -2,8 +2,6 @@
* $Id$
*/
#pragma linenumber=on
/*
* Harbour Project source code:
*
@@ -82,7 +80,7 @@ METHOD HbQtObjectHandler:fromPointer( pPtr )
IF hb_isPointer( pPtr )
::pPtr := pPtr
ELSE
__hbqt_Error()
__hbqt_error()
ENDIF
RETURN Self
@@ -130,31 +128,31 @@ METHOD HbQtObjectHandler:connect( cnEvent, bBlock )
CASE "C"
IF Empty( ::__pSlots )
::__pSlots := __hbqt_slots_New()
::__pSlots := __hbqt_slots_new()
ENDIF
nResult := __hbqt_slots_Connect( ::__pSlots, ::pPtr, cnEvent, bBlock )
nResult := __hbqt_slots_connect( ::__pSlots, ::pPtr, cnEvent, bBlock )
IF nResult == 0
RETURN .T.
ENDIF
__HBQT_ERROR( 1300 + nResult )
__hbqt_error( 1300 + nResult )
EXIT
CASE "N"
IF Empty( ::__pEvents )
::__pEvents := __hbqt_events_New()
::__pEvents := __hbqt_events_new()
::installEventFilter( HBQEventsFromPointer( ::__pEvents ) )
ENDIF
nResult := __hbqt_events_Connect( ::__pEvents, ::pPtr, cnEvent, bBlock )
nResult := __hbqt_events_connect( ::__pEvents, ::pPtr, cnEvent, bBlock )
IF nResult == 0
RETURN .T.
ENDIF
__HBQT_ERROR( 1200 + nResult )
__hbqt_error( 1200 + nResult )
EXIT
OTHERWISE
__HBQT_ERROR( 1203 )
__hbqt_error( 1203 )
ENDSWITCH
@@ -169,32 +167,32 @@ METHOD HbQtObjectHandler:disconnect( cnEvent )
CASE "C"
IF Empty( ::__pSlots )
__HBQT_ERROR( 1301 )
__hbqt_error( 1301 )
ELSE
nResult := __hbqt_slots_Disconnect( ::__pSlots, ::pPtr, cnEvent )
nResult := __hbqt_slots_disconnect( ::__pSlots, ::pPtr, cnEvent )
IF nResult == 0
RETURN .T.
ENDIF
__HBQT_ERROR( 1350 + nResult )
__hbqt_error( 1350 + nResult )
ENDIF
EXIT
CASE "N"
IF Empty( ::__pEvents )
__HBQT_ERROR( 1201 )
__hbqt_error( 1201 )
ELSE
nResult := __hbqt_events_Disconnect( ::__pEvents, ::pPtr, cnEvent )
nResult := __hbqt_events_disconnect( ::__pEvents, ::pPtr, cnEvent )
IF nResult == 0
RETURN .T.
ENDIF
__HBQT_ERROR( 1250 + nResult )
__hbqt_error( 1250 + nResult )
ENDIF
EXIT
OTHERWISE
__HBQT_ERROR( 1202 )
__hbqt_error( 1202 )
ENDSWITCH