diff options
Diffstat (limited to 'src/modules/objects')
39 files changed, 582 insertions, 585 deletions
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index 7ea183ad4..6dc64094d 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -67,10 +67,10 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_button,"button","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_button,setText) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_button,text) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_button,clickEvent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_button,setImage) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_button,setText) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_button,text) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_button,clickEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_button,setImage) KVSO_END_REGISTERCLASS(KviKvsObject_button) diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp index 3c61771a8..355242a65 100644 --- a/src/modules/objects/class_buttongroup.cpp +++ b/src/modules/objects/class_buttongroup.cpp @@ -55,8 +55,8 @@ */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_buttongroup,"buttongroup","object") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_buttongroup,addButton) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_buttongroup,checkedButton) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_buttongroup,addButton) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_buttongroup,checkedButton) KVSO_END_REGISTERCLASS(KviKvsObject_buttongroup) diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index 0cd0fa9e0..26e7e7212 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -63,9 +63,9 @@ //--------------------------------------------------------------------------------- KVSO_BEGIN_REGISTERCLASS(KviKvsObject_checkbox,"checkbox","button") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_checkbox,setChecked) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_checkbox,isChecked) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_checkbox,toggleEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_checkbox,setChecked) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_checkbox,isChecked) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_checkbox,toggleEvent) KVSO_END_REGISTERCLASS(KviKvsObject_checkbox) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_checkbox,KviKvsObject_button) diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index 80305a347..e6d3295a4 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -100,27 +100,26 @@ */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_combobox,"combobox","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,insertItem) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,changeItem) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,removeItem) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,clear) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,setMaxCount) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,maxCount) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,count) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,current) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,currentItem) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,setEditable); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,editable) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,setEditText) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,textAt) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,textLineEdit) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,setTextLineEdit) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,setCurrentItem) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,popup) - - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,setInsertionPolicy) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,textChangedEvent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_combobox,activatedEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,insertItem) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,changeItem) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,removeItem) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,clear) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,setMaxCount) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,maxCount) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,count) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,current) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,currentItem) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,setEditable); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,editable) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,setEditText) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,textAt) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,textLineEdit) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,setTextLineEdit) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,setCurrentItem) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,popup) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,setInsertionPolicy) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,textChangedEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,activatedEvent) KVSO_END_REGISTERCLASS(KviKvsObject_combobox) diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp index b52cb80eb..da080efd8 100644 --- a/src/modules/objects/class_dialog.cpp +++ b/src/modules/objects/class_dialog.cpp @@ -54,7 +54,7 @@ */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_dialog,"dialog","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_dialog,setModal) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_dialog,setModal) KVSO_END_REGISTERCLASS(KviKvsObject_dialog) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_dialog,KviKvsObject_widget) diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index cec0abfaa..ec351b41b 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -64,11 +64,11 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_dockwindow,"dockwindow","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_dockwindow,addWidget) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_dockwindow,resizeEnabled) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_dockwindow,setResizeEnabled) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_dockwindow,setAllowedDockAreas) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_dockwindow,dock) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_dockwindow,addWidget) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_dockwindow,resizeEnabled) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_dockwindow,setResizeEnabled) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_dockwindow,setAllowedDockAreas) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_dockwindow,dock) KVSO_END_REGISTERCLASS(KviKvsObject_dockwindow) diff --git a/src/modules/objects/class_ftp.cpp b/src/modules/objects/class_ftp.cpp index 76d6b6fc9..22fb97dc8 100644 --- a/src/modules/objects/class_ftp.cpp +++ b/src/modules/objects/class_ftp.cpp @@ -63,14 +63,14 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_ftp,"ftp","object") KVSO_REGISTER_HANDLER(KviKvsObject_ftp,"connect",functionConnect) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,abort) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,login) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,get) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,cd) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,list) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,commandFinishedEvent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,listInfoEvent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,dataTransferProgressEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,abort) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,login) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,get) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,cd) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,list) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,commandFinishedEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,listInfoEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,dataTransferProgressEvent) KVSO_END_REGISTERCLASS(KviKvsObject_ftp) @@ -82,7 +82,6 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_ftp,KviKvsObject) connect(m_pFtp,SIGNAL(dataTransferProgress(qint64,qint64)),this,SLOT(slotDataTransferProgress(qint64,qint64))); connect(m_pFtp,SIGNAL(done(bool)),this,SLOT(slotDone(bool))); connect(m_pFtp,SIGNAL(listInfo(const QUrlInfo)),this,SLOT(slotListInfo(const QUrlInfo))); - connect(m_pFtp,SIGNAL(rawCommandReply(int,QString)),this,SLOT(slotRawCommandReplay(int,QString))); connect(m_pFtp,SIGNAL(readyRead()),this,SLOT(slotReadyRead())); connect(m_pFtp,SIGNAL(stateChanged(int)),this,SLOT(slotStateChanged(int))); KVSO_END_CONSTRUCTOR(KviKvsObject_ftp) @@ -218,9 +217,6 @@ KVSO_CLASS_FUNCTION(ftp,listInfoEvent) emitSignal("listInfo",c,c->params()); return true; } -void KviKvsObject_ftp::slotRawCommandReply ( int, const QString &) -{ -} void KviKvsObject_ftp::slotReadyRead () { diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index 359c67c59..87e347f2d 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -150,23 +150,23 @@ const int align_cod[] = { */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_groupbox,"groupbox","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,setTitle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,title) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,setFlat) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,isFlat) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,setCheckable) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,isCheckable) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,setInsideMargin) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,insideMargin) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,setInsideSpacing) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,insideSpacing) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,addSpace) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,alignment) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,setAlignment) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,setOrientation) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,setOrientation) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,isChecked) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_groupbox,setChecked) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setTitle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,title) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setFlat) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,isFlat) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setCheckable) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,isCheckable) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setInsideMargin) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,insideMargin) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setInsideSpacing) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,insideSpacing) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,addSpace) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,alignment) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setAlignment) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setOrientation) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setOrientation) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,isChecked) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setChecked) KVSO_END_REGISTERCLASS(KviKvsObject_groupbox) diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp index 987b338bd..ee610618e 100644 --- a/src/modules/objects/class_hbox.cpp +++ b/src/modules/objects/class_hbox.cpp @@ -84,11 +84,11 @@ const int align_cod[] = { KVSO_BEGIN_REGISTERCLASS(KviKvsObject_hbox,"hbox","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_hbox,setMargin) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_hbox,setSpacing) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_hbox,setStretchFactor ) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_hbox,addStretch ) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_hbox,setAlignment ) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_hbox,setMargin) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_hbox,setSpacing) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_hbox,setStretchFactor ) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_hbox,addStretch ) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_hbox,setAlignment ) KVSO_END_REGISTERCLASS(KviKvsObject_hbox) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_hbox,KviKvsObject_widget) diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index 8cbc97a0d..1aec71f2a 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -184,16 +184,16 @@ const int frame_cod[] = { KVSO_BEGIN_REGISTERCLASS(KviKvsObject_label,"label","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_label,setText) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_label,text) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_label,margin) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_label,setMargin) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_label,alignment) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_label,setAlignment) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_label,clear) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_label,frameStyle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_label,setFrameStyle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_label,setImage) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,setText) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,text) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,margin) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,setMargin) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,alignment) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,setAlignment) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,clear) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,frameStyle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,setFrameStyle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,setImage) KVSO_END_REGISTERCLASS(KviKvsObject_label) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_label,KviKvsObject_widget) diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp index 77117c554..1936c810f 100644 --- a/src/modules/objects/class_layout.cpp +++ b/src/modules/objects/class_layout.cpp @@ -108,17 +108,17 @@ const int align_cod[] = { KVSO_BEGIN_REGISTERCLASS(KviKvsObject_layout,"layout","object") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,addWidget) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,addMultiCellWidget) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,setRowStretch) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,addWidget) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,addMultiCellWidget) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,setRowStretch) KVSO_REGISTER_HANDLER(KviKvsObject_layout,"setColStretch",setColumnStretch) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,setColumnStretch) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,addRowSpacing) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,addColSpacing) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,setMargin) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,setSpacing) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,setResizeMode) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,setAlignment ) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,setColumnStretch) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,addRowSpacing) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,addColSpacing) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,setMargin) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,setSpacing) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,setResizeMode) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,setAlignment ) KVSO_END_REGISTERCLASS(KviKvsObject_layout) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_layout,KviKvsObject) diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp index cc2a5756b..ff46e63d3 100644 --- a/src/modules/objects/class_lcd.cpp +++ b/src/modules/objects/class_lcd.cpp @@ -70,14 +70,14 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_lcd,"lcdnumber","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lcd,displayStr) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lcd,displayInt) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lcd,displayDouble) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lcd,setMode) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lcd,setSegmentStyle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lcd,setNumDigits) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lcd,setSmallDecimalPoint) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lcd,checkOverflow) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,displayStr) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,displayInt) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,displayDouble) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,setMode) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,setSegmentStyle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,setNumDigits) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,setSmallDecimalPoint) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,checkOverflow) KVSO_END_REGISTERCLASS(KviKvsObject_lcd) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_lcd,KviKvsObject_widget) diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index 74c6e2599..16dc14a7f 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -179,29 +179,29 @@ static const int mode_cod[] = { KVSO_BEGIN_REGISTERCLASS(KviKvsObject_lineedit,"lineedit","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,text) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,setText) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,maxLength) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,setMaxLength) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,frame) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,setCursorPosition) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,cursorPosition) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,setFrame) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,selectAll) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,setSelection) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,copy) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,cut) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,paste) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,echoMode) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,setEchoMode) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,clear) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,dragAndDrop) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,setInputMask) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,setReadOnly) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,returnPressedEvent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,lostFocusEvent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,textChangedEvent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_lineedit,setInputValidator) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,text) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setText) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,maxLength) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setMaxLength) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,frame) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setCursorPosition) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,cursorPosition) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setFrame) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,selectAll) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setSelection) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,copy) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,cut) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,paste) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,echoMode) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setEchoMode) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,clear) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,dragAndDrop) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setInputMask) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setReadOnly) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,returnPressedEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,lostFocusEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,textChangedEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setInputValidator) KVSO_END_REGISTERCLASS(KviKvsObject_lineedit) diff --git a/src/modules/objects/class_list.cpp b/src/modules/objects/class_list.cpp index 0614ecd15..4d6b21f26 100644 --- a/src/modules/objects/class_list.cpp +++ b/src/modules/objects/class_list.cpp @@ -137,27 +137,27 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_list,"list","object") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,count) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,isEmpty) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,clear) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,count) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,isEmpty) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,clear) KVSO_REGISTER_HANDLER(KviKvsObject_list,"removeAll",clear) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,append) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,prepend) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,insert) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,insert) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,at) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,append) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,prepend) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,insert) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,insert) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,at) KVSO_REGISTER_HANDLER(KviKvsObject_list,"item",at) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,remove) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,removeFirst) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,removeLast) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,removeCurrent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,moveFirst) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,moveNext) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,movePrev) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,moveLast) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,sort) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,eof) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_list,current) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,remove) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,removeFirst) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,removeLast) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,removeCurrent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,moveFirst) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,moveNext) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,movePrev) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,moveLast) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,sort) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,eof) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,current) KVSO_END_REGISTERCLASS(KviKvsObject_list) diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp index 11a78c502..26decfc31 100644 --- a/src/modules/objects/class_listwidget.cpp +++ b/src/modules/objects/class_listwidget.cpp @@ -107,28 +107,28 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_listwidget,"listbox","widget")
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,insertItem)
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,insertWidgetItem)
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,changeItem)
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,removeItem)
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,clear)
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,count)
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,currentText)
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,currentItem)
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,textAt);
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,itemAt);
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,itemRect);
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,setCurrentItem);
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,insertItem)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,insertWidgetItem)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,changeItem)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,removeItem)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,clear)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,count)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,currentText)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,currentItem)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,textAt);
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,itemAt);
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,itemRect);
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,setCurrentItem);
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,selectedItems)
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,setSelected)
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,isSelected)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,selectedItems)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,setSelected)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,isSelected)
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,setSelectionMode);
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,selectionMode);
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,currentItemChangeEvent);
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_listwidget,itemEnteredEvent);
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,setSelectionMode);
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,selectionMode);
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,currentItemChangeEvent);
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,itemEnteredEvent);
KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_listwidget,"selectionChangeEvent")
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp index 903909b8e..67defdcc5 100644 --- a/src/modules/objects/class_mainwindow.cpp +++ b/src/modules/objects/class_mainwindow.cpp @@ -52,9 +52,9 @@ */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_mainwindow,"mainwindow","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_mainwindow,setCentralWidget) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_mainwindow,setDockEnabled) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_mainwindow,isDockEnabled) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_mainwindow,setCentralWidget) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_mainwindow,setDockEnabled) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_mainwindow,isDockEnabled) KVSO_END_REGISTERCLASS(KviKvsObject_mainwindow) diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/class_memorybuffer.cpp index 8690b0d60..4e6e71c4e 100644 --- a/src/modules/objects/class_memorybuffer.cpp +++ b/src/modules/objects/class_memorybuffer.cpp @@ -58,8 +58,8 @@ */
KVSO_BEGIN_REGISTERCLASS(KviKvsObject_memorybuffer,"memorybuffer","object")
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_memorybuffer,loadFromFile);
- KVSO_REGISTER_HANDLER_NEW(KviKvsObject_memorybuffer,saveToFile);
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_memorybuffer,loadFromFile);
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_memorybuffer,saveToFile);
KVSO_END_REGISTERCLASS(KviKvsObject_memorybuffer)
diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/class_menubar.cpp index 93b79fdb9..b569da73d 100644 --- a/src/modules/objects/class_menubar.cpp +++ b/src/modules/objects/class_menubar.cpp @@ -47,7 +47,7 @@ */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_menubar,"menubar","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_menubar,insertItem) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_menubar,insertItem) KVSO_END_REGISTERCLASS(KviKvsObject_menubar) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_menubar,KviKvsObject_widget) diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index f5d5de474..72f889bf7 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -428,91 +428,91 @@ const char * const brushstyles_tbl[] = { KVSO_BEGIN_REGISTERCLASS(KviKvsObject_painter,"painter","object") // Fonts - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setFont) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setFontSize) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,fontAscent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,fontDescent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,fontMetricsHeight) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,fontMetricsWidth) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setFont) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setFontSize) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,fontAscent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,fontDescent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,fontMetricsHeight) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,fontMetricsWidth) // Draws - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawRect) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawLine) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawRoundRect) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawWinFocusRect) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawPoint) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawArc) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawEllipse) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawPie) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawChord) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,fillRect) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawRect) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawLine) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawRoundRect) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawWinFocusRect) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPoint) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawArc) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawEllipse) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPie) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawChord) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,fillRect) // Text & Pixmap & Icons - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawText) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawPixmap) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawIcon) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawHtmlText) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,htmlTextSize) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawText) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPixmap) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawIcon) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawHtmlText) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,htmlTextSize) // Matrix Operation - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,rotate) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,shear) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,scale) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,translate) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,reset) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,rotate) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,shear) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,scale) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,translate) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,reset) // ?? - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setOpacity) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setTextAntialiasing) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setAntialiasing) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setSmoothPixmapTransform) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setBackGroundMode) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setOpacity) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setTextAntialiasing) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setAntialiasing) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setSmoothPixmapTransform) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setBackGroundMode) // QPainterPath stuff - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,drawPath) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,resetPath) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,pathAddText) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,pathMoveTo) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,pathLineTo) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPath) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,resetPath) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,pathAddText) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,pathMoveTo) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,pathLineTo) // Pen - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setPenJoinStyle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setPenCapStyle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setPenWidth) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setPenStyle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setPen) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,colorNames) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPenJoinStyle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPenCapStyle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPenWidth) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPenStyle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPen) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,colorNames) // Brush - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setBrush) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setBrushStyle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setBrush) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setBrushStyle) // Gradients - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setGradientStart) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setGradientStop) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setGradientColor) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,setGradientAsBrush) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,clearGradient) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setGradientStart) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setGradientStop) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setGradientColor) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setGradientAsBrush) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,clearGradient) // painter state - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,save) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,restore) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,save) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,restore) // painter device - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,painterDeviceWidth) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,painterDeviceHeight) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,begin) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,end) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,painterDeviceWidth) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,painterDeviceHeight) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,begin) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,end) // extra - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_painter,beginPdf)// FIXME: needs doc! + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,beginPdf)// FIXME: needs doc! KVSO_END_REGISTERCLASS(KviKvsObject_painter) diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index b836b1072..627c8eedd 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -75,17 +75,17 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_pixmap,"pixmap","object") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,fill) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,resize) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,load) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,loadFromMemoryBuffer) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,fill) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,resize) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,load) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,loadFromMemoryBuffer) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,height) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,height) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,width) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,setOpacity) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,scale) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,rotate) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,width) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,setOpacity) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,scale) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,rotate) KVSO_END_REGISTERCLASS(KviKvsObject_pixmap) diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index b99c6ae42..a00af1203 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -166,16 +166,16 @@ */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_popupmenu,"popupmenu","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,insertItem) - //KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,"insertWidget", functioninsertWidget) -// KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,"setTitle", functionsetTitle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,exec) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,insertSeparator) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,removeItem) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,insertItem) + //KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,"insertWidget", functioninsertWidget) +// KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,"setTitle", functionsetTitle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,exec) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,insertSeparator) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,removeItem) // events - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,highlightedEvent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,activatedEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,highlightedEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,activatedEvent) KVSO_END_REGISTERCLASS(KviKvsObject_popupmenu) diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index beb75636b..b23275d73 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -161,21 +161,21 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_process,"process","object") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,addArgument); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,startProcess); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,readStdout); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,readStderr); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,writeToStdin); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,closekill); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,kill); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,tryTerminate); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,closeStdin); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,isRunning); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,normalExit); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,addArgument); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,startProcess); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,readStdout); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,readStderr); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,writeToStdin); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,closekill); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,kill); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,tryTerminate); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,closeStdin); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,isRunning); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,normalExit); // Events - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,readyReadStdoutEvent); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,readyReadStderrEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,readyReadStdoutEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,readyReadStderrEvent); KVSO_END_REGISTERCLASS(KviKvsObject_process) diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp index ed1851fbc..ed8f2aadb 100644 --- a/src/modules/objects/class_progressbar.cpp +++ b/src/modules/objects/class_progressbar.cpp @@ -68,12 +68,12 @@ */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_progressbar,"progressbar","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_progressbar,setProgress) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_progressbar,setFormat) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_progressbar,setTotalSteps) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_progressbar,reset) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_progressbar,setPercentageVisible) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_progressbar,percentageVisible) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_progressbar,setProgress) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_progressbar,setFormat) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_progressbar,setTotalSteps) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_progressbar,reset) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_progressbar,setPercentageVisible) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_progressbar,percentageVisible) KVSO_END_REGISTERCLASS(KviKvsObject_progressbar) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_progressbar,KviKvsObject_widget) diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index a36450af7..68925d936 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -66,11 +66,11 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_radiobutton,"radiobutton","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_radiobutton,setText) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_radiobutton,setChecked) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_radiobutton,isChecked) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_radiobutton,setImage) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_radiobutton,toggleEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_radiobutton,setText) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_radiobutton,setChecked) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_radiobutton,isChecked) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_radiobutton,setImage) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_radiobutton,toggleEvent) KVSO_END_REGISTERCLASS(KviKvsObject_radiobutton) diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index df858dda5..e9d969188 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -103,23 +103,23 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_slider,"slider","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setTracking); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setValue); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setMinValue); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setMaxValue); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setLineStep); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setPageStep); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setTickInterval); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,value); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,minValue); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,maxValue); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,lineStep); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,pageStep); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setTickmarks); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setOrientation); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setTracking); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setValue); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setMinValue); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setMaxValue); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setLineStep); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setPageStep); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setTickInterval); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,value); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,minValue); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,maxValue); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,lineStep); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,pageStep); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setTickmarks); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setOrientation); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,valueChangedEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,valueChangedEvent); KVSO_END_REGISTERCLASS(KviKvsObject_slider) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_slider,KviKvsObject_widget) diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index a8b6dafef..809dc4797 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -279,22 +279,22 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_socket,"socket","object") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,status) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,remotePort) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,remoteIp) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,localIp) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,localPort) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,status) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,remotePort) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,remoteIp) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,localIp) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,localPort) KVSO_REGISTER_HANDLER(KviKvsObject_socket,"connect",functionConnect) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,connectTimeout) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,setConnectTimeout) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,close) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,read) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,readHex) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,write) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,writeHex) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,setProtocol) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,listen) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,accept) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,connectTimeout) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,setConnectTimeout) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,close) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,read) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,readHex) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,write) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,writeHex) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,setProtocol) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,listen) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,accept) KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_socket,"connectEvent") KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_socket,"connectFailedEvent") diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index 0258e7a63..f3b76cb15 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -104,22 +104,22 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_spinbox,"spinbox","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setValue); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setMinValue); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setMaxValue); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setLineStep); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setSpecialValueText); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,value); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,minValue); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,maxValue); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,lineStep); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,specialValueText); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setValue); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setMinValue); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setMaxValue); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setLineStep); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setSpecialValueText); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,value); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,minValue); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,maxValue); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,lineStep); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,specialValueText); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setPrefix); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setSuffix); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setPrefix); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setSuffix); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,valueChangedEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,valueChangedEvent); KVSO_END_REGISTERCLASS(KviKvsObject_spinbox) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_spinbox,KviKvsObject_widget) diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 766743fe0..211fb539f 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -147,23 +147,23 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_tabwidget,"tabwidget","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,addTab) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,insertTab) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,setTabToolTip) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,removeTabToolTip) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,setTabLabel) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,changeTab) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,setCurrentPage) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,currentPageIndex) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,tabLabel) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,currentTabLabel) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,addTab) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,insertTab) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,setTabToolTip) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,removeTabToolTip) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,setTabLabel) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,changeTab) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,setCurrentPage) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,currentPageIndex) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,tabLabel) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,currentTabLabel) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,count) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,removePage) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,setTabPosition) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,count) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,removePage) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,setTabPosition) // events - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_tabwidget,currentChangedEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,currentChangedEvent) diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index 4459244e1..cc4026d8d 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -67,12 +67,12 @@ */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_textbrowser,"textbrowser","multilineedit") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_textbrowser,setSource) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_textbrowser,forward) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_textbrowser,backward) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_textbrowser,home) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_textbrowser,reload) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_textbrowser,linkClickedEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_textbrowser,setSource) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_textbrowser,forward) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_textbrowser,backward) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_textbrowser,home) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_textbrowser,reload) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_textbrowser,linkClickedEvent) KVSO_END_REGISTERCLASS(KviKvsObject_textbrowser) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_textbrowser,KviKvsObject_textedit) diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index 4ad6f6e0e..912126f95 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -61,10 +61,10 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_toolbar,"toolbar","object") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbar,addSeparator) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbar,setLabel) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbar,label) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbar,clear) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbar,addSeparator) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbar,setLabel) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbar,label) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbar,clear) KVSO_END_REGISTERCLASS(KviKvsObject_toolbar) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_toolbar,KviKvsObject_widget) diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index eb16fa8d5..0a4a01c0e 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -99,30 +99,30 @@ Returns the time delay between pressing the button and the appearance of the associated popup menu in milliseconds. */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_toolbutton,"toolbutton","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,setImage) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,setUsesBigPixmap) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,usesBigPixmap) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,setUsesTextLabel) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,usesTextLabel) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,setAutoRaise) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,autoRaise) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,setTextLabel) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,textLabel) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,setPopup) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,openPopup) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setImage) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setUsesBigPixmap) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,usesBigPixmap) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setUsesTextLabel) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,usesTextLabel) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setAutoRaise) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,autoRaise) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setTextLabel) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,textLabel) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setPopup) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,openPopup) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,setToggleButton) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,toggle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,setOn) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setToggleButton) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,toggle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setOn) /* - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,"setPopupDelay", functionsetPopupDelay) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,"popupDelay", functionpopupDelay) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,"setPopupDelay", functionsetPopupDelay) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,"popupDelay", functionpopupDelay) */ - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,setTextPosition) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,textPosition) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setTextPosition) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,textPosition) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_toolbutton,clickEvent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,clickEvent) KVSO_END_REGISTERCLASS(KviKvsObject_toolbutton) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_toolbutton,KviKvsObject_widget) diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp index 57fa732e4..877b05e82 100644 --- a/src/modules/objects/class_treewidget.cpp +++ b/src/modules/objects/class_treewidget.cpp @@ -48,185 +48,188 @@ #include <QUrl> /* - @doc: treewidget - @keyterms: - treewidget widget class - @title: - treewidget class - @type: - class - @short: - A treewidget class - @inherits: - [class]widget[/class] - @description: - It can display and control a hierarchy of multi-column items, and provides the ability to add new items at any time. - The items are added by creating children [class]treewidgetitem[/class] objects: simply allocating them with $new - will add the items to the treewidget and simply deleting them will remove them. - Allocating a [class]treewidgetitem[/class] item2 as a child of item1 will insert it to the same treewidget creating - a subtree of items spannig from item1. The subtree can be opened or closed by a simple click either - on the parent item or on the little plus sign on the side of it (when [classfnc:treewidget]$setRootIsDecorated[/classfnc] - is set to $true. The treewidget can be in Single, Multi, Extended or NoSelection selection mode. - In single selection mode there can be only one selected item at a time and the selected item is also - the current item (this mode is the default). In Multi and Extended selection mode there can be multiple selected items - and the current item is one of them. The difference between Multi and Extended is in the way - that items can be selected by the mouse actions: experiment with the two modes :). - The NoSelection mode has obviously no selection at all. - @functions: - !fn: $addColumn(<text_label:string> <width:unsigned integer>) - Adds a width pixels wide column with the column header label to the list view. + @doc: listview + @keyterms: + listview widget class + @title: + listview widget class + @type: + class + @short: + A listview widget class + @inherits: + [class]widget[/class] + @description: + It can display and control a hierarchy of multi-column items, and provides the ability to add new items at any time. + The items are added by creating children [class]listviewitem[/class] objects: simply allocating them with $new + will add the items to the listview and simply deleting them will remove them. + Allocating a [class]listviewtitem[/class] item2 as a child of item1 will insert it to the same listview creating + a subtree of items spannig from item1. The subtree can be opened or closed by a simple click either + on the parent item or on the little plus sign on the side of it (when [classfnc:listview]$setRootIsDecorated[/classfnc] + is set to $true. The listview can be in Single, Multi, Extended or NoSelection selection mode. + In single selection mode there can be only one selected item at a time and the selected item is also + the current item (this mode is the default). In Multi and Extended selection mode there can be multiple selected items + and the current item is one of them. The difference between Multi and Extended is in the way + that items can be selected by the mouse actions: experiment with the two modes :). + The NoSelection mode has obviously no selection at all. + @functions: + !fn: $addColumn(<text_label:string> <width:unsigned integer>) + Adds a width pixels wide column with the column header label to the list view. - !fn: $setSorting(<column:integer>,<sort_order:string>) - Sets the list view to be sorted by column in ascending order if sort_order is "ascending" or descending order if it is "descending". - !fn: $setSortingEnabled(<bEnabled:boolean>) - If <bEnabled> is true, user sorting is enabled for the tree. The default value is false. - In order to avoid performance issues, it is recommended that sorting is enabled after inserting the items into the tree. - !fn: $hideListViewHeader() - Hide the treewidget column header. + !fn: $setSorting(<column:integer>,<sort_order:string>) + Sets the list view to be sorted by column in ascending order if sort_order is "ascending" or descending order if it is "descending". + !fn: $setSortingEnabled(<bEnabled:boolean>) + If <bEnabled> is true, user sorting is enabled for the tree. The default value is false. + In order to avoid performance issues, it is recommended that sorting is enabled after inserting the items into the tree. + !fn: $hideListViewHeader() + Hide the listview column header. - !fn: $showListViewHeader() - Show the treewidget column header. + !fn: $showListViewHeader() + Show the listview column header. - !fn: <boolean> $isListViewHeaderVisible() - Returns '1' if the treewidget header is currently visible. Otherwise this function returns '0'. + !fn: <boolean> $isListViewHeaderVisible() + Returns '1' if the listview header is currently visible. Otherwise this function returns '0'. - !fn: $setAllColumnsShowFocus(<bAllColumnsShowFocus:boolean>) - When the argument is $true, causes the treewidget to display the focus and selection - by highlighting all the columns of the item. When the argument is $false then - only the first column is selected/highlighted. + !fn: $setAllColumnsShowFocus(<bAllColumnsShowFocus:boolean>) + When the argument is $true, causes the listview to display the focus and selection + by highlighting all the columns of the item. When the argument is $false then + only the first column is selected/highlighted. - !fn: $setSelectionMode(<mode:string>) - Sets the selection mode for this treewidget. <mode> can be one of "Single","NoSelection","Multi" or "Extended". + !fn: $setSelectionMode(<mode:string>) + Sets the selection mode for this listview. <mode> can be one of "Single","NoSelection","Multi" or "Extended". - !fn: <treewidgetitem> $selectedItem() - Returns the currently selected [class]treewidgetitem[/class] or $null if no items are selected. - This function works only if the list view is in single selection mode. + !fn: <listviewitem> $selectedItem() + Returns the currently selected [class]listviewitem[/class] or $null if no items are selected. + This function works only if the list view is in single selection mode. - !fn: <treewidgetitem> $currentItem() - Returns the current [class]treewidgetitem[/class] or $null if no item is current at the moment. + !fn: <listviewitem> $currentItem() + Returns the current [class]listviewitem[/class] or $null if no item is current at the moment. - !fn: <treewidgetitem> $firstChild() - Returns the first child [class]treewidgetitem[/class] of this treewidget or $null if there are no items at all. + !fn: <listviewitem> $firstChild() + Returns the first child [class]listviewitem[/class] of this listview or $null if there are no items at all. - !fn: $clickEvent(<item:object>) - This function is called when the user clicks in the list view. - In its argument the [class]treewidgetitem[/class] object clicked or 0 if the user didn't click on an item.[br] - The default implementation emits the [classfnc]$clicked[/classfnc]() signal. + !fn: $clickEvent(<item:object>) + This function is called when the user clicks in the list view. + In its argument the [class]listviewitem[/class] object clicked or 0 if the user didn't click on an item.[br] + The default implementation emits the [classfnc]$clicked[/classfnc]() signal. - !fn: $selectionChangedEvent(<item:object>) - This event handle whenever the set of selected items has changed. - The argument is the newly selected item if the treewidget is in single selection mode.[br] - When the treewidget is in Multi or Extended selection mode then item is always $null.[br] - The default implementation emits the [classfnc]$selectionChanged[/classfnc]() signal. + !fn: $selectionChangedEvent(<item:object>) + This event handle whenever the set of selected items has changed. + The argument is the newly selected item if the listview is in single selection mode.[br] + When the listview is in Multi or Extended selection mode then item is always $null.[br] + The default implementation emits the [classfnc]$selectionChanged[/classfnc]() signal. - !fn: $currentChangedEvent(<item:object>) - This event are called whenever the current item has changed. - In its argument is the newly selected item or 0 if the change made no item current.[br] - The default implementation emits the [classfnc]$currentChanged[/classfnc]() signal. + !fn: $currentChangedEvent(<item:object>) + This event are called whenever the current item has changed. + In its argument is the newly selected item or 0 if the change made no item current.[br] + The default implementation emits the [classfnc]$currentChanged[/classfnc]() signal. - !fn: $returnPressedEvent(<item:object>) - This function is called by the framework when the enter key is pressed.[br] - In its arument the currrent item.[br] - The default implementation emits the [classfnc]$returnPressed[/classfnc]() signal. + !fn: $returnPressedEvent(<item:object>) + This function is called by the framework when the enter key is pressed.[br] + In its arument the currrent item.[br] + The default implementation emits the [classfnc]$returnPressed[/classfnc]() signal. - !fn: $spacePressedEvent(<item:object>) - This function is called by the framework when the space key is pressed.[br] - In its arument the currrent item.[br] - The default implementation emits the [classfnc]$spacePressed[/classfnc]() signal. + !fn: $spacePressedEvent(<item:object>) + This function is called by the framework when the space key is pressed.[br] + In its arument the currrent item.[br] + The default implementation emits the [classfnc]$spacePressed[/classfnc]() signal. - !fn: $onItemEvent(<item:object) - This event is called by framwork when the user moves the mouse cursor onto item. - The default implementation emits the [classfnc]$onItem[/classfnc]() signal. + !fn: $onItemEvent(<item:object) + This event is called by framwork when the user moves the mouse cursor onto item. + The default implementation emits the [classfnc]$onItem[/classfnc]() signal. - !fn: $itemExpandedEvent(<item:object>) - This event is called when an item has been expanded, i.e. when the children of item are shown. - The default implementation emits the [classfnc]$expanded[/classfnc]() signal. + !fn: $itemExpandedEvent(<item:object>) + This event is called when an item has been expanded, i.e. when the children of item are shown. + The default implementation emits the [classfnc]$expanded[/classfnc]() signal. - !fn: $itemCollapsedEvent(<item:object>) - This event is called when an item has been collapsed, i.e. when the children of item are hidden. - The default implementation emits the [classfnc]$collapsed[/classfnc]() signal. + !fn: $itemCollapsedEvent(<item:object>) + This event is called when an item has been collapsed, i.e. when the children of item are hidden. + The default implementation emits the [classfnc]$collapsed[/classfnc]() signal. - !fn: $itemRenamedEvent(<item:object>,<col:integer>,<text:string>) - This event is called when the item has been renamed in text, e.g. by in in-place renaming, in column col.[br] - The default implementation emits the [classfnc]$itemRenamed[/classfnc]() signal. + !fn: $itemRenamedEvent(<item:object>,<col:integer>,<text:string>) + This event is called when the item has been renamed in text, e.g. by in in-place renaming, in column col.[br] + The default implementation emits the [classfnc]$itemRenamed[/classfnc]() signal. - !fn: $rightButtonClickEvent(<item:object>,<x:integer>,>y:integer>) - This signal is emitted when the right button is clicked.[br] - The arguments are the relevant item (may be 0), the point in global coordinates and the relevant column (or -1 if the click was outside the list). - The default implementation emits the [classfnc]$rightButtonClicked[/classfnc]() signal. - @signals: - !sg: $clicked() - This signal is emitted by the default implementation of [classfnc]$clickEvent[/classfnc](). - !sg: $selectionChanged() - This signal is emitted by the default implementation of [classfnc]$selectionChangedEvent[/classfnc](). - !sg: $currentChanged() - This signal is emitted by the default implementation of [classfnc]$currentChangedEvent[/classfnc](). - !sg: $returnPressed() - This signal is emitted by the default implementation of [classfnc]$returnPressedEvent[/classfnc](). - !sg: $spacePressed() - This signal is emitted by the default implementation of [classfnc]$spacePredssedEvent[/classfnc](). - !sg: $onItem() - This signal is emitted by the default implementation of [classfnc]$onItemEvent[/classfnc](). - !sg: $itemExpanded() - This signal is emitted by the default implementation of [classfnc]$itemExpandedEvent[/classfnc](). - !sg: $itemCollapsed() - This signal is emitted by the default implementation of [classfnc]$itemCollapsedEvent[/classfnc](). - !sg: $itemRenamed() - This signal is emitted by the default implementation of [classfnc]$itemRenamedEvent[/classfnc](). - !sg: $rightButtonClicked() - This signal is emitted by the default implementation of [classfnc]$rightButtonClickedEvent[/classfnc](). + !fn: $rightButtonClickEvent(<item:object>,<x:integer>,>y:integer>) + This signal is emitted when the right button is clicked.[br] + The arguments are the relevant item (may be 0), the point in global coordinates and the relevant column (or -1 if the click was outside the list). + The default implementation emits the [classfnc]$rightButtonClicked[/classfnc]() signal. + @signals: + !sg: $clicked() + This signal is emitted by the default implementation of [classfnc]$clickEvent[/classfnc](). + !sg: $selectionChanged() + This signal is emitted by the default implementation of [classfnc]$selectionChangedEvent[/classfnc](). + !sg: $currentChanged() + This signal is emitted by the default implementation of [classfnc]$currentChangedEvent[/classfnc](). + !sg: $returnPressed() + This signal is emitted by the default implementation of [classfnc]$returnPressedEvent[/classfnc](). + !sg: $spacePressed() + This signal is emitted by the default implementation of [classfnc]$spacePredssedEvent[/classfnc](). + !sg: $onItem() + This signal is emitted by the default implementation of [classfnc]$onItemEvent[/classfnc](). + !sg: $itemExpanded() + This signal is emitted by the default implementation of [classfnc]$itemExpandedEvent[/classfnc](). + !sg: $itemCollapsed() + This signal is emitted by the default implementation of [classfnc]$itemCollapsedEvent[/classfnc](). + !sg: $itemRenamed() + This signal is emitted by the default implementation of [classfnc]$itemRenamedEvent[/classfnc](). + !sg: $rightButtonClicked() + This signal is emitted by the default implementation of [classfnc]$rightButtonClickedEvent[/classfnc](). */ + + //--------------------------------------------------------------------------------- KVSO_BEGIN_REGISTERCLASS(KviKvsObject_treewidget,"listview","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setHeaderLabels) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,addColumn) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setHeaderLabels) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,addColumn) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setColumnText) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setColumnCount) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setColumnText) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setColumnCount) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setSorting) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setSortingEnabled) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setRootIsDecorated) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setAllColumnsShowFocus) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,clear) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setSorting) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setSortingEnabled) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setRootIsDecorated) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setAllColumnsShowFocus) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,clear) //FIXME KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"selectedItem",selectedItems)//<--- remove this - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,selectedItems) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,selectedItems) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,currentItem) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setSelectionMode) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,listViewHeaderIsVisible) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,currentItem) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setSelectionMode) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,listViewHeaderIsVisible) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,hideListViewHeader) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,showListViewHeader) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,firstChild) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,selectionChangedEvent); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,currentChangedEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,hideListViewHeader) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,showListViewHeader) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,firstChild) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,selectionChangedEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,currentChangedEvent); // FIX-ME KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"returnPressedEvent",itemActivatedEvent);//<- remove me - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemActivatedEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,itemActivatedEvent); // -// KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,"spacePressedEvent",function_spacePressedEvent); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,onItemEvent); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemClickedEvent); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemExpandedEvent); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemCollapsedEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,onItemEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,itemClickedEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,itemExpandedEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,itemCollapsedEvent); //FIXME KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"itemRenamedEvent",itemChangedEvent);//<- remove me - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemChangedEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,itemChangedEvent); // KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"rightButtonClickedEvent",customContextMenuRequestedEvent); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,customContextMenuRequestedEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,customContextMenuRequestedEvent); + + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setAcceptDrops); KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_treewidget,"fileDroppedEvent") @@ -255,9 +258,7 @@ bool KviKvsObject_treewidget::init(KviKvsRunTimeContext *,KviKvsVariantList *) connect(widget(),SIGNAL(itemEntered(QTreeWidgetItem *,int)),this,SLOT(slotOnItemEntered(QTreeWidgetItem *,int))); connect(widget(),SIGNAL(itemExpanded(QTreeWidgetItem *)),this,SLOT(slotItemExpanded(QTreeWidgetItem *))); connect(widget(),SIGNAL(itemCollapsed(QTreeWidgetItem *)),this,SLOT(slotItemCollapsed(QTreeWidgetItem *))); - //connect(widget(),SIGNAL(rightButtonClicked(QTreeWidgetItem *,const QPoint &,int)),this,SLOT(slotRightButtonClicked(QTreeWidgetItem *,const QPoint &,int))); connect(widget(),SIGNAL(itemChanged(QTreeWidgetItem *,int)),this,SLOT(slotItemChanged(QTreeWidgetItem *,int))); - widget()->setContextMenuPolicy(Qt::CustomContextMenu); connect(widget(),SIGNAL(customContextMenuRequested(const QPoint &)),this,SLOT(slotCustomContextMenuRequested(const QPoint &))); @@ -308,7 +309,7 @@ KVSO_CLASS_FUNCTION(treewidget,addColumn) //col++; return true; } -/* + KVSO_CLASS_FUNCTION(treewidget,setAcceptDrops) { bool bEnable; @@ -319,7 +320,7 @@ KVSO_CLASS_FUNCTION(treewidget,setAcceptDrops) ((QTreeWidget *)object())->setAcceptDrops(bEnable); return true; } -*/ + KVSO_CLASS_FUNCTION(treewidget,clear) { if (widget()) @@ -629,6 +630,7 @@ void KviKvsTreeWidget::dragEnterEvent( QDragEnterEvent * e ) e->ignore(); return; } + e->accept(); } void KviKvsTreeWidget::dropEvent(QDropEvent * e) diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp index bfc3cc2bc..47db85ec6 100644 --- a/src/modules/objects/class_treewidgetitem.cpp +++ b/src/modules/objects/class_treewidgetitem.cpp @@ -130,22 +130,22 @@ const char * const itemflags_tbl[] = { //=========================================================================================== KVSO_BEGIN_REGISTERCLASS(KviKvsObject_treewidgetitem,"listviewitem","object") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,setText) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,text) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,setPixmap); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,setRenameEnabled); - //KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,"setEnabled",function_setEnabled); - //KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,"isEnabled",function_isEnabled); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,setOpen); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,isOpen); - //KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,"setCheckable",function_setCheckable); - //KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,"isCheckable",function_isCheckable); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,setChecked); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,isChecked); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,firstChild); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,setFlags); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setText) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,text) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setPixmap); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setRenameEnabled); + //KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,"setEnabled",function_setEnabled); + //KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,"isEnabled",function_isEnabled); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setOpen); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,isOpen); + //KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,"setCheckable",function_setCheckable); + //KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,"isCheckable",function_isCheckable); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setChecked); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,isChecked); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,firstChild); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setFlags); - //KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,"nextSibling",function_nextSibling); + //KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,"nextSibling",function_nextSibling); KVSO_END_REGISTERCLASS(KviKvsObject_treewidgetitem) diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp index f61431d72..d5bd69bdb 100644 --- a/src/modules/objects/class_vbox.cpp +++ b/src/modules/objects/class_vbox.cpp @@ -88,11 +88,11 @@ const int align_cod[] = { KVSO_BEGIN_REGISTERCLASS(KviKvsObject_vbox,"vbox","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_vbox,setMargin) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_vbox,setSpacing) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_vbox,setStretchFactor) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_vbox,addStretch) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_vbox,setAlignment) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_vbox,setMargin) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_vbox,setSpacing) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_vbox,setStretchFactor) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_vbox,addStretch) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_vbox,setAlignment) KVSO_END_REGISTERCLASS(KviKvsObject_vbox) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_vbox,KviKvsObject_widget) diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 33ec297e3..e693f0dde 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -615,76 +615,76 @@ const Qt::WindowType widgettypes_cod[] = { KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,reparent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,reparent) // apparence - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,show) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,hide) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,update) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,show) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,hide) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,update) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,repaint) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,isTopLevel) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,isVisible) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,raise) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,lower) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setEnabled) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,isEnabled) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setMouseTracking) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setWindowTitle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setWindowTitle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,windowTitle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,windowTitle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,hasFocus) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setFocus) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setToolTip) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setWFlags) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setWindowIcon) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,repaint) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,isTopLevel) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,isVisible) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,raise) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,lower) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setEnabled) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,isEnabled) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setMouseTracking) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setWindowTitle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setWindowTitle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,windowTitle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,windowTitle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,hasFocus) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setFocus) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setToolTip) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setWFlags) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setWindowIcon) // fonts - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,fontDescent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,fontAscent) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,fontMetricsWidth) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,fontMetricsHeight) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setFont) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,fontDescent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,fontAscent) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,fontMetricsWidth) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,fontMetricsHeight) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setFont) // geometry - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,screenResolution) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,centerToScreen) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,geometry) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setGeometry) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,mapToGlobal) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,mapFromGlobal) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,y) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,x) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,screenResolution) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,centerToScreen) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,geometry) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setGeometry) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,mapToGlobal) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,mapFromGlobal) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,y) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,x) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,globalCursorX) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,globalCursorY) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,globalCursorX) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,globalCursorY) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,width) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,height) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setMinimumWidth) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setMinimumHeight) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setMaximumWidth) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setMaximumHeight) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,move) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,sizeHint) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,resize) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,width) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,height) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setMinimumWidth) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setMinimumHeight) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setMaximumWidth) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setMaximumHeight) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,move) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,sizeHint) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,resize) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setFocusPolicy) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,addWidgetToWrappedLayout) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setFocusPolicy) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,addWidgetToWrappedLayout) // colors and image - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setPaletteForeground) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setBackgroundColor) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setBackgroundImage) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,backgroundColor) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,foregroundColor) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setMask) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setAttribute) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,colorPalette) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setStyleSheet) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setKeyShortcut) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setPaletteForeground) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setBackgroundColor) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setBackgroundImage) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,backgroundColor) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,foregroundColor) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setMask) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setAttribute) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,colorPalette) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setStyleSheet) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setKeyShortcut) // statusbar - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,insertIntoStatusBar) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,removeFromStatusBar) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,insertIntoStatusBar) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,removeFromStatusBar) // events KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"mousePressEvent") KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"mouseReleaseEvent") @@ -706,7 +706,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object") KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"shortCutEvent") #ifdef COMPILE_WEBKIT_SUPPORT - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_widget,setWebView) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setWebView) #endif KVSO_END_REGISTERCLASS(KviKvsObject_widget) diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index 081568e05..abb840b9b 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -96,8 +96,8 @@ void KviKvsScriptWindowWindow::centralWidgetDestroyed() KVSO_BEGIN_REGISTERCLASS(KviKvsObject_window,"window","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_window,setWindowTitle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_window,setCentralWidget) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_window,setWindowTitle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_window,setCentralWidget) KVSO_END_REGISTERCLASS(KviKvsObject_window) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_window,KviKvsObject_widget) diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index d43c89cf4..ba6fbc1e9 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -93,21 +93,21 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_wizard,"wizard","widget") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,addPage) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,insertPage) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setTitle) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,addPage) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,insertPage) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setTitle) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setBackEnabled); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setNextEnabled); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setFinishEnabled); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setHelpEnabled); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setBackEnabled); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setNextEnabled); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setFinishEnabled); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setHelpEnabled); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setBackBtnText); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setNextBtnText); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setFinishBtnText); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setHelpBtnText); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,nextClickedEvent); - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,backClickedEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setBackBtnText); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setNextBtnText); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setFinishBtnText); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setHelpBtnText); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,nextClickedEvent); + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,backClickedEvent); KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_wizard,"acceptEvent") diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index 47f4fe5ef..4d9b2265d 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -277,8 +277,8 @@ public: KVSO_BEGIN_REGISTERCLASS(KviKvsObject_xmlreader,"xmlreader","object") - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_xmlreader,lastError) - KVSO_REGISTER_HANDLER_NEW(KviKvsObject_xmlreader,parse) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_xmlreader,lastError) + KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_xmlreader,parse) KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KviKvsObject_xmlreader,"onDocumentStart") KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KviKvsObject_xmlreader,"onDocumentEnd") diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h index cba681364..4a2b78e72 100644 --- a/src/modules/objects/object_macros.h +++ b/src/modules/objects/object_macros.h @@ -45,7 +45,7 @@ g_pKvs##__className##Class->registerFunctionHandler(__szName,(KviKvsObjectFunctionHandlerProc)(KVI_PTR2MEMBER(__className::__proc))); // TEST -#define KVSO_REGISTER_HANDLER_NEW(__className,__szName) \ +#define KVSO_REGISTER_HANDLER_BY_NAME(__className,__szName) \ g_pKvs##__className##Class->registerFunctionHandler(#__szName,(KviKvsObjectFunctionHandlerProc)(KVI_PTR2MEMBER(__className::__szName))); #define KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(__className,__szName) \ |