rename the following methods:

tqparent parent
tqmask mask


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

7 files changed, 27 insertions, 27 deletions

diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp
index f9acc02..7b8b064 100644
--- a/kmoon/kmoonapplet.cpp
+++ b/kmoon/kmoonapplet.cpp
@@ -53,18 +53,18 @@ const char *description = I18N_NOOP("Moon Phase Indicator for KDE");
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet *init(TQWidget *tqparent, const TQString& configFile)
+  KDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
   {
     KGlobal::locale()->insertCatalogue("kmoon");
     return new MoonPAWidget(configFile, KPanelApplet::Normal,
 			    KPanelApplet::About|KPanelApplet::Preferences,
-			    tqparent, "kmoonapplet");
+			    parent, "kmoonapplet");
   }
 }
 
 MoonPAWidget::MoonPAWidget(const TQString& configFile, Type type, int actions,
-			   TQWidget *tqparent, const char *name)
-  : KPanelApplet(configFile, type, actions, tqparent, name)
+			   TQWidget *parent, const char *name)
+  : KPanelApplet(configFile, type, actions, parent, name)
 {
     KConfig *config = KGlobal::config();
     config->setGroup("General");
@@ -123,7 +123,7 @@ void MoonPAWidget::showAbout()
 
 void MoonPAWidget::settings()
 {
-	KMoonDlg dlg(moon->angle(), moon->northHemi(), moon->tqmask(),
+	KMoonDlg dlg(moon->angle(), moon->northHemi(), moon->mask(),
 		     this, "moondlg");
 	if (dlg.exec() == KMoonDlg::Accepted) {
 		moon->setAngle(dlg.getAngle());
@@ -133,7 +133,7 @@ void MoonPAWidget::settings()
 		config->setGroup("General");
 		config->writeEntry("Rotation", moon->angle());
                 config->writeEntry("Northern", moon->northHemi());
-                config->writeEntry("Mask", moon->tqmask());
+                config->writeEntry("Mask", moon->mask());
                 config->sync();
 	}
 	tqrepaint();
diff --git a/kmoon/kmoonapplet.h b/kmoon/kmoonapplet.h
index aa88592..2c2b69b 100644
--- a/kmoon/kmoonapplet.h
+++ b/kmoon/kmoonapplet.h
@@ -41,7 +41,7 @@ class MoonPAWidget : public KPanelApplet
 
 public:
     MoonPAWidget(const TQString& configFile, Type t = Normal, int actions = 0,
-		 TQWidget *tqparent = 0, const char *name = 0);
+		 TQWidget *parent = 0, const char *name = 0);
     ~MoonPAWidget();
 
     int widthForHeight(int height) const { return height; }
diff --git a/kmoon/kmoondlg.cpp b/kmoon/kmoondlg.cpp
index acb789a..d4d750f 100644
--- a/kmoon/kmoondlg.cpp
+++ b/kmoon/kmoondlg.cpp
@@ -29,9 +29,9 @@
 #include "kmoondlg.h"
 #include "kmoonwidget.h"
 
-KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *tqparent, const char *name)
-    : KDialogBase(tqparent, name, true, i18n("Change View"),
-                  Ok|Cancel|Help), angle(a), north(n), tqmask(m)
+KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, true, i18n("Change View"),
+                  Ok|Cancel|Help), angle(a), north(n), mask(m)
 {
 	TQWidget *page = new TQWidget( this );
 	setMainWidget(page);
@@ -72,7 +72,7 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *tqparent, const char *name)
         connect(hemitoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleHemi()));
 
         masktoggle = new TQPushButton(hbox2);
-	masktoggle->setText(tqmask ? i18n("Switch Masking Off") :
+	masktoggle->setText(mask ? i18n("Switch Masking Off") :
 			    i18n("Switch Masking On"));
 
         connect(masktoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleMask()));
@@ -105,9 +105,9 @@ void KMoonDlg::toggleHemi() {
 }
 
 void KMoonDlg::toggleMask() {
-    moon->setMask(!moon->tqmask());
-    tqmask = moon->tqmask();
-    masktoggle->setText(tqmask ? i18n("Switch Masking Off") :
+    moon->setMask(!moon->mask());
+    mask = moon->mask();
+    masktoggle->setText(mask ? i18n("Switch Masking Off") :
 			i18n("Switch Masking On"));
 }
 
diff --git a/kmoon/kmoondlg.h b/kmoon/kmoondlg.h
index 12a0a0d..54206da 100644
--- a/kmoon/kmoondlg.h
+++ b/kmoon/kmoondlg.h
@@ -32,17 +32,17 @@ class KMoonDlg : public KDialogBase {
   TQ_OBJECT
     
  public:
-  KMoonDlg(int angle, bool north, bool tqmask, TQWidget *tqparent, const char *name);
+  KMoonDlg(int angle, bool north, bool mask, TQWidget *parent, const char *name);
   int getAngle() const { return angle; }
   bool getNorthHemi() const { return north; }
-  bool getMask() const { return tqmask; }
+  bool getMask() const { return mask; }
   
  private:
   TQSlider *slider;
   MoonWidget *moon;
   int angle;
   bool north;
-  bool tqmask;
+  bool mask;
   TQPushButton *hemitoggle;
   TQPushButton *masktoggle;
   
diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp
index f909235..3e727c5 100644
--- a/kmoon/kmoonwidget.cpp
+++ b/kmoon/kmoonwidget.cpp
@@ -50,8 +50,8 @@
 extern double moonphasebylunation(int lun, int phi);
 extern time_t JDtoDate(double jd, struct tm *event_date);
 
-MoonWidget::MoonWidget(TQWidget *tqparent, const char *name)
-  : TQWidget(tqparent, name)
+MoonWidget::MoonWidget(TQWidget *parent, const char *name)
+  : TQWidget(parent, name)
 {
     struct tm * t;
     time_t clock;
@@ -61,10 +61,10 @@ MoonWidget::MoonWidget(TQWidget *tqparent, const char *name)
     config->setGroup("General");
     _angle = config->readNumEntry("Rotation", 0);
     _north = config->readBoolEntry("Northern", true);
-    _tqmask = config->readBoolEntry("Mask", true);
+    _mask = config->readBoolEntry("Mask", true);
     old_angle = old_w = old_h = old_counter = -1;
     old_north = false;
-    old_tqmask = false;
+    old_mask = false;
     startTimer(1000 * 60 * 20);
 
     time(&clock);
@@ -250,7 +250,7 @@ void MoonWidget::setNorthHemi(bool n)
 
 void MoonWidget::setMask(bool value)
 {
-    _tqmask = value;
+    _mask = value;
     renderGraphic();
     tqrepaint();
 }
@@ -328,7 +328,7 @@ void MoonWidget::renderGraphic()
     } else {
       dest = im.smoothScale(mw, mw).convertDepth(32);
     }
-    if (_tqmask) {
+    if (_mask) {
       // generate alpha-channel
       int dmw = mw*2;
       TQBitmap dMask(dmw, dmw);
diff --git a/kmoon/kmoonwidget.h b/kmoon/kmoonwidget.h
index d1f7367..3b2415f 100644
--- a/kmoon/kmoonwidget.h
+++ b/kmoon/kmoonwidget.h
@@ -34,7 +34,7 @@ class MoonWidget : public TQWidget
   TQ_OBJECT
 
 public:
-    MoonWidget(TQWidget *tqparent = 0, const char *name = 0);
+    MoonWidget(TQWidget *parent = 0, const char *name = 0);
     ~MoonWidget();
 
     void calctqStatus( time_t time );
@@ -45,14 +45,14 @@ public:
     bool northHemi() const { return _north; }
     void setNorthHemi(bool b);
 
-    bool tqmask() const { return _tqmask; }
+    bool mask() const { return _mask; }
     void setMask(bool b);
 
 protected:
     int old_w, old_h;
     int counter,  old_counter;
     int _angle, old_angle;
-    int _tqmask, old_tqmask;
+    int _mask, old_mask;
     bool old_north, _north;
 
     TQPixmap pixmap;
diff --git a/kmoon/phases.cpp b/kmoon/phases.cpp
index 972afc2..74cc1a9 100644
--- a/kmoon/phases.cpp
+++ b/kmoon/phases.cpp
@@ -168,7 +168,7 @@ double torad(double x)
 **    int phi:  another phase parameter, selecting the phase of the
 **              moon.  0 = New, 1 = First TQtr, 2 = Full, 3 = Last TQtr
 **
-** Return:  Aptqparent JD of the needed phase
+** Return:  Apparent JD of the needed phase
 */
 
 #include <stdio.h>