diff options
| author |  Noldor | 2008-10-15 16:26:21 +0000 |
|---|---|---|
| committer | Noldor | 2008-10-15 16:26:21 +0000 |
| commit | 4c47d7cbcb483810d8adb40b7aba993d6f5bc414 (patch) | |
| tree | bef8df30449050bb2c25dcaab34fd2c5fafb87d0 /src/modules/objects/object_macros.h | |
| parent | other small fixes (diff) | |
| download | KVIrc-4c47d7cbcb483810d8adb40b7aba993d6f5bc414.tar.gz KVIrc-4c47d7cbcb483810d8adb40b7aba993d6f5bc414.tar.bz2 KVIrc-4c47d7cbcb483810d8adb40b7aba993d6f5bc414.zip | |
fixed some serious bugs in module object+code clean and improvements.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2738 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects/object_macros.h')
| -rw-r--r-- | src/modules/objects/object_macros.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h index 55552a1d5..cea176c44 100644 --- a/src/modules/objects/object_macros.h +++ b/src/modules/objects/object_macros.h @@ -89,7 +89,9 @@ g_pKvs##__className##Class->registerFunctionHandler(#__szName,(KviKvsObjectFunct #define KVSO_BEGIN_DESTRUCTOR(__className) \ __className::~__className() \ - { + {\ + callFunction(this,"destructor"); + #define KVSO_END_DESTRUCTOR(__className) \ } @@ -97,10 +99,10 @@ g_pKvs##__className##Class->registerFunctionHandler(#__szName,(KviKvsObjectFunct #define KVSO_CLASS_FUNCTION(__className,__functionName)\ bool KviKvsObject_##__className::__functionName(KviKvsObjectFunctionCall * c) -#define CHECK_INTERNAL_QPOINTER(__pointer)\ +#define CHECK_INTERNAL_POINTER(__pointer)\ if(!__pointer) \ { \ - c->error(__tr2qs_ctx("Internal error: no valid pointer for this object","object")); \ + c->error(__tr2qs("Internal error: no valid pointer for this object")); \ return false; \ } #endif |