diff options
Diffstat (limited to 'lib/kross/api/eventslot.cpp')
-rw-r--r-- | lib/kross/api/eventslot.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/kross/api/eventslot.cpp b/lib/kross/api/eventslot.cpp index fd566d31..3f6482db 100644 --- a/lib/kross/api/eventslot.cpp +++ b/lib/kross/api/eventslot.cpp @@ -46,7 +46,7 @@ const TQString EventSlot::getClassName() const Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments) { #ifdef KROSS_API_EVENTSLOT_CALL_DEBUG - krossdebug( TQString("EventSlot::call() m_slot=%1 arguments=%2").tqarg(m_slot).tqarg(arguments->toString()) ); + krossdebug( TQString("EventSlot::call() m_slot=%1 arguments=%2").arg(m_slot).arg(arguments->toString()) ); #endif TQString n = m_slot; //TODO name; //Variant::toString(args->item(0)); @@ -54,9 +54,9 @@ Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments) if(n.startsWith("1")) // Remove prefix of SLOT-macros n.remove(0,1); - int slotid = m_receiver->tqmetaObject()->findSlot(n.latin1(), false); + int slotid = m_receiver->metaObject()->findSlot(n.latin1(), false); if(slotid < 0) - throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(n)) ); + throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").arg(n)) ); TQUObject* uo = QtObject::toTQUObject(n, arguments); m_receiver->qt_invoke(slotid, uo); // invoke the slot @@ -72,7 +72,7 @@ TQCString EventSlot::getSlot(const TQCString& signal) int startpos = signature.find("("); int endpos = signature.findRev(")"); if(startpos < 0 || startpos > endpos) { - krosswarning( TQString("EventSlot::getSlot(%1) Invalid signal.").tqarg(signal) ); + krosswarning( TQString("EventSlot::getSlot(%1) Invalid signal.").arg(signal) ); return TQCString(); } TQString signalname = signature.left(startpos); @@ -80,16 +80,16 @@ TQCString EventSlot::getSlot(const TQCString& signal) //TQStringList paramlist = TQStringList::split(",", params); TQCString slot = TQString("callback(" + params + ")").latin1(); //normalizeSignalSlot(); - TQMetaObject* mo = tqmetaObject(); + TQMetaObject* mo = metaObject(); int slotid = mo->findSlot(slot, false); if(slotid < 0) { - krossdebug( TQString("EventSlot::getSlot(%1) No such slot '%2' avaiable.").tqarg(signal).tqarg(slot) ); + krossdebug( TQString("EventSlot::getSlot(%1) No such slot '%2' avaiable.").arg(signal).arg(slot) ); return TQCString(); } const TQMetaData* md = mo->slot(slotid, false); if(md->access != TQMetaData::Public) { - krossdebug( TQString("EventSlot::getSlot(%1) The slot '%2' is not public.").tqarg(signal).tqarg(slot) ); + krossdebug( TQString("EventSlot::getSlot(%1) The slot '%2' is not public.").arg(signal).arg(slot) ); return TQCString(); } @@ -97,7 +97,7 @@ TQCString EventSlot::getSlot(const TQCString& signal) //const TQUMethod *method = md->method; krossdebug( TQString("signal=%1 slot=%2 slotid=%3 params=%4 mdname=%5") - .tqarg(signal).tqarg(slot).tqarg(slotid).tqarg(params).tqarg(md->name) ); + .arg(signal).arg(slot).arg(slotid).arg(params).arg(md->name) ); return TQCString("1" + slot); // Emulate the TQT_SLOT(...) macro by adding as first char a "1". } @@ -114,7 +114,7 @@ bool EventSlot::connect(EventManager* eventmanager, TQObject* senderobj, const T EventSlot* eventslot = create(eventmanager); eventslot->connect(eventmanager, senderobj, signal, function, slot); m_slots.append(eventslot); - krossdebug( TQString("EventSlot::connect(%1, %2, %3) added child EventSlot !!!").tqarg(senderobj->name()).tqarg(signal).tqarg(function) ); + krossdebug( TQString("EventSlot::connect(%1, %2, %3) added child EventSlot !!!").arg(senderobj->name()).arg(signal).arg(function) ); } else { m_sender = senderobj; @@ -122,10 +122,10 @@ bool EventSlot::connect(EventManager* eventmanager, TQObject* senderobj, const T m_function = function; m_slot = myslot; if(! TQObject::connect((TQObject*)senderobj, signal, this, myslot)) { - krossdebug( TQString("EventSlot::connect(%1, %2, %3) failed.").tqarg(senderobj->name()).tqarg(signal).tqarg(function) ); + krossdebug( TQString("EventSlot::connect(%1, %2, %3) failed.").arg(senderobj->name()).arg(signal).arg(function) ); return false; } - krossdebug( TQString("EventSlot::connect(%1, %2, %3) successfully connected.").tqarg(senderobj->name()).tqarg(signal).tqarg(function) ); + krossdebug( TQString("EventSlot::connect(%1, %2, %3) successfully connected.").arg(senderobj->name()).arg(signal).arg(function) ); } return true; } @@ -144,7 +144,7 @@ bool EventSlot::disconnect() void EventSlot::call(const TQVariant& variant) { krossdebug( TQString("EventSlot::call() sender='%1' signal='%2' function='%3'") - .tqarg(m_sender->name()).tqarg(m_signal).tqarg(m_function) ); + .arg(m_sender->name()).arg(m_signal).arg(m_function) ); Kross::Api::List* arglist = 0; @@ -159,7 +159,7 @@ void EventSlot::call(const TQVariant& variant) } catch(Exception& e) { //TODO add hadError(), getError() and setError() - krossdebug( TQString("EXCEPTION in EventSlot::call('%1') type='%2' description='%3'").tqarg(variant.toString()).tqarg(e.type()).tqarg(e.description()) ); + krossdebug( TQString("EXCEPTION in EventSlot::call('%1') type='%2' description='%3'").arg(variant.toString()).arg(e.type()).arg(e.description()) ); } } |