diff options
Diffstat (limited to 'src/modules/objects/object_macros.h')
| -rw-r--r-- | src/modules/objects/object_macros.h | 114 |
1 files changed, 55 insertions, 59 deletions
diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h index d6225dfb1..f89318575 100644 --- a/src/modules/objects/object_macros.h +++ b/src/modules/objects/object_macros.h @@ -30,94 +30,90 @@ #include "KviKvsObjectController.h" #include "KviKvsObjectFunctionCall.h" -#define KVSO_DECLARE_OBJECT(__className) \ - __className(KviKvsObjectClass * pClass,KviKvsObject * pParent,const QString &szName); \ - ~__className(); \ - static void registerSelf(); \ +#define KVSO_DECLARE_OBJECT(__className) \ + __className(KviKvsObjectClass * pClass, KviKvsObject * pParent, const QString & szName); \ + ~__className(); \ + static void registerSelf(); \ static void unregisterSelf(); -#define SET_OBJECT(__className) \ - __className *obj=new __className(parentScriptWidget()); \ - obj->setObjectName(getName()); \ - setObject(obj,true); +#define SET_OBJECT(__className) \ + __className * obj = new __className(parentScriptWidget()); \ + obj->setObjectName(getName()); \ + setObject(obj, true); -#define KVSO_REGISTER_HANDLER(__className,__szName,__proc) \ - g_pKvs##__className##Class->registerFunctionHandler(__szName,(KviKvsObjectFunctionHandlerProc)(KVI_PTR2MEMBER(__className::__proc))); +#define KVSO_REGISTER_HANDLER(__className, __szName, __proc) \ + g_pKvs##__className##Class->registerFunctionHandler(__szName, (KviKvsObjectFunctionHandlerProc)(KVI_PTR2MEMBER(__className::__proc))); // TEST -#define KVSO_REGISTER_HANDLER_BY_NAME(__className,__szName) \ -g_pKvs##__className##Class->registerFunctionHandler(#__szName,(KviKvsObjectFunctionHandlerProc)(KVI_PTR2MEMBER(__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) \ +#define KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(__className, __szName) \ g_pKvs##__className##Class->registerStandardNothingReturnFunctionHandler(__szName); -#define KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(__className,__szName) \ +#define KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(__className, __szName) \ g_pKvs##__className##Class->registerStandardTrueReturnFunctionHandler(__szName); -#define KVSO_REGISTER_STANDARD_FALSERETURN_HANDLER(__className,__szName) \ +#define KVSO_REGISTER_STANDARD_FALSERETURN_HANDLER(__className, __szName) \ g_pKvs##__className##Class->registerStandardFalseReturnFunctionHandler(__szName); -#define KVSO_BEGIN_REGISTERCLASS(__className,__stringName,__baseClass) \ - static KviKvsObjectClass * g_pKvs##__className##Class = 0; \ - static KviKvsObject * kvs_##__className##_createInstance(KviKvsObjectClass * pClass,KviKvsObject * pParent,const QString &szName) \ - { \ - return new __className(pClass,pParent,szName); \ - } \ - void __className::unregisterSelf() \ - { \ - delete g_pKvs##__className##Class; \ - g_pKvs##__className##Class = 0; \ - } \ - void __className::registerSelf() \ - { \ - KviKvsObjectClass * base = KviKvsKernel::instance()->objectController()->lookupClass(__baseClass); \ - g_pKvs##__className##Class = new KviKvsObjectClass(base,__stringName,kvs_##__className##_createInstance,true); - - +#define KVSO_BEGIN_REGISTERCLASS(__className, __stringName, __baseClass) \ + static KviKvsObjectClass * g_pKvs##__className##Class = 0; \ + static KviKvsObject * kvs_##__className##_createInstance(KviKvsObjectClass * pClass, KviKvsObject * pParent, const QString & szName) \ + { \ + return new __className(pClass, pParent, szName); \ + } \ + void __className::unregisterSelf() \ + { \ + delete g_pKvs##__className##Class; \ + g_pKvs##__className##Class = 0; \ + } \ + void __className::registerSelf() \ + { \ + KviKvsObjectClass * base = KviKvsKernel::instance()->objectController()->lookupClass(__baseClass); \ + g_pKvs##__className##Class = new KviKvsObjectClass(base, __stringName, kvs_##__className##_createInstance, true); #define KVSO_END_REGISTERCLASS(__className) \ } - -#define KVSO_BEGIN_CONSTRUCTOR(__className,__baseClass) \ - __className::__className(KviKvsObjectClass * pClass,KviKvsObject * pParent,const QString &szName) \ - : __baseClass(pClass,pParent,szName) \ +#define KVSO_BEGIN_CONSTRUCTOR(__className, __baseClass) \ + __className::__className(KviKvsObjectClass * pClass, KviKvsObject * pParent, const QString & szName) \ + : __baseClass(pClass, pParent, szName) \ { #define KVSO_END_CONSTRUCTOR(__className) \ } #define KVSO_BEGIN_DESTRUCTOR(__className) \ - __className::~__className() \ + __className::~__className() \ { - #define KVSO_END_DESTRUCTOR(__className) \ } -#define KVSO_CLASS_FUNCTION(__className,__functionName)\ +#define KVSO_CLASS_FUNCTION(__className, __functionName) \ bool KvsObject_##__className::__functionName(KviKvsObjectFunctionCall * c) -#define CHECK_INTERNAL_POINTER(__pointer)\ - if(!__pointer) \ - { \ - c->error(__tr2qs_ctx("Internal error: no valid pointer for this object","objects")); \ - return false; \ +#define CHECK_INTERNAL_POINTER(__pointer) \ + if(!__pointer) \ + { \ + c->error(__tr2qs_ctx("Internal error: no valid pointer for this object", "objects")); \ + return false; \ } -#define CHECK_HOBJECT_IS_WIDGET(__pObject)\ -if (!__pObject)\ - {\ - c->warning(__tr2qs_ctx("Widget parameter is not an object","objects"));\ - return true;\ - }\ - if (!__pObject->object())\ - {\ - c->warning(__tr2qs_ctx("Widget parameter is not a valid object","objects"));\ - return true;\ - }\ - if(!__pObject->object()->isWidgetType())\ - {\ - c->warning(__tr2qs_ctx("Widget object required","objects"));\ - return true;\ +#define CHECK_HOBJECT_IS_WIDGET(__pObject) \ + if(!__pObject) \ + { \ + c->warning(__tr2qs_ctx("Widget parameter is not an object", "objects")); \ + return true; \ + } \ + if(!__pObject->object()) \ + { \ + c->warning(__tr2qs_ctx("Widget parameter is not a valid object", "objects")); \ + return true; \ + } \ + if(!__pObject->object()->isWidgetType()) \ + { \ + c->warning(__tr2qs_ctx("Widget object required", "objects")); \ + return true; \ } #endif |
