From a13e26c2f1eb3c5be81acf4f571dd4bafac10199 Mon Sep 17 00:00:00 2001 From: tpearson 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 --- libkdegames/kgame/dialogs/kgameconnectdialog.cpp | 12 ++++----- libkdegames/kgame/dialogs/kgameconnectdialog.h | 12 ++++----- libkdegames/kgame/dialogs/kgamedebugdialog.cpp | 4 +-- libkdegames/kgame/dialogs/kgamedebugdialog.h | 2 +- libkdegames/kgame/dialogs/kgamedialog.cpp | 34 ++++++++++++------------ libkdegames/kgame/dialogs/kgamedialog.h | 24 ++++++++--------- libkdegames/kgame/dialogs/kgamedialogconfig.cpp | 22 +++++++-------- libkdegames/kgame/dialogs/kgamedialogconfig.h | 18 ++++++------- libkdegames/kgame/dialogs/kgameerrordialog.cpp | 18 ++++++------- libkdegames/kgame/dialogs/kgameerrordialog.h | 6 ++--- libkdegames/kgame/kgame.cpp | 2 +- libkdegames/kgame/kgame.h | 2 +- libkdegames/kgame/kgamechat.cpp | 6 ++--- libkdegames/kgame/kgamechat.h | 6 ++--- libkdegames/kgame/kgameio.cpp | 26 +++++++++--------- libkdegames/kgame/kgameio.h | 8 +++--- libkdegames/kgame/kgamenetwork.cpp | 2 +- libkdegames/kgame/kgamenetwork.h | 2 +- libkdegames/kgame/kgameproperty.cpp | 8 +++--- libkdegames/kgame/kgameproperty.h | 14 +++++----- libkdegames/kgame/kgamepropertyhandler.cpp | 4 +-- libkdegames/kgame/kgamepropertyhandler.h | 18 ++++++------- libkdegames/kgame/kmessageclient.cpp | 4 +-- libkdegames/kgame/kmessageclient.h | 2 +- libkdegames/kgame/kmessageio.cpp | 30 ++++++++++----------- libkdegames/kgame/kmessageio.h | 18 ++++++------- libkdegames/kgame/kmessageserver.cpp | 8 +++--- libkdegames/kgame/kmessageserver.h | 4 +-- 28 files changed, 158 insertions(+), 158 deletions(-) (limited to 'libkdegames/kgame') diff --git a/libkdegames/kgame/dialogs/kgameconnectdialog.cpp b/libkdegames/kgame/dialogs/kgameconnectdialog.cpp index f0e0c606..98958ffd 100644 --- a/libkdegames/kgame/dialogs/kgameconnectdialog.cpp +++ b/libkdegames/kgame/dialogs/kgameconnectdialog.cpp @@ -56,7 +56,7 @@ class KGameConnectWidgetPrivate TQString mType; }; -KGameConnectWidget::KGameConnectWidget(TQWidget* tqparent) : TQWidget(tqparent) +KGameConnectWidget::KGameConnectWidget(TQWidget* parent) : TQWidget(parent) { d = new KGameConnectWidgetPrivate; @@ -212,9 +212,9 @@ class KGameConnectDialogPrivate KGameConnectWidget* mConnect; }; -// buttontqmask =Ok|Cancel -KGameConnectDialog::KGameConnectDialog(TQWidget* tqparent,int buttontqmask) : KDialogBase(Plain, - i18n("Network Game"),buttontqmask , Ok, tqparent, 0, true, buttontqmask!=0) +// buttonmask =Ok|Cancel +KGameConnectDialog::KGameConnectDialog(TQWidget* parent,int buttonmask) : KDialogBase(Plain, + i18n("Network Game"),buttonmask , Ok, parent, 0, true, buttonmask!=0) { d = new KGameConnectDialogPrivate; TQVBoxLayout* vb = new TQVBoxLayout(plainPage(), spacingHint()); @@ -228,9 +228,9 @@ KGameConnectDialog::~KGameConnectDialog() } int KGameConnectDialog::initConnection( unsigned short int& port, - TQString& host, TQWidget* tqparent, bool server) + TQString& host, TQWidget* parent, bool server) { - KGameConnectDialog d(tqparent); + KGameConnectDialog d(parent); d.setHost(host); d.setPort(port); if (server) { diff --git a/libkdegames/kgame/dialogs/kgameconnectdialog.h b/libkdegames/kgame/dialogs/kgameconnectdialog.h index ad4ff7d1..0a14183d 100644 --- a/libkdegames/kgame/dialogs/kgameconnectdialog.h +++ b/libkdegames/kgame/dialogs/kgameconnectdialog.h @@ -31,7 +31,7 @@ class KGameConnectWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KGameConnectWidget(TQWidget* tqparent); + KGameConnectWidget(TQWidget* parent); virtual ~KGameConnectWidget(); /** @@ -109,8 +109,8 @@ private: * @short Dialog to ask for host and port * * This Dialog is used to create a game. You call initConnection(port, - * TQString(), tqparent, true) to create a network game (as a server) - * or initConnection(port, host, tqparent) to join a network game. + * TQString(), parent, true) to create a network game (as a server) + * or initConnection(port, host, parent) to join a network game. * * @author Andreas Beckermann **/ @@ -119,7 +119,7 @@ class KGameConnectDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KGameConnectDialog(TQWidget* tqparent = 0,int buttontqmask=Ok|Cancel); + KGameConnectDialog(TQWidget* parent = 0,int buttonmask=Ok|Cancel); virtual ~KGameConnectDialog(); /** @@ -128,11 +128,11 @@ public: * @param port The port the user wants to connect to. * @param host The host the user wants to connect to. Will be * TQString() if server game is chosen - * @param tqparent The tqparent of the dialog + * @param parent The parent of the dialog * @param server True to create a network game per default, false to * join a game by default **/ - static int initConnection(unsigned short int& port, TQString& host, TQWidget* tqparent, bool server = false); + static int initConnection(unsigned short int& port, TQString& host, TQWidget* parent, bool server = false); /** * @param host The host to connect to by default diff --git a/libkdegames/kgame/dialogs/kgamedebugdialog.cpp b/libkdegames/kgame/dialogs/kgamedebugdialog.cpp index 06987aad..6a7e1155 100644 --- a/libkdegames/kgame/dialogs/kgamedebugdialog.cpp +++ b/libkdegames/kgame/dialogs/kgamedebugdialog.cpp @@ -120,9 +120,9 @@ public: KListBox* mHideIdList; }; -KGameDebugDialog::KGameDebugDialog(KGame* g, TQWidget* tqparent, bool modal) : +KGameDebugDialog::KGameDebugDialog(KGame* g, TQWidget* parent, bool modal) : KDialogBase(Tabbed, i18n("KGame Debug Dialog"), Close, Close, - tqparent, 0, modal, true) + parent, 0, modal, true) { d = new KGameDebugDialogPrivate; diff --git a/libkdegames/kgame/dialogs/kgamedebugdialog.h b/libkdegames/kgame/dialogs/kgamedebugdialog.h index 8682ce69..92b35597 100644 --- a/libkdegames/kgame/dialogs/kgamedebugdialog.h +++ b/libkdegames/kgame/dialogs/kgamedebugdialog.h @@ -36,7 +36,7 @@ class KDE_EXPORT KGameDebugDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KGameDebugDialog(KGame* g, TQWidget* tqparent, bool modal = false); + KGameDebugDialog(KGame* g, TQWidget* parent, bool modal = false); ~KGameDebugDialog(); /** diff --git a/libkdegames/kgame/dialogs/kgamedialog.cpp b/libkdegames/kgame/dialogs/kgamedialog.cpp index f589333e..c03df4ff 100644 --- a/libkdegames/kgame/dialogs/kgamedialog.cpp +++ b/libkdegames/kgame/dialogs/kgamedialog.cpp @@ -64,17 +64,17 @@ public: }; KGameDialog::KGameDialog(KGame* g, KPlayer* owner, const TQString& title, - TQWidget* tqparent, bool modal) + TQWidget* parent, bool modal) : KDialogBase(Tabbed, title, Ok|Default|Apply, - Ok, tqparent, 0, modal, true) + Ok, parent, 0, modal, true) { init(g, owner); } KGameDialog::KGameDialog(KGame* g, KPlayer* owner, const TQString& title, - TQWidget* tqparent, long initConfigs, int chatMsgId, bool modal) + TQWidget* parent, long initConfigs, int chatMsgId, bool modal) : KDialogBase(Tabbed, title, Ok|Default|Apply, - Ok, tqparent, 0, modal, true) + Ok, parent, 0, modal, true) { init(g, owner); if ((ConfigOptions)initConfigs!=NoConfig) { @@ -165,34 +165,34 @@ void KGameDialog::addMsgServerConfig(KGameDialogMsgServerConfig* msgConf) d->mMsgServerPage = addConfigPage(msgConf, i18n("&Message Server")); } -void KGameDialog::addChatWidget(KGameDialogChatConfig* chat, TQVBox* tqparent) +void KGameDialog::addChatWidget(KGameDialogChatConfig* chat, TQVBox* parent) { if (!chat) { return; } - if (!tqparent) { - tqparent = d->mGamePage; + if (!parent) { + parent = d->mGamePage; } - if (!tqparent) { + if (!parent) { kdError(11001) << "cannot add chat widget without page" << endl; return; } - addConfigWidget(chat, tqparent); + addConfigWidget(chat, parent); } -void KGameDialog::addConnectionList(KGameDialogConnectionConfig* c, TQVBox* tqparent) +void KGameDialog::addConnectionList(KGameDialogConnectionConfig* c, TQVBox* parent) { if (!c) { return; } - if (!tqparent) { - tqparent = d->mNetworkPage; + if (!parent) { + parent = d->mNetworkPage; } - if (!tqparent) { + if (!parent) { kdError(11001) << "Cannot add connection list without page" << endl; return; } - addConfigWidget(c, tqparent); + addConfigWidget(c, parent); } TQVBox *KGameDialog::configPage(ConfigOptions which) @@ -226,18 +226,18 @@ TQVBox* KGameDialog::addConfigPage(KGameDialogConfig* widget, const TQString& ti return page; } -void KGameDialog::addConfigWidget(KGameDialogConfig* widget, TQWidget* tqparent) +void KGameDialog::addConfigWidget(KGameDialogConfig* widget, TQWidget* parent) { if (!widget) { kdError(11001) << "Cannot add NULL config widget" << endl; return; } - if (!tqparent) { + if (!parent) { kdError(11001) << "Cannot reparent to NULL widget" << endl; return; } // kdDebug(11001) << "reparenting widget" << endl; - widget->reparent(tqparent, TQPoint(0,0)); + widget->reparent(parent, TQPoint(0,0)); d->mConfigWidgets.append(widget); connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(slotRemoveConfigWidget(TQObject*))); if (!d->mGame) { diff --git a/libkdegames/kgame/dialogs/kgamedialog.h b/libkdegames/kgame/dialogs/kgamedialog.h index cb731993..423f5de1 100644 --- a/libkdegames/kgame/dialogs/kgamedialog.h +++ b/libkdegames/kgame/dialogs/kgamedialog.h @@ -95,11 +95,11 @@ public: * @param owner The KPlayer object who is responsible for this * dialog, aka "the local player" * @param title The title of the dialog - see KDialog::setCaption - * @param tqparent The tqparent of the dialog + * @param parent The parent of the dialog * @param modal Whether the dialog is modal or not **/ KGameDialog(KGame* g, KPlayer* owner, const TQString& title, - TQWidget* tqparent, bool modal = false); + TQWidget* parent, bool modal = false); /** * Create a KGameDialog with the standard configuration widgets. This @@ -122,7 +122,7 @@ public: * @param owner The KPlayer object who is responsible for this * dialog, aka "the local player" * @param title The title of the dialog - see KDialog::setCaption - * @param tqparent The tqparent of the dialog + * @param parent The parent of the dialog * @param modal Whether the dialog is modal or not * @param initConfigs whether the default KGameDialogConfig widgets * shall be created using initDefaultDialog. Use false if you want @@ -131,7 +131,7 @@ public: * if initConfigs = false **/ KGameDialog(KGame* g, KPlayer* owner, const TQString& title, - TQWidget* tqparent, long initConfigs = AllConfig, + TQWidget* parent, long initConfigs = AllConfig, int chatMsgId = 15432, bool modal = false); virtual ~KGameDialog(); @@ -169,14 +169,14 @@ public: virtual void submitToKGame(); /** - * Adds a KGameChat to the dialog. If no tqparent is specified the + * Adds a KGameChat to the dialog. If no parent is specified the * game page will be used. * @param chat The chat widget - * @param tqparent The tqparent of the chat widget. This MUST be an + * @param parent The parent of the chat widget. This MUST be an * already added config widget. Note that the game page will be used - * if tqparent is 0. + * if parent is 0. **/ - void addChatWidget(KGameDialogChatConfig* chat, TQVBox* tqparent = 0); + void addChatWidget(KGameDialogChatConfig* chat, TQVBox* parent = 0); /** * Add a connection list to the dialog. The list consists of a @@ -187,10 +187,10 @@ public: * This is another not-really-config-config-widget. It just displays the * connections and lets you ban players. * @param c The KGameDialogConnectionConfig object - * @param tqparent The tqparent of the widget. If 0 the networkConfig + * @param parent The parent of the widget. If 0 the networkConfig * page is used. **/ - void addConnectionList(KGameDialogConnectionConfig* c, TQVBox* tqparent = 0); + void addConnectionList(KGameDialogConnectionConfig* c, TQVBox* parent = 0); /** * Add a new page to the dialog. The page will contain you new config @@ -223,12 +223,12 @@ public: KGameDialogGeneralConfig* gameConfig() const; /** - * Add a config widget to the specified tqparent. Usually you call + * Add a config widget to the specified parent. Usually you call * addConfigPage for one widget and addConfigWidget for another to add * it to the same page. Just use the returned page of * addConfigPage. **/ - void addConfigWidget(KGameDialogConfig* widget, TQWidget* tqparent); + void addConfigWidget(KGameDialogConfig* widget, TQWidget* parent); /** * Used to add the main network config widget in a new page. Use this to diff --git a/libkdegames/kgame/dialogs/kgamedialogconfig.cpp b/libkdegames/kgame/dialogs/kgamedialogconfig.cpp index eeaf50e1..f6845650 100644 --- a/libkdegames/kgame/dialogs/kgamedialogconfig.cpp +++ b/libkdegames/kgame/dialogs/kgamedialogconfig.cpp @@ -57,7 +57,7 @@ public: KPlayer* mOwner; }; -KGameDialogConfig::KGameDialogConfig(TQWidget* tqparent) : TQWidget(tqparent) +KGameDialogConfig::KGameDialogConfig(TQWidget* parent) : TQWidget(parent) { d = new KGameDialogConfigPrivate; } @@ -116,8 +116,8 @@ public: }; -KGameDialogNetworkConfig::KGameDialogNetworkConfig(TQWidget* tqparent) - : KGameDialogConfig(tqparent) +KGameDialogNetworkConfig::KGameDialogNetworkConfig(TQWidget* parent) + : KGameDialogConfig(parent) { // kdDebug(11001) << k_funcinfo << ": this=" << this << endl; d = new KGameDialogNetworkConfigPrivate(); @@ -261,8 +261,8 @@ public: TQVBoxLayout* mTopLayout; }; -KGameDialogGeneralConfig::KGameDialogGeneralConfig(TQWidget* tqparent, bool initializeGUI) - : KGameDialogConfig(tqparent) +KGameDialogGeneralConfig::KGameDialogGeneralConfig(TQWidget* parent, bool initializeGUI) + : KGameDialogConfig(parent) { // kdDebug(11001) << k_funcinfo << ": this=" << this << endl; d = new KGameDialogGeneralConfigPrivate; @@ -388,8 +388,8 @@ public: // TODO: change ADMIN ID, remove CLIENTS, change MAXCLIENTS // we do everything here with TQPushButtons as we want to wait a moment before // continuing - the message must be sent over network first -KGameDialogMsgServerConfig::KGameDialogMsgServerConfig(TQWidget* tqparent) - : KGameDialogConfig(tqparent) +KGameDialogMsgServerConfig::KGameDialogMsgServerConfig(TQWidget* parent) + : KGameDialogConfig(parent) { d = new KGameDialogMsgServerConfigPrivate; @@ -547,8 +547,8 @@ public: KGameChat* mChat; }; -KGameDialogChatConfig::KGameDialogChatConfig(int chatMsgId, TQWidget* tqparent) - : KGameDialogConfig(tqparent) +KGameDialogChatConfig::KGameDialogChatConfig(int chatMsgId, TQWidget* parent) + : KGameDialogConfig(parent) { d = new KGameDialogChatConfigPrivate; TQVBoxLayout* topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -599,8 +599,8 @@ public: KListBox* mPlayerBox; }; -KGameDialogConnectionConfig::KGameDialogConnectionConfig(TQWidget* tqparent) - : KGameDialogConfig(tqparent) +KGameDialogConnectionConfig::KGameDialogConnectionConfig(TQWidget* parent) + : KGameDialogConfig(parent) { //TODO: prevent player to ban himself d = new KGameDialogConnectionConfigPrivate; diff --git a/libkdegames/kgame/dialogs/kgamedialogconfig.h b/libkdegames/kgame/dialogs/kgamedialogconfig.h index 7c42d05d..a7f309ac 100644 --- a/libkdegames/kgame/dialogs/kgamedialogconfig.h +++ b/libkdegames/kgame/dialogs/kgamedialogconfig.h @@ -53,7 +53,7 @@ class KDE_EXPORT KGameDialogConfig : public TQWidget Q_OBJECT TQ_OBJECT public: - KGameDialogConfig(TQWidget* tqparent = 0); + KGameDialogConfig(TQWidget* parent = 0); virtual ~KGameDialogConfig(); /** @@ -137,7 +137,7 @@ private: * The main game configuration widget. * * It currently contains a line edit for the name of the player only. You can - * add widgets by using the KGameDialogGeneralConfig as tqparent parameter as it + * add widgets by using the KGameDialogGeneralConfig as parent parameter as it * uses TQLayout::autoAdd == true. * @author Andreas Beckermann **/ @@ -152,17 +152,17 @@ public: * edit widget to change the player name only. * * If you just want to add more widgets you can just create your widgets - * with the KGameDialogGeneralConfig as tqparent as it uses + * with the KGameDialogGeneralConfig as parent as it uses * TQLayout::setAutoAdd(true). * - * @param tqparent Parent widget for this dialog. + * @param parent Parent widget for this dialog. * @param initializeGUI If you really don't want to use the * predefined widget and/or tqlayout use FALSE here. Note that then none * of the predefined widgets (currently only the name of the player) * will exist anymore. * **/ - KGameDialogGeneralConfig(TQWidget* tqparent = 0, bool initializeGUI = true); + KGameDialogGeneralConfig(TQWidget* parent = 0, bool initializeGUI = true); virtual ~KGameDialogGeneralConfig(); /** @@ -215,7 +215,7 @@ class KDE_EXPORT KGameDialogNetworkConfig : public KGameDialogConfig Q_OBJECT TQ_OBJECT public: - KGameDialogNetworkConfig(TQWidget* tqparent = 0); + KGameDialogNetworkConfig(TQWidget* parent = 0); virtual ~KGameDialogNetworkConfig(); @@ -282,7 +282,7 @@ class KGameDialogMsgServerConfig : public KGameDialogConfig Q_OBJECT TQ_OBJECT public: - KGameDialogMsgServerConfig(TQWidget* tqparent = 0); + KGameDialogMsgServerConfig(TQWidget* parent = 0); virtual ~KGameDialogMsgServerConfig(); virtual void submitToKGame(KGame*, KPlayer*) {} @@ -316,7 +316,7 @@ class KGameDialogChatConfig : public KGameDialogConfig Q_OBJECT TQ_OBJECT public: - KGameDialogChatConfig(int chatMsgId, TQWidget* tqparent = 0); + KGameDialogChatConfig(int chatMsgId, TQWidget* parent = 0); virtual ~KGameDialogChatConfig(); virtual void setKGame(KGame* g); @@ -338,7 +338,7 @@ class KGameDialogConnectionConfig : public KGameDialogConfig Q_OBJECT TQ_OBJECT public: - KGameDialogConnectionConfig(TQWidget* tqparent = 0); + KGameDialogConnectionConfig(TQWidget* parent = 0); virtual ~KGameDialogConnectionConfig(); virtual void setKGame(KGame* g); diff --git a/libkdegames/kgame/dialogs/kgameerrordialog.cpp b/libkdegames/kgame/dialogs/kgameerrordialog.cpp index d5df6ba3..6ab9d71c 100644 --- a/libkdegames/kgame/dialogs/kgameerrordialog.cpp +++ b/libkdegames/kgame/dialogs/kgameerrordialog.cpp @@ -37,7 +37,7 @@ public: const KGame* mGame; }; -KGameErrorDialog::KGameErrorDialog(TQWidget* tqparent) : TQObject(tqparent) +KGameErrorDialog::KGameErrorDialog(TQWidget* parent) : TQObject(parent) { d = new KGameErrorDialogPrivate; } @@ -71,14 +71,14 @@ void KGameErrorDialog::slotUnsetKGame() d->mGame = 0; } -void KGameErrorDialog::error(const TQString& errorText, TQWidget* tqparent) -{ KMessageBox::error(tqparent, errorText); } +void KGameErrorDialog::error(const TQString& errorText, TQWidget* parent) +{ KMessageBox::error(parent, errorText); } void KGameErrorDialog::slotServerConnectionLost() { // TODO: add IP/port of the server TQString message = i18n("Connection to the server has been lost!"); - error(message, (TQWidget*)tqparent()); + error(message, (TQWidget*)parent()); } void KGameErrorDialog::slotClientConnectionLost(TQ_UINT32 /*id*/,bool) @@ -91,13 +91,13 @@ void KGameErrorDialog::slotClientConnectionLost(TQ_UINT32 /*id*/,bool) // message = i18n("Connection to client has been lost!"); // } message = i18n("Connection to client has been lost!"); - error(message, (TQWidget*)tqparent()); + error(message, (TQWidget*)parent()); } void KGameErrorDialog::slotError(int errorNo, TQString text) { TQString message = i18n("Received a network error!\nError number: %1\nError message: %2").tqarg(errorNo).tqarg(text); - error(message, (TQWidget*)tqparent()); + error(message, (TQWidget*)parent()); } void KGameErrorDialog::connectionError(TQString s) @@ -108,15 +108,15 @@ void KGameErrorDialog::connectionError(TQString s) } else { message = i18n("No connection could be created.\nThe error message was:\n%1").tqarg(s); } - error(message, (TQWidget*)tqparent()); + error(message, (TQWidget*)parent()); } // should become the real dialog - currently we just use messageboxes // -> maybe unused forever -KGameErrorMessageDialog::KGameErrorMessageDialog(TQWidget* tqparent) - : KDialogBase(Plain, i18n("Error"), Ok, Ok, tqparent, 0, true, true) +KGameErrorMessageDialog::KGameErrorMessageDialog(TQWidget* parent) + : KDialogBase(Plain, i18n("Error"), Ok, Ok, parent, 0, true, true) { } diff --git a/libkdegames/kgame/dialogs/kgameerrordialog.h b/libkdegames/kgame/dialogs/kgameerrordialog.h index b8d34c1a..08726dc2 100644 --- a/libkdegames/kgame/dialogs/kgameerrordialog.h +++ b/libkdegames/kgame/dialogs/kgameerrordialog.h @@ -41,7 +41,7 @@ class KGameErrorDialog : public TQObject Q_OBJECT TQ_OBJECT public: - KGameErrorDialog(TQWidget* tqparent); + KGameErrorDialog(TQWidget* parent); ~KGameErrorDialog(); /** @@ -88,7 +88,7 @@ public slots: void slotUnsetKGame(); protected: - void error(const TQString& errorText, TQWidget* tqparent = 0); + void error(const TQString& errorText, TQWidget* parent = 0); private: KGameErrorDialogPrivate* d; @@ -106,7 +106,7 @@ class KGameErrorMessageDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KGameErrorMessageDialog(TQWidget* tqparent); + KGameErrorMessageDialog(TQWidget* parent); ~KGameErrorMessageDialog(); private: diff --git a/libkdegames/kgame/kgame.cpp b/libkdegames/kgame/kgame.cpp index 6965ebcf..a917df81 100644 --- a/libkdegames/kgame/kgame.cpp +++ b/libkdegames/kgame/kgame.cpp @@ -81,7 +81,7 @@ public: }; // ------------------- GAME CLASS -------------------------- -KGame::KGame(int cookie,TQObject* tqparent) : KGameNetwork(cookie,tqparent) +KGame::KGame(int cookie,TQObject* parent) : KGameNetwork(cookie,parent) { kdDebug(11001) << k_funcinfo << " - " << this << ", sizeof(KGame)=" << sizeof(KGame) << endl; d = new KGamePrivate; diff --git a/libkdegames/kgame/kgame.h b/libkdegames/kgame/kgame.h index af278d5a..bf66dcb8 100644 --- a/libkdegames/kgame/kgame.h +++ b/libkdegames/kgame/kgame.h @@ -101,7 +101,7 @@ public: * game in load/save and network operations. Change this between * games. */ - KGame(int cookie=42,TQObject* tqparent=0); + KGame(int cookie=42,TQObject* parent=0); /** * Destructs the game diff --git a/libkdegames/kgame/kgamechat.cpp b/libkdegames/kgame/kgamechat.cpp index 53714706..11f47f7b 100644 --- a/libkdegames/kgame/kgamechat.cpp +++ b/libkdegames/kgame/kgamechat.cpp @@ -57,18 +57,18 @@ public: int mToMyGroup; // just as the above - but for the group, not for players }; -KGameChat::KGameChat(KGame* g, int msgid, TQWidget* tqparent) : KChatBase(tqparent) +KGameChat::KGameChat(KGame* g, int msgid, TQWidget* parent) : KChatBase(parent) { init(g, msgid); } -KGameChat::KGameChat(KGame* g, int msgid, KPlayer* fromPlayer, TQWidget* tqparent) : KChatBase(tqparent) +KGameChat::KGameChat(KGame* g, int msgid, KPlayer* fromPlayer, TQWidget* parent) : KChatBase(parent) { init(g, msgid); setFromPlayer(fromPlayer); } -KGameChat::KGameChat(TQWidget* tqparent) : KChatBase(tqparent) +KGameChat::KGameChat(TQWidget* parent) : KChatBase(parent) { init(0, -1); } diff --git a/libkdegames/kgame/kgamechat.h b/libkdegames/kgame/kgamechat.h index f0d8310d..88139d33 100644 --- a/libkdegames/kgame/kgamechat.h +++ b/libkdegames/kgame/kgamechat.h @@ -50,14 +50,14 @@ public: * the chat message. The @p fromPlayer is the local player (see @ref * setFromPlayer). **/ - KGameChat(KGame* game, int msgid, KPlayer* fromPlayer, TQWidget * tqparent); + KGameChat(KGame* game, int msgid, KPlayer* fromPlayer, TQWidget * parent); /** * @overload * To make use of this widget you need to call @ref setFromPlayer * manually. **/ - KGameChat(KGame* game, int msgId, TQWidget* tqparent); + KGameChat(KGame* game, int msgId, TQWidget* parent); /** * @overload @@ -65,7 +65,7 @@ public: * setGame, setFromPlayer and setMessageId manually. * @since 3.2 **/ - KGameChat(TQWidget* tqparent); + KGameChat(TQWidget* parent); virtual ~KGameChat(); diff --git a/libkdegames/kgame/kgameio.cpp b/libkdegames/kgame/kgameio.cpp index a408c0cd..5b736ea0 100644 --- a/libkdegames/kgame/kgameio.cpp +++ b/libkdegames/kgame/kgameio.cpp @@ -117,21 +117,21 @@ void KGameIO::Debug() // ----------------------- Key IO --------------------------- -KGameKeyIO::KGameKeyIO(TQWidget *tqparent) +KGameKeyIO::KGameKeyIO(TQWidget *parent) : KGameIO() { - if (tqparent) + if (parent) { kdDebug(11001) << "Key Event filter installed" << endl; - tqparent->installEventFilter(this); + parent->installEventFilter(this); } } KGameKeyIO::~KGameKeyIO() { - if (tqparent()) + if (parent()) { - tqparent()->removeEventFilter(this); + parent()->removeEventFilter(this); } } @@ -167,22 +167,22 @@ bool KGameKeyIO::eventFilter( TQObject *o, TQEvent *e ) // ----------------------- Mouse IO --------------------------- -KGameMouseIO::KGameMouseIO(TQWidget *tqparent,bool trackmouse) +KGameMouseIO::KGameMouseIO(TQWidget *parent,bool trackmouse) : KGameIO() { - if (tqparent) + if (parent) { kdDebug(11001) << "Mouse Event filter installed tracking=" << trackmouse << endl; - tqparent->installEventFilter(this); - tqparent->setMouseTracking(trackmouse); + parent->installEventFilter(this); + parent->setMouseTracking(trackmouse); } } KGameMouseIO::~KGameMouseIO() { - if (tqparent()) + if (parent()) { - tqparent()->removeEventFilter(this); + parent()->removeEventFilter(this); } } @@ -193,9 +193,9 @@ int KGameMouseIO::rtti() const void KGameMouseIO::setMouseTracking(bool b) { - if (tqparent()) + if (parent()) { - ((TQWidget*)tqparent())->setMouseTracking(b); + ((TQWidget*)parent())->setMouseTracking(b); } } diff --git a/libkdegames/kgame/kgameio.h b/libkdegames/kgame/kgameio.h index 6f6a6ae9..510ab0b7 100644 --- a/libkdegames/kgame/kgameio.h +++ b/libkdegames/kgame/kgameio.h @@ -199,9 +199,9 @@ public: * this,TQT_SLOT(slotKeyInput(KGameIO *,TQDataStream &,TQKeyEvent *,bool *))); * \endcode * - * @param tqparent The parents widget whose keyboard events * should be grabbed + * @param parent The parents widget whose keyboard events * should be grabbed */ - KGameKeyIO(TQWidget *tqparent); + KGameKeyIO(TQWidget *parent); virtual ~KGameKeyIO(); /** @@ -265,10 +265,10 @@ public: * this,TQT_SLOT(slotMouseInput(KGameIO *,TQDataStream &,TQMouseEvent *,bool *))); * \endcode * - * @param tqparent The widget whose events should be captured + * @param parent The widget whose events should be captured * @param trackmouse enables mouse tracking (gives mouse move events) */ - KGameMouseIO(TQWidget *tqparent,bool trackmouse=false); + KGameMouseIO(TQWidget *parent,bool trackmouse=false); virtual ~KGameMouseIO(); /** diff --git a/libkdegames/kgame/kgamenetwork.cpp b/libkdegames/kgame/kgamenetwork.cpp index 2fe901b3..a3548579 100644 --- a/libkdegames/kgame/kgamenetwork.cpp +++ b/libkdegames/kgame/kgamenetwork.cpp @@ -59,7 +59,7 @@ public: }; // ------------------- NETWORK GAME ------------------------ -KGameNetwork::KGameNetwork(int c, TQObject* tqparent) : TQObject(tqparent, 0) +KGameNetwork::KGameNetwork(int c, TQObject* parent) : TQObject(parent, 0) { d = new KGameNetworkPrivate; d->mCookie = (TQ_INT16)c; diff --git a/libkdegames/kgame/kgamenetwork.h b/libkdegames/kgame/kgamenetwork.h index e6c9fc5d..b5975ffc 100644 --- a/libkdegames/kgame/kgamenetwork.h +++ b/libkdegames/kgame/kgamenetwork.h @@ -52,7 +52,7 @@ public: /** * Create a KGameNetwork object */ - KGameNetwork(int cookie=42,TQObject* tqparent=0); + KGameNetwork(int cookie=42,TQObject* parent=0); virtual ~KGameNetwork(); /** diff --git a/libkdegames/kgame/kgameproperty.cpp b/libkdegames/kgame/kgameproperty.cpp index e7d35410..49a8984f 100644 --- a/libkdegames/kgame/kgameproperty.cpp +++ b/libkdegames/kgame/kgameproperty.cpp @@ -29,16 +29,16 @@ #define KPLAYERHANDLER_LOAD_COOKIE 6239 -KGamePropertyBase::KGamePropertyBase(int id, KGame* tqparent) +KGamePropertyBase::KGamePropertyBase(int id, KGame* parent) { init(); - registerData(id, tqparent); + registerData(id, parent); } -KGamePropertyBase::KGamePropertyBase(int id, KPlayer* tqparent) +KGamePropertyBase::KGamePropertyBase(int id, KPlayer* parent) { init(); - registerData(id, tqparent); + registerData(id, parent); } KGamePropertyBase::KGamePropertyBase(int id, KGamePropertyHandler* owner) diff --git a/libkdegames/kgame/kgameproperty.h b/libkdegames/kgame/kgameproperty.h index c5f35997..f02c4db0 100644 --- a/libkdegames/kgame/kgameproperty.h +++ b/libkdegames/kgame/kgameproperty.h @@ -125,8 +125,8 @@ public: **/ KGamePropertyBase(int id, KGamePropertyHandler* owner); - KGamePropertyBase(int id, KGame* tqparent); - KGamePropertyBase(int id, KPlayer* tqparent); + KGamePropertyBase(int id, KGame* parent); + KGamePropertyBase(int id, KPlayer* parent); /** * Creates a KGamePropertyBase object without an owner. Remember to call @@ -344,7 +344,7 @@ protected: bool sendProperty(const TQByteArray& b); /** - * Causes the tqparent object to emit a signal on value change + * Causes the parent object to emit a signal on value change **/ void emitSignal(); @@ -413,7 +413,7 @@ private: * property. This is achieved by using send to change the value of the * property. send needs a running KMessageServer and therefore * MUST be plugged into a KGamePropertyHandler using either - * registerData or the constructor. The tqparent of the dataHandler must be able + * registerData or the constructor. The parent of the dataHandler must be able * to send messages (see above: the message server must be running). If you use * send to change the value of a property you won't see the effect * immediately: The new value is first transferred to the message server which @@ -588,12 +588,12 @@ public: * @param id The id of this property. MUST be UNITQUE! Used to send and * receive changes in the property of the playere automatically via * network. - * @param owner The tqparent of the object. Must be a KGame which manages + * @param owner The parent of the object. Must be a KGame which manages * the changes made to this object, i.e. which will send the new data. * Note that in contrast to most KDE/QT classes KGameProperty objects * are not deleted automatically! **/ -// TODO: ID: Very ugly - better use something like tqparent()->propertyId() or so which assigns a free id automatically. +// TODO: ID: Very ugly - better use something like parent()->propertyId() or so which assigns a free id automatically. KGameProperty(int id, KGamePropertyHandler* owner) : KGamePropertyBase(id, owner) { init(); } /** @@ -651,7 +651,7 @@ public: * \endcode * as myProperty has not yet been set when doSomething is being called. * - * You are informed about a value change by a singal from the tqparent of + * You are informed about a value change by a singal from the parent of * the property which can be deactivated by setEmittingSignal because of * performance (you probably don't have to deactivate it - except you * want to write a real-time game like Command&Conquer with a lot of diff --git a/libkdegames/kgame/kgamepropertyhandler.cpp b/libkdegames/kgame/kgamepropertyhandler.cpp index 26588de3..405d433e 100644 --- a/libkdegames/kgame/kgamepropertyhandler.cpp +++ b/libkdegames/kgame/kgamepropertyhandler.cpp @@ -51,13 +51,13 @@ public: TQPtrQueue mSignalQueue; }; -KGamePropertyHandler::KGamePropertyHandler(int id, const TQObject* receiver, const char * sendf, const char *emitf, TQObject* tqparent) : TQObject(tqparent) +KGamePropertyHandler::KGamePropertyHandler(int id, const TQObject* receiver, const char * sendf, const char *emitf, TQObject* parent) : TQObject(parent) { init(); registerHandler(id,receiver,sendf,emitf); } -KGamePropertyHandler::KGamePropertyHandler(TQObject* tqparent) : TQObject(tqparent) +KGamePropertyHandler::KGamePropertyHandler(TQObject* parent) : TQObject(parent) { init(); } diff --git a/libkdegames/kgame/kgamepropertyhandler.h b/libkdegames/kgame/kgamepropertyhandler.h index df9a66cb..c2a3429f 100644 --- a/libkdegames/kgame/kgamepropertyhandler.h +++ b/libkdegames/kgame/kgamepropertyhandler.h @@ -43,8 +43,8 @@ class KGamePropertyHandlerPrivate; // wow - what a name ;-) * to care about the KGamePropertHandler. KGame and KPlayer implement * all features of KGamePropertyHandler so you will rather use it there. * - * You have to use the KGamePropertyHandler as tqparent for all KGameProperty - * objects but you can also use KPlayer or KGame as tqparent - then + * You have to use the KGamePropertyHandler as parent for all KGameProperty + * objects but you can also use KPlayer or KGame as parent - then * KPlayer::dataHandler or KGame::dataHandler will be used. * * Every KGamePropertyHandler must have - just like every KGameProperty - @@ -81,18 +81,18 @@ public: * You have to call registerHandler before you can use this * handler! **/ - KGamePropertyHandler(TQObject* tqparent = 0); + KGamePropertyHandler(TQObject* parent = 0); /** * Construct a registered handler. * * @see registerHandler **/ - KGamePropertyHandler(int id, const TQObject* receiver, const char* sendf, const char* emitf, TQObject* tqparent = 0); + KGamePropertyHandler(int id, const TQObject* receiver, const char* sendf, const char* emitf, TQObject* parent = 0); ~KGamePropertyHandler(); /** - * Register the handler with a tqparent. This is to use + * Register the handler with a parent. This is to use * if the constructor without arguments has been chosen. * Otherwise you need not call this. * @@ -106,7 +106,7 @@ public: /** * Main message process function. This has to be called by - * the tqparent's message event handler. If the id of the message + * the parent's message event handler. If the id of the message * agrees with the id of the handler, the message is extracted * and processed. Otherwise false is returned. * Example: @@ -170,7 +170,7 @@ public: /** * called by a property to send itself into the * datastream. This call is simply forwarded to - * the tqparent object + * the parent object **/ bool sendProperty(TQDataStream &s); @@ -179,7 +179,7 @@ public: /** * called by a property to emit a signal * This call is simply forwarded to - * the tqparent object + * the parent object **/ void emitSignal(KGamePropertyBase *data); @@ -316,7 +316,7 @@ signals: /** * This signal is emitted when a property needs to be sent. Only the - * tqparent has to react to this. + * parent has to react to this. * @param msgid The id of the handler * @param sent set this to true if the property was sent successfully - * otherwise don't touch diff --git a/libkdegames/kgame/kmessageclient.cpp b/libkdegames/kgame/kmessageclient.cpp index 3fa330ba..0233884a 100644 --- a/libkdegames/kgame/kmessageclient.cpp +++ b/libkdegames/kgame/kmessageclient.cpp @@ -48,8 +48,8 @@ public: TQValueList delayedMessages; }; -KMessageClient::KMessageClient (TQObject *tqparent, const char *name) - : TQObject (tqparent, name) +KMessageClient::KMessageClient (TQObject *parent, const char *name) + : TQObject (parent, name) { d = new KMessageClientPrivate (); d->isLocked = false; diff --git a/libkdegames/kgame/kmessageclient.h b/libkdegames/kgame/kmessageclient.h index f81d7a69..8a35234d 100644 --- a/libkdegames/kgame/kmessageclient.h +++ b/libkdegames/kgame/kmessageclient.h @@ -59,7 +59,7 @@ public: Creates an unconnected KMessageClient object. Use setServer() later to connect to a KMessageServer object. */ - KMessageClient (TQObject *tqparent = 0, const char *name = 0); + KMessageClient (TQObject *parent = 0, const char *name = 0); /** Destructor. diff --git a/libkdegames/kgame/kmessageio.cpp b/libkdegames/kgame/kmessageio.cpp index ec33b159..b35382b0 100644 --- a/libkdegames/kgame/kmessageio.cpp +++ b/libkdegames/kgame/kmessageio.cpp @@ -29,8 +29,8 @@ // ----------------------- KMessageIO ------------------------- -KMessageIO::KMessageIO (TQObject *tqparent, const char *name) - : TQObject (tqparent, name), m_id (0) +KMessageIO::KMessageIO (TQObject *parent, const char *name) + : TQObject (parent, name), m_id (0) {} KMessageIO::~KMessageIO () @@ -48,9 +48,9 @@ TQ_UINT32 KMessageIO::id () // ----------------------KMessageSocket ----------------------- -KMessageSocket::KMessageSocket (TQString host, TQ_UINT16 port, TQObject *tqparent, +KMessageSocket::KMessageSocket (TQString host, TQ_UINT16 port, TQObject *parent, const char *name) - : KMessageIO (tqparent, name) + : KMessageIO (parent, name) { mSocket = new TQSocket (); mSocket->connectToHost (host, port); @@ -58,25 +58,25 @@ const char *name) } KMessageSocket::KMessageSocket (TQHostAddress host, TQ_UINT16 port, TQObject -*tqparent, const char *name) - : KMessageIO (tqparent, name) +*parent, const char *name) + : KMessageIO (parent, name) { mSocket = new TQSocket (); mSocket->connectToHost (host.toString(), port); initSocket (); } -KMessageSocket::KMessageSocket (TQSocket *socket, TQObject *tqparent, const char +KMessageSocket::KMessageSocket (TQSocket *socket, TQObject *parent, const char *name) - : KMessageIO (tqparent, name) + : KMessageIO (parent, name) { mSocket = socket; initSocket (); } -KMessageSocket::KMessageSocket (int socketFD, TQObject *tqparent, const char +KMessageSocket::KMessageSocket (int socketFD, TQObject *parent, const char *name) - : KMessageIO (tqparent, name) + : KMessageIO (parent, name) { mSocket = new TQSocket (); mSocket->setSocket (socketFD); @@ -177,9 +177,9 @@ TQString KMessageSocket::peerName () const // ----------------------KMessageDirect ----------------------- -KMessageDirect::KMessageDirect (KMessageDirect *partner, TQObject *tqparent, +KMessageDirect::KMessageDirect (KMessageDirect *partner, TQObject *parent, const char *name) - : KMessageIO (tqparent, name), mPartner (0) + : KMessageIO (parent, name), mPartner (0) { // 0 as first parameter leaves the object unconnected if (!partner) @@ -238,7 +238,7 @@ KMessageProcess::~KMessageProcess() // Maybe todo: delete mSendBuffer } } -KMessageProcess::KMessageProcess(TQObject *tqparent, TQString file) : KMessageIO(tqparent,0) +KMessageProcess::KMessageProcess(TQObject *parent, TQString file) : KMessageIO(parent,0) { // Start process kdDebug(11001) << "@@@KMessageProcess::Start process" << endl; @@ -397,7 +397,7 @@ void KMessageProcess::slotProcessExited(KProcess * /*p*/) // ----------------------- KMessageFilePipe --------------------------- -KMessageFilePipe::KMessageFilePipe(TQObject *tqparent,TQFile *readfile,TQFile *writefile) : KMessageIO(tqparent,0) +KMessageFilePipe::KMessageFilePipe(TQObject *parent,TQFile *readfile,TQFile *writefile) : KMessageIO(parent,0) { mReadFile=readfile; mWriteFile=writefile; @@ -430,7 +430,7 @@ void KMessageFilePipe::send(const TQByteArray &msg) mWriteFile->writeBlock(buffer); mWriteFile->flush(); /* - fprintf(stderr,"+++ KMessageFilePipe:: SEND(%d to tqparent) realsize=%d\n",msg.size(),buffer.size()); + fprintf(stderr,"+++ KMessageFilePipe:: SEND(%d to parent) realsize=%d\n",msg.size(),buffer.size()); for (int i=0;imIsRecursive=false; diff --git a/libkdegames/kgame/kmessageserver.h b/libkdegames/kgame/kmessageserver.h index 3a416a6b..9042fca2 100644 --- a/libkdegames/kgame/kmessageserver.h +++ b/libkdegames/kgame/kmessageserver.h @@ -209,7 +209,7 @@ public: /** * Create a KGameNetwork object **/ - KMessageServer(TQ_UINT16 cookie = 42, TQObject* tqparent = 0); + KMessageServer(TQ_UINT16 cookie = 42, TQObject* parent = 0); ~KMessageServer(); @@ -480,7 +480,7 @@ class KMessageServerSocket : public TQServerSocket TQ_OBJECT public: - KMessageServerSocket (TQ_UINT16 port, TQObject *tqparent = 0); + KMessageServerSocket (TQ_UINT16 port, TQObject *parent = 0); ~KMessageServerSocket (); void newConnection (int socket); -- cgit v1.2.1