From 803408f7fa5485cc5cf79c469cc6e48fcdf597e6 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 23 Nov 2023 11:23:52 +0900 Subject: Replaced various '#define' with actual strings - part 2 Signed-off-by: Michele Calgaro (cherry picked from commit 225d44ba560c805b2e1ef783032e885fef01f4fd) --- PerlTQt/TQt.xs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/PerlTQt/TQt.xs b/PerlTQt/TQt.xs index 8032e8e..e80e459 100644 --- a/PerlTQt/TQt.xs +++ b/PerlTQt/TQt.xs @@ -436,19 +436,19 @@ public: Smoke::StackItem *si = _stack + i; switch(_args[i].argType) { case xmoc_bool: - static_TQUType_bool.set(po, si->s_bool); + static_QUType_bool.set(po, si->s_bool); break; case xmoc_int: - static_TQUType_int.set(po, si->s_int); + static_QUType_int.set(po, si->s_int); break; case xmoc_double: static_QUType_double.set(po, si->s_double); break; case xmoc_charstar: - static_TQUType_charstar.set(po, (char*)si->s_voidp); + static_QUType_charstar.set(po, (char*)si->s_voidp); break; case xmoc_TQString: - static_TQUType_TQString.set(po, *(TQString*)si->s_voidp); + static_QUType_TQString.set(po, *(TQString*)si->s_voidp); break; default: { @@ -511,7 +511,7 @@ public: p = 0; break; } - static_TQUType_ptr.set(po, p); + static_QUType_ptr.set(po, p); } } } @@ -561,24 +561,24 @@ public: TQUObject *o = _o + i + 1; switch(_args[i].argType) { case xmoc_bool: - _stack[i].s_bool = static_TQUType_bool.get(o); + _stack[i].s_bool = static_QUType_bool.get(o); break; case xmoc_int: - _stack[i].s_int = static_TQUType_int.get(o); + _stack[i].s_int = static_QUType_int.get(o); break; case xmoc_double: _stack[i].s_double = static_QUType_double.get(o); break; case xmoc_charstar: - _stack[i].s_voidp = static_TQUType_charstar.get(o); + _stack[i].s_voidp = static_QUType_charstar.get(o); break; case xmoc_TQString: - _stack[i].s_voidp = &static_TQUType_TQString.get(o); + _stack[i].s_voidp = &static_QUType_TQString.get(o); break; default: // case xmoc_ptr: { const SmokeType &t = _args[i].st; - void *p = static_TQUType_ptr.get(o); + void *p = static_QUType_ptr.get(o); switch(t.elem()) { case Smoke::t_bool: _stack[i].s_bool = *(bool*)p; @@ -1634,18 +1634,18 @@ make_TQUParameter(name, type, extra, inout) p->name = new char[strlen(name) + 1]; strcpy((char*)p->name, name); if(!strcmp(type, "bool")) - p->type = &static_TQUType_bool; + p->type = &static_QUType_bool; else if(!strcmp(type, "int")) - p->type = &static_TQUType_int; + p->type = &static_QUType_int; else if(!strcmp(type, "double")) p->type = &static_QUType_double; else if(!strcmp(type, "char*") || !strcmp(type, "const char*")) - p->type = &static_TQUType_charstar; + p->type = &static_QUType_charstar; else if(!strcmp(type, "TQString") || !strcmp(type, "TQString&") || !strcmp(type, "const TQString") || !strcmp(type, "const TQString&")) - p->type = &static_TQUType_TQString; + p->type = &static_QUType_TQString; else - p->type = &static_TQUType_ptr; + p->type = &static_QUType_ptr; // Lacking support for several types. Evil. p->inOut = inout; p->typeExtra = 0; -- cgit v1.2.3