Rename old tq methods that no longer need a unique name

6 files changed, 22 insertions, 22 deletions

diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp
index e3a8e54f..86e868f5 100644
--- a/lib/kross/api/eventsignal.cpp
+++ b/lib/kross/api/eventsignal.cpp
@@ -54,7 +54,7 @@ Object::Ptr EventSignal::call(const TQString& /*name*/, KSharedPtr<List> argumen
     if(n.startsWith("2")) // Remove prefix of SIGNAL-macros
         n.remove(0,1);
 
-    int signalid = m_sender->tqmetaObject()->findSignal(n.latin1(), false);
+    int signalid = m_sender->metaObject()->findSignal(n.latin1(), false);
     if(signalid < 0)
         throw new Exception(TQString("No such signal '%1'.").tqarg(n));
 
diff --git a/lib/kross/api/eventslot.cpp b/lib/kross/api/eventslot.cpp
index fd566d31..56616904 100644
--- a/lib/kross/api/eventslot.cpp
+++ b/lib/kross/api/eventslot.cpp
@@ -54,7 +54,7 @@ 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)) );
 
@@ -80,7 +80,7 @@ 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) );
diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp
index 243f0503..04736e2a 100644
--- a/lib/kross/api/qtobject.cpp
+++ b/lib/kross/api/qtobject.cpp
@@ -42,13 +42,13 @@ QtObject::QtObject(TQObject* object, const TQString& name)
     // Walk through the signals and slots the TQObject has
     // and attach them as events to this QtObject.
 
-    TQStrList slotnames = m_object->tqmetaObject()->slotNames(false);
+    TQStrList slotnames = m_object->metaObject()->slotNames(false);
     for(char* c = slotnames.first(); c; c = slotnames.next()) {
         TQCString s = c;
         addChild(s, new EventSlot(s, object, s) );
     }
 
-    TQStrList signalnames = m_object->tqmetaObject()->signalNames(false);
+    TQStrList signalnames = m_object->metaObject()->signalNames(false);
     for(char* c = signalnames.first(); c; c = signalnames.next()) {
         TQCString s = c;
         addChild(s, new EventSignal(s, object, s) );
@@ -129,13 +129,13 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments)
 Kross::Api::Object::Ptr QtObject::propertyNames(Kross::Api::List::Ptr)
 {
     return new Kross::Api::Variant(
-        TQStringList::fromStrList(m_object->tqmetaObject()->propertyNames(false)));
+        TQStringList::fromStrList(m_object->metaObject()->propertyNames(false)));
 }
 
 Kross::Api::Object::Ptr QtObject::hasProperty(Kross::Api::List::Ptr args)
 {
     return new Kross::Api::Variant(
-        m_object->tqmetaObject()->findProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false));
+        m_object->metaObject()->findProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false));
 }
 
 Kross::Api::Object::Ptr QtObject::getProperty(Kross::Api::List::Ptr args)
@@ -158,13 +158,13 @@ Kross::Api::Object::Ptr QtObject::setProperty(Kross::Api::List::Ptr args)
 Kross::Api::Object::Ptr QtObject::slotNames(Kross::Api::List::Ptr)
 {
     return new Kross::Api::Variant(
-           TQStringList::fromStrList(m_object->tqmetaObject()->slotNames(false)));
+           TQStringList::fromStrList(m_object->metaObject()->slotNames(false)));
 }
 
 Kross::Api::Object::Ptr QtObject::hasSlot(Kross::Api::List::Ptr args)
 {
     return new Kross::Api::Variant(
-           bool(m_object->tqmetaObject()->slotNames(false).find(
+           bool(m_object->metaObject()->slotNames(false).find(
                Kross::Api::Variant::toString(args->item(0)).latin1()
            ) != -1));
 }
@@ -173,7 +173,7 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args)
 {
 //TODO just call the child event ?!
     TQString name = Kross::Api::Variant::toString(args->item(0));
-    int slotid = m_object->tqmetaObject()->findSlot(name.latin1(), false);
+    int slotid = m_object->metaObject()->findSlot(name.latin1(), false);
     if(slotid < 0)
         throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(name)) );
 
@@ -187,13 +187,13 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args)
 Kross::Api::Object::Ptr QtObject::signalNames(Kross::Api::List::Ptr)
 {
     return new Kross::Api::Variant(
-           TQStringList::fromStrList(m_object->tqmetaObject()->signalNames(false)));
+           TQStringList::fromStrList(m_object->metaObject()->signalNames(false)));
 }
 
 Kross::Api::Object::Ptr QtObject::hasSignal(Kross::Api::List::Ptr args)
 {
     return new Kross::Api::Variant(
-           bool(m_object->tqmetaObject()->signalNames(false).find(
+           bool(m_object->metaObject()->signalNames(false).find(
                Kross::Api::Variant::toString(args->item(0)).latin1()
            ) != -1));
 }
@@ -201,7 +201,7 @@ Kross::Api::Object::Ptr QtObject::hasSignal(Kross::Api::List::Ptr args)
 Kross::Api::Object::Ptr QtObject::emitSignal(Kross::Api::List::Ptr args)
 {
     TQString name = Kross::Api::Variant::toString(args->item(0));
-    int signalid = m_object->tqmetaObject()->findSignal(name.latin1(), false);
+    int signalid = m_object->metaObject()->findSignal(name.latin1(), false);
     if(signalid < 0)
         throw Exception::Ptr( new Exception(TQString("No such signal '%1'.").tqarg(name)) );
     m_object->qt_invoke(signalid, 0); //TODO convert Kross::Api::List::Ptr => TQUObject*
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index b3b29bda..bce26d5c 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -377,7 +377,7 @@ void ScriptGUIClient::showScriptManager()
     KDialogBase* dialog = new KDialogBase(d->parent, "", true, i18n("Scripts Manager"), KDialogBase::Close);
     WdgScriptsManager* wsm = new WdgScriptsManager(this, dialog);
     dialog->setMainWidget(wsm);
-    dialog->resize( TQSize(360, 320).expandedTo(dialog->tqminimumSizeHint()) );
+    dialog->resize( TQSize(360, 320).expandedTo(dialog->minimumSizeHint()) );
     dialog->show();
 }
 
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index 488b7409..cb696c5a 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -93,7 +93,7 @@ class ToolTip : public TQToolTip
         virtual void maybeTip(const TQPoint& p) {
             ListItem* item = dynamic_cast<ListItem*>( m_parent->itemAt(p) );
             if(item) {
-                TQRect r( m_parent->tqitemRect(item) );
+                TQRect r( m_parent->itemRect(item) );
                 if(r.isValid() && item->action()) {
                     tip(r, TQString("<qt>%1</qt>").tqarg(item->action()->toolTip()));
                 }
diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui
index 379fb2db..d04223a4 100644
--- a/lib/kross/main/wdgscriptsmanagerbase.ui
+++ b/lib/kross/main/wdgscriptsmanagerbase.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -66,7 +66,7 @@
                     <property name="name">
                         <cstring>btnExec</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -97,7 +97,7 @@
                     <property name="name">
                         <cstring>btnLoad</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -114,7 +114,7 @@
                     <property name="name">
                         <cstring>btnUnload</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -145,7 +145,7 @@
                     <property name="name">
                         <cstring>btnInstall</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -162,7 +162,7 @@
                     <property name="name">
                         <cstring>btnUninstall</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -193,7 +193,7 @@
                     <property name="name">
                         <cstring>btnNewStuff</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>