diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c2ee1db488..bd09868e02 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-09 14:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/qtgui/hbqt_errorsys.prg + * contrib/hbide/plugins/hbide_script_qtgui.hbs + * contrib/hbide/ideeditor.prg + - Deleted :new() calls. + + * contrib/hbqt/qtcore/hbqt_pointer.cpp + * contrib/hbqt/qtcore/hbqt.h + * Formatting. + 2011-03-09 11:15 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rtl/hbzlibgz.c % encapsulated all GZIP IO functions inside hb_vmUnlock() / hb_vmLock() diff --git a/harbour/contrib/hbide/ideeditor.prg b/harbour/contrib/hbide/ideeditor.prg index f62cdbee53..b0dac7ac7b 100644 --- a/harbour/contrib/hbide/ideeditor.prg +++ b/harbour/contrib/hbide/ideeditor.prg @@ -1801,7 +1801,7 @@ METHOD IdeEditor:qscintilla() STATIC oSci, qLexer, qAPIs, fontBold, fontNormal, fontItalic, c1, c2, c3 IF empty( oSci ) - oSci := HBQsciScintilla():new() + oSci := HBQsciScintilla() // oSci:setAutoIndent( .t. ) oSci:setCaretLineVisible( .t. ) @@ -1840,8 +1840,8 @@ METHOD IdeEditor:qscintilla() oSci:setMatchedBraceBackgroundColor( c2 ) oSci:setUnmatchedBraceForegroundColor( c3 ) - qLexer := QsciLexerFlagship():new() - //qLexer := QsciLexerCPP():new() + qLexer := QsciLexerFlagship() + //qLexer := QsciLexerCPP() qLexer:setDefaultFont( ::oFont:oWidget ) qLexer:setFoldAtElse( .f. ) @@ -1868,7 +1868,7 @@ METHOD IdeEditor:qscintilla() qLexer:setColor( QColor( 127, 67, 255 ), SCE_FS_OPERATOR ) qLexer:setColor( QColor( 255, 0, 0 ), SCE_FS_BRACE ) - qApis := QsciAPIs():new( qLexer ) + qApis := QsciAPIs( qLexer ) qApis:load( "c:/temp/cpp.api" ) qApis:prepare() qLexer:setAPIs( qApis ) diff --git a/harbour/contrib/hbide/plugins/hbide_script_qtgui.hbs b/harbour/contrib/hbide/plugins/hbide_script_qtgui.hbs index bbed7a5db9..d1632197e3 100644 --- a/harbour/contrib/hbide/plugins/hbide_script_qtgui.hbs +++ b/harbour/contrib/hbide/plugins/hbide_script_qtgui.hbs @@ -62,14 +62,14 @@ FUNCTION Main( oIde ) oIde := hbide_setIde() ENDIF - qDlg := QDialog():new( oIde:oDlg:oWidget ) + qDlg := QDialog( oIde:oDlg:oWidget ) qdlg:resize( 300, 350 ) - qLbl := QLabel():new( qDlg ) + qLbl := QLabel( qDlg ) qLbl:setText( "Harbour-Qt Gui Dialog as Script" ) qLbl:move( 20,20 ) - qCombo := QComboBox():new( qDlg ) + qCombo := QComboBox( qDlg ) qCombo:move( 100, 100 ) qCombo:resize( 130, 30 ) qCombo:addItem( "Sky" ) @@ -77,21 +77,21 @@ FUNCTION Main( oIde ) qCombo:addItem( "The Limit" ) qCombo:setCurrentIndex( 0 ) - qCheck := QCheckBox():new( qDlg ) + qCheck := QCheckBox( qDlg ) qCheck:move( 100, 150 ) qCheck:setText( "Harbour is Preferred ?" ) qCheck:setChecked( .t. ) - qEdit := QLineEdit():new( qDlg ) + qEdit := QLineEdit( qDlg ) qEdit:move( 100, 180 ) qEdit:resize( 130, 30 ) qEdit:setText( "Harbour Root Path" ) - qBtnOk := QPushButton():new( qDlg ) + qBtnOk := QPushButton( qDlg ) qBtnOk:move( 50, 300 ) qBtnOk:setText( "OK" ) - qBtnCn := QPushButton():new( qDlg ) + qBtnCn := QPushButton( qDlg ) qBtnCn:move( 170, 300 ) qBtnCn:setText( "Cancel" ) diff --git a/harbour/contrib/hbqt/qtcore/hbqt.h b/harbour/contrib/hbqt/qtcore/hbqt.h index 3e16b68409..492582cd1f 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt.h +++ b/harbour/contrib/hbqt/qtcore/hbqt.h @@ -99,12 +99,12 @@ extern HB_EXPORT const HB_GC_FUNCS * hbqt_gcFuncs( void ); extern HB_EXPORT void * hbqt_pPtrFromObj( int iParam ); extern HB_EXPORT int hbqt_isObjectType( int iParam, HB_U32 iType ); /* check if parameter iParam is EXACTLY of type iType */ extern HB_EXPORT void hbqt_errRT_ARG( void ); -extern HB_EXPORT PHB_ITEM hbqt_defineClassBegin( const char* szClsName, PHB_ITEM s_oClass, const char* szParentClsStr ); +extern HB_EXPORT PHB_ITEM hbqt_defineClassBegin( const char * szClsName, PHB_ITEM s_oClass, const char* szParentClsStr ); extern HB_EXPORT void hbqt_defineClassEnd( PHB_ITEM s_oClass, PHB_ITEM oClass ); extern HB_EXPORT void * hbqt_getqtptr( void ); extern HB_EXPORT PHB_ITEM hbqt_create_object( void * pObject, const char * pszObjectName ); extern HB_EXPORT PHB_ITEM hbqt_create_objectGC( void * pObject, const char * pszObjectName ); -extern HB_EXPORT void hbqt_itemPushReturn( void* ptr, PHB_ITEM pSelf ); +extern HB_EXPORT void hbqt_itemPushReturn( void * ptr, PHB_ITEM pSelf ); extern HB_EXPORT void hbqt_set_pptr( void * ptr, PHB_ITEM pSelf ); extern HB_EXPORT HBQT_GC_T * hbqt_getObjectGC( int iParam ); /* returns a pointer to the HBQT_GC_T area */ diff --git a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp index a5885bfc2b..230bab532b 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp @@ -296,7 +296,6 @@ HBQT_GC_T * hbqt_getObjectGC( int iParam ) /* hbqt_errRT_ARG(); */ /* NOTE: Could not check type for whatever reason */ - return NULL; } @@ -432,7 +431,7 @@ HB_FUNC( __HBQT_SETUTF8 ) hb_vmSetCDP( cdp ); } -PHB_ITEM hbqt_defineClassBegin( const char* szClsName, PHB_ITEM s_oClass, const char * szParentClsStr ) +PHB_ITEM hbqt_defineClassBegin( const char * szClsName, PHB_ITEM s_oClass, const char * szParentClsStr ) { static PHB_DYNS s__CLSLOCKDEF = NULL; diff --git a/harbour/contrib/hbqt/qtgui/hbqt_errorsys.prg b/harbour/contrib/hbqt/qtgui/hbqt_errorsys.prg index f9ccc2ff19..f399b49f55 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_errorsys.prg +++ b/harbour/contrib/hbqt/qtgui/hbqt_errorsys.prg @@ -209,7 +209,7 @@ STATIC FUNCTION hbqt_messageBox( cMsg, cInfo, cTitle, nIcon ) DEFAULT cTitle TO "Information" DEFAULT nIcon TO QMessageBox_Information - oMB := QMessageBox():new() + oMB := QMessageBox() oMB:setText( cMsg ) IF !empty( cInfo ) oMB:setInformativeText( cInfo )