diff options
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/class_button.cpp | 11 | ||||
| -rw-r--r-- | src/modules/objects/class_button.h | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index ebde7161f..630a0538d 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -34,8 +34,11 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_button,"button","widget") KVSO_REGISTER_HANDLER(KviKvsObject_button,"text", functionText) KVSO_REGISTER_HANDLER(KviKvsObject_button,"setAutoDefault", functionSetAutoDefault) KVSO_REGISTER_HANDLER(KviKvsObject_button,"setToggleButton", functionSetToggleButton) - KVSO_REGISTER_HANDLER(KviKvsObject_button,"setOn", functionSetOn) - KVSO_REGISTER_HANDLER(KviKvsObject_button,"isOn", functionIsOn) + KVSO_REGISTER_HANDLER(KviKvsObject_button,"setOn", functionSetChecked)/*DEPRECATED*/ + KVSO_REGISTER_HANDLER(KviKvsObject_button,"setChecked", functionSetChecked) + KVSO_REGISTER_HANDLER(KviKvsObject_button,"isOn", functionIsChecked)/*DEPRECATED*/ + KVSO_REGISTER_HANDLER(KviKvsObject_button,"isChecked", functionIsChecked) + KVSO_REGISTER_HANDLER(KviKvsObject_button,"toggle", functionToggle) KVSO_REGISTER_HANDLER(KviKvsObject_button,"clickEvent", functionclickEvent) KVSO_REGISTER_HANDLER(KviKvsObject_button,"setImage", functionSetImage) @@ -95,7 +98,7 @@ bool KviKvsObject_button::functionSetToggleButton(KviKvsObjectFunctionCall *c) ((QPushButton *)widget())->setCheckable(bEnabled); return true; } -bool KviKvsObject_button::functionSetOn(KviKvsObjectFunctionCall *c) +bool KviKvsObject_button::functionSetChecked(KviKvsObjectFunctionCall *c) { bool bEnabled; KVSO_PARAMETERS_BEGIN(c) @@ -108,7 +111,7 @@ bool KviKvsObject_button::functionSetOn(KviKvsObjectFunctionCall *c) // -bool KviKvsObject_button::functionIsOn(KviKvsObjectFunctionCall *c) +bool KviKvsObject_button::functionIsChecked(KviKvsObjectFunctionCall *c) { if (widget()) c->returnValue()->setBoolean(((QPushButton *)widget())->isChecked()); return true; diff --git a/src/modules/objects/class_button.h b/src/modules/objects/class_button.h index 5b1c92e4c..ae1c5e68b 100644 --- a/src/modules/objects/class_button.h +++ b/src/modules/objects/class_button.h @@ -42,8 +42,8 @@ protected: bool functionText(KviKvsObjectFunctionCall *c); bool functionSetAutoDefault(KviKvsObjectFunctionCall *c); bool functionSetToggleButton(KviKvsObjectFunctionCall *c); - bool functionSetOn(KviKvsObjectFunctionCall *c); - bool functionIsOn(KviKvsObjectFunctionCall *c); + bool functionSetChecked(KviKvsObjectFunctionCall *c); + bool functionisChecked(KviKvsObjectFunctionCall *c); bool functionToggle(KviKvsObjectFunctionCall *c); bool functionSetImage(KviKvsObjectFunctionCall *c); bool functionclickEvent(KviKvsObjectFunctionCall *c); |