Rename old tq methods that no longer need a unique name

(cherry picked from commit 9445f97b426e97c6ce46de18fba4030da45d56df)

1 files changed, 8 insertions, 8 deletions

diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 601d98a8..d2bcff45 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -368,7 +368,7 @@ int MainWindow::currentTool() const
 {
   if (!actionCurrentTool)
     return POINTER_TOOL;
-  return TQString::tqfromLatin1(actionCurrentTool->name()).toInt();
+  return TQString::fromLatin1(actionCurrentTool->name()).toInt();
 }
 
 void MainWindow::slotCreateBackups()
@@ -1012,18 +1012,18 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge
 
 void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int> &props, TQWidget *w)
 {
-    const TQMetaProperty* text = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("text", true), true);
+    const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true);
     if (text && qstrcmp(text->type(), TQSTRING_OBJECT_NAME_STRING) != 0)
         text = 0;
-    const TQMetaProperty* title = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("title", true), true);
+    const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true);
     if (title && qstrcmp(title->type(), TQSTRING_OBJECT_NAME_STRING) != 0)
         title = 0;
     const TQMetaProperty* pagetitle =
-        w->tqmetaObject()->property(w->tqmetaObject()->findProperty("pageTitle", true), true);
+        w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true);
     if (pagetitle && qstrcmp(pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0)
         pagetitle = 0;
     const TQMetaProperty* pixmap =
-        w->tqmetaObject()->property(w->tqmetaObject()->findProperty("pixmap", true), true);
+        w->metaObject()->property(w->metaObject()->findProperty("pixmap", true), true);
     if (pixmap && qstrcmp(pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0)
         pixmap = 0;
 
@@ -1627,8 +1627,8 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*)
         return true;
     }
 
-    const TQMetaProperty* text = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("text", true), true);
-    const TQMetaProperty* title = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("title", true), true);
+    const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true);
+    const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true);
     if (text && text->designable(w)) {
         bool ok = false;
         TQString text;
@@ -1756,7 +1756,7 @@ void MainWindow::checkTempFiles()
 void MainWindow::showDialogHelp()
 {
     TQWidget *w = (TQWidget*)sender();
-    w = w->tqtopLevelWidget();
+    w = w->topLevelWidget();
 
     TQString link = "designer-manual-12.html#";