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

12 files changed, 30 insertions, 30 deletions

diff --git a/kworldwatch/applet.cpp b/kworldwatch/applet.cpp
index 6f9615d..5accd63 100644
--- a/kworldwatch/applet.cpp
+++ b/kworldwatch/applet.cpp
@@ -42,20 +42,20 @@
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet *init(TQWidget *tqparent, const TQString& configFile)
+  KDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
   {
     KGlobal::locale()->insertCatalogue("kworldclock");
     KGlobal::locale()->insertCatalogue("timezones"); // For time zone translation
     return new KWWApplet(configFile, KPanelApplet::Normal,
 			 0,
-			 tqparent, "kwwapplet");
+			 parent, "kwwapplet");
   }
 }
 
 
 KWWApplet::KWWApplet(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)
 {
   // make use of the icons installed for ksaferppp
   KGlobal::iconLoader()->addAppDir("kworldwatch");
diff --git a/kworldwatch/applet.h b/kworldwatch/applet.h
index 0142fc2..cc99bc6 100644
--- a/kworldwatch/applet.h
+++ b/kworldwatch/applet.h
@@ -47,7 +47,7 @@ class KWWApplet : public KPanelApplet
 public:
 
   KWWApplet(const TQString& configFile, Type t = Normal, int actions = 0,
-     TQWidget *tqparent = 0, const char *name = 0);
+     TQWidget *parent = 0, const char *name = 0);
   ~KWWApplet();
 
   int widthForHeight(int height) const;
diff --git a/kworldwatch/astro.c b/kworldwatch/astro.c
index 5d09dcd..3423119 100644
--- a/kworldwatch/astro.c
+++ b/kworldwatch/astro.c
@@ -7,7 +7,7 @@
 long jdate(struct tm *);
 double jtime(struct tm *);
 double kepler(double m, double ecc);
-void sunpos(double jd, int aptqparent, double *ra, double *dec, double *rv, double *slong);
+void sunpos(double jd, int apparent, double *ra, double *dec, double *rv, double *slong);
 double gmst(double jd);
 
 /*  JDATE  --  Convert internal GMT date and time to Julian day
@@ -65,19 +65,19 @@ double m, ecc;
 
 /*  SUNPOS  --	Calculate position of the Sun.	JD is the Julian  date
 		of  the  instant for which the position is desired and
-		APPARENT should be nonzero if  the  aptqparent  position
+		APPARENT should be nonzero if  the  apparent  position
 		(corrected  for  nutation  and aberration) is desired.
                 The Sun's co-ordinates are returned  in  RA  and  DEC,
 		both  specified  in degrees (divide RA by 15 to obtain
 		hours).  The radius vector to the Sun in  astronomical
                 units  is returned in RV and the Sun's longitude (true
-		or aptqparent, as desired) is  returned  as  degrees  in
+		or apparent, as desired) is  returned  as  degrees  in
 		SLONG.	*/
 
 void
-sunpos(jd, aptqparent, ra, dec, rv, slong)
+sunpos(jd, apparent, ra, dec, rv, slong)
 double jd;
-int aptqparent;
+int apparent;
 double *ra, *dec, *rv, *slong;
 {
 	double t, t2, t3, l, m, e, ea, v, theta, omega,
@@ -119,9 +119,9 @@ double *ra, *dec, *rv, *slong;
 
 	eps = 23.452294 - 0.0130125 * t - 0.00000164 * t2 + 0.000000503 * t3;
 
-        /* Corrections for Sun's aptqparent longitude, if desired. */
+        /* Corrections for Sun's apparent longitude, if desired. */
 
-	if (aptqparent) {
+	if (apparent) {
 	   omega = fixangle(259.18 - 1934.142 * t);
 	   theta = theta - 0.00569 - 0.00479 * sin(dtr(omega));
 	   eps += 0.00256 * cos(dtr(omega));
diff --git a/kworldwatch/astro.h b/kworldwatch/astro.h
index 6f39458..2c6a561 100644
--- a/kworldwatch/astro.h
+++ b/kworldwatch/astro.h
@@ -34,7 +34,7 @@
 extern "C" {
 double jtime(struct tm *t);
 double kepler(double m, double ecc);
-void sunpos(double jd, int aptqparent, double *ra, double *dec, double *rv, double *slong);
+void sunpos(double jd, int apparent, double *ra, double *dec, double *rv, double *slong);
 void projillum(short *wtab, int xdots, int ydots, double dec);
 }
 
diff --git a/kworldwatch/flags.cpp b/kworldwatch/flags.cpp
index 7b9899c..6f9837f 100644
--- a/kworldwatch/flags.cpp
+++ b/kworldwatch/flags.cpp
@@ -39,7 +39,7 @@ FlagList::FlagList()
   _flags.setAutoDelete(true);
 
   _flagPixmap = TQPixmap(locate("data", "kworldclock/pics/flag.png"));
-  _flagMask = TQPixmap(locate("data", "kworldclock/pics/flag-tqmask.xpm"), 0, TQPixmap::ThresholdDither);
+  _flagMask = TQPixmap(locate("data", "kworldclock/pics/flag-mask.xpm"), 0, TQPixmap::ThresholdDither);
   _flagMask.setMask(_flagMask.createHeuristicMask());
 }
 
diff --git a/kworldwatch/flow.h b/kworldwatch/flow.h
index df7f6b3..91b5b79 100644
--- a/kworldwatch/flow.h
+++ b/kworldwatch/flow.h
@@ -21,12 +21,12 @@
 class SimpleFlow : public TQLayout
 {
 public:
-    SimpleFlow( TQWidget *tqparent, int border=0, int space=-1,
+    SimpleFlow( TQWidget *parent, int border=0, int space=-1,
 		const char *name=0 )
-	: TQLayout( tqparent, border, space, name ),
+	: TQLayout( parent, border, space, name ),
 	cached_width(0), cached_hfw(0) {}
-    SimpleFlow( TQLayout* tqparent, int space=-1, const char *name=0 )
-	: TQLayout( tqparent, space, name ),
+    SimpleFlow( TQLayout* parent, int space=-1, const char *name=0 )
+	: TQLayout( parent, space, name ),
 	cached_width(0), cached_hfw(0) {}
     SimpleFlow( int space=-1, const char *name=0 )
 	: TQLayout( space, name ),
diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp
index 44a6656..346a97b 100644
--- a/kworldwatch/main.cpp
+++ b/kworldwatch/main.cpp
@@ -48,8 +48,8 @@
 #include "zoneclock.h"
 
 
-WorldWideWatch::WorldWideWatch(bool restore, TQWidget *tqparent, const char *name)
-  : KMainWindow(tqparent, name)
+WorldWideWatch::WorldWideWatch(bool restore, TQWidget *parent, const char *name)
+  : KMainWindow(parent, name)
 {
   KGlobal::locale()->insertCatalogue("timezones"); // For time zone translation
 
diff --git a/kworldwatch/main.h b/kworldwatch/main.h
index 1eb3d30..2f28b86 100644
--- a/kworldwatch/main.h
+++ b/kworldwatch/main.h
@@ -44,7 +44,7 @@ class WorldWideWatch : public KMainWindow
 
 public:
 
-  WorldWideWatch(bool restore=false, TQWidget *tqparent=0, const char *name=0);
+  WorldWideWatch(bool restore=false, TQWidget *parent=0, const char *name=0);
 
   void save(KConfig *config);
   void load(KConfig *load);
diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp
index 88f63e5..680d8ef 100644
--- a/kworldwatch/mapwidget.cpp
+++ b/kworldwatch/mapwidget.cpp
@@ -56,8 +56,8 @@
 #include "mapwidget.moc"
 
 
-MapWidget::MapWidget(bool applet, bool restore, TQWidget *tqparent, const char *name)
-  : TQWidget(tqparent, name), _loader(), _illumination(true), _cities(true), _flags(true), _cityList(0),
+MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *name)
+  : TQWidget(parent, name), _loader(), _illumination(true), _cities(true), _flags(true), _cityList(0),
     _applet(applet), _width(0), _height(0)
 {
   // this ugly construction is necessary so we don't load 
diff --git a/kworldwatch/mapwidget.h b/kworldwatch/mapwidget.h
index b414c81..8441306 100644
--- a/kworldwatch/mapwidget.h
+++ b/kworldwatch/mapwidget.h
@@ -60,7 +60,7 @@ class MapWidget : public TQWidget
 
 public:
 
-  MapWidget(bool applet=false, bool restore=false, TQWidget *tqparent=0, const char *name=0);
+  MapWidget(bool applet=false, bool restore=false, TQWidget *parent=0, const char *name=0);
   ~MapWidget();
 
   void setTheme(const TQString &theme);
diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp
index 01361cc..1c81814 100644
--- a/kworldwatch/zoneclock.cpp
+++ b/kworldwatch/zoneclock.cpp
@@ -51,8 +51,8 @@
 #include "zoneclock.moc"
 #include <kdebug.h>
 
-ZoneClock::ZoneClock(const TQString &zone, const TQString &name, TQWidget *tqparent, const char *n)
-  : TQFrame(tqparent, n), _zone(zone), _name(name)
+ZoneClock::ZoneClock(const TQString &zone, const TQString &name, TQWidget *parent, const char *n)
+  : TQFrame(parent, n), _zone(zone), _name(name)
 {
   setFrameStyle(TQFrame::Panel | TQFrame::Raised);
   TQHBoxLayout *hbox = new TQHBoxLayout(this, 2,2);
@@ -162,8 +162,8 @@ void ZoneClock::updateTime()
 }
 
 
-ZoneClockPanel::ZoneClockPanel(TQWidget *tqparent, const char *name)
-  : TQFrame(tqparent, name), _dlg(0)
+ZoneClockPanel::ZoneClockPanel(TQWidget *parent, const char *name)
+  : TQFrame(parent, name), _dlg(0)
 {
   _flow = new SimpleFlow(this,1,1);
 
diff --git a/kworldwatch/zoneclock.h b/kworldwatch/zoneclock.h
index 92d688e..19b87b4 100644
--- a/kworldwatch/zoneclock.h
+++ b/kworldwatch/zoneclock.h
@@ -50,7 +50,7 @@ class ZoneClock : public TQFrame
 
 public:
 
-  ZoneClock(const TQString &zone, const TQString &name, TQWidget *tqparent=0, const char *n=0);
+  ZoneClock(const TQString &zone, const TQString &name, TQWidget *parent=0, const char *n=0);
 
 
   TQString zone() const { return _zone; };
@@ -102,7 +102,7 @@ class ZoneClockPanel : public TQFrame
 
 public:
 
-  ZoneClockPanel(TQWidget *tqparent=0, const char *name=0);
+  ZoneClockPanel(TQWidget *parent=0, const char *name=0);
 
   void addClock(const TQString &zone, const TQString &name);