diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6ba1ffc23f..2358357492 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,39 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-22 12:26 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbxbp/hbpprocess.prg + * contrib/hbxbp/xbp3state.prg + * contrib/hbxbp/xbpbitmap.prg + * contrib/hbxbp/xbpbrowse.prg + * contrib/hbxbp/xbpcheckbox.prg + * contrib/hbxbp/xbpclipboard.prg + * contrib/hbxbp/xbpcombobox.prg + * contrib/hbxbp/xbpdataref.prg + * contrib/hbxbp/xbpdialog.prg + * contrib/hbxbp/xbpfiledialog.prg + * contrib/hbxbp/xbpfontdialog.prg + * contrib/hbxbp/xbphtmlviewer.prg + * contrib/hbxbp/xbplistbox.prg + * contrib/hbxbp/xbpmenubar.prg + * contrib/hbxbp/xbpmle.prg + * contrib/hbxbp/xbppresspace.prg + * contrib/hbxbp/xbpprintdialog.prg + * contrib/hbxbp/xbpprinter.prg + * contrib/hbxbp/xbppushbutton.prg + * contrib/hbxbp/xbpradiobutton.prg + * contrib/hbxbp/xbprtf.prg + * contrib/hbxbp/xbpscrollbar.prg + * contrib/hbxbp/xbpsle.prg + * contrib/hbxbp/xbpspinbutton.prg + * contrib/hbxbp/xbpstatic.prg + * contrib/hbxbp/xbpstatusbar.prg + * contrib/hbxbp/xbpstyle.prg + * contrib/hbxbp/xbptabpage.prg + * contrib/hbxbp/xbptoolbar.prg + * contrib/hbxbp/xbptreeview.prg + ! Changed: Method :new() => :init() as per Xbase++ compatibility. + 2011-02-22 18:35 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * config/vxworks/gcc.mk * config/vxworks/diab.mk diff --git a/harbour/contrib/hbxbp/hbpprocess.prg b/harbour/contrib/hbxbp/hbpprocess.prg index 821041e0e1..8c8d17aa0b 100644 --- a/harbour/contrib/hbxbp/hbpprocess.prg +++ b/harbour/contrib/hbxbp/hbpprocess.prg @@ -92,7 +92,7 @@ CLASS HbpProcess DATA cShellCmd DATA lDetached INIT .f. - METHOD new( cShellCmd ) + METHOD init( cShellCmd ) METHOD create( cShellCmd ) METHOD destroy() VIRTUAL METHOD addArg( cArg, lTokened ) @@ -128,7 +128,7 @@ CLASS HbpProcess /*----------------------------------------------------------------------*/ -METHOD HbpProcess:new( cShellCmd ) +METHOD HbpProcess:init( cShellCmd ) ::cShellCmd := cShellCmd diff --git a/harbour/contrib/hbxbp/xbp3state.prg b/harbour/contrib/hbxbp/xbp3state.prg index 67a55a3cb4..cf25516e14 100644 --- a/harbour/contrib/hbxbp/xbp3state.prg +++ b/harbour/contrib/hbxbp/xbp3state.prg @@ -80,7 +80,7 @@ CLASS Xbp3State INHERIT XbpWindow, DataRef DATA pointerFocus INIT .T. DATA selection INIT .F. - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -97,7 +97,7 @@ CLASS Xbp3State INHERIT XbpWindow, DataRef /*----------------------------------------------------------------------*/ -METHOD Xbp3State:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD Xbp3State:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbpbitmap.prg b/harbour/contrib/hbxbp/xbpbitmap.prg index 2df69e388a..de77cf5886 100644 --- a/harbour/contrib/hbxbp/xbpbitmap.prg +++ b/harbour/contrib/hbxbp/xbpbitmap.prg @@ -88,7 +88,7 @@ CLASS XbpBitmap ACCESS xSize INLINE ::oWidget:width() ACCESS ySize INLINE ::oWidget:height() - METHOD new() INLINE Self + METHOD init() INLINE Self METHOD create( oPS ) METHOD configure() VIRTUAL METHOD destroy() VIRTUAL diff --git a/harbour/contrib/hbxbp/xbpbrowse.prg b/harbour/contrib/hbxbp/xbpbrowse.prg index 2089ba53c6..44dacd8b28 100644 --- a/harbour/contrib/hbxbp/xbpbrowse.prg +++ b/harbour/contrib/hbxbp/xbpbrowse.prg @@ -300,7 +300,7 @@ EXPORTED: MESSAGE _right() METHOD Right() MESSAGE _end() METHOD End() - METHOD new( nTop, nLeft, nBottom, nRight ) // constructor, NOTE: This method is a Harbour extension [vszakats] + METHOD init( nTop, nLeft, nBottom, nRight ) // constructor, NOTE: This method is a Harbour extension [vszakats] METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) // constructor, NOTE: This method is a Harbour extension [vszakats] METHOD execSlot( nEvent, p1, p2, p3 ) // executes view events METHOD supplyInfo( nMode, nCall, nRole, nX, nY ) // supplies cell parameters to Qt engine @@ -603,7 +603,7 @@ METHOD XbpBrowse:disconnect() /*----------------------------------------------------------------------*/ /* Just to retain TBrowse functionality: in the future */ -METHOD XbpBrowse:new( nTop, nLeft, nBottom, nRight ) +METHOD XbpBrowse:init( nTop, nLeft, nBottom, nRight ) DEFAULT nTop TO 0 DEFAULT nLeft TO 0 diff --git a/harbour/contrib/hbxbp/xbpcheckbox.prg b/harbour/contrib/hbxbp/xbpcheckbox.prg index 11ed11028f..a5c66d4602 100644 --- a/harbour/contrib/hbxbp/xbpcheckbox.prg +++ b/harbour/contrib/hbxbp/xbpcheckbox.prg @@ -80,7 +80,7 @@ CLASS XbpCheckBox INHERIT XbpWindow, DataRef DATA pointerFocus INIT .T. DATA selection INIT .F. - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -97,7 +97,7 @@ CLASS XbpCheckBox INHERIT XbpWindow, DataRef /*----------------------------------------------------------------------*/ -METHOD XbpCheckBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpCheckBox:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbpclipboard.prg b/harbour/contrib/hbxbp/xbpclipboard.prg index b2cc73568c..907d9f17ef 100644 --- a/harbour/contrib/hbxbp/xbpclipboard.prg +++ b/harbour/contrib/hbxbp/xbpclipboard.prg @@ -78,7 +78,7 @@ CLASS XbpClipBoard DATA oWidget DATA oOldXbp - METHOD new() + METHOD init() METHOD create() METHOD destroy() @@ -96,7 +96,7 @@ CLASS XbpClipBoard /*----------------------------------------------------------------------*/ -METHOD XbpClipBoard:new() +METHOD XbpClipBoard:init() RETURN Self diff --git a/harbour/contrib/hbxbp/xbpcombobox.prg b/harbour/contrib/hbxbp/xbpcombobox.prg index 53276e2b58..81f26b7154 100644 --- a/harbour/contrib/hbxbp/xbpcombobox.prg +++ b/harbour/contrib/hbxbp/xbpcombobox.prg @@ -78,8 +78,7 @@ CLASS XbpComboBox INHERIT XbpWindow DATA type INIT XBPCOMBO_DROPDOWN DATA drawMode INIT XBP_DRAW_NORMAL -// MESSAGE init( ... ) METHOD new( ... ) - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) VIRTUAL @@ -125,7 +124,7 @@ CLASS XbpComboBox INHERIT XbpWindow /*----------------------------------------------------------------------*/ -METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbpdataref.prg b/harbour/contrib/hbxbp/xbpdataref.prg index eeea970d22..adec107c6e 100644 --- a/harbour/contrib/hbxbp/xbpdataref.prg +++ b/harbour/contrib/hbxbp/xbpdataref.prg @@ -84,7 +84,7 @@ CLASS DataRef DATA sl_editBuffer DATA sl_buffer - METHOD new() + METHOD init() METHOD getData() METHOD setData( xValue, mp2 ) METHOD undo() @@ -95,7 +95,7 @@ CLASS DataRef /*----------------------------------------------------------------------*/ -METHOD DataRef:new() +METHOD DataRef:init() RETURN self diff --git a/harbour/contrib/hbxbp/xbpdialog.prg b/harbour/contrib/hbxbp/xbpdialog.prg index 34daad3ef8..b247ca3206 100644 --- a/harbour/contrib/hbxbp/xbpdialog.prg +++ b/harbour/contrib/hbxbp/xbpdialog.prg @@ -93,7 +93,7 @@ CLASS XbpDialog FROM XbpWindow DATA origin INIT XBPDLG_ORIGIN_OWNER DATA sysMenu INIT .T. - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -122,7 +122,7 @@ CLASS XbpDialog FROM XbpWindow /*----------------------------------------------------------------------*/ -METHOD XbpDialog:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpDialog:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -391,16 +391,16 @@ CLASS XbpDrawingArea INHERIT XbpWindow DATA clipSiblings INIT .T. DATA clipChildren INIT .F. - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ENDCLASS /*----------------------------------------------------------------------*/ -METHOD XbpDrawingArea:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpDrawingArea:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) - ::xbpWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::visible := .t. RETURN Self diff --git a/harbour/contrib/hbxbp/xbpfiledialog.prg b/harbour/contrib/hbxbp/xbpfiledialog.prg index 3159600cbe..07ce7d053f 100644 --- a/harbour/contrib/hbxbp/xbpfiledialog.prg +++ b/harbour/contrib/hbxbp/xbpfiledialog.prg @@ -85,7 +85,7 @@ CLASS XbpFileDialog INHERIT XbpWindow DATA title INIT NIL // "" DATA validatePath INIT .f. - METHOD new( oParent, oOwner, aPos ) + METHOD init( oParent, oOwner, aPos ) METHOD create( oParent, oOwner, aPos ) METHOD execSlot( cSlot, p ) METHOD destroy() @@ -98,7 +98,7 @@ CLASS XbpFileDialog INHERIT XbpWindow /*----------------------------------------------------------------------*/ -METHOD XbpFileDialog:new( oParent, oOwner, aPos ) +METHOD XbpFileDialog:init( oParent, oOwner, aPos ) ::xbpWindow:INIT( oParent, oOwner, aPos ) diff --git a/harbour/contrib/hbxbp/xbpfontdialog.prg b/harbour/contrib/hbxbp/xbpfontdialog.prg index 86489d141e..dd50385b65 100644 --- a/harbour/contrib/hbxbp/xbpfontdialog.prg +++ b/harbour/contrib/hbxbp/xbpfontdialog.prg @@ -117,7 +117,7 @@ CLASS XbpFontDialog INHERIT XbpWindow DATA viewPrinterFonts INIT .F. DATA viewScreenFonts INIT .T. - METHOD new( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) + METHOD init( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) METHOD create( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) METHOD execSlot( cSlot, p ) METHOD display( nMode ) @@ -144,7 +144,7 @@ CLASS XbpFontDialog INHERIT XbpWindow /*----------------------------------------------------------------------*/ -METHOD XbpFontDialog:new( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) +METHOD XbpFontDialog:init( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) DEFAULT oParent TO ::oParent DEFAULT oOwner TO ::oOwner diff --git a/harbour/contrib/hbxbp/xbphtmlviewer.prg b/harbour/contrib/hbxbp/xbphtmlviewer.prg index bf7190348e..e5967fe904 100644 --- a/harbour/contrib/hbxbp/xbphtmlviewer.prg +++ b/harbour/contrib/hbxbp/xbphtmlviewer.prg @@ -95,7 +95,7 @@ CLASS XbpHTMLViewer INHERIT XbpWindow DATA oURL DATA cSelectedText - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD destroy() METHOD execSlot( cSlot, p ) @@ -142,7 +142,7 @@ CLASS XbpHTMLViewer INHERIT XbpWindow /*----------------------------------------------------------------------*/ -METHOD XbpHTMLViewer:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpHTMLViewer:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbplistbox.prg b/harbour/contrib/hbxbp/xbplistbox.prg index 57be2765fa..d6ce2af99e 100644 --- a/harbour/contrib/hbxbp/xbplistbox.prg +++ b/harbour/contrib/hbxbp/xbplistbox.prg @@ -88,7 +88,7 @@ CLASS XbpListBox INHERIT XbpWindow, DataRef DATA nOldIndex INIT 0 - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -145,7 +145,7 @@ CLASS XbpListBox INHERIT XbpWindow, DataRef /*----------------------------------------------------------------------*/ -METHOD XbpListBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpListBox:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbpmenubar.prg b/harbour/contrib/hbxbp/xbpmenubar.prg index c9b20147f3..f14583d7f8 100644 --- a/harbour/contrib/hbxbp/xbpmenubar.prg +++ b/harbour/contrib/hbxbp/xbpmenubar.prg @@ -116,7 +116,7 @@ CLASS xbpMenuBar INHERIT xbpWindow DATA aIds INIT {} DATA className INIT "XbpMenuBar" - METHOD new( oParent, aPresParams, lVisible ) + METHOD init( oParent, aPresParams, lVisible ) METHOD create( oParent, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, aPresParams, lVisible ) @@ -154,7 +154,7 @@ CLASS xbpMenuBar INHERIT xbpWindow /*----------------------------------------------------------------------*/ -METHOD xbpMenuBar:new( oParent, aPresParams, lVisible ) +METHOD xbpMenuBar:init( oParent, aPresParams, lVisible ) ::xbpWindow:init( oParent, , , , aPresParams, lVisible ) @@ -674,7 +674,7 @@ CLASS xbpMenu INHERIT xbpMenuBar DATA title INIT "" - METHOD new( oParent, aPresParams, lVisible ) + METHOD init( oParent, aPresParams, lVisible ) METHOD create( oParent, aPresParams, lVisible ) METHOD getTitle() METHOD setTitle( cTitle ) @@ -686,7 +686,7 @@ CLASS xbpMenu INHERIT xbpMenuBar /*----------------------------------------------------------------------*/ -METHOD xbpMenu:new( oParent, aPresParams, lVisible ) +METHOD xbpMenu:init( oParent, aPresParams, lVisible ) ::xbpWindow:init( oParent, , , , aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbpmle.prg b/harbour/contrib/hbxbp/xbpmle.prg index b5f20bb662..2ab2aa740c 100644 --- a/harbour/contrib/hbxbp/xbpmle.prg +++ b/harbour/contrib/hbxbp/xbpmle.prg @@ -84,7 +84,7 @@ CLASS XbpMLE INHERIT XbpWindow, DataRef DATA changed INIT .F. - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) VIRTUAL @@ -123,7 +123,7 @@ CLASS XbpMLE INHERIT XbpWindow, DataRef /*----------------------------------------------------------------------*/ -METHOD XbpMLE:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpMLE:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbppresspace.prg b/harbour/contrib/hbxbp/xbppresspace.prg index f40ec4cba6..6162b74fe7 100644 --- a/harbour/contrib/hbxbp/xbppresspace.prg +++ b/harbour/contrib/hbxbp/xbppresspace.prg @@ -79,7 +79,7 @@ CLASS XbpPresSpace DATA mode INIT XBPPS_MODE_NORMAL DATA d - METHOD new() + METHOD init() METHOD create( oDevice, aPageSize, nUnits ) METHOD configure() VIRTUAL METHOD destroy() VIRTUAL @@ -158,7 +158,7 @@ CLASS XbpPresSpace /*----------------------------------------------------------------------*/ -METHOD XbpPresSpace:new() +METHOD XbpPresSpace:init() RETURN Self /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbxbp/xbpprintdialog.prg b/harbour/contrib/hbxbp/xbpprintdialog.prg index a276e8047f..f44116e32a 100644 --- a/harbour/contrib/hbxbp/xbpprintdialog.prg +++ b/harbour/contrib/hbxbp/xbpprintdialog.prg @@ -88,7 +88,7 @@ CLASS XbpPrintDialog INHERIT XbpWindow DATA printRange INIT XBPPDLG_PRINT_ALLPAGES DATA printToFile INIT .F. - METHOD new( oParent, oOwner ) + METHOD init( oParent, oOwner ) METHOD create( oParent, oOwner ) METHOD destroy() METHOD display( oXbpPrinter ) @@ -98,7 +98,7 @@ CLASS XbpPrintDialog INHERIT XbpWindow /*----------------------------------------------------------------------*/ -METHOD XbpPrintDialog:new( oParent, oOwner ) +METHOD XbpPrintDialog:init( oParent, oOwner ) ::xbpWindow:init( oParent, oOwner ) diff --git a/harbour/contrib/hbxbp/xbpprinter.prg b/harbour/contrib/hbxbp/xbpprinter.prg index f497adb600..3180640a81 100644 --- a/harbour/contrib/hbxbp/xbpprinter.prg +++ b/harbour/contrib/hbxbp/xbpprinter.prg @@ -94,7 +94,7 @@ CLASS XbpPrinter /* Internal */ DATA isValid - METHOD new() + METHOD init() METHOD create( cDeviceName, nSpoolFormat, cDeviceParams ) METHOD configure() VIRTUAL METHOD destroy() VIRTUAL @@ -137,7 +137,7 @@ CLASS XbpPrinter /*----------------------------------------------------------------------*/ -METHOD XbpPrinter:new() +METHOD XbpPrinter:init() RETURN Self /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbxbp/xbppushbutton.prg b/harbour/contrib/hbxbp/xbppushbutton.prg index 02df430188..77ee0dbb4d 100644 --- a/harbour/contrib/hbxbp/xbppushbutton.prg +++ b/harbour/contrib/hbxbp/xbppushbutton.prg @@ -88,7 +88,7 @@ CLASS XbpPushButton INHERIT XbpWindow DATA sl_draw - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -109,7 +109,7 @@ CLASS XbpPushButton INHERIT XbpWindow /*----------------------------------------------------------------------*/ -METHOD XbpPushButton:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpPushButton:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:INIT( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbpradiobutton.prg b/harbour/contrib/hbxbp/xbpradiobutton.prg index f769a384a3..1c772cdade 100644 --- a/harbour/contrib/hbxbp/xbpradiobutton.prg +++ b/harbour/contrib/hbxbp/xbpradiobutton.prg @@ -80,7 +80,7 @@ CLASS XbpRadioButton INHERIT XbpWindow, DataRef DATA pointerFocus INIT .T. DATA selection INIT .F. - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -97,7 +97,7 @@ CLASS XbpRadioButton INHERIT XbpWindow, DataRef ENDCLASS /*----------------------------------------------------------------------*/ -METHOD XbpRadioButton:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpRadioButton:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbprtf.prg b/harbour/contrib/hbxbp/xbprtf.prg index ba8d39ee9e..0815e61f84 100644 --- a/harbour/contrib/hbxbp/xbprtf.prg +++ b/harbour/contrib/hbxbp/xbprtf.prg @@ -76,7 +76,7 @@ CLASS XbpRtf INHERIT XbpWindow - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure() @@ -159,7 +159,7 @@ CLASS XbpRtf INHERIT XbpWindow /*----------------------------------------------------------------------*/ -METHOD XbpRtf:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpRtf:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbpscrollbar.prg b/harbour/contrib/hbxbp/xbpscrollbar.prg index 62fa4c1fbe..a747a29c47 100644 --- a/harbour/contrib/hbxbp/xbpscrollbar.prg +++ b/harbour/contrib/hbxbp/xbpscrollbar.prg @@ -83,7 +83,7 @@ CLASS XbpScrollBar INHERIT XbpWindow, DataRef DATA sl_xbeSB_Scroll - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) VIRTUAL @@ -103,7 +103,7 @@ CLASS XbpScrollBar INHERIT XbpWindow, DataRef /*----------------------------------------------------------------------*/ -METHOD XbpScrollBar:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpScrollBar:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbpsle.prg b/harbour/contrib/hbxbp/xbpsle.prg index 4a8dd4e671..94436cebca 100644 --- a/harbour/contrib/hbxbp/xbpsle.prg +++ b/harbour/contrib/hbxbp/xbpsle.prg @@ -86,7 +86,7 @@ CLASS XbpSLE INHERIT XbpWindow, DataRef DATA changed INIT .F. - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) VIRTUAL @@ -121,7 +121,7 @@ CLASS XbpSLE INHERIT XbpWindow, DataRef /*----------------------------------------------------------------------*/ -METHOD XbpSLE:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpSLE:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbpspinbutton.prg b/harbour/contrib/hbxbp/xbpspinbutton.prg index 6c6596aded..d5772aa130 100644 --- a/harbour/contrib/hbxbp/xbpspinbutton.prg +++ b/harbour/contrib/hbxbp/xbpspinbutton.prg @@ -90,7 +90,7 @@ CLASS XbpSpinButton INHERIT XbpWindow, DataRef DATA nOldValue INIT 0 - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) VIRTUAL @@ -127,7 +127,7 @@ CLASS XbpSpinButton INHERIT XbpWindow, DataRef /*----------------------------------------------------------------------*/ -METHOD XbpSpinButton:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpSpinButton:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbpstatic.prg b/harbour/contrib/hbxbp/xbpstatic.prg index 056744a46a..0cbc5f9c30 100644 --- a/harbour/contrib/hbxbp/xbpstatic.prg +++ b/harbour/contrib/hbxbp/xbpstatic.prg @@ -84,7 +84,7 @@ CLASS XbpStatic INHERIT XbpWindow DATA hBitmap - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -96,7 +96,7 @@ CLASS XbpStatic INHERIT XbpWindow ENDCLASS /*----------------------------------------------------------------------*/ -METHOD XbpStatic:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpStatic:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbpstatusbar.prg b/harbour/contrib/hbxbp/xbpstatusbar.prg index c43d3cce73..7f6ee661d5 100644 --- a/harbour/contrib/hbxbp/xbpstatusbar.prg +++ b/harbour/contrib/hbxbp/xbpstatusbar.prg @@ -80,7 +80,7 @@ CLASS XbpStatusBar INHERIT XbpWindow DATA aItems INIT {} - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -101,7 +101,7 @@ CLASS XbpStatusBar INHERIT XbpWindow ENDCLASS /*----------------------------------------------------------------------*/ -METHOD XbpStatusBar:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpStatusBar:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -311,14 +311,14 @@ CLASS XbpStatusBarPanel DATA width INIT 0 DATA minWidth INIT 0 - METHOD new( cCaption, nStyle, cKey ) + METHOD init( cCaption, nStyle, cKey ) METHOD create( cCaption, nStyle, cKey ) METHOD caption( cCaption ) SETGET ENDCLASS /*----------------------------------------------------------------------*/ -METHOD XbpStatusBarPanel:new( cCaption, nStyle, cKey ) +METHOD XbpStatusBarPanel:init( cCaption, nStyle, cKey ) DEFAULT cCaption TO ::sl_caption DEFAULT nStyle TO ::style diff --git a/harbour/contrib/hbxbp/xbpstyle.prg b/harbour/contrib/hbxbp/xbpstyle.prg index 5e65e6f7c1..7c22b45236 100644 --- a/harbour/contrib/hbxbp/xbpstyle.prg +++ b/harbour/contrib/hbxbp/xbpstyle.prg @@ -83,7 +83,7 @@ CLASS XbpStyle DATA colorFG DATA colorBG - METHOD New() INLINE Self + METHOD init() INLINE Self METHOD Create() METHOD Configure() VIRTUAL METHOD Destroy() VIRTUAL diff --git a/harbour/contrib/hbxbp/xbptabpage.prg b/harbour/contrib/hbxbp/xbptabpage.prg index ff8db00624..d31ef09cc9 100644 --- a/harbour/contrib/hbxbp/xbptabpage.prg +++ b/harbour/contrib/hbxbp/xbptabpage.prg @@ -84,7 +84,7 @@ CLASS XbpTabPage INHERIT XbpWindow DATA tabHeight INIT -1 /* Determines the height of the tab. */ DATA type INIT XBPTABPAGE_TAB_TOP /* Determines the position of the tab. */ - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -105,7 +105,7 @@ CLASS XbpTabPage INHERIT XbpWindow /*----------------------------------------------------------------------*/ -METHOD XbpTabPage:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpTabPage:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -258,7 +258,7 @@ CLASS XbpTabWidget INHERIT XbpWindow DATA aTabs INIT {} DATA qCornerWidget - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) VIRTUAL METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -271,7 +271,7 @@ CLASS XbpTabWidget INHERIT XbpWindow /*----------------------------------------------------------------------*/ -METHOD XbpTabWidget:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpTabWidget:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbptoolbar.prg b/harbour/contrib/hbxbp/xbptoolbar.prg index 404a991c8a..5acef73e8e 100644 --- a/harbour/contrib/hbxbp/xbptoolbar.prg +++ b/harbour/contrib/hbxbp/xbptoolbar.prg @@ -101,7 +101,7 @@ CLASS XbpToolBar INHERIT XbpWindow METHOD numItems() INLINE Len( ::aItems ) - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -130,9 +130,9 @@ CLASS XbpToolBar INHERIT XbpWindow ENDCLASS /*----------------------------------------------------------------------*/ -METHOD XbpToolbar:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpToolbar:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) - ::xbpWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self @@ -450,13 +450,13 @@ CLASS XbpToolbarButton DATA command INIT 0 DATA oAction - METHOD new( cCaption, nStyle, cKey ) + METHOD init( cCaption, nStyle, cKey ) ENDCLASS /*----------------------------------------------------------------------*/ -METHOD XbpToolbarButton:new( cCaption, nStyle, cKey ) +METHOD XbpToolbarButton:init( cCaption, nStyle, cKey ) DEFAULT cCaption TO ::caption DEFAULT nStyle TO ::style diff --git a/harbour/contrib/hbxbp/xbptreeview.prg b/harbour/contrib/hbxbp/xbptreeview.prg index 4ddb99ce35..f9d67a8cf2 100644 --- a/harbour/contrib/hbxbp/xbptreeview.prg +++ b/harbour/contrib/hbxbp/xbptreeview.prg @@ -83,7 +83,7 @@ CLASS XbpTreeView INHERIT XbpWindow, DataRef DATA oRootItem ACCESS rootItem() INLINE ::oRootItem - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject ) METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -124,7 +124,7 @@ CLASS XbpTreeView INHERIT XbpWindow, DataRef /*----------------------------------------------------------------------*/ -METHOD XbpTreeView:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) +METHOD XbpTreeView:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -381,7 +381,7 @@ CLASS XbpTreeViewItem INHERIT DataRef DATA aChilds INIT {} DATA tooltipText INIT "" - METHOD new() + METHOD init() METHOD create() METHOD configure() METHOD destroy() @@ -444,7 +444,7 @@ METHOD XbpTreeViewItem:addItem( xItem, xNormalImage, xMarkedImage, xExpandedImag /*----------------------------------------------------------------------*/ -METHOD XbpTreeViewItem:new() +METHOD XbpTreeViewItem:init() RETURN Self