From a13e26c2f1eb3c5be81acf4f571dd4bafac10199 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 10 Aug 2011 22:19:39 +0000
Subject: rename the following methods: tqparent parent tqmask mask

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kbattleship/kbattleship/kbattlefield.cpp             | 10 +++++-----
 kbattleship/kbattleship/kbattlefield.h               |  2 +-
 kbattleship/kbattleship/kbattleshipview.cpp          |  4 ++--
 kbattleship/kbattleship/kbattleshipview.h            |  2 +-
 kbattleship/kbattleship/kbchooserstrategy.cpp        |  2 +-
 kbattleship/kbattleship/kbchooserstrategy.h          |  2 +-
 kbattleship/kbattleship/kbdestroyshipstrategy.cpp    |  2 +-
 kbattleship/kbattleship/kbdestroyshipstrategy.h      |  2 +-
 kbattleship/kbattleship/kbdiagonalshotstrategy.cpp   |  2 +-
 kbattleship/kbattleship/kbdiagonalshotstrategy.h     |  2 +-
 kbattleship/kbattleship/kbdiagonalwrapstrategy.cpp   |  4 ++--
 kbattleship/kbattleship/kbdiagonalwrapstrategy.h     |  2 +-
 kbattleship/kbattleship/kbhorizontalstepstrategy.cpp |  4 ++--
 kbattleship/kbattleship/kbhorizontalstepstrategy.h   |  2 +-
 kbattleship/kbattleship/kbrandomshotstrategy.cpp     |  2 +-
 kbattleship/kbattleship/kbrandomshotstrategy.h       |  2 +-
 kbattleship/kbattleship/kbstrategy.cpp               |  4 ++--
 kbattleship/kbattleship/kbstrategy.h                 |  2 +-
 kbattleship/kbattleship/kbverticalstepstrategy.cpp   |  4 ++--
 kbattleship/kbattleship/kbverticalstepstrategy.h     |  2 +-
 kbattleship/kbattleship/kchatwidget.cpp              |  2 +-
 kbattleship/kbattleship/kchatwidget.h                |  2 +-
 kbattleship/kbattleship/kclientdialog.cpp            |  4 ++--
 kbattleship/kbattleship/kclientdialog.h              |  2 +-
 kbattleship/kbattleship/kgridwidget.cpp              |  6 +++---
 kbattleship/kbattleship/kgridwidget.h                |  2 +-
 kbattleship/kbattleship/konnectionhandling.cpp       |  4 ++--
 kbattleship/kbattleship/konnectionhandling.h         |  4 ++--
 kbattleship/kbattleship/kserverdialog.cpp            |  4 ++--
 kbattleship/kbattleship/kserverdialog.h              |  2 +-
 kbattleship/kbattleship/kstatdialog.cpp              |  2 +-
 kbattleship/kbattleship/kstatdialog.h                |  2 +-
 32 files changed, 47 insertions(+), 47 deletions(-)

(limited to 'kbattleship')

diff --git a/kbattleship/kbattleship/kbattlefield.cpp b/kbattleship/kbattleship/kbattlefield.cpp
index bb6cbd5a..dc567d2b 100644
--- a/kbattleship/kbattleship/kbattlefield.cpp
+++ b/kbattleship/kbattleship/kbattlefield.cpp
@@ -20,10 +20,10 @@
 
 #include "kbattlefield.h"
 
-KBattleField::KBattleField(TQWidget *tqparent, bool grid) : KGridWidget(tqparent, grid)
+KBattleField::KBattleField(TQWidget *parent, bool grid) : KGridWidget(parent, grid)
 {
-	m_parent = tqparent;
-	m_width = tqparent->width();
+	m_parent = parent;
+	m_width = parent->width();
 	m_canDraw = true;
 
 	m_ownfieldx = 10;
@@ -91,7 +91,7 @@ void KBattleField::drawOwnField()
 	if(!m_canDraw)
 		return;
 
-	KBattleshipWindow *window = static_cast<KBattleshipWindow *>(TQT_TQWIDGET(m_parent->tqparent()->tqparent()));
+	KBattleshipWindow *window = static_cast<KBattleshipWindow *>(TQT_TQWIDGET(m_parent->parent()->parent()));
 	KShip *ship = 0;
 	int data;
 
@@ -151,7 +151,7 @@ void KBattleField::drawEnemyField()
 	if(!m_canDraw)
 		return;
 
-	KBattleshipWindow *window = static_cast<KBattleshipWindow *>(TQT_TQWIDGET(m_parent->tqparent()->tqparent()));
+	KBattleshipWindow *window = static_cast<KBattleshipWindow *>(TQT_TQWIDGET(m_parent->parent()->parent()));
 
 	for(int i = 0; i != m_enemyfieldx; i++)
 	{
diff --git a/kbattleship/kbattleship/kbattlefield.h b/kbattleship/kbattleship/kbattlefield.h
index 51c62198..94bcf3f5 100644
--- a/kbattleship/kbattleship/kbattlefield.h
+++ b/kbattleship/kbattleship/kbattlefield.h
@@ -27,7 +27,7 @@ class KBattleField : public KGridWidget
 {
 public:
 	enum{FREE, WATER, HIT, DEATH, BORDER, SHIP1P1, SHIP2P1, SHIP2P2, SHIP3P1, SHIP3P2, SHIP3P3, SHIP4P1, SHIP4P2, SHIP4P3, SHIP4P4};
-	KBattleField(TQWidget *tqparent, bool grid);
+	KBattleField(TQWidget *parent, bool grid);
 
 	void clearOwnField();
 	void clearEnemyField();
diff --git a/kbattleship/kbattleship/kbattleshipview.cpp b/kbattleship/kbattleship/kbattleshipview.cpp
index 2c4bb1ca..3e70a2a4 100644
--- a/kbattleship/kbattleship/kbattleshipview.cpp
+++ b/kbattleship/kbattleship/kbattleshipview.cpp
@@ -22,8 +22,8 @@
 #include "kbattleship.h"
 #include "kbattleshipview.moc"
 
-KBattleshipView::KBattleshipView(TQWidget *tqparent, const char *name, bool draw) 
-	: TQWidget(tqparent, name, WResizeNoErase), m_drawGrid(draw)
+KBattleshipView::KBattleshipView(TQWidget *parent, const char *name, bool draw) 
+	: TQWidget(parent, name, WResizeNoErase), m_drawGrid(draw)
 {
 	setFixedSize(20 * 32 + 30, 10 * 32 + 20);
 	setBackgroundMode(NoBackground);
diff --git a/kbattleship/kbattleship/kbattleshipview.h b/kbattleship/kbattleship/kbattleshipview.h
index 7e65b9f3..3e1cf83f 100644
--- a/kbattleship/kbattleship/kbattleshipview.h
+++ b/kbattleship/kbattleship/kbattleshipview.h
@@ -35,7 +35,7 @@ class KBattleshipView : public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KBattleshipView(TQWidget *tqparent = 0, const char *name = 0, bool draw = false);
+	KBattleshipView(TQWidget *parent = 0, const char *name = 0, bool draw = false);
 	~KBattleshipView();
 
 	KBattleField *field() { return m_battlefield; }
diff --git a/kbattleship/kbattleship/kbchooserstrategy.cpp b/kbattleship/kbattleship/kbchooserstrategy.cpp
index fc832086..6473e73b 100644
--- a/kbattleship/kbattleship/kbchooserstrategy.cpp
+++ b/kbattleship/kbattleship/kbchooserstrategy.cpp
@@ -25,7 +25,7 @@
 
 #define MAX_CHILD_NUM 4
 
-KBChooserStrategy::KBChooserStrategy(KBStrategy *tqparent) : KBStrategy(tqparent)
+KBChooserStrategy::KBChooserStrategy(KBStrategy *parent) : KBStrategy(parent)
 {
 	m_destroyer = new KBDestroyShipStrategy(this);
 	m_destroying = false;
diff --git a/kbattleship/kbattleship/kbchooserstrategy.h b/kbattleship/kbattleship/kbchooserstrategy.h
index c2df5103..5ac7d7c2 100644
--- a/kbattleship/kbattleship/kbchooserstrategy.h
+++ b/kbattleship/kbattleship/kbchooserstrategy.h
@@ -25,7 +25,7 @@
 class KBChooserStrategy : public KBStrategy
 {
 public: 
-	KBChooserStrategy(KBStrategy *tqparent = 0);
+	KBChooserStrategy(KBStrategy *parent = 0);
 	virtual ~KBChooserStrategy();
 
 	virtual void init(KBattleField *field, const TQRect &field_rect);
diff --git a/kbattleship/kbattleship/kbdestroyshipstrategy.cpp b/kbattleship/kbattleship/kbdestroyshipstrategy.cpp
index 528d18b2..a3882963 100644
--- a/kbattleship/kbattleship/kbdestroyshipstrategy.cpp
+++ b/kbattleship/kbattleship/kbdestroyshipstrategy.cpp
@@ -17,7 +17,7 @@
 
 #include "kbdestroyshipstrategy.h"
 
-KBDestroyShipStrategy::KBDestroyShipStrategy(KBStrategy *tqparent) : KBStrategy(tqparent)
+KBDestroyShipStrategy::KBDestroyShipStrategy(KBStrategy *parent) : KBStrategy(parent)
 {
 	m_working = false;
 }
diff --git a/kbattleship/kbattleship/kbdestroyshipstrategy.h b/kbattleship/kbattleship/kbdestroyshipstrategy.h
index c6e758a3..41503be1 100644
--- a/kbattleship/kbattleship/kbdestroyshipstrategy.h
+++ b/kbattleship/kbattleship/kbdestroyshipstrategy.h
@@ -23,7 +23,7 @@
 class KBDestroyShipStrategy : public KBStrategy
 {
 public:
-	KBDestroyShipStrategy(KBStrategy *tqparent = 0);
+	KBDestroyShipStrategy(KBStrategy *parent = 0);
 
 	virtual void init(KBattleField *field, const TQRect &field_rect);
 	virtual const TQPoint nextShot();
diff --git a/kbattleship/kbattleship/kbdiagonalshotstrategy.cpp b/kbattleship/kbattleship/kbdiagonalshotstrategy.cpp
index 0f5e6284..db83bc75 100644
--- a/kbattleship/kbattleship/kbdiagonalshotstrategy.cpp
+++ b/kbattleship/kbattleship/kbdiagonalshotstrategy.cpp
@@ -16,7 +16,7 @@
 
 #include "kbdiagonalshotstrategy.h"
 
-KBDiagonalShotStrategy::KBDiagonalShotStrategy(KBStrategy *tqparent) : KBStrategy(tqparent)
+KBDiagonalShotStrategy::KBDiagonalShotStrategy(KBStrategy *parent) : KBStrategy(parent)
 {
 	m_column = 0;
 	m_row = 0;
diff --git a/kbattleship/kbattleship/kbdiagonalshotstrategy.h b/kbattleship/kbattleship/kbdiagonalshotstrategy.h
index 47af1240..e328fad2 100644
--- a/kbattleship/kbattleship/kbdiagonalshotstrategy.h
+++ b/kbattleship/kbattleship/kbdiagonalshotstrategy.h
@@ -23,7 +23,7 @@ class KBDiagonalShotStrategy : public KBStrategy
 {
 public:
 	enum Direction {LEFTUP, LEFTDOWN, RIGHTUP, RIGHTDOWN};
-	KBDiagonalShotStrategy(KBStrategy *tqparent = 0);
+	KBDiagonalShotStrategy(KBStrategy *parent = 0);
 
 	virtual const TQPoint nextShot();
 	virtual bool hasMoreShots();
diff --git a/kbattleship/kbattleship/kbdiagonalwrapstrategy.cpp b/kbattleship/kbattleship/kbdiagonalwrapstrategy.cpp
index 7f0a305e..7055403b 100644
--- a/kbattleship/kbattleship/kbdiagonalwrapstrategy.cpp
+++ b/kbattleship/kbattleship/kbdiagonalwrapstrategy.cpp
@@ -17,11 +17,11 @@
 #include <krandomsequence.h>
 #include "kbdiagonalwrapstrategy.h"
 
-KBDiagonalWrapStrategy::KBDiagonalWrapStrategy(KBStrategy *tqparent) : KBStrategy(tqparent)
+KBDiagonalWrapStrategy::KBDiagonalWrapStrategy(KBStrategy *parent) : KBStrategy(parent)
 {
 	m_child = new KBDiagonalShotStrategy(this);
 
-	if(tqparent == 0)
+	if(parent == 0)
 	{
 		m_destroyer = new KBDestroyShipStrategy(this);
 		m_destroying = false;
diff --git a/kbattleship/kbattleship/kbdiagonalwrapstrategy.h b/kbattleship/kbattleship/kbdiagonalwrapstrategy.h
index 26c271d1..f4a7c28d 100644
--- a/kbattleship/kbattleship/kbdiagonalwrapstrategy.h
+++ b/kbattleship/kbattleship/kbdiagonalwrapstrategy.h
@@ -24,7 +24,7 @@
 class KBDiagonalWrapStrategy : public KBStrategy
 {
 public: 
-	KBDiagonalWrapStrategy(KBStrategy *tqparent = 0);
+	KBDiagonalWrapStrategy(KBStrategy *parent = 0);
 	virtual ~KBDiagonalWrapStrategy();
 
 	virtual void init(KBattleField *field, const TQRect &field_rect);
diff --git a/kbattleship/kbattleship/kbhorizontalstepstrategy.cpp b/kbattleship/kbattleship/kbhorizontalstepstrategy.cpp
index 63ee74fa..a6e931da 100644
--- a/kbattleship/kbattleship/kbhorizontalstepstrategy.cpp
+++ b/kbattleship/kbattleship/kbhorizontalstepstrategy.cpp
@@ -17,10 +17,10 @@
 #include <krandomsequence.h>
 #include "kbhorizontalstepstrategy.h"
 
-KBHorizontalStepStrategy::KBHorizontalStepStrategy(KBStrategy *tqparent) : KBStrategy(tqparent)
+KBHorizontalStepStrategy::KBHorizontalStepStrategy(KBStrategy *parent) : KBStrategy(parent)
 {
 	m_child = 0;
-	if(tqparent == 0) // only the master destroys ships
+	if(parent == 0) // only the master destroys ships
 	{
 		m_destroyer = new KBDestroyShipStrategy(this);
 		m_destroying = false;
diff --git a/kbattleship/kbattleship/kbhorizontalstepstrategy.h b/kbattleship/kbattleship/kbhorizontalstepstrategy.h
index 21bfac4e..80ec7b72 100644
--- a/kbattleship/kbattleship/kbhorizontalstepstrategy.h
+++ b/kbattleship/kbattleship/kbhorizontalstepstrategy.h
@@ -23,7 +23,7 @@
 class KBHorizontalStepStrategy : public KBStrategy
 {
 public: 
-	KBHorizontalStepStrategy(KBStrategy *tqparent = 0);
+	KBHorizontalStepStrategy(KBStrategy *parent = 0);
 	virtual ~KBHorizontalStepStrategy();
 
 	virtual void init(KBattleField *field, const TQRect &field_rect);
diff --git a/kbattleship/kbattleship/kbrandomshotstrategy.cpp b/kbattleship/kbattleship/kbrandomshotstrategy.cpp
index 901fbe75..62416350 100644
--- a/kbattleship/kbattleship/kbrandomshotstrategy.cpp
+++ b/kbattleship/kbattleship/kbrandomshotstrategy.cpp
@@ -16,7 +16,7 @@
 
 #include "kbrandomshotstrategy.h"
 
-KBRandomShotStrategy::KBRandomShotStrategy(KBStrategy *tqparent) : KBStrategy(tqparent)
+KBRandomShotStrategy::KBRandomShotStrategy(KBStrategy *parent) : KBStrategy(parent)
 {
 	m_destroyer = new KBDestroyShipStrategy(this);
 	m_destroying = false;
diff --git a/kbattleship/kbattleship/kbrandomshotstrategy.h b/kbattleship/kbattleship/kbrandomshotstrategy.h
index 79e15018..141961b9 100644
--- a/kbattleship/kbattleship/kbrandomshotstrategy.h
+++ b/kbattleship/kbattleship/kbrandomshotstrategy.h
@@ -25,7 +25,7 @@
 class KBRandomShotStrategy : public KBStrategy
 {
 public: 
-	KBRandomShotStrategy(KBStrategy *tqparent = 0);
+	KBRandomShotStrategy(KBStrategy *parent = 0);
 	virtual ~KBRandomShotStrategy();
 
 	virtual void init(KBattleField *field, const TQRect &field_rect);
diff --git a/kbattleship/kbattleship/kbstrategy.cpp b/kbattleship/kbattleship/kbstrategy.cpp
index e7ce823a..be445559 100644
--- a/kbattleship/kbattleship/kbstrategy.cpp
+++ b/kbattleship/kbattleship/kbstrategy.cpp
@@ -17,9 +17,9 @@
 
 #include "kbstrategy.h"
 
-KBStrategy::KBStrategy(KBStrategy *tqparent)
+KBStrategy::KBStrategy(KBStrategy *parent)
 {
-	m_parent = tqparent;
+	m_parent = parent;
 	m_viableShots = 0;
 }
 
diff --git a/kbattleship/kbattleship/kbstrategy.h b/kbattleship/kbattleship/kbstrategy.h
index 04ade696..9c4cdf15 100644
--- a/kbattleship/kbattleship/kbstrategy.h
+++ b/kbattleship/kbattleship/kbstrategy.h
@@ -26,7 +26,7 @@ class KBStrategy
 {
 public:
 	enum{FREE, SHOT, SHIP};
-	KBStrategy(KBStrategy *tqparent = 0);
+	KBStrategy(KBStrategy *parent = 0);
 	virtual ~KBStrategy();
 
 	virtual const TQPoint nextShot() = 0;
diff --git a/kbattleship/kbattleship/kbverticalstepstrategy.cpp b/kbattleship/kbattleship/kbverticalstepstrategy.cpp
index a9784463..7642ccaf 100644
--- a/kbattleship/kbattleship/kbverticalstepstrategy.cpp
+++ b/kbattleship/kbattleship/kbverticalstepstrategy.cpp
@@ -18,11 +18,11 @@
 #include <krandomsequence.h>
 #include "kbverticalstepstrategy.h"
 
-KBVerticalStepStrategy::KBVerticalStepStrategy(KBStrategy *tqparent) : KBStrategy(tqparent)
+KBVerticalStepStrategy::KBVerticalStepStrategy(KBStrategy *parent) : KBStrategy(parent)
 {
 	m_child = 0;
 
-	if(tqparent == 0) // only the master destroys ships
+	if(parent == 0) // only the master destroys ships
 	{
 		m_destroyer = new KBDestroyShipStrategy(this);
 		m_destroying = false;
diff --git a/kbattleship/kbattleship/kbverticalstepstrategy.h b/kbattleship/kbattleship/kbverticalstepstrategy.h
index 642210ca..a5d614c6 100644
--- a/kbattleship/kbattleship/kbverticalstepstrategy.h
+++ b/kbattleship/kbattleship/kbverticalstepstrategy.h
@@ -24,7 +24,7 @@
 class KBVerticalStepStrategy : public KBStrategy
 {
 public: 
-	KBVerticalStepStrategy(KBStrategy *tqparent = 0);
+	KBVerticalStepStrategy(KBStrategy *parent = 0);
 	virtual ~KBVerticalStepStrategy();
 
 	virtual void init(KBattleField *field, const TQRect &field_rect);
diff --git a/kbattleship/kbattleship/kchatwidget.cpp b/kbattleship/kbattleship/kchatwidget.cpp
index 1e9dd005..ef545cd2 100644
--- a/kbattleship/kbattleship/kchatwidget.cpp
+++ b/kbattleship/kbattleship/kchatwidget.cpp
@@ -18,7 +18,7 @@
 #include <kapplication.h>
 #include "kchatwidget.moc"
 
-KChatWidget::KChatWidget(TQWidget *tqparent, const char *name) : chatDlg(tqparent, name)
+KChatWidget::KChatWidget(TQWidget *parent, const char *name) : chatDlg(parent, name)
 {
 	connect(sendBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotComputeMessage()));
 	connect(commentEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotComputeMessage()));
diff --git a/kbattleship/kbattleship/kchatwidget.h b/kbattleship/kbattleship/kchatwidget.h
index 574e8648..1c75a497 100644
--- a/kbattleship/kbattleship/kchatwidget.h
+++ b/kbattleship/kbattleship/kchatwidget.h
@@ -29,7 +29,7 @@ class KChatWidget : public chatDlg
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KChatWidget(TQWidget *tqparent = 0, const char *name = 0);
+	KChatWidget(TQWidget *parent = 0, const char *name = 0);
 
 	void clear();
 	void setNickname(const TQString &nickname) { m_currentNickname = nickname; }
diff --git a/kbattleship/kbattleship/kclientdialog.cpp b/kbattleship/kbattleship/kclientdialog.cpp
index 37cd7fe7..f52e9472 100644
--- a/kbattleship/kbattleship/kclientdialog.cpp
+++ b/kbattleship/kbattleship/kclientdialog.cpp
@@ -25,8 +25,8 @@
 #include "kbattleshipserver.h" // for BATTLESHIP_SERVICE
 #include "kclientdialog.moc"
 
-KClientDialog::KClientDialog(TQWidget *tqparent, const char *name) 
- : KDialogBase(Plain, i18n("Connect to Server"), Ok|Cancel, Ok, tqparent, name, true, false, KGuiItem(i18n("&Connect")))
+KClientDialog::KClientDialog(TQWidget *parent, const char *name) 
+ : KDialogBase(Plain, i18n("Connect to Server"), Ok|Cancel, Ok, parent, name, true, false, KGuiItem(i18n("&Connect")))
 {
 	TQFrame* page = plainPage();
 	TQGridLayout* pageLayout = new TQGridLayout(page, 1, 1, 0, 0);
diff --git a/kbattleship/kbattleship/kclientdialog.h b/kbattleship/kbattleship/kclientdialog.h
index f46018ab..b128d8be 100644
--- a/kbattleship/kbattleship/kclientdialog.h
+++ b/kbattleship/kbattleship/kclientdialog.h
@@ -34,7 +34,7 @@ class KClientDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KClientDialog(TQWidget *tqparent = 0, const char *name = 0);
+	KClientDialog(TQWidget *parent = 0, const char *name = 0);
 	~KClientDialog();
 
 	TQString port() const;
diff --git a/kbattleship/kbattleship/kgridwidget.cpp b/kbattleship/kbattleship/kgridwidget.cpp
index cb6e573e..b848484b 100644
--- a/kbattleship/kbattleship/kgridwidget.cpp
+++ b/kbattleship/kbattleship/kgridwidget.cpp
@@ -26,10 +26,10 @@
 #include "kbattlefield.h"
 #include "kgridwidget.h"
 
-KGridWidget::KGridWidget(TQWidget *tqparent, bool draw) : m_drawGrid(draw)
+KGridWidget::KGridWidget(TQWidget *parent, bool draw) : m_drawGrid(draw)
 {
-	m_doubleBuffer = new TQPixmap(tqparent->width(), tqparent->height());
-	m_parent = tqparent;
+	m_doubleBuffer = new TQPixmap(parent->width(), parent->height());
+	m_parent = parent;
 
 	cleanBuffer();
 	cacheImages();
diff --git a/kbattleship/kbattleship/kgridwidget.h b/kbattleship/kbattleship/kgridwidget.h
index 96ecde3a..1026695b 100644
--- a/kbattleship/kbattleship/kgridwidget.h
+++ b/kbattleship/kbattleship/kgridwidget.h
@@ -23,7 +23,7 @@
 class KGridWidget
 {
 public:
-	KGridWidget(TQWidget *tqparent, bool draw);
+	KGridWidget(TQWidget *parent, bool draw);
 	~KGridWidget();
 
 	void enableGrid() { m_drawGrid = true; }
diff --git a/kbattleship/kbattleship/konnectionhandling.cpp b/kbattleship/kbattleship/konnectionhandling.cpp
index dc1a5880..45a2a452 100644
--- a/kbattleship/kbattleship/konnectionhandling.cpp
+++ b/kbattleship/kbattleship/konnectionhandling.cpp
@@ -19,7 +19,7 @@
 
 extern const char *protocolVersion;
 
-KonnectionHandling::KonnectionHandling(TQWidget *tqparent, KBattleshipServer *server) : TQObject(tqparent)
+KonnectionHandling::KonnectionHandling(TQWidget *parent, KBattleshipServer *server) : TQObject(parent)
 {
 	m_kbserver = server;
 	m_kbclient = 0;
@@ -31,7 +31,7 @@ KonnectionHandling::KonnectionHandling(TQWidget *tqparent, KBattleshipServer *se
 	connect(server, TQT_SIGNAL(sigMessageSent(KMessage *)), this, TQT_SLOT(slotMessageSent(KMessage *)));
 }
 
-KonnectionHandling::KonnectionHandling(TQWidget *tqparent, KBattleshipClient *client) : TQObject(tqparent)
+KonnectionHandling::KonnectionHandling(TQWidget *parent, KBattleshipClient *client) : TQObject(parent)
 {
 	m_kbclient = client;
 	m_kbserver = 0;
diff --git a/kbattleship/kbattleship/konnectionhandling.h b/kbattleship/kbattleship/konnectionhandling.h
index 598225c5..941f1384 100644
--- a/kbattleship/kbattleship/konnectionhandling.h
+++ b/kbattleship/kbattleship/konnectionhandling.h
@@ -33,8 +33,8 @@ class KonnectionHandling : public TQObject
   TQ_OBJECT
 public:
 	enum{SERVER, CLIENT};
-	KonnectionHandling(TQWidget *tqparent, KBattleshipServer *server);
-	KonnectionHandling(TQWidget *tqparent, KBattleshipClient *client);
+	KonnectionHandling(TQWidget *parent, KBattleshipServer *server);
+	KonnectionHandling(TQWidget *parent, KBattleshipClient *client);
 
 	int type() { return m_type; }
 
diff --git a/kbattleship/kbattleship/kserverdialog.cpp b/kbattleship/kbattleship/kserverdialog.cpp
index 2574757f..d8fa1b1d 100644
--- a/kbattleship/kbattleship/kserverdialog.cpp
+++ b/kbattleship/kbattleship/kserverdialog.cpp
@@ -21,8 +21,8 @@
 
 #include "kserverdialog.h"
 
-KServerDialog::KServerDialog(TQWidget *tqparent, const char *name) : 
-	KDialogBase(Plain, i18n("Start Server"), Ok|Cancel, Ok, tqparent, name, true, false, KGuiItem(i18n("&Start")))
+KServerDialog::KServerDialog(TQWidget *parent, const char *name) : 
+	KDialogBase(Plain, i18n("Start Server"), Ok|Cancel, Ok, parent, name, true, false, KGuiItem(i18n("&Start")))
 {
 	TQFrame* page = plainPage();
 	TQGridLayout* pageLayout = new TQGridLayout(page, 1, 1, 0, 0);
diff --git a/kbattleship/kbattleship/kserverdialog.h b/kbattleship/kbattleship/kserverdialog.h
index ad7cc499..c6a85aa2 100644
--- a/kbattleship/kbattleship/kserverdialog.h
+++ b/kbattleship/kbattleship/kserverdialog.h
@@ -33,7 +33,7 @@ class KServerDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KServerDialog(TQWidget *tqparent = 0, const char *name = 0);
+	KServerDialog(TQWidget *parent = 0, const char *name = 0);
 
 	TQString port() const;
 	TQString nickname() const;
diff --git a/kbattleship/kbattleship/kstatdialog.cpp b/kbattleship/kbattleship/kstatdialog.cpp
index 28b9c142..03bc7d41 100644
--- a/kbattleship/kbattleship/kstatdialog.cpp
+++ b/kbattleship/kbattleship/kstatdialog.cpp
@@ -19,7 +19,7 @@
 #include <tqlabel.h>
 #include "kstatdialog.moc"
 
-KStatDialog::KStatDialog(TQWidget *tqparent, const char *name) : statDlg(tqparent, name)
+KStatDialog::KStatDialog(TQWidget *parent, const char *name) : statDlg(parent, name)
 {
 }
 
diff --git a/kbattleship/kbattleship/kstatdialog.h b/kbattleship/kbattleship/kstatdialog.h
index 172b7e47..86f39012 100644
--- a/kbattleship/kbattleship/kstatdialog.h
+++ b/kbattleship/kbattleship/kstatdialog.h
@@ -25,7 +25,7 @@ class KStatDialog : public statDlg
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KStatDialog(TQWidget *tqparent = 0, const char *name = 0);
+	KStatDialog(TQWidget *parent = 0, const char *name = 0);
 
 	void setShot();
 	void setShot(int shot);
-- 
cgit v1.2.1