diff options
| author | Michele Calgaro <[email protected]> | 2023-11-23 11:23:44 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-11-23 11:50:34 +0900 |
| commit | 8263fdf7603821cad365e436ab78557f40a9e9db (patch) | |
| tree | 07c85db4dbef5e877fc285af69f190eeeb050ddb | |
| parent | 00aa1f43c3491376c7eef84432710a2f8ceac62c (diff) | |
| download | koffice-8263fdf7603821cad365e436ab78557f40a9e9db.tar.gz koffice-8263fdf7603821cad365e436ab78557f40a9e9db.zip | |
Replaced various '#define' with actual strings - part 2
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 10a82ab583d7608cd9efd5fe1e76700c9d06b4c2)
| -rw-r--r-- | kexi/plugins/macros/lib/metamethod.cpp | 18 | ||||
| -rw-r--r-- | lib/kross/api/qtobject.cpp | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/kexi/plugins/macros/lib/metamethod.cpp b/kexi/plugins/macros/lib/metamethod.cpp index 364b5347..1ad78d3a 100644 --- a/kexi/plugins/macros/lib/metamethod.cpp +++ b/kexi/plugins/macros/lib/metamethod.cpp @@ -205,15 +205,15 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments) switch(metaargument->variantType()) { case TQVariant::String: { const TQString s = variant.toString(); - static_TQUType_TQString.set( &(uo[i + 1]), s ); + static_QUType_TQString.set( &(uo[i + 1]), s ); } break; case TQVariant::Int: { const int j = variant.toInt(); - static_TQUType_int.set( &(uo[i + 1]), j ); + static_QUType_int.set( &(uo[i + 1]), j ); } break; case TQVariant::Bool: { const bool b = variant.toBool(); - static_TQUType_bool.set( &(uo[i + 1]), b ); + static_QUType_bool.set( &(uo[i + 1]), b ); } break; case TQVariant::Double: { const double d = variant.toDouble(); @@ -224,8 +224,8 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments) } /*FIXME - static_TQUType_charstar - static_TQUType_ptr.get(uo); TQObject *qobj = (TQObject *)(ptr); + static_QUType_charstar + static_QUType_ptr.get(uo); TQObject *qobj = (TQObject *)(ptr); */ default: { @@ -241,7 +241,7 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments) if(! obj) { //FIXME: move check to MetaParameter?! throw Exception(TQString("No TQObject !")); } - static_TQUType_ptr.set( &(uo[i + 1]), obj ); + static_QUType_ptr.set( &(uo[i + 1]), obj ); } break; default: { @@ -263,17 +263,17 @@ TDESharedPtr<Variable> MetaMethod::toVariable(TQUObject* uo) } if(desc == "TQString") { - const TQString s = static_TQUType_TQString.get(uo); + const TQString s = static_QUType_TQString.get(uo); return new Variable(s); } if(desc == "int") { - const int j = static_TQUType_int.get(uo); + const int j = static_QUType_int.get(uo); return new Variable(j); } if(desc == "bool") { - const bool b = static_TQUType_bool.get(uo); + const bool b = static_QUType_bool.get(uo); return new Variable(b); } diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp index 8f0819aa..55c07ca3 100644 --- a/lib/kross/api/qtobject.cpp +++ b/lib/kross/api/qtobject.cpp @@ -115,7 +115,7 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments) if(paramlist[i].find("TQString") >= 0) { const TQString s = (argcount > i) ? Variant::toString(arguments->item(i)) : TQString(); //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. else { |