From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:31 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 94844816550ad672ccfcdc25659c625546239998. --- kexi/plugins/macros/lib/metaobject.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'kexi/plugins/macros/lib/metaobject.cpp') diff --git a/kexi/plugins/macros/lib/metaobject.cpp b/kexi/plugins/macros/lib/metaobject.cpp index ee865c82..e9e56b44 100644 --- a/kexi/plugins/macros/lib/metaobject.cpp +++ b/kexi/plugins/macros/lib/metaobject.cpp @@ -77,31 +77,31 @@ TQObject* const MetaObject::object() const /* TQStrList MetaObject::signalNames() const { - return object()->metaObject()->signalNames(); + return object()->tqmetaObject()->signalNames(); } TQStrList MetaObject::slotNames() const { - return object()->metaObject()->slotNames(); + return object()->tqmetaObject()->slotNames(); } */ int MetaObject::indexOfSignal(const char* signal) const { - TQMetaObject* metaobject = object()->metaObject(); + TQMetaObject* metaobject = object()->tqmetaObject(); int signalid = metaobject->findSignal(signal, false); if(signalid < 0) { - throw Exception(TQString("Invalid signal \"%1\"").arg(signal)); + throw Exception(TQString("Invalid signal \"%1\"").tqarg(signal)); } return signalid; } int MetaObject::indexOfSlot(const char* slot) const { - TQMetaObject* metaobject = object()->metaObject(); + TQMetaObject* metaobject = object()->tqmetaObject(); int slotid = metaobject->findSlot(slot, false); if(slotid < 0) { - throw Exception(TQString("Invalid slot \"%1\"").arg(slot)); + throw Exception(TQString("Invalid slot \"%1\"").tqarg(slot)); } return slotid; } @@ -110,7 +110,7 @@ KSharedPtr MetaObject::method(int index) { TQObject* obj = object(); MetaMethod::Type type = MetaMethod::Slot; - TQMetaObject* metaobject = obj->metaObject(); + TQMetaObject* metaobject = obj->tqmetaObject(); const TQMetaData* metadata = metaobject->slot(index, true); if(! metadata) { @@ -119,13 +119,13 @@ KSharedPtr MetaObject::method(int index) metadata = metaobject->signal(index, true); if(! metadata) { - throw Exception(TQString("Invalid method index \"%1\" in object \"%2\"").arg(index).arg(obj->name())); + throw Exception(TQString("Invalid method index \"%1\" in object \"%2\"").tqarg(index).tqarg(obj->name())); } type = MetaMethod::Signal; } if(metadata->access != TQMetaData::Public) { - throw Exception(TQString("Not allowed to access method \"%1\" in object \"%2\"").arg(metadata->name).arg(obj->name())); + throw Exception(TQString("Not allowed to access method \"%1\" in object \"%2\"").tqarg(metadata->name).tqarg(obj->name())); } return new MetaMethod(metadata->name, type, this); -- cgit v1.2.1