From 1fffbdafa12271a1a635caf46777fb8acfb6f31b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 10:00:36 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076.
---
 kommander/editor/assoctexteditorimpl.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kommander/editor/assoctexteditorimpl.cpp')

diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index 8498b96f..1298db05 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -90,9 +90,9 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
     }
 
   doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(a_parent), "KTextEditor::Document");
-  TQGridLayout *layout = new TQGridLayout(editorFrame, 1, 1);
+  TQGridLayout *tqlayout = new TQGridLayout(editorFrame, 1, 1);
   view = doc->createView(editorFrame);
-  layout->addWidget(view, 1,1);
+  tqlayout->addWidget(view, 1,1);
   partManager->addPart(doc, true);
 
   //trick to import all the KatePart actions into the dialog
@@ -268,7 +268,7 @@ void AssocTextEditor::save() const
 
   if (atw->associatedText() != associatedText())
   {
-    TQString text = i18n("Set the \'text association\' of \'%1\'").arg(m_widget->name());
+    TQString text = i18n("Set the \'text association\' of \'%1\'").tqarg(m_widget->name());
     SetPropertyCommand *cmd  = new SetPropertyCommand(text, m_formWindow,
         TQT_TQOBJECT(m_widget), m_propertyEditor, "associations", atw->associatedText(),
         associatedText(), TQString(), TQString(), false);
@@ -278,7 +278,7 @@ void AssocTextEditor::save() const
   }
   if (atw->populationText() != populationText())
   {
-    TQString text = i18n("Set the \'population text\' of \'%1\'").arg(m_widget->name());
+    TQString text = i18n("Set the \'population text\' of \'%1\'").tqarg(m_widget->name());
     SetPropertyCommand *cmd  = new SetPropertyCommand(text, m_formWindow, TQT_TQOBJECT(m_widget),
         m_propertyEditor, "populationText", atw->populationText(),
         populationText(), TQString(), TQString(), false);
@@ -314,7 +314,7 @@ TQStringList AssocTextEditor::buildWidgetList()
     // There is a warning message with the property() function if it does not exist.
     // Verify the property exists with the meta information first */
     bool pExists = false;
-    TQMetaObject *metaObj = it.current()->metaObject();
+    TQMetaObject *metaObj = it.current()->tqmetaObject();
     if(metaObj)
     {
       int id = metaObj->findProperty("KommanderWidget", true);
@@ -427,7 +427,7 @@ void AssocTextEditor::insertFile()
   TQFile insertFile(fileName);
   if(!insertFile.open(IO_ReadOnly))
   {
-    KMessageBox::error( this, i18n("<qt>Cannot open file<br><b>%1</b></qt").arg( fileName ) );
+    KMessageBox::error( this, i18n("<qt>Cannot open file<br><b>%1</b></qt").tqarg( fileName ) );
     return;
   }
   TQTextStream insertStream(&insertFile);
@@ -456,7 +456,7 @@ TQString AssocTextEditor::widgetToString(TQWidget* widget, bool formatted)
    if (!widget)
      return TQString();
    else if (formatted)
-     return TQString("%1 (%2)").arg(widget->name()).arg(widget->className());
+     return TQString("%1 (%2)").tqarg(widget->name()).tqarg(widget->className());
    else
      return widget->name();
 }
-- 
cgit v1.2.3