TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/53/head
Michele Calgaro 1 year ago
parent 390bf1c592
commit 10a82ab583
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

18
kexi/plugins/macros/lib/metamethod.cpp
Unescape View File

@ -205,15 +205,15 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments)
switch(metaargument->variantType()) { switch(metaargument->variantType()) {
case TQVariant::String: { case TQVariant::String: {
const TQString s = variant.toString(); const TQString s = variant.toString();
static_TQUType_TQString.set( &(uo[i + 1]), s ); static_QUType_TQString.set( &(uo[i + 1]), s );
} break; } break;
case TQVariant::Int: { case TQVariant::Int: {
const int j = variant.toInt(); const int j = variant.toInt();
static_TQUType_int.set( &(uo[i + 1]), j ); static_QUType_int.set( &(uo[i + 1]), j );
} break; } break;
case TQVariant::Bool: { case TQVariant::Bool: {
const bool b = variant.toBool(); const bool b = variant.toBool();
static_TQUType_bool.set( &(uo[i + 1]), b ); static_QUType_bool.set( &(uo[i + 1]), b );
} break; } break;
case TQVariant::Double: { case TQVariant::Double: {
const double d = variant.toDouble(); const double d = variant.toDouble();
@ -224,8 +224,8 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments)
} }
/*FIXME /*FIXME
static_TQUType_charstar static_QUType_charstar
static_TQUType_ptr.get(uo); TQObject *qobj = (TQObject *)(ptr); static_QUType_ptr.get(uo); TQObject *qobj = (TQObject *)(ptr);
*/ */
default: { default: {
@ -241,7 +241,7 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments)
if(! obj) { //FIXME: move check to MetaParameter?! if(! obj) { //FIXME: move check to MetaParameter?!
throw Exception(TQString("No TQObject !")); throw Exception(TQString("No TQObject !"));
} }
static_TQUType_ptr.set( &(uo[i + 1]), obj ); static_QUType_ptr.set( &(uo[i + 1]), obj );
} break; } break;
default: { default: {
@ -263,17 +263,17 @@ TDESharedPtr<Variable> MetaMethod::toVariable(TQUObject* uo)
} }
if(desc == "TQString") { if(desc == "TQString") {
const TQString s = static_TQUType_TQString.get(uo); const TQString s = static_QUType_TQString.get(uo);
return new Variable(s); return new Variable(s);
} }
if(desc == "int") { if(desc == "int") {
const int j = static_TQUType_int.get(uo); const int j = static_QUType_int.get(uo);
return new Variable(j); return new Variable(j);
} }
if(desc == "bool") { if(desc == "bool") {
const bool b = static_TQUType_bool.get(uo); const bool b = static_QUType_bool.get(uo);
return new Variable(b); return new Variable(b);
} }

2
lib/kross/api/qtobject.cpp
Unescape View File

@ -115,7 +115,7 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments)
if(paramlist[i].find("TQString") >= 0) { if(paramlist[i].find("TQString") >= 0) {
const TQString s = (argcount > i) ? Variant::toString(arguments->item(i)) : TQString(); const TQString s = (argcount > i) ? Variant::toString(arguments->item(i)) : TQString();
//krossdebug(TQString("EventSlot::toTQUObject s=%1").arg(s)); //krossdebug(TQString("EventSlot::toTQUObject s=%1").arg(s));
static_TQUType_TQString.set( &(uo[i + 1]), s ); static_QUType_TQString.set( &(uo[i + 1]), s );
} }
//TODO handle int, long, char*, TQStringList, etc. //TODO handle int, long, char*, TQStringList, etc.
else { else {

Write Preview
Loading…
Cancel
Save