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

61 files changed, 150 insertions, 150 deletions

diff --git a/amor/amor.cpp b/amor/amor.cpp
index fafee0c..2efb896 100644
--- a/amor/amor.cpp
+++ b/amor/amor.cpp
@@ -562,14 +562,14 @@ void Amor::restack()
 #endif
 
     Window sibling = mTargetWin;
-    Window dw, tqparent = None, *wins;
+    Window dw, parent = None, *wins;
 
     do {
         unsigned int nwins = 0;
 
-        // We must use the target window's tqparent as our sibling.
-        // Is there a faster way to get tqparent window than XQueryTree?
-        if (XQueryTree(qt_xdisplay(), sibling, &dw, &tqparent, &wins, &nwins))
+        // We must use the target window's parent as our sibling.
+        // Is there a faster way to get parent window than XQueryTree?
+        if (XQueryTree(qt_xdisplay(), sibling, &dw, &parent, &wins, &nwins))
         {
             if (nwins)
             {
@@ -577,9 +577,9 @@ void Amor::restack()
             }
         }
 
-        if (tqparent != None && tqparent != dw )
-            sibling = tqparent;
-    } while ( tqparent != None && tqparent != dw );
+        if (parent != None && parent != dw )
+            sibling = parent;
+    } while ( parent != None && parent != dw );
 
     // Set animation's stacking order to be above the window manager's
     // decoration of target window.
diff --git a/amor/amorbubble.cpp b/amor/amorbubble.cpp
index 2860ccd..49e65b7 100644
--- a/amor/amorbubble.cpp
+++ b/amor/amorbubble.cpp
@@ -99,7 +99,7 @@ void AmorBubble::setMessage(const TQString& message)
 
 //---------------------------------------------------------------------------
 //
-// Calculates the size, position and tqmask of the bubble
+// Calculates the size, position and mask of the bubble
 //
 void AmorBubble::calcGeometry()
 {
@@ -141,7 +141,7 @@ void AmorBubble::calcGeometry()
     setGeometry(xpos, ypos, w, h);
     mBrowser->setGeometry( mBound );
 
-    // create and apply the tqshape tqmask
+    // create and apply the tqshape mask
     mMask.resize(w, h);
     mMask.fill(color0);
     TQPainter maskPainter(&mMask);
diff --git a/amor/amorbubble.h b/amor/amorbubble.h
index 408c568..54e8912 100644
--- a/amor/amorbubble.h
+++ b/amor/amorbubble.h
@@ -70,7 +70,7 @@ protected:
     int   mOriginX;             // X origin of bubble arrow
     int   mOriginY;             // Y origin of bubble arrow
     TQRect mBound;               // bounds of the text
-    TQBitmap mMask;              // tqshape tqmask
+    TQBitmap mMask;              // tqshape mask
     VertPos mArrowVert;         // vertical position of the arrow
     HorzPos mArrowHorz;         // horizontal position of the arrow
     TQTextBrowser *mBrowser;	// displays the message
diff --git a/amor/amorwidget.cpp b/amor/amorwidget.cpp
index b64af77..e5cc7b0 100644
--- a/amor/amorwidget.cpp
+++ b/amor/amorwidget.cpp
@@ -60,10 +60,10 @@ void AmorWidget::setPixmap(const TQPixmap *pixmap)
 
     if (mPixmap)
     {
-        if (mPixmap->tqmask())
+        if (mPixmap->mask())
         {
             XShapeCombineMask( x11Display(), winId(), ShapeBounding, 0, 0,
-                                mPixmap->tqmask()->handle(), ShapeSet );
+                                mPixmap->mask()->handle(), ShapeSet );
             tqrepaint(false);
         }
     
diff --git a/eyesapplet/eyes.cpp b/eyesapplet/eyes.cpp
index e1b9623..84bdfbe 100644
--- a/eyesapplet/eyes.cpp
+++ b/eyesapplet/eyes.cpp
@@ -33,17 +33,17 @@
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile)
+    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         KGlobal::locale()->insertCatalogue("keyesapplet");
-        EyesApplet *applet = new EyesApplet(configFile, KPanelApplet::Normal, 0, tqparent, "keyesapplet");
+        EyesApplet *applet = new EyesApplet(configFile, KPanelApplet::Normal, 0, parent, "keyesapplet");
         return applet;
     }
 }
 
 EyesApplet::EyesApplet(const TQString& configFile, Type t, int actions,
-                       TQWidget *tqparent, const char *name)
-  : KPanelApplet( configFile, t, actions, tqparent, name )
+                       TQWidget *parent, const char *name)
+  : KPanelApplet( configFile, t, actions, parent, name )
 {
     setWFlags(WNoAutoErase);
     setBackgroundOrigin(AncestorOrigin);
diff --git a/eyesapplet/eyes.h b/eyesapplet/eyes.h
index 1e03bab..90b90da 100644
--- a/eyesapplet/eyes.h
+++ b/eyesapplet/eyes.h
@@ -29,7 +29,7 @@ class EyesApplet : public KPanelApplet
 
 public:
     EyesApplet(const TQString& configFile, Type t = Normal, int actions = 0,
-               TQWidget *tqparent = 0, const char *name = 0);
+               TQWidget *parent = 0, const char *name = 0);
 
     int widthForHeight(int height) const;
     int heightForWidth(int width) const;
diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp
index 8393f9e..83a45aa 100644
--- a/fifteenapplet/fifteenapplet.cpp
+++ b/fifteenapplet/fifteenapplet.cpp
@@ -38,17 +38,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile)
+    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         KGlobal::locale()->insertCatalogue("kfifteenapplet");
         return new FifteenApplet(configFile, KPanelApplet::Normal,
-                                 KPanelApplet::About, tqparent, "kfifteenapplet");
+                                 KPanelApplet::About, parent, "kfifteenapplet");
     }
 }
 
 FifteenApplet::FifteenApplet(const TQString& configFile, Type type, int actions,
-                               TQWidget *tqparent, const char *name)
-    : KPanelApplet(configFile, type, actions, tqparent, name), _aboutData(0)
+                               TQWidget *parent, const char *name)
+    : KPanelApplet(configFile, type, actions, parent, name), _aboutData(0)
 {
     // setup table
     _table = new PiecesTable(this);
@@ -87,8 +87,8 @@ void FifteenApplet::about()
     dialog.exec();
 }
 
-PiecesTable::PiecesTable(TQWidget* tqparent, const char* name )
-    : QtTableView(tqparent, name), _activeRow(-1), _activeCol(-1), _randomized(false)
+PiecesTable::PiecesTable(TQWidget* parent, const char* name )
+    : QtTableView(parent, name), _activeRow(-1), _activeCol(-1), _randomized(false)
 {
     _menu = new TQPopupMenu(this);
     _menu->insertItem(i18n("R&andomize Pieces"), this, TQT_SLOT(randomizeMap()));
diff --git a/fifteenapplet/fifteenapplet.h b/fifteenapplet/fifteenapplet.h
index c17adc8..8cc25c6 100644
--- a/fifteenapplet/fifteenapplet.h
+++ b/fifteenapplet/fifteenapplet.h
@@ -38,7 +38,7 @@ class PiecesTable : public QtTableView
   TQ_OBJECT
 
 public:
-    PiecesTable(TQWidget* tqparent = 0, const char* name = 0);
+    PiecesTable(TQWidget* parent = 0, const char* name = 0);
     TQPopupMenu* popup() { return _menu; }
 
 protected:
@@ -71,7 +71,7 @@ class FifteenApplet : public KPanelApplet
 
 public:
     FifteenApplet(const TQString& configFile, Type t = Stretch, int actions = 0,
-                  TQWidget *tqparent = 0, const char *name = 0);
+                  TQWidget *parent = 0, const char *name = 0);
 
     int widthForHeight(int height) const;
     int heightForWidth(int width) const;
diff --git a/fifteenapplet/qttableview.cpp b/fifteenapplet/qttableview.cpp
index 4f60216..4aded39 100644
--- a/fifteenapplet/qttableview.cpp
+++ b/fifteenapplet/qttableview.cpp
@@ -45,8 +45,8 @@ public:
     void paintEvent( TQPaintEvent * );
 };
 
-QCornerSquare::QCornerSquare( TQWidget *tqparent, const char *name )
-	: TQWidget( tqparent, name )
+QCornerSquare::QCornerSquare( TQWidget *parent, const char *name )
+	: TQWidget( parent, name )
 {
 }
 
@@ -125,7 +125,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
 
 
 /*!
-  Constructs a table view.  The \a tqparent, \a name and \f arguments
+  Constructs a table view.  The \a parent, \a name and \f arguments
   are passed to the TQFrame constructor.
 
   The \link setTableFlags() table flags\endlink are all cleared (set to 0).
@@ -144,8 +144,8 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
 
 */
 
-QtTableView::QtTableView( TQWidget *tqparent, const char *name, WFlags f )
-    : TQFrame( tqparent, name, f )
+QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f )
+    : TQFrame( parent, name, f )
 {
     nRows		 = nCols      = 0;	// zero rows/cols
     xCellOffs		 = yCellOffs  = 0;	// zero offset
diff --git a/fifteenapplet/qttableview.h b/fifteenapplet/qttableview.h
index d723aa2..a47da01 100644
--- a/fifteenapplet/qttableview.h
+++ b/fifteenapplet/qttableview.h
@@ -39,7 +39,7 @@ public:
     void	tqrepaint( const TQRect &, bool erase=TRUE );
 
 protected:
-    QtTableView( TQWidget *tqparent=0, const char *name=0, WFlags f=0 );
+    QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
    ~QtTableView();
 
     int		numRows()	const;
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>
diff --git a/kodo/kimagenumber.cpp b/kodo/kimagenumber.cpp
index 1b6d9be..911f718 100644
--- a/kodo/kimagenumber.cpp
+++ b/kodo/kimagenumber.cpp
@@ -25,8 +25,8 @@
 
 #include "kimagenumber.h"
 
-KImageNumber::KImageNumber(const TQString& font, TQWidget* tqparent,const char* name) :
-	TQFrame(tqparent,name),
+KImageNumber::KImageNumber(const TQString& font, TQWidget* parent,const char* name) :
+	TQFrame(parent,name),
 	m_value(0)
 {
 	fontPix = new TQPixmap(font);
diff --git a/kodo/kimagenumber.h b/kodo/kimagenumber.h
index 9f8a9b9..0500d76 100644
--- a/kodo/kimagenumber.h
+++ b/kodo/kimagenumber.h
@@ -35,7 +35,7 @@ class KImageNumber : public TQFrame
   TQ_OBJECT
 	TQ_PROPERTY( double m_value READ value WRITE setValue )
 public:
-	KImageNumber(const TQString& font, TQWidget* tqparent=0, const char* name=0);
+	KImageNumber(const TQString& font, TQWidget* parent=0, const char* name=0);
 
 	virtual ~KImageNumber();
 
diff --git a/kodo/kodometer.cpp b/kodo/kodometer.cpp
index 5ff372a..811c90d 100644
--- a/kodo/kodometer.cpp
+++ b/kodo/kodometer.cpp
@@ -42,8 +42,8 @@ static	struct conversionEntry ConversionTable[MAX_UNIT] = {
  * Note that we use installEventFilter on the two KImageNumber's
  * to make clicks on them bring up the context-menu.
  */
-Kodometer::Kodometer(TQWidget* tqparent, const char* name)
-	: TQFrame(tqparent, name),
+Kodometer::Kodometer(TQWidget* parent, const char* name)
+	: TQFrame(parent, name),
 	dontRefresh(false),
         speed(0.0),
 	lastDistance(0.0),
diff --git a/kteatime/tealist.cpp b/kteatime/tealist.cpp
index 8ef9dc5..dcc4209 100644
--- a/kteatime/tealist.cpp
+++ b/kteatime/tealist.cpp
@@ -25,14 +25,14 @@ TQString int2time(int time)
 }
 
 
-TeaListItem::TeaListItem(TQListView * tqparent)
-    :TQListViewItem(tqparent)
+TeaListItem::TeaListItem(TQListView * parent)
+    :TQListViewItem(parent)
 {
 
 }
 
-TeaListItem::TeaListItem(TQListView * tqparent, TQListViewItem *after)
-    :TQListViewItem(tqparent, after)
+TeaListItem::TeaListItem(TQListView * parent, TQListViewItem *after)
+    :TQListViewItem(parent, after)
 {
 
 }
diff --git a/kteatime/tealist.h b/kteatime/tealist.h
index 8012af9..7b65795 100644
--- a/kteatime/tealist.h
+++ b/kteatime/tealist.h
@@ -18,8 +18,8 @@ class TeaListItem : public TQListViewItem
 {
 
 public:
-	TeaListItem(TQListView *tqparent);
-	TeaListItem(TQListView *tqparent, TQListViewItem *after);
+	TeaListItem(TQListView *parent);
+	TeaListItem(TQListView *parent, TQListViewItem *after);
 	~TeaListItem();
 
 	int time();
diff --git a/kteatime/timeedit.cpp b/kteatime/timeedit.cpp
index 5344520..473a11b 100644
--- a/kteatime/timeedit.cpp
+++ b/kteatime/timeedit.cpp
@@ -13,8 +13,8 @@
 #include "timeedit.h"
 #include "timeedit.moc"
 
-WrappingSpinBox::WrappingSpinBox(int minValue, int maxValue, int step, TQWidget *tqparent, const char *name)
-	: TQSpinBox(minValue, maxValue, step, tqparent, name)
+WrappingSpinBox::WrappingSpinBox(int minValue, int maxValue, int step, TQWidget *parent, const char *name)
+	: TQSpinBox(minValue, maxValue, step, parent, name)
 {
 }
 
@@ -49,8 +49,8 @@ void WrappingSpinBox::stepDown()
 // -------------------------------------------------------------------------
 
 
-TimeEdit::TimeEdit(TQWidget* tqparent, const char* name)
-    : TQWidget(tqparent, name)
+TimeEdit::TimeEdit(TQWidget* parent, const char* name)
+    : TQWidget(parent, name)
 {
 	tqlayout = new TQHBoxLayout(this);
 	minuteBox = new TQSpinBox(0, 300, 1, this);
diff --git a/kteatime/timeedit.h b/kteatime/timeedit.h
index 3370dac..c614f57 100644
--- a/kteatime/timeedit.h
+++ b/kteatime/timeedit.h
@@ -24,7 +24,7 @@ class WrappingSpinBox : public TQSpinBox
   TQ_OBJECT
 
 public:
-	WrappingSpinBox(int minValue, int maxValue, int step = 1, TQWidget *tqparent=0, const char *name=0);
+	WrappingSpinBox(int minValue, int maxValue, int step = 1, TQWidget *parent=0, const char *name=0);
 	~WrappingSpinBox();
 
 	void stepUp();
@@ -46,7 +46,7 @@ class TimeEdit : public TQWidget
   TQ_OBJECT
 
 public:
-	TimeEdit(TQWidget* tqparent = 0, const char* name = 0);
+	TimeEdit(TQWidget* parent = 0, const char* name = 0);
 	~TimeEdit();
 
 	void setValue(int value);
diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp
index 65cf116..82539ce 100644
--- a/kteatime/toplevel.cpp
+++ b/kteatime/toplevel.cpp
@@ -251,15 +251,15 @@ void TopLevel::paintEvent(TQPaintEvent *)
 	// overlay pie chart onto tray icon
 	TQPixmap base(*pm);                                      // make copy of base pixmap
 	if (useTrayVis && running) {
-		// extend tqmask
-		TQBitmap tqmask = *(base.tqmask());
-		TQPainter pm(&tqmask);
+		// extend mask
+		TQBitmap mask = *(base.mask());
+		TQPainter pm(&mask);
 		pm.setBrush(TQt::color1);                            // fill with "foreground-colour"
 		pm.setPen(TQt::NoPen);                               // no border needed/wanted
 		pm.drawPie(0+1, ((float) width()/(float) 2.44444444444)+1, (width()/2), (width()/2), 90*16, -360*16);       // full circle of small size
 		pm.drawPie(0, ((float) width()/(float) 2.44444444444), ((float) width()/(float) 1.69230769231), ((float) width()/(float) 1.69230769231), 90*16, percentDone*16);    // pie part of big size
 		pm.end();
-		base.setMask(tqmask);
+		base.setMask(mask);
 
 		// draw pie chart
 		TQPainter px(&base);
diff --git a/ktux/sprite.cpp b/ktux/sprite.cpp
index 9598116..5138159 100644
--- a/ktux/sprite.cpp
+++ b/ktux/sprite.cpp
@@ -43,8 +43,8 @@ extern "C"
 
 //-----------------------------------------------------------------------------
 
-KSpriteSetup::KSpriteSetup( TQWidget *tqparent, const char *name )
-  : TQDialog( tqparent, name, TRUE )
+KSpriteSetup::KSpriteSetup( TQWidget *parent, const char *name )
+  : TQDialog( parent, name, TRUE )
 {
     KGlobal::locale()->insertCatalogue("ktux");
     saver = 0;
diff --git a/ktux/sprite.h b/ktux/sprite.h
index 236fddd..4845eac 100644
--- a/ktux/sprite.h
+++ b/ktux/sprite.h
@@ -52,7 +52,7 @@ class KSpriteSetup : public TQDialog
     Q_OBJECT
   TQ_OBJECT
 public:
-    KSpriteSetup( TQWidget *tqparent = NULL, const char *name = NULL );
+    KSpriteSetup( TQWidget *parent = NULL, const char *name = NULL );
     ~KSpriteSetup();
 
 protected:
diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp
index 6005315..04576b1 100644
--- a/kweather/dockwidget.cpp
+++ b/kweather/dockwidget.cpp
@@ -30,8 +30,8 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 
-dockwidget::dockwidget(const TQString &location, TQWidget *tqparent,
-        const char *name) : TQWidget(tqparent,name), m_locationCode( location ), m_orientation(Qt::Horizontal )
+dockwidget::dockwidget(const TQString &location, TQWidget *parent,
+        const char *name) : TQWidget(parent,name), m_locationCode( location ), m_orientation(Qt::Horizontal )
 {
     m_font = KGlobalSettings::generalFont();
     setBackgroundOrigin( AncestorOrigin );
diff --git a/kweather/dockwidget.h b/kweather/dockwidget.h
index 72c1a43..54ce388 100644
--- a/kweather/dockwidget.h
+++ b/kweather/dockwidget.h
@@ -34,7 +34,7 @@ class dockwidget : public TQWidget
   TQ_OBJECT
 
 public:
-    dockwidget(const TQString &location, TQWidget *tqparent=0, const char *name=0);
+    dockwidget(const TQString &location, TQWidget *parent=0, const char *name=0);
     ~dockwidget();
 
     enum {ShowIconOnly=1, ShowTempOnly=2, ShowAll=3 };
diff --git a/kweather/kcmweather.cpp b/kweather/kcmweather.cpp
index 7388dc8..d49d3a0 100644
--- a/kweather/kcmweather.cpp
+++ b/kweather/kcmweather.cpp
@@ -43,14 +43,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_weather( TQWidget *tqparent, const char * )
+  KDE_EXPORT KCModule *create_weather( TQWidget *parent, const char * )
   {
-    return new KCMWeather( tqparent, "kweather" );
+    return new KCMWeather( parent, "kweather" );
   }
 }
 
-KCMWeather::KCMWeather( TQWidget *tqparent, const char *name )
-  : KCModule( tqparent, name )
+KCMWeather::KCMWeather( TQWidget *parent, const char *name )
+  : KCModule( parent, name )
 {
   mWeatherService = new WeatherService_stub( "KWeatherService",
       "WeatherService" );
diff --git a/kweather/kcmweather.h b/kweather/kcmweather.h
index 8a836f1..d5ef450 100644
--- a/kweather/kcmweather.h
+++ b/kweather/kcmweather.h
@@ -33,7 +33,7 @@ class KCMWeather : public KCModule
   TQ_OBJECT
 
   public:
-    KCMWeather( TQWidget *tqparent = 0, const char *name = 0 );
+    KCMWeather( TQWidget *parent = 0, const char *name = 0 );
     ~KCMWeather();
 
     virtual void load();
diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp
index 834d77a..db8325d 100644
--- a/kweather/kcmweatherservice.cpp
+++ b/kweather/kcmweatherservice.cpp
@@ -33,13 +33,13 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_weatherservice( TQWidget *tqparent, const char * ) {
-    return new KCMWeatherService( tqparent, "kweather" );
+  KDE_EXPORT KCModule *create_weatherservice( TQWidget *parent, const char * ) {
+    return new KCMWeatherService( parent, "kweather" );
   }
 }
 
-KCMWeatherService::KCMWeatherService( TQWidget *tqparent, const char *name )
-  : KCModule( tqparent, name )
+KCMWeatherService::KCMWeatherService( TQWidget *parent, const char *name )
+  : KCModule( parent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   mWidget = new ServiceConfigWidget( this );
diff --git a/kweather/kcmweatherservice.h b/kweather/kcmweatherservice.h
index bd5075e..cbd5949 100644
--- a/kweather/kcmweatherservice.h
+++ b/kweather/kcmweatherservice.h
@@ -34,7 +34,7 @@ class KCMWeatherService : public KCModule
   TQ_OBJECT
 
   public:
-    KCMWeatherService( TQWidget *tqparent = 0, const char *name = 0 );
+    KCMWeatherService( TQWidget *parent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index d65be55..9b8c481 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -40,18 +40,18 @@
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile)
+    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         KGlobal::locale()->insertCatalogue("kweather");
         kweather *theApplet = new kweather(configFile, KPanelApplet::Normal,
-                0, tqparent, "kweather");
+                0, parent, "kweather");
         return theApplet;
     }
 }
 
 kweather::kweather(const TQString& configFile, Type t, int actions,
-        TQWidget *tqparent, const char *name):
-        KPanelApplet(configFile, t, actions, tqparent, name), weatherIface(),
+        TQWidget *parent, const char *name):
+        KPanelApplet(configFile, t, actions, parent, name), weatherIface(),
         mFirstRun( false ), mReport( 0 ), mClient( 0 ),
         mContextMenu( 0 ), mWeatherService( 0 ), settingsDialog( 0 ), mTextColor(TQt::black)
 {
diff --git a/kweather/kweather.h b/kweather/kweather.h
index 70f0a44..79c1bfe 100644
--- a/kweather/kweather.h
+++ b/kweather/kweather.h
@@ -36,7 +36,7 @@ class kweather : public KPanelApplet, public weatherIface
   TQ_OBJECT
 
 public:
-    kweather(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *tqparent = 0, const char *name = 0);
+    kweather(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *parent = 0, const char *name = 0);
     ~kweather();
     void help();
     void resizeEvent(TQResizeEvent*);
diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp
index bba90cf..f25df19 100644
--- a/kweather/reportview.cpp
+++ b/kweather/reportview.cpp
@@ -55,7 +55,7 @@ reportView::reportView(const TQString &reportLocation)
 reportView::~reportView(){
     delete m_weatherService;
     // we do not have to delete m_reportView because this class is
-    // the tqparent of the TQVBox, and that is the tqparent of the KHTMLPart.
+    // the parent of the TQVBox, and that is the parent of the KHTMLPart.
 
     KConfig config( "weather_panelappletrc" );
     config.setGroup( "General Options" );
diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp
index 52f5e25..08a3b51 100644
--- a/kweather/serviceconfigwidget.cpp
+++ b/kweather/serviceconfigwidget.cpp
@@ -55,8 +55,8 @@ class StationItem : public TQListViewItem
 
 static void parseStationEntry( const TQString &line, TQString &name, TQString &uid );
 
-ServiceConfigWidget::ServiceConfigWidget( TQWidget *tqparent, const char *name )
-  : wsPrefs( tqparent, name ), mService(0)
+ServiceConfigWidget::ServiceConfigWidget( TQWidget *parent, const char *name )
+  : wsPrefs( parent, name ), mService(0)
 {
   mService = new WeatherService_stub( "KWeatherService", "WeatherService" );
   connect( mAllStations, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQT_SLOT( addStation() ) );
diff --git a/kweather/serviceconfigwidget.h b/kweather/serviceconfigwidget.h
index 3f65194..01625fe 100644
--- a/kweather/serviceconfigwidget.h
+++ b/kweather/serviceconfigwidget.h
@@ -31,7 +31,7 @@ class ServiceConfigWidget : public wsPrefs
   TQ_OBJECT
 
   public:
-    ServiceConfigWidget( TQWidget *tqparent, const char *name = 0 );
+    ServiceConfigWidget( TQWidget *parent, const char *name = 0 );
     virtual ~ServiceConfigWidget();
 
   signals:
diff --git a/kweather/sidebarwidget.cpp b/kweather/sidebarwidget.cpp
index 0ef9e30..0a7c080 100644
--- a/kweather/sidebarwidget.cpp
+++ b/kweather/sidebarwidget.cpp
@@ -22,8 +22,8 @@
  #include "sidebarwidget.h"  
  #include <tqscrollview.h>
    
-   sidebarwidget::sidebarwidget(TQWidget* tqparent, const char* name) :
-   	sidebarwidgetbase(tqparent,name)
+   sidebarwidget::sidebarwidget(TQWidget* parent, const char* name) :
+   	sidebarwidgetbase(parent,name)
    {
    	view = new TQVBox(reportGrid->viewport());
 	reportGrid->addChild(view);
diff --git a/kweather/sidebarwidget.h b/kweather/sidebarwidget.h
index c917452..383e145 100644
--- a/kweather/sidebarwidget.h
+++ b/kweather/sidebarwidget.h
@@ -31,7 +31,7 @@ class sidebarwidget : public sidebarwidgetbase
 Q_OBJECT
   TQ_OBJECT
 public:
-    sidebarwidget(TQWidget* tqparent, const char* name = 0);
+    sidebarwidget(TQWidget* parent, const char* name = 0);
     virtual ~sidebarwidget();
     void addWidget(TQWidget *w, const TQString &s);
     TQWidget *viewport();
diff --git a/kweather/sun.cpp b/kweather/sun.cpp
index 43809cb..8cabdb9 100644
--- a/kweather/sun.cpp
+++ b/kweather/sun.cpp
@@ -282,7 +282,7 @@ static int __sunriset__( int year, int month, int day, double lon, double lat,
       double  sr;         /* Solar distance, astronomical units */
       double  sRA;        /* Sun's Right Ascension */
       double  sdec;       /* Sun's declination */
-      double  sradius;    /* Sun's aptqparent radius */
+      double  sradius;    /* Sun's apparent radius */
       double  t;          /* Diurnal arc */
       double  tsouth;     /* Time when Sun is at south */
       double  sidtime;    /* Local sidereal time */
@@ -303,7 +303,7 @@ static int __sunriset__( int year, int month, int day, double lon, double lat,
       /* Compute time when Sun is at south - in hours UT */
       tsouth = 12.0 - rev180(sidtime - sRA) / 15.0;
 
-      /* Compute the Sun's aptqparent radius, degrees */
+      /* Compute the Sun's apparent radius, degrees */
       sradius = 0.2666 / sr;
 
       /* Do correction to upper limb, if necessary */
diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp
index 540e912..c77333d 100644
--- a/kweather/weatherbar.cpp
+++ b/kweather/weatherbar.cpp
@@ -36,11 +36,11 @@
 #include <dcopref.h>
 
 
-KonqSidebarWeather::KonqSidebarWeather(KInstance* inst, TQObject* tqparent,
+KonqSidebarWeather::KonqSidebarWeather(KInstance* inst, TQObject* parent,
                                          TQWidget* widgetParent,
                                          TQString& desktopName, const char* name)
 
-    : KonqSidebarPlugin(inst, tqparent, widgetParent, desktopName, name),
+    : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name),
     DCOPObject(name)
 {
 
diff --git a/kweather/weatherbar.h b/kweather/weatherbar.h
index cd8cb47..0d00c13 100644
--- a/kweather/weatherbar.h
+++ b/kweather/weatherbar.h
@@ -40,7 +40,7 @@ class KonqSidebarWeather: public KonqSidebarPlugin, virtual public DCOPObject
   TQ_OBJECT
     K_DCOP
 public:
-    KonqSidebarWeather(KInstance* inst, TQObject* tqparent, TQWidget* widgetParent,
+    KonqSidebarWeather(KInstance* inst, TQObject* parent, TQWidget* widgetParent,
                         TQString& desktopName_, const char* name = 0);
 
     ~KonqSidebarWeather();
diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp
index cc3c145..ceb4360 100644
--- a/kweather/weatherbutton.cpp
+++ b/kweather/weatherbutton.cpp
@@ -29,8 +29,8 @@
 #include <kipc.h>
 #include <kstandarddirs.h>
 
-WeatherButton::WeatherButton( TQWidget *tqparent, const char *name )
-    : TQButton( tqparent, name ), m_highlight( false )
+WeatherButton::WeatherButton( TQWidget *parent, const char *name )
+    : TQButton( parent, name ), m_highlight( false )
 {
     setBackgroundOrigin( AncestorOrigin );
 
diff --git a/kweather/weatherbutton.h b/kweather/weatherbutton.h
index fd060fe..4f1eb52 100644
--- a/kweather/weatherbutton.h
+++ b/kweather/weatherbutton.h
@@ -29,7 +29,7 @@ class WeatherButton : public TQButton
   TQ_OBJECT
 
   public:
-    WeatherButton( TQWidget *tqparent, const char *name );
+    WeatherButton( TQWidget *parent, const char *name );
     void setPixmap( const TQPixmap &pix );
 
   protected:
diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp
index 1fee670..40eab31 100644
--- a/kweather/weatherlib.cpp
+++ b/kweather/weatherlib.cpp
@@ -77,8 +77,8 @@ void WeatherLib::Data::clear()
 	}
 }
 
-WeatherLib::WeatherLib(StationDatabase *stationDB, TQObject *tqparent, const char *name)
-	: TQObject (tqparent, name)
+WeatherLib::WeatherLib(StationDatabase *stationDB, TQObject *parent, const char *name)
+	: TQObject (parent, name)
 {
 	KGlobal::locale()->insertCatalogue("kweather");
 	
diff --git a/kweather/weatherlib.h b/kweather/weatherlib.h
index b745b26..88957c0 100644
--- a/kweather/weatherlib.h
+++ b/kweather/weatherlib.h
@@ -37,7 +37,7 @@ class WeatherLib : public TQObject
 	public:
 		class Data;
 
-		WeatherLib(StationDatabase *stationDB, TQObject *tqparent =0L, const char *name =0L);
+		WeatherLib(StationDatabase *stationDB, TQObject *parent =0L, const char *name =0L);
 		virtual ~WeatherLib();
 
 		TQString temperature(const TQString &stationID);
diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp
index c45315f..da179b6 100644
--- a/kweather/weatherservice.cpp
+++ b/kweather/weatherservice.cpp
@@ -31,7 +31,7 @@
 #include "stationdatabase.h"
 #include "sun.h"
 
-WeatherService::WeatherService(TQObject *tqparent, const char *name) : TQObject (tqparent, name),  DCOPObject("WeatherService")
+WeatherService::WeatherService(TQObject *parent, const char *name) : TQObject (parent, name),  DCOPObject("WeatherService")
 {
 	kdDebug(12006) << "Starting new service... " << endl;
 
diff --git a/kweather/weatherservice.h b/kweather/weatherservice.h
index 81235cd..deae981 100644
--- a/kweather/weatherservice.h
+++ b/kweather/weatherservice.h
@@ -44,7 +44,7 @@ class WeatherService : public TQObject, public DCOPObject
 		void slotStationRemoved(const TQString &stationID);
 
 	public:
-		WeatherService(TQObject *tqparent, const char *name);
+		WeatherService(TQObject *parent, const char *name);
 		~WeatherService();
 
 	k_dcop_signals:
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);