Replaced various '#define' with actual strings - part 2

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/13/head
Michele Calgaro 6 months ago
parent 51a5ce7e7b
commit 225d44ba56
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -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;

Loading…
Cancel
Save