rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 10 insertions, 10 deletions

diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index da699bd2..8886acab 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -411,8 +411,8 @@ static ParseNode f_createWidget(Parser* p, const ParameterList& params)
   KommanderWidget *widget = p->currentWidget()->widgetByName(parentName);
   if (!widget)
     return ParseNode::error("unknown widget");
-  TQWidget *tqparent = dynamic_cast<TQWidget*>(widget->object());
-  TQWidget *w = KommanderFactory::createWidget(widgetType, tqparent, widgetName.latin1());
+  TQWidget *parent = dynamic_cast<TQWidget*>(widget->object());
+  TQWidget *w = KommanderFactory::createWidget(widgetType, parent, widgetName.latin1());
   if (w)
     w->adjustSize();
   return ParseNode();
diff --git a/kommander/widget/invokeclass.cpp b/kommander/widget/invokeclass.cpp
index a82a5305..ec360d69 100644
--- a/kommander/widget/invokeclass.cpp
+++ b/kommander/widget/invokeclass.cpp
@@ -15,7 +15,7 @@
 #include <tqcolor.h>
 #include <tqregexp.h>
 
-InvokeClass::InvokeClass(TQObject *tqparent):TQObject(tqparent)
+InvokeClass::InvokeClass(TQObject *parent):TQObject(parent)
 {
   m_acceptedSlots = acceptedSlots();
 }
diff --git a/kommander/widget/invokeclass.h b/kommander/widget/invokeclass.h
index 043ba73b..19001f9e 100644
--- a/kommander/widget/invokeclass.h
+++ b/kommander/widget/invokeclass.h
@@ -20,7 +20,7 @@ class InvokeClass : public TQObject {
 Q_OBJECT
   TQ_OBJECT
 public:
-  InvokeClass(TQObject *tqparent);
+  InvokeClass(TQObject *parent);
   void invokeSlot(TQObject *object,  const TQString& slot, TQStringList args);
 
   static TQStringList acceptedSlots() 
diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp
index 603c1326..e123a035 100644
--- a/kommander/widget/kmdrmainwindow.cpp
+++ b/kommander/widget/kmdrmainwindow.cpp
@@ -13,8 +13,8 @@
 
 #include <tqtimer.h>
 
-KmdrMainWindow::KmdrMainWindow(TQWidget *tqparent, const char *name, WFlags f)
- : KMainWindow(tqparent, name, f)
+KmdrMainWindow::KmdrMainWindow(TQWidget *parent, const char *name, WFlags f)
+ : KMainWindow(parent, name, f)
 {
   TQTimer::singleShot(10, this, TQT_SIGNAL(initialize()));
 }
diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h
index 4896db2b..0d1a415b 100644
--- a/kommander/widget/kmdrmainwindow.h
+++ b/kommander/widget/kmdrmainwindow.h
@@ -22,7 +22,7 @@ class KmdrMainWindow : public KMainWindow
 Q_OBJECT
   TQ_OBJECT
 public:
-    KmdrMainWindow(TQWidget *tqparent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose);
+    KmdrMainWindow(TQWidget *parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose);
 
     ~KmdrMainWindow();
 
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp
index 793be627..d0f9e885 100644
--- a/kommander/widget/kommanderwidget.cpp
+++ b/kommander/widget/kommanderwidget.cpp
@@ -652,9 +652,9 @@ TQString KommanderWidget::substituteVariable(TQString text, TQString variable, T
 TQWidget* KommanderWidget::parentDialog() const
 {
   TQObject *superParent = m_thisObject;
-  while (superParent->tqparent())
+  while (superParent->parent())
   {
-    superParent = superParent->tqparent();
+    superParent = superParent->parent();
     if (superParent->inherits(TQDIALOG_OBJECT_NAME_STRING) || superParent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))
       break;
   }
diff --git a/kommander/widget/kommanderwidget.h b/kommander/widget/kommanderwidget.h
index bb223f3d..d3116c80 100644
--- a/kommander/widget/kommanderwidget.h
+++ b/kommander/widget/kommanderwidget.h
@@ -140,7 +140,7 @@ protected:
 
   // Parse given identifier as widget name
   KommanderWidget* parseWidget(const TQString& name) const;
-  // Return tqparent dialog of this widget
+  // Return parent dialog of this widget
   TQWidget* parentDialog() const;
   TQString substituteVariable(TQString text, TQString variable, TQString value) const;