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

21 files changed, 54 insertions, 54 deletions

diff --git a/libksirtet/lib/defines.cpp b/libksirtet/lib/defines.cpp
index 3b3ec229..7eef441e 100644
--- a/libksirtet/lib/defines.cpp
+++ b/libksirtet/lib/defines.cpp
@@ -2,12 +2,12 @@
 
 #include <klocale.h>
 
-void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *tqparent)
+void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *parent)
 {
     TQString str;
     if ( msg2.isNull() ) str = msg1;
     else str = i18n("%1:\n%2").tqarg(msg1).tqarg(msg2);
-    KMessageBox::error(tqparent, str);
+    KMessageBox::error(parent, str);
 }
 
 TQString socketError(const KExtendedSocket *socket)
@@ -16,9 +16,9 @@ TQString socketError(const KExtendedSocket *socket)
 }
 
 bool checkSocket(int res, const KExtendedSocket *socket,
-                 const TQString &msg, TQWidget *tqparent)
+                 const TQString &msg, TQWidget *parent)
 {
     if ( res==0 ) return false;
-    errorBox(msg, socketError(socket), tqparent);
+    errorBox(msg, socketError(socket), parent);
     return true;
 }
diff --git a/libksirtet/lib/defines.h b/libksirtet/lib/defines.h
index db936b10..a6728a38 100644
--- a/libksirtet/lib/defines.h
+++ b/libksirtet/lib/defines.h
@@ -16,10 +16,10 @@
 #define MP_SERVER_ADDRESS "Server address"
 #define MP_PORT           "Port"
 
-void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *tqparent);
+void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *parent);
 TQString socketError(const KExtendedSocket *socket);
 bool checkSocket(int res, const KExtendedSocket *,
-                 const TQString &msg, TQWidget *tqparent);
+                 const TQString &msg, TQWidget *parent);
 
 #define R_ERROR_BOX(msg1, msg2) { \
     errorBox(msg1, msg2, this); \
diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp
index 48dbb025..599f7372 100644
--- a/libksirtet/lib/keys.cpp
+++ b/libksirtet/lib/keys.cpp
@@ -7,8 +7,8 @@
 
 
 KeyData::KeyData(uint maxNb, uint nbActions, const ActionData *data,
-                 TQObject *tqparent)
-    : TQObject(tqparent), _maxNb(maxNb)
+                 TQObject *parent)
+    : TQObject(parent), _maxNb(maxNb)
 {
     _data.duplicate(data, nbActions);
 
diff --git a/libksirtet/lib/keys.h b/libksirtet/lib/keys.h
index 16e25118..a5227a9b 100644
--- a/libksirtet/lib/keys.h
+++ b/libksirtet/lib/keys.h
@@ -13,7 +13,7 @@ class KeyData : public TQObject
   TQ_OBJECT
  public:
     KeyData(uint maxNb, uint nbActions, const ActionData *,
-            TQObject *tqparent);
+            TQObject *parent);
     void setKeycodes(uint nb, uint i, const int *keycodes);
 
     void setCurrentNb(uint nb);
diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp
index d9b3028a..5e0e679f 100644
--- a/libksirtet/lib/meeting.cpp
+++ b/libksirtet/lib/meeting.cpp
@@ -14,10 +14,10 @@
 
 NetMeeting::NetMeeting(const cId &_id, Socket *socket,
                        MPOptionWidget *option,
-					   bool _server, TQWidget *tqparent, const char * name)
+					   bool _server, TQWidget *parent, const char * name)
 : KDialogBase(Plain, i18n("Network Meeting"),
 			  (_server ? Ok|Cancel|Help : Cancel|Help),
-			  (_server ? Ok : Cancel), tqparent, name),
+			  (_server ? Ok : Cancel), parent, name),
   server(_server), ow(option), id(_id), socketRemoved(FALSE)
 {
 	sm.append(socket, SocketManager::ReadWrite);
@@ -213,8 +213,8 @@ void NetMeeting::message(const TQString &str)
 /** ServerNetMeeting *********************************************************/
 ServerNetMeeting::ServerNetMeeting(const cId &id,
 	const RemoteHostData &r, MPOptionWidget *option,
-	TQPtrList<RemoteHostData> &arhd, TQWidget *tqparent, const char * name)
-: NetMeeting(id, r.socket, option, TRUE, tqparent, name), rhd(arhd)
+	TQPtrList<RemoteHostData> &arhd, TQWidget *parent, const char * name)
+: NetMeeting(id, r.socket, option, TRUE, parent, name), rhd(arhd)
 {
 	connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)), TQT_SLOT(newHost(int)));
 	players.append(Accepted); // server
@@ -448,8 +448,8 @@ void ServerNetMeeting::optionsChanged()
 /** ClientNetMeeting *********************************************************/
 ClientNetMeeting::ClientNetMeeting(const cId &id,
 		const RemoteHostData &rhd, MPOptionWidget *option,
-	    TQWidget *tqparent, const char * name)
-: NetMeeting(id, rhd.socket, option, FALSE, tqparent, name), bds(rhd.bds)
+	    TQWidget *parent, const char * name)
+: NetMeeting(id, rhd.socket, option, FALSE, parent, name), bds(rhd.bds)
 {
 	connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)),
 			TQT_SLOT(readNotifier(int)));
diff --git a/libksirtet/lib/meeting.h b/libksirtet/lib/meeting.h
index cc8356fc..a1cdc8e0 100644
--- a/libksirtet/lib/meeting.h
+++ b/libksirtet/lib/meeting.h
@@ -19,7 +19,7 @@ class NetMeeting : public KDialogBase
 	// "gameName" and "gameId" are TQByteArray because they are
     // used for ID comparing between games.
 	NetMeeting(const cId &id, Socket *, MPOptionWidget *option, bool server,
-               TQWidget *tqparent = 0, const char * name = 0);
+               TQWidget *parent = 0, const char * name = 0);
 	virtual ~NetMeeting();
 
  protected slots:
@@ -84,7 +84,7 @@ class ServerNetMeeting : public NetMeeting
      ServerNetMeeting(const cId &id,
 					  const RemoteHostData &rhd, MPOptionWidget *options,
 					  TQPtrList<RemoteHostData> &arhd,
-					  TQWidget *tqparent = 0, const char * name = 0);
+					  TQWidget *parent = 0, const char * name = 0);
 
  private slots:
 	void newHost(int);
@@ -115,7 +115,7 @@ class ClientNetMeeting : public NetMeeting
  public:
 	ClientNetMeeting(const cId &id,
 					 const RemoteHostData &rhd, MPOptionWidget *options,
-					 TQWidget *tqparent = 0, const char * name = 0);
+					 TQWidget *parent = 0, const char * name = 0);
 
  private slots:
 	void textChanged(const TQString &text);
diff --git a/libksirtet/lib/miscui.cpp b/libksirtet/lib/miscui.cpp
index 7bc8e48b..dde70adb 100644
--- a/libksirtet/lib/miscui.cpp
+++ b/libksirtet/lib/miscui.cpp
@@ -8,8 +8,8 @@
 
 //-----------------------------------------------------------------------------
 MeetingCheckBox::MeetingCheckBox(Type type, bool owner, bool server,
-                                 TQWidget *tqparent)
-    : TQWidget(tqparent, "meeting_check_box")
+                                 TQWidget *parent)
+    : TQWidget(parent, "meeting_check_box")
 {
     TQVBoxLayout *vbox = new TQVBoxLayout(this);
 
@@ -46,8 +46,8 @@ void MeetingCheckBox::changedSlot()
 
 //-----------------------------------------------------------------------------
 PlayerComboBox::PlayerComboBox(Type type, bool canBeEmpty, bool acceptAI,
-                               TQWidget *tqparent)
-    : TQComboBox(tqparent, "player_combo_box")
+                               TQWidget *parent)
+    : TQComboBox(parent, "player_combo_box")
 {
     insertItem(i18n("Human"));
     if (acceptAI) insertItem(i18n("AI"));
diff --git a/libksirtet/lib/miscui.h b/libksirtet/lib/miscui.h
index 3bc7fd32..d8d67002 100644
--- a/libksirtet/lib/miscui.h
+++ b/libksirtet/lib/miscui.h
@@ -12,7 +12,7 @@ class MeetingCheckBox : public TQWidget
   TQ_OBJECT
  public:
 	enum Type { Ready, NotReady, Excluded };
-	MeetingCheckBox(Type, bool owner, bool server, TQWidget *tqparent);
+	MeetingCheckBox(Type, bool owner, bool server, TQWidget *parent);
 
     void setType(Type);
 	Type type() const;
@@ -34,7 +34,7 @@ class PlayerComboBox : public TQComboBox
   TQ_OBJECT
  public:
 	enum Type { Human = 0, AI, None };
-	PlayerComboBox(Type, bool canBeNone, bool acceptAI, TQWidget *tqparent);
+	PlayerComboBox(Type, bool canBeNone, bool acceptAI, TQWidget *parent);
 
 	Type type() const { return (Type)currentItem(); }
 
diff --git a/libksirtet/lib/mp_board.h b/libksirtet/lib/mp_board.h
index 2578e927..3f7e7212 100644
--- a/libksirtet/lib/mp_board.h
+++ b/libksirtet/lib/mp_board.h
@@ -13,8 +13,8 @@ class MPBoard : public TQWidget
   TQ_OBJECT
 
  public:
-    MPBoard(TQWidget *tqparent, const char *name=0)
-	: TQWidget(tqparent, name) {}
+    MPBoard(TQWidget *parent, const char *name=0)
+	: TQWidget(parent, name) {}
 	virtual ~MPBoard() {}
 
 	/**
diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp
index 6683ba00..e28ebdf8 100644
--- a/libksirtet/lib/mp_interface.cpp
+++ b/libksirtet/lib/mp_interface.cpp
@@ -21,8 +21,8 @@
 /*****************************************************************************/
 MPInterface::MPInterface(const MPGameInfo &_gameInfo,
                          uint nbActions, const ActionData *data,
-						 TQWidget *tqparent, const char *name)
-: TQWidget(tqparent, name), internal(0), gameInfo(_gameInfo), nbLocalHumans(0)
+						 TQWidget *parent, const char *name)
+: TQWidget(parent, name), internal(0), gameInfo(_gameInfo), nbLocalHumans(0)
 {
 	Q_ASSERT( gameInfo.maxNbLocalPlayers>=1 );
 
diff --git a/libksirtet/lib/mp_interface.h b/libksirtet/lib/mp_interface.h
index ea70736f..1beaa442 100644
--- a/libksirtet/lib/mp_interface.h
+++ b/libksirtet/lib/mp_interface.h
@@ -83,7 +83,7 @@ class MPInterface : public TQWidget
      */
     MPInterface(const MPGameInfo &gameInfo,
                 uint nbActions, const ActionData *data,
-				TQWidget *tqparent = 0, const char *name = 0);
+				TQWidget *parent = 0, const char *name = 0);
 	virtual ~MPInterface();
 
  public slots:
diff --git a/libksirtet/lib/mp_option.h b/libksirtet/lib/mp_option.h
index 3d7468b5..bca42bfa 100644
--- a/libksirtet/lib/mp_option.h
+++ b/libksirtet/lib/mp_option.h
@@ -38,8 +38,8 @@ class MPOptionWidget : public TQWidget
   TQ_OBJECT
 		
  public:
-	MPOptionWidget(bool Server, TQWidget *tqparent = 0, const char *name = 0)
-	: TQWidget(tqparent, name), server(Server) {}
+	MPOptionWidget(bool Server, TQWidget *parent = 0, const char *name = 0)
+	: TQWidget(parent, name), server(Server) {}
 	virtual ~MPOptionWidget() {}
 
 	bool isServer() const { return server; }
diff --git a/libksirtet/lib/mp_simple_board.h b/libksirtet/lib/mp_simple_board.h
index 24a7654f..f01291f0 100644
--- a/libksirtet/lib/mp_simple_board.h
+++ b/libksirtet/lib/mp_simple_board.h
@@ -12,8 +12,8 @@ class KDE_EXPORT MPSimpleBoard : public MPBoard
   TQ_OBJECT
 		
  public:
-    MPSimpleBoard(TQWidget *tqparent = 0, const char *name = 0)
-	: MPBoard(tqparent, name) {}
+    MPSimpleBoard(TQWidget *parent = 0, const char *name = 0)
+	: MPBoard(parent, name) {}
 	virtual ~MPSimpleBoard() {}
 
 	void init(bool AI, bool multiplayers, bool server, bool first,
diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp
index e863b069..17515fb0 100644
--- a/libksirtet/lib/mp_simple_interface.cpp
+++ b/libksirtet/lib/mp_simple_interface.cpp
@@ -13,8 +13,8 @@
 
 MPSimpleInterface::MPSimpleInterface(const MPGameInfo &gi,
                                      uint nbActions, const ActionData *data,
-									 TQWidget *tqparent, const char *name)
-: MPInterface(gi, nbActions, data, tqparent, name), state(SS_Standby)
+									 TQWidget *parent, const char *name)
+: MPInterface(gi, nbActions, data, parent, name), state(SS_Standby)
 {}
 
 void MPSimpleInterface::init()
diff --git a/libksirtet/lib/mp_simple_interface.h b/libksirtet/lib/mp_simple_interface.h
index 04cb014c..fbe4ba1d 100644
--- a/libksirtet/lib/mp_simple_interface.h
+++ b/libksirtet/lib/mp_simple_interface.h
@@ -12,7 +12,7 @@ class MPSimpleInterface : public MPInterface
  public:
 	MPSimpleInterface(const MPGameInfo &gi,
                       uint nbActions, const ActionData *data,
-                      TQWidget *tqparent = 0, const char *name = 0);
+                      TQWidget *parent = 0, const char *name = 0);
 
     bool isPaused() const { return state==SS_Pause; }
 
diff --git a/libksirtet/lib/pline.cpp b/libksirtet/lib/pline.cpp
index 94e9c50e..3a63a0b0 100644
--- a/libksirtet/lib/pline.cpp
+++ b/libksirtet/lib/pline.cpp
@@ -9,8 +9,8 @@
 #define THIN_BORDER 4
 
 MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine,
-						 TQWidget *tqparent, const char *name)
-: TQFrame(tqparent, name)
+						 TQWidget *parent, const char *name)
+: TQFrame(parent, name)
 {
 	setFrameStyle(Panel | (serverLine ? Raised : Plain));
 
@@ -84,8 +84,8 @@ void MeetingLine::data(ExtData &ed) const
 PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt,
 					   bool humanSetting, bool AISetting,
 					   bool canBeEmpty, bool acceptAI,
-					   TQWidget *tqparent, const char *name)
-: TQFrame(tqparent, name), hs(humanSetting), as(AISetting)
+					   TQWidget *parent, const char *name)
+: TQFrame(parent, name), hs(humanSetting), as(AISetting)
 {
 	setFrameStyle(Panel | Raised);
 
@@ -128,8 +128,8 @@ void PlayerLine::setSlot()
 }
 
 /*****************************************************************************/
-GWidgetList::GWidgetList(uint interval, TQWidget *tqparent, const char * name)
-	: TQWidget(tqparent, name), vbl(this, interval)
+GWidgetList::GWidgetList(uint interval, TQWidget *parent, const char * name)
+	: TQWidget(parent, name), vbl(this, interval)
 {
 	widgets.setAutoDelete(TRUE);
 }
diff --git a/libksirtet/lib/pline.h b/libksirtet/lib/pline.h
index 9cef8d29..5bba6c4b 100644
--- a/libksirtet/lib/pline.h
+++ b/libksirtet/lib/pline.h
@@ -20,7 +20,7 @@ class MeetingLine : public TQFrame
 
  public:
     MeetingLine(bool isOwner, bool readerIsServer, bool serverLine,
-				TQWidget *tqparent, const char *name = 0);
+				TQWidget *parent, const char *name = 0);
 
 	MeetingCheckBox::Type type() const { return tcb->type(); }
 	void setType(MeetingCheckBox::Type type) { tcb->setType(type); }
@@ -58,7 +58,7 @@ class PlayerLine : public TQFrame
 	PlayerLine(PlayerComboBox::Type type, const TQString &txt,
 			   bool humanSetting, bool AISetting,
 			   bool canBeEmpty, bool acceptAI,
-			   TQWidget *tqparent = 0, const char *name = 0);
+			   TQWidget *parent = 0, const char *name = 0);
 
 	PlayerComboBox::Type type() const { return pcb->type(); }
 	TQString name() const { return edit->text(); }
@@ -86,13 +86,13 @@ class GWidgetList : public TQWidget
   TQ_OBJECT
 
  public:
-	GWidgetList(uint interval, TQWidget *tqparent = 0, const char * name = 0);
+	GWidgetList(uint interval, TQWidget *parent = 0, const char * name = 0);
 
 	void remove(uint i);
 	uint size() const { return widgets.count(); }
 
  protected:
-	/** The widget must be created with this widget as tqparent. */
+	/** The widget must be created with this widget as parent. */
 	void append(TQWidget *);
 	TQWidget *widget(uint i) { return widgets.at(i); }
 
@@ -105,8 +105,8 @@ template <class Type>
 class WidgetList : public GWidgetList
 {
  public:
-	WidgetList(uint interval, TQWidget *tqparent=0, const char *name=0)
-	: GWidgetList(interval, tqparent, name) {}
+	WidgetList(uint interval, TQWidget *parent=0, const char *name=0)
+	: GWidgetList(interval, parent, name) {}
 
 	void append(Type *w) { GWidgetList::append(w); }
 	Type *widget(uint i) { return (Type *)GWidgetList::widget(i); }
diff --git a/libksirtet/lib/socket.cpp b/libksirtet/lib/socket.cpp
index 7dd74f74..6defc94b 100644
--- a/libksirtet/lib/socket.cpp
+++ b/libksirtet/lib/socket.cpp
@@ -21,13 +21,13 @@
 #endif
 
 Socket::Socket(KExtendedSocket *s, bool createNotifier,
-               TQObject *tqparent, const char *name)
+               TQObject *parent, const char *name)
 : _socket(s), _notifier(0)
 {
     Q_ASSERT(s);
 	if (createNotifier) {
 		_notifier = new TQSocketNotifier(s->fd(), TQSocketNotifier::Read,
-                                        tqparent, name);
+                                        parent, name);
 		_notifier->setEnabled(FALSE);
 	}
 }
diff --git a/libksirtet/lib/socket.h b/libksirtet/lib/socket.h
index 75538670..01dac726 100644
--- a/libksirtet/lib/socket.h
+++ b/libksirtet/lib/socket.h
@@ -12,7 +12,7 @@ class Socket
 {
  public:
  	Socket(KExtendedSocket *, bool createNotifier = FALSE,
-		   TQObject *tqparent = 0, const char *name = 0);
+		   TQObject *parent = 0, const char *name = 0);
 
 	/** close the socket */
     ~Socket();
diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp
index a059cfa2..29508e26 100644
--- a/libksirtet/lib/wizard.cpp
+++ b/libksirtet/lib/wizard.cpp
@@ -32,8 +32,8 @@
 #define MAX_USER_PORT 65535
 
 MPWizard::MPWizard(const MPGameInfo &gi, ConnectionData &_cd,
-				   TQWidget *tqparent, const char *name)
-: KWizard(tqparent, name, TRUE), cd(_cd)
+				   TQWidget *parent, const char *name)
+: KWizard(parent, name, TRUE), cd(_cd)
 {
 //	setupTypePage(); // #### REMOVE NETWORK GAMES UNTIL FIXED
     type = Local;
diff --git a/libksirtet/lib/wizard.h b/libksirtet/lib/wizard.h
index 42623ec7..3de9f1b7 100644
--- a/libksirtet/lib/wizard.h
+++ b/libksirtet/lib/wizard.h
@@ -23,7 +23,7 @@ class MPWizard : public KWizard
 
  public:
 	MPWizard(const MPGameInfo &gi, ConnectionData &cd,
-			 TQWidget *tqparent = 0, const char *name = 0);
+			 TQWidget *parent = 0, const char *name = 0);
 
 	void showPage(TQWidget *page);