From da5f925ce4a195dade4e9ad0748e6f7596b43717 Mon Sep 17 00:00:00 2001 From: Noldor Date: Sat, 18 Oct 2008 10:25:29 +0000 Subject: more works on objects module (locale stuff+some fixes+code clean) git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2752 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/objects/class_buttongroup.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/modules/objects/class_buttongroup.cpp') diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp index ece10d839..3c61771a8 100644 --- a/src/modules/objects/class_buttongroup.cpp +++ b/src/modules/objects/class_buttongroup.cpp @@ -82,22 +82,8 @@ KVSO_CLASS_FUNCTION(buttongroup,addButton) KVSO_PARAMETER("button",KVS_PT_HOBJECT,0,hObject) KVSO_PARAMETERS_END(c) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if (!pObject) - { - c->warning(__tr2qs("Widget parameter is not an object")); - return true; - } - if (!pObject->object()) - { - c->warning(__tr2qs("Widget parameter is not a valid object")); - return true; - } - if(!pObject->object()->isWidgetType()) - { - c->warning(__tr2qs("Can't add a non-widget object")); - return true; - } - if(pObject->inheritsClass("radiobutton") || pObject->inheritsClass("KviKvsObject")) + CHECK_HOBJECT_IS_WIDGET(pObject) + if(pObject->inheritsClass("radiobutton") || pObject->inheritsClass("checkbox")) { m_pButtonGroup->addButton(((QRadioButton *)(pObject->object())),m_iId); c->returnValue()->setInteger(m_iId); -- cgit v1.3.1-10-gc9f91