Rename a number of old tq methods that are no longer tq specific

2 files changed, 9 insertions, 9 deletions

diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp
index ae79ca68..41ea61b4 100644
--- a/kommander/plugin/specialinformation.cpp
+++ b/kommander/plugin/specialinformation.cpp
@@ -71,15 +71,15 @@ TQString SpecialFunction::prototype(uint prototypeFlags) const
   TQStringList params;
   for (uint i=start; i<m_types.count(); i++)
     if (prototypeFlags & ShowArgumentNames)
-      params.append(TQString("%1 %2").tqarg(m_types[i]).tqarg(m_args[i]));
+      params.append(TQString("%1 %2").arg(m_types[i]).arg(m_args[i]));
     else
       params.append(m_types[i]);
   if (!params.count())
     return m_function;
   else if (prototypeFlags & NoSpaces)
-    return TQString("%1(%2)").tqarg(m_function).tqarg(params.join(","));
+    return TQString("%1(%2)").arg(m_function).arg(params.join(","));
   else
-    return TQString("%1(%2)").tqarg(m_function).tqarg(params.join(", "));
+    return TQString("%1(%2)").arg(m_function).arg(params.join(", "));
 }
 
 TQString SpecialFunction::argumentName(uint i) const
@@ -291,7 +291,7 @@ void SpecialInformation::registerSpecials()
          i18n("Returns text of a cell in a table."), 3);
   insert(DCOP::checked, "checked(TQString widget)",
          i18n("Returns 1 for checked boxes, 0 for unchecked."), 1);
-  insert(DCOP::tqchildren, "tqchildren(TQString widget, bool recursive)",
+  insert(DCOP::children, "children(TQString widget, bool recursive)",
          i18n("Returns the list of child widgets contained in the parent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets."), 2);
   insert(DCOP::clear, "clear(TQString widget)",
          i18n("Removes all content from the widget."), 1);
@@ -375,8 +375,8 @@ void SpecialInformation::registerSpecials()
      i18n("Returns type(class) of widget."), 1);
   insert(DCOP::setEditable, "setEditable(TQString widget, bool editable)", 
      i18n("Makes the widget editable or read only, depending on the editable argument."), 2);
-  insertInternal(DCOP::tqgeometry, "tqgeometry(TQString widget)", 
-     i18n("Return the widget's tqgeometry as <i>x y w h</i>. This is useful for positioning a created widget."), 1);
+  insertInternal(DCOP::geometry, "geometry(TQString widget)", 
+     i18n("Return the widget's geometry as <i>x y w h</i>. This is useful for positioning a created widget."), 1);
   insertInternal(DCOP::hasFocus, "hasFocus(TQString widget)", 
      i18n("Returns true if the widget has focus."), 1);
   insertInternal(DCOP::getBackgroundColor, "getBackgroundColor(TQString widget)", 
diff --git a/kommander/plugin/specials.h b/kommander/plugin/specials.h
index ec809161..40ff162e 100644
--- a/kommander/plugin/specials.h
+++ b/kommander/plugin/specials.h
@@ -28,19 +28,19 @@ namespace Group
 
 namespace DCOP
 {
-  enum {addUniqueItem, associatedText, cancel, cellText, clear, checked, tqchildren, columnCount, count, currentColumn,
+  enum {addUniqueItem, associatedText, cancel, cellText, clear, checked, children, columnCount, count, currentColumn,
     currentItem, currentRow, execute, findItem, global, insertColumn, insertItem, insertItems, insertRow, 
     item, itemDepth, itemPath, removeColumn, removeItem, removeRow, selection, setAssociatedText, setChecked, 
     setCellText, setCurrentItem, insertTab, setColumnCaption, setEnabled, setGlobal, setMaximum, setPixmap, 
     setRowCaption, setSelection, setText, getBackgroundColor, setBackgroundColor,
-    setVisible, text, type, setCellWidget, cellWidget, setEditable, tqgeometry, hasFocus, isModified};
+    setVisible, text, type, setCellWidget, cellWidget, setEditable, geometry, hasFocus, isModified};
 }
 
 namespace Kommander
 {
   enum {widgetText, selectedWidgetText, null, pid, dcopid, parentPid, debug,
   echo, env, exec, expr, global, i18n, dialog, readSetting, setGlobal, writeSetting, dcop,
-  switchBlock, execBegin, forBlock, forEachBlock, ifBlock, comment, createWidget, connect, disconnect, widgetExists, exit, Break, Continue, Return, execBackground, switchInternal}; //, tqfocusWidget};
+  switchBlock, execBegin, forBlock, forEachBlock, ifBlock, comment, createWidget, connect, disconnect, widgetExists, exit, Break, Continue, Return, execBackground, switchInternal}; //, focusWidget};
 }
 
 namespace Array