rename the following methods:

tqparent parent
tqmask mask


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

12 files changed, 81 insertions, 81 deletions

diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index b90fe00..ca555a4 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -107,15 +107,15 @@ class KSim::Chart::Private
 };
 
 KSim::Chart::Chart(bool showKrell, int maxValue,
-   const TQString &title, TQWidget *tqparent, const char *name,
-   WFlags fl) : TQWidget(tqparent, name, fl)
+   const TQString &title, TQWidget *parent, const char *name,
+   WFlags fl) : TQWidget(parent, name, fl)
 {
   init(showKrell, maxValue, title);
 }
 
 KSim::Chart::Chart(bool showKrell, int maxValue,
-   TQWidget *tqparent, const char *name, WFlags fl)
-   : TQWidget(tqparent, name, fl)
+   TQWidget *parent, const char *name, WFlags fl)
+   : TQWidget(parent, name, fl)
 {
   init(showKrell, maxValue, i18n("None"));
 }
diff --git a/ksim/library/chart.h b/ksim/library/chart.h
index 2354e22..cd658c0 100644
--- a/ksim/library/chart.h
+++ b/ksim/library/chart.h
@@ -47,10 +47,10 @@ namespace KSim
        * @param minValue is the minimum value to show
        * @param maxValue is the maximum value to show
        * @param title is the title off the krell bar (if enabled)
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        */
       Chart(bool displayMeter, int maxValue,
-         const TQString &title, TQWidget *tqparent,
+         const TQString &title, TQWidget *parent,
          const char *name = 0, WFlags fl = 0);
       /**
        * Constructs a KSim::Chart.
@@ -58,10 +58,10 @@ namespace KSim
        * @param showKrell is if the krellbar should be shown
        * @param minValue is the minimum value to show
        * @param maxValue is the maximum value to show
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        */
       Chart(bool displayMeter, int maxValue,
-         TQWidget *tqparent, const char *name = 0,
+         TQWidget *parent, const char *name = 0,
          WFlags fl = 0);
       /**
        * destructs KSim::Chart
diff --git a/ksim/library/common.h b/ksim/library/common.h
index c64504b..9fc01c0 100644
--- a/ksim/library/common.h
+++ b/ksim/library/common.h
@@ -58,7 +58,7 @@ namespace KSim
    *  class Test : public TQWidget, virtual public KSim::Base
    *  {
    *    public:
-   *      Test(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
+   *      Test(TQWidget *parent, const char *name) : TQWidget(parent, name)
    *      {
    *      }
    *      ~Test() {}
diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp
index 37b86b3..0b9ed18 100644
--- a/ksim/library/label.cpp
+++ b/ksim/library/label.cpp
@@ -50,20 +50,20 @@ class KSim::Label::Private
     bool showShadow;
 };
 
-KSim::Label::Label(TQWidget *tqparent, const char *name, WFlags fl)
-   : TQWidget(tqparent, name, fl)
+KSim::Label::Label(TQWidget *parent, const char *name, WFlags fl)
+   : TQWidget(parent, name, fl)
 {
   initWidget(KSim::Types::None);
 }
 
-KSim::Label::Label(int type, TQWidget *tqparent, const char *name, 
-   WFlags fl) : TQWidget(tqparent, name, fl)
+KSim::Label::Label(int type, TQWidget *parent, const char *name, 
+   WFlags fl) : TQWidget(parent, name, fl)
 {
   initWidget(type);
 }
 
-KSim::Label::Label(int type, const TQString &text, TQWidget *tqparent,
-   const char *name, WFlags fl) : TQWidget(tqparent, name, fl)
+KSim::Label::Label(int type, const TQString &text, TQWidget *parent,
+   const char *name, WFlags fl) : TQWidget(parent, name, fl)
 {
   initWidget(type);
   setText(text);
diff --git a/ksim/library/label.h b/ksim/library/label.h
index a888d89..f20d8df 100644
--- a/ksim/library/label.h
+++ b/ksim/library/label.h
@@ -42,7 +42,7 @@ namespace KSim
       /**
        * Constructs a KSim::Label.
        *
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        *
        * Example usage:
        * <pre>
@@ -51,12 +51,12 @@ namespace KSim
        * To create a KSim::Label with the normal theme look
        * @see KSim::ThemeLoader
        */
-      Label(TQWidget *tqparent, const char *name = 0, WFlags fl = 0);
+      Label(TQWidget *parent, const char *name = 0, WFlags fl = 0);
       /**
        * Constructs a KSimLabel.
        *
        * @param type is the theme type
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        *
        * Example usage:
        * <pre>
@@ -66,13 +66,13 @@ namespace KSim
        * NOTE: this is the same as the KSim::Label(TQWidget *, const char *, WFlags) ctor
        * @see KSim::ThemeLoader
        */
-      Label(int type, TQWidget *tqparent, const char *name = 0, WFlags fl = 0);
+      Label(int type, TQWidget *parent, const char *name = 0, WFlags fl = 0);
       /**
        * Constructs a KSim::Label.
        *
        * @param type is the theme type
        * @param text is the default text to display
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        *
        * Example usage:
        * <pre>
@@ -82,7 +82,7 @@ namespace KSim
        * @see KSim::ThemeLoader
        */
       Label(int type, const TQString &text,
-           TQWidget *tqparent, const char *name = 0, WFlags fl = 0);
+           TQWidget *parent, const char *name = 0, WFlags fl = 0);
       /**
        * destructs KSim::Label.
        */
diff --git a/ksim/library/led.cpp b/ksim/library/led.cpp
index f2acc2b..3fa8d7f 100644
--- a/ksim/library/led.cpp
+++ b/ksim/library/led.cpp
@@ -81,10 +81,10 @@ void KSim::Led::setOn(bool force)
     return;
   }
 
-  if (d->pixmap.tqmask() && !d->pixmap.tqmask()->isNull()) {
-    TQBitmap tqmask(rect.size());
-    bitBlt(&tqmask, TQPoint(0, 0), d->pixmap.tqmask(), rect, CopyROP);
-    setMask(tqmask);
+  if (d->pixmap.mask() && !d->pixmap.mask()->isNull()) {
+    TQBitmap mask(rect.size());
+    bitBlt(&mask, TQPoint(0, 0), d->pixmap.mask(), rect, CopyROP);
+    setMask(mask);
   }
 
   bitBlt(this, TQPoint(0, 0), &d->pixmap, rect, CopyROP);
@@ -104,10 +104,10 @@ void KSim::Led::setOff(bool force)
     return;
   }
 
-  if (d->pixmap.tqmask() && !d->pixmap.tqmask()->isNull()) {
-    TQBitmap tqmask(rect.size());
-    bitBlt(&tqmask, TQPoint(0, 0), d->pixmap.tqmask(), rect, CopyROP);
-    setMask(tqmask);
+  if (d->pixmap.mask() && !d->pixmap.mask()->isNull()) {
+    TQBitmap mask(rect.size());
+    bitBlt(&mask, TQPoint(0, 0), d->pixmap.mask(), rect, CopyROP);
+    setMask(mask);
   }
 
   bitBlt(this, TQPoint(0, 0), &d->pixmap, rect, CopyROP);
@@ -184,24 +184,24 @@ class KSim::LedLabel::Private
 };
 
 KSim::LedLabel::LedLabel(int max, int type, const TQString &label,
-   TQWidget *tqparent, const char *name, WFlags fl)
-   : KSim::Progress(max, type, Panel, tqparent, name, fl)
+   TQWidget *parent, const char *name, WFlags fl)
+   : KSim::Progress(max, type, Panel, parent, name, fl)
 {
   init();
   setText(label);
 }
 
 KSim::LedLabel::LedLabel(int max, int type,
-   TQWidget *tqparent, const char *name, WFlags fl)
-   : KSim::Progress(max, type, Panel, tqparent, name, fl)
+   TQWidget *parent, const char *name, WFlags fl)
+   : KSim::Progress(max, type, Panel, parent, name, fl)
 {
   init();
 }
 
 KSim::LedLabel::LedLabel(int max, 
-   TQWidget *tqparent, const char *name, WFlags fl)
+   TQWidget *parent, const char *name, WFlags fl)
    : KSim::Progress(max, KSim::Types::None,
-   Panel, tqparent, name, fl)
+   Panel, parent, name, fl)
 {
   init();
 }
diff --git a/ksim/library/led.h b/ksim/library/led.h
index 8ed0a14..5c5e615 100644
--- a/ksim/library/led.h
+++ b/ksim/library/led.h
@@ -46,7 +46,7 @@ namespace KSim
        * @param ImageName is the image to display
        * the image's height is divided by 4 and each item is used for send in,
        * send out, receive in and receive out
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        * @param name is the object instance name
        */
       Led(Type type, const TQString &imageName);
@@ -114,29 +114,29 @@ namespace KSim
        *
        * @param type is the theme type
        * @param label is the default text to display
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        * @see KSim::ThemeLoader
        */
       LedLabel(int max, int type, const TQString &label,
-            TQWidget *tqparent, const char *name = 0, WFlags fl = 0);
+            TQWidget *parent, const char *name = 0, WFlags fl = 0);
       /**
        * Constructs a KSim::LedLabel.
        *
        * @param type is the theme type
        * @param label is the default text to display
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        * @see KSim::ThemeLoader
        */
-      LedLabel(int max, int type, TQWidget *tqparent,
+      LedLabel(int max, int type, TQWidget *parent,
              const char *name = 0, WFlags fl = 0);
       /**
        * Constructs a KSim::LedLabel.
        *
        * @param label is the default text to display
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        * @see KSim::ThemeLoader
        */
-      LedLabel(int max, TQWidget *tqparent,
+      LedLabel(int max, TQWidget *parent,
              const char *name = 0, WFlags fl = 0);
       /**
        * destructor for KSim::LedLabel.
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index f3b941c..abe6609 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -77,19 +77,19 @@ class KSim::PluginPage::Private
 {
   public:
     KConfig *config;
-    KSim::PluginObject *tqparent;
+    KSim::PluginObject *parent;
 };
 
-KSim::PluginPage::PluginPage(KSim::PluginObject *tqparent, const char *name)
+KSim::PluginPage::PluginPage(KSim::PluginObject *parent, const char *name)
    : TQWidget(0, name)
 {
   d = new PluginPage::Private;
-  d->tqparent = tqparent;
-  if (tqparent && !tqparent->configFileName().isEmpty())
-    d->config = new KConfig(tqparent->configFileName() + "rc");
+  d->parent = parent;
+  if (parent && !parent->configFileName().isEmpty())
+    d->config = new KConfig(parent->configFileName() + "rc");
   else {
     kdWarning() << className() << ": Can not create the config() "
-       "pointer due to the tqparent being null" << endl;
+       "pointer due to the parent being null" << endl;
     d->config = 0;
   }
 }
@@ -111,25 +111,25 @@ KConfig *KSim::PluginPage::config() const
 class KSim::PluginView::Private
 {
   public:
-    PluginObject *tqparent;
+    PluginObject *parent;
     TQPopupMenu *popupMenu;
     KConfig *config;
 };
 
-KSim::PluginView::PluginView(KSim::PluginObject *tqparent, const char *name)
+KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name)
    : TQWidget(0, name)
 {
   d = new PluginView::Private;
-  d->tqparent = tqparent;
+  d->parent = parent;
   d->popupMenu = new TQPopupMenu(this);
   d->popupMenu->insertItem(i18n("About"), this,
      TQT_SLOT(showAbout()), 0, -1, 0);
 
-  if (tqparent && !tqparent->configFileName().isEmpty())
-    d->config = new KConfig(tqparent->configFileName() + "rc");
+  if (parent && !parent->configFileName().isEmpty())
+    d->config = new KConfig(parent->configFileName() + "rc");
   else {
     kdWarning() << className() << ": Can not create the config() "
-       "pointer due to the tqparent being null" << endl;
+       "pointer due to the parent being null" << endl;
     d->config = 0;
   }
 }
@@ -165,7 +165,7 @@ void KSim::PluginView::mousePressEvent(TQMouseEvent *ev)
 
 KSim::PluginObject *KSim::PluginView::parentPlugin() const
 {
-  return d->tqparent;
+  return d->parent;
 }
 
 void KSim::PluginView::showAbout()
diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h
index 91285f4..56d491c 100644
--- a/ksim/library/pluginmodule.h
+++ b/ksim/library/pluginmodule.h
@@ -119,7 +119,7 @@ namespace KSim
       /**
        * constructor for PluginPage
        */
-      PluginPage(KSim::PluginObject *tqparent, const char *name);
+      PluginPage(KSim::PluginObject *parent, const char *name);
       /**
        * destructor for PluginPage
        */
@@ -168,7 +168,7 @@ namespace KSim
       /**
        * constructor for PluginView
        */
-      PluginView(KSim::PluginObject *tqparent, const char *name);
+      PluginView(KSim::PluginObject *parent, const char *name);
       /**
        * destructor for PluginView
        */
diff --git a/ksim/library/progress.cpp b/ksim/library/progress.cpp
index bbdbd61..e37cff1 100644
--- a/ksim/library/progress.cpp
+++ b/ksim/library/progress.cpp
@@ -40,17 +40,17 @@ class KSim::Progress::Private
 };
 
 KSim::Progress::Progress(int maxValue,
-   TQWidget *tqparent, const char *name,
-   WFlags fl) : KSim::Label(tqparent, name, fl)
+   TQWidget *parent, const char *name,
+   WFlags fl) : KSim::Label(parent, name, fl)
 {
   init(maxValue);
   configureObject();
 }
 
 KSim::Progress::Progress(int maxValue,
-   int type, const TQString &label, TQWidget *tqparent,
+   int type, const TQString &label, TQWidget *parent,
    const char *name, WFlags fl)
-   : KSim::Label(type, label, tqparent, name, fl)
+   : KSim::Label(type, label, parent, name, fl)
 {
   init(maxValue);
   configureObject();
@@ -58,17 +58,17 @@ KSim::Progress::Progress(int maxValue,
 
 KSim::Progress::Progress(int maxValue,
    int type, const TQString &label, int value,
-   TQWidget *tqparent, const char *name, WFlags fl)
-   : KSim::Label(type, label, tqparent, name, fl)
+   TQWidget *parent, const char *name, WFlags fl)
+   : KSim::Label(type, label, parent, name, fl)
 {
   init(maxValue, value);
   configureObject();
 }
 
 KSim::Progress::Progress(int maxValue,
-   int type, TQWidget *tqparent,
+   int type, TQWidget *parent,
    const char *name, WFlags fl)
-   : KSim::Label(type, tqparent, name, fl)
+   : KSim::Label(type, parent, name, fl)
 {
   init(maxValue);
   configureObject();
@@ -76,8 +76,8 @@ KSim::Progress::Progress(int maxValue,
 
 KSim::Progress::Progress(int maxValue, int type,
    ProgressType progressType,
-   TQWidget *tqparent, const char *name, WFlags fl)
-   : KSim::Label(type, tqparent, name, fl)
+   TQWidget *parent, const char *name, WFlags fl)
+   : KSim::Label(type, parent, name, fl)
 {
   init(maxValue, 0, progressType);
   configureObject();
diff --git a/ksim/library/progress.h b/ksim/library/progress.h
index 09c4a21..0e30986 100644
--- a/ksim/library/progress.h
+++ b/ksim/library/progress.h
@@ -42,9 +42,9 @@ namespace KSim
        * @param maxValue is the maximum value
        * that the progress bar will show
        * @param label is the text that will be displayed
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        */
-      Progress(int maxValue, TQWidget *tqparent,
+      Progress(int maxValue, TQWidget *parent,
          const char *name = 0, WFlags fl = 0);
       /**
        * constructs a KSim::Progress
@@ -53,10 +53,10 @@ namespace KSim
        * that the progress bar will show
        * @param type is the theme type
        * @param label is the text that will be displayed
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        */
       Progress(int maxValue, int type, const TQString &label,
-           TQWidget *tqparent, const char *name = 0, WFlags fl = 0);
+           TQWidget *parent, const char *name = 0, WFlags fl = 0);
       /**
        * constructs a KSim::Progress
        *
@@ -65,10 +65,10 @@ namespace KSim
        * @param type is the theme type
        * @param label is the text that will be displayed
        * @param value is the initial value to be displayed
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        */
       Progress(int maxValue, int type, const TQString &label,
-           int value, TQWidget *tqparent, const char *name = 0,
+           int value, TQWidget *parent, const char *name = 0,
            WFlags fl = 0);
       /**
        * constructs a KSim::Progress
@@ -76,9 +76,9 @@ namespace KSim
        * @param maxValue is the maximum value
        * that the progress bar will show
        * @param type is the theme type
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        */
-      Progress(int maxValue, int type, TQWidget *tqparent,
+      Progress(int maxValue, int type, TQWidget *parent,
            const char *name = 0, WFlags fl = 0);
       /**
        * constructs a KSim::Progress
@@ -87,11 +87,11 @@ namespace KSim
        * that the progress bar will show
        * @param type is the theme type
        * @param progressType is onr of Progress::ProgressType
-       * @param tqparent is the tqparent widget
+       * @param parent is the parent widget
        */
       Progress(int maxValue, int type,
            ProgressType progressType,
-           TQWidget *tqparent, const char *name = 0,
+           TQWidget *parent, const char *name = 0,
            WFlags fl = 0);
       /**
        * destructs KSim::Chart
diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp
index 58a6f61..3fced29 100644
--- a/ksim/library/themeloader.cpp
+++ b/ksim/library/themeloader.cpp
@@ -607,11 +607,11 @@ TQValueList<TQPixmap> KSim::Theme::pixmapToList(PixmapType type,
   for (int i = 0; i < (depth + 1); ++i) {
     newPixmap.fill();
 
-    if (pixmap.tqmask()) {
-      TQBitmap tqmask(newPixmap.size());
-      bitBlt(&tqmask, 0, 0, pixmap.tqmask(), xOffset, yOffset,
+    if (pixmap.mask()) {
+      TQBitmap mask(newPixmap.size());
+      bitBlt(&mask, 0, 0, pixmap.mask(), xOffset, yOffset,
          image.width() - xOffset, size);
-      newPixmap.setMask(tqmask);
+      newPixmap.setMask(mask);
     }
 
     bitBlt(&newPixmap, 0, 0, &pixmap, xOffset, yOffset,