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

12 files changed, 64 insertions, 64 deletions

diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index 4425412c..287302c8 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -36,8 +36,8 @@ enum Functions {
   LastFunction
 };
 
-AboutDialog::AboutDialog(TQWidget *tqparent, const char *name)
- : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this))
+AboutDialog::AboutDialog(TQWidget *parent, const char *name)
+ : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h
index 5837f355..0afa9fc4 100644
--- a/kommander/widgets/aboutdialog.h
+++ b/kommander/widgets/aboutdialog.h
@@ -29,7 +29,7 @@ class AboutDialog : public TQLabel, public KommanderWidget
   TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
   TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
 public:
-    AboutDialog(TQWidget *tqparent = 0, const char *name = 0);
+    AboutDialog(TQWidget *parent = 0, const char *name = 0);
 
     ~AboutDialog();
 
diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp
index a8892d13..af6c5561 100644
--- a/kommander/widgets/closebutton.cpp
+++ b/kommander/widgets/closebutton.cpp
@@ -41,14 +41,14 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name)
 
   connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess()));
 
-  TQObject *tqparent = TQT_TQOBJECT(this);
-  while (tqparent->tqparent() != 0)
+  TQObject *parent = TQT_TQOBJECT(this);
+  while (parent->parent() != 0)
   {
-    tqparent = tqparent->tqparent();
-    if (tqparent->inherits(TQDIALOG_OBJECT_NAME_STRING))
+    parent = parent->parent();
+    if (parent->inherits(TQDIALOG_OBJECT_NAME_STRING))
       break;
   }
-  connect(this, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(reject()));
+  connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject()));
 }
 
 CloseButton::~CloseButton()
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index 3efde0f4..b2f0fdba 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -28,8 +28,8 @@ enum Functions {
   LastFunction
 };
 
-FontDialog::FontDialog(TQWidget *tqparent, const char *name)
- : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this))
+FontDialog::FontDialog(TQWidget *parent, const char *name)
+ : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h
index 46c828e2..d81f15fa 100644
--- a/kommander/widgets/fontdialog.h
+++ b/kommander/widgets/fontdialog.h
@@ -28,7 +28,7 @@ class FontDialog : public TQLabel, public KommanderWidget
   TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
   TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
-    FontDialog(TQWidget *tqparent = 0, const char *name = 0);
+    FontDialog(TQWidget *parent = 0, const char *name = 0);
 
     ~FontDialog();
 
diff --git a/kommander/widgets/plugin.cpp b/kommander/widgets/plugin.cpp
index 009da398..020ae6da 100644
--- a/kommander/widgets/plugin.cpp
+++ b/kommander/widgets/plugin.cpp
@@ -57,7 +57,7 @@ class KomStdPlugin : public KommanderPlugin
 {
 public:
     KomStdPlugin();
-    virtual TQWidget *create( const TQString &key, TQWidget *tqparent = 0, const char *name = 0 );
+    virtual TQWidget *create( const TQString &key, TQWidget *parent = 0, const char *name = 0 );
 };
 
 KomStdPlugin::KomStdPlugin()
@@ -97,41 +97,41 @@ KomStdPlugin::KomStdPlugin()
   addWidget("AboutDialog", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium)));
 }
 
-TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *tqparent, const char *name )
+TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *parent, const char *name )
 {
-  if (key == "ButtonGroup") return new ButtonGroup(tqparent, name);
-  else if (key == "CheckBox") return new CheckBox(tqparent, name);
-  else if (key == "CloseButton") return new CloseButton(tqparent, name);
-  else if (key == "ComboBox") return new ComboBox(tqparent, name);
-  else if (key == "Dialog") return new Dialog(tqparent, name);
-  else if (key == "ExecButton") return new ExecButton(tqparent, name);
-  else if (key == "FileSelector") return new FileSelector(tqparent, name);
-  else if (key == "GroupBox") return new GroupBox(tqparent, name);
-  else if (key == "Konsole") return new Konsole(tqparent, name);
-  else if (key == "Label") return new Label(tqparent, name);
-  else if (key == "LineEdit") return new LineEdit(tqparent, name);
-  else if (key == "ListBox") return new ListBox(tqparent, name);
-  else if (key == "PixmapLabel") return new PixmapLabel(tqparent, name);
-  else if (key == "ProgressBar") return new ProgressBar(tqparent, name);
-  else if (key == "RadioButton") return new RadioButton(tqparent, name);
-  else if (key == "RichTextEditor") return new RichTextEditor(tqparent, name);
-  else if (key == "ScriptObject") return new ScriptObject(tqparent, name);
-  else if (key == "Slider") return new Slider(tqparent, name);
-  else if (key == "SpinBoxInt") return new SpinBoxInt(tqparent, name);
-  else if (key == "StatusBar") return new StatusBar(tqparent, name);
-  else if (key == "SubDialog") return new SubDialog(tqparent, name);
-  else if (key == "Table") return new Table(tqparent, name);
-  else if (key == "TabWidget") return new TabWidget(tqparent, name);
-  else if (key == "ToolBox") return new ToolBox(tqparent, name);
-  else if (key == "TextBrowser") return new TextBrowser(tqparent, name);
-  else if (key == "TextEdit") return new TextEdit(tqparent, name);
-  else if (key == "Timer") return new Timer(tqparent, name);
-  else if (key == "TreeWidget") return new TreeWidget(tqparent, name);
-  else if (key == "Wizard") return new Wizard(tqparent, name);
-  else if (key == "DatePicker") return new DatePicker(tqparent, name);
-  else if (key == "PopupMenu") return new PopupMenu(tqparent, name);
-  else if (key == "FontDialog") return new FontDialog(tqparent, name);
-  else if (key == "AboutDialog") return new AboutDialog(tqparent, name);
+  if (key == "ButtonGroup") return new ButtonGroup(parent, name);
+  else if (key == "CheckBox") return new CheckBox(parent, name);
+  else if (key == "CloseButton") return new CloseButton(parent, name);
+  else if (key == "ComboBox") return new ComboBox(parent, name);
+  else if (key == "Dialog") return new Dialog(parent, name);
+  else if (key == "ExecButton") return new ExecButton(parent, name);
+  else if (key == "FileSelector") return new FileSelector(parent, name);
+  else if (key == "GroupBox") return new GroupBox(parent, name);
+  else if (key == "Konsole") return new Konsole(parent, name);
+  else if (key == "Label") return new Label(parent, name);
+  else if (key == "LineEdit") return new LineEdit(parent, name);
+  else if (key == "ListBox") return new ListBox(parent, name);
+  else if (key == "PixmapLabel") return new PixmapLabel(parent, name);
+  else if (key == "ProgressBar") return new ProgressBar(parent, name);
+  else if (key == "RadioButton") return new RadioButton(parent, name);
+  else if (key == "RichTextEditor") return new RichTextEditor(parent, name);
+  else if (key == "ScriptObject") return new ScriptObject(parent, name);
+  else if (key == "Slider") return new Slider(parent, name);
+  else if (key == "SpinBoxInt") return new SpinBoxInt(parent, name);
+  else if (key == "StatusBar") return new StatusBar(parent, name);
+  else if (key == "SubDialog") return new SubDialog(parent, name);
+  else if (key == "Table") return new Table(parent, name);
+  else if (key == "TabWidget") return new TabWidget(parent, name);
+  else if (key == "ToolBox") return new ToolBox(parent, name);
+  else if (key == "TextBrowser") return new TextBrowser(parent, name);
+  else if (key == "TextEdit") return new TextEdit(parent, name);
+  else if (key == "Timer") return new Timer(parent, name);
+  else if (key == "TreeWidget") return new TreeWidget(parent, name);
+  else if (key == "Wizard") return new Wizard(parent, name);
+  else if (key == "DatePicker") return new DatePicker(parent, name);
+  else if (key == "PopupMenu") return new PopupMenu(parent, name);
+  else if (key == "FontDialog") return new FontDialog(parent, name);
+  else if (key == "AboutDialog") return new AboutDialog(parent, name);
   else return 0;
 }
 
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index e00ee485..7bf77c27 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -32,8 +32,8 @@
 #define INSERTSUBMENU 109
 #define LAST_FUNCTION INSERTSUBMENU 
 
-PopupMenu::PopupMenu(TQWidget *tqparent, const char *name)
- : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this))
+PopupMenu::PopupMenu(TQWidget *parent, const char *name)
+ : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h
index 9a0dc925..e9e6c638 100644
--- a/kommander/widgets/popupmenu.h
+++ b/kommander/widgets/popupmenu.h
@@ -30,7 +30,7 @@ class PopupMenu : public TQLabel, public KommanderWidget
   TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
   TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
-  PopupMenu(TQWidget *tqparent = 0, const char *name = 0);
+  PopupMenu(TQWidget *parent = 0, const char *name = 0);
   ~PopupMenu();
 
   virtual bool isKommanderWidget() const;
diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp
index b2b57748..fad8ca38 100644
--- a/kommander/widgets/toolbox.cpp
+++ b/kommander/widgets/toolbox.cpp
@@ -27,8 +27,8 @@
 #define FIRST_FUNCTION ADDWIDGET
 #define LAST_FUNCTION INDEXOF 
 
-ToolBox::ToolBox(TQWidget *tqparent, const char *name)
- : TQToolBox(tqparent, name), KommanderWidget(TQT_TQOBJECT(this))
+ToolBox::ToolBox(TQWidget *parent, const char *name)
+ : TQToolBox(parent, name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h
index ab5375b0..a7245889 100644
--- a/kommander/widgets/toolbox.h
+++ b/kommander/widgets/toolbox.h
@@ -26,7 +26,7 @@ class ToolBox : public TQToolBox, public KommanderWidget
   TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
   TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
-  ToolBox(TQWidget *tqparent = 0, const char *name = 0);
+  ToolBox(TQWidget *parent = 0, const char *name = 0);
 
   ~ToolBox();
 
diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp
index d9f6b0c8..9a19d2b0 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -95,7 +95,7 @@ void TreeWidget::addItemFromString(const TQString& s)
   TQStringList elements = TQStringList::split(m_pathSeparator, s, true);
   if (elements.count() > 1)
     setRootIsDecorated(true);
-  TQListViewItem* tqparent = 0;
+  TQListViewItem* parent = 0;
   if (m_lastPath.size() < elements.count())
     m_lastPath.resize(elements.count());
   uint i = 0;
@@ -103,13 +103,13 @@ void TreeWidget::addItemFromString(const TQString& s)
   {
     if (m_lastPath[i] && m_lastPath[i]->text(0) == elements[i])
     {
-      tqparent = m_lastPath[i];
+      parent = m_lastPath[i];
       i++;
       continue;
     }
     else 
     {
-      TQListViewItem* item = (i>0) ? tqparent->firstChild() : firstChild();
+      TQListViewItem* item = (i>0) ? parent->firstChild() : firstChild();
       while (item)
       {
         if (item->text(0) == *it)
@@ -117,16 +117,16 @@ void TreeWidget::addItemFromString(const TQString& s)
         item = item->nextSibling(); 
       }
       if (item)
-        tqparent = item;
+        parent = item;
       else 
-        tqparent = itemFromString(tqparent, *it);
-      m_lastPath.insert(i, tqparent); 
+        parent = itemFromString(parent, *it);
+      m_lastPath.insert(i, parent); 
       i++;
     }
   }
 }
 
-TQListViewItem* TreeWidget::itemFromString(TQListViewItem* tqparent, const TQString& s)
+TQListViewItem* TreeWidget::itemFromString(TQListViewItem* parent, const TQString& s)
 {
   TQStringList elements;
   if (s.contains("\t"))
@@ -137,8 +137,8 @@ TQListViewItem* TreeWidget::itemFromString(TQListViewItem* tqparent, const TQStr
   if (cols >= columns())
     cols = columns();
   TQListViewItem* item;
-  if (tqparent)
-    item = new TQListViewItem(tqparent);
+  if (parent)
+    item = new TQListViewItem(parent);
   else
     item = new TQListViewItem(this);
   int i = 0;
@@ -219,14 +219,14 @@ TQString TreeWidget::itemPath(TQListViewItem* item) const
 {
   if (!item)
     return TQString();
-  item = item->tqparent();
+  item = item->parent();
   if (!item)
     return TQString();
   TQStringList path;
   while (item)
   {
     path.prepend(item->text(0));
-    item = item->tqparent();
+    item = item->parent();
   }
   return path.join(m_pathSeparator);
 }
diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h
index df7440b1..8cdbeb10 100644
--- a/kommander/widgets/treewidget.h
+++ b/kommander/widgets/treewidget.h
@@ -76,7 +76,7 @@ protected:
   TQString itemPath(TQListViewItem* item) const;
 private:
   void addItemFromString(const TQString& s);
-  TQListViewItem* itemFromString(TQListViewItem* tqparent, const TQString& s);
+  TQListViewItem* itemFromString(TQListViewItem* parent, const TQString& s);
   TQPtrVector<TQListViewItem> m_lastPath;
   TQString m_pathSeparator;
   int addColumnTree(const TQString & label, int width = -1 );