diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | a13e26c2f1eb3c5be81acf4f571dd4bafac10199 (patch) | |
tree | 1f1d3e407ae668b1448847970b2f1b626083faf6 /libkdegames | |
parent | 24c5cdc2737fe0044b11a12359606973eb93fc0b (diff) | |
download | tdegames-a13e26c2f1eb3c5be81acf4f571dd4bafac10199.tar.gz tdegames-a13e26c2f1eb3c5be81acf4f571dd4bafac10199.zip |
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
Diffstat (limited to 'libkdegames')
56 files changed, 350 insertions, 350 deletions
diff --git a/libkdegames/highscore/kexthighscore.cpp b/libkdegames/highscore/kexthighscore.cpp index 22fa4a85..d352a266 100644 --- a/libkdegames/highscore/kexthighscore.cpp +++ b/libkdegames/highscore/kexthighscore.cpp @@ -44,19 +44,19 @@ void setGameType(uint type) internal->setGameType(type); } -bool configure(TQWidget *tqparent) +bool configure(TQWidget *parent) { internal->checkFirst(); - ConfigDialog *cd = new ConfigDialog(tqparent); + ConfigDialog *cd = new ConfigDialog(parent); cd->exec(); bool saved = cd->hasBeenSaved(); delete cd; return saved; } -void show(TQWidget *tqparent, int rank) +void show(TQWidget *parent, int rank) { - HighscoresDialog *hd = new HighscoresDialog(rank, tqparent); + HighscoresDialog *hd = new HighscoresDialog(rank, parent); hd->exec(); delete hd; } diff --git a/libkdegames/highscore/kexthighscore.h b/libkdegames/highscore/kexthighscore.h index 7f16eac6..5809a896 100644 --- a/libkdegames/highscore/kexthighscore.h +++ b/libkdegames/highscore/kexthighscore.h @@ -51,17 +51,17 @@ KDE_EXPORT void setGameType(uint gameType); * Configure the highscores. * @return true if the configuration has been modified and saved */ -KDE_EXPORT bool configure(TQWidget *tqparent); +KDE_EXPORT bool configure(TQWidget *parent); /** * Show the highscores lists. */ -KDE_EXPORT void show(TQWidget *tqparent); +KDE_EXPORT void show(TQWidget *parent); /** * Submit a score. See @ref Manager for usage example. * - * @param widget a widget used as tqparent for error message box. + * @param widget a widget used as parent for error message box. */ KDE_EXPORT void submitScore(const Score &score, TQWidget *widget); diff --git a/libkdegames/highscore/kexthighscore_gui.cpp b/libkdegames/highscore/kexthighscore_gui.cpp index 9aa28e89..02ea99b6 100644 --- a/libkdegames/highscore/kexthighscore_gui.cpp +++ b/libkdegames/highscore/kexthighscore_gui.cpp @@ -58,8 +58,8 @@ void ShowItem::paintCell(TQPainter *p, const TQColorGroup &cg, } //----------------------------------------------------------------------------- -ScoresList::ScoresList(TQWidget *tqparent) - : KListView(tqparent) +ScoresList::ScoresList(TQWidget *parent) + : KListView(parent) { setSelectionMode(TQListView::NoSelection); setItemMargin(3); @@ -99,8 +99,8 @@ void ScoresList::addLineItem(const ItemArray &items, } //----------------------------------------------------------------------------- -HighscoresList::HighscoresList(TQWidget *tqparent) - : ScoresList(tqparent) +HighscoresList::HighscoresList(TQWidget *parent) + : ScoresList(parent) {} TQString HighscoresList::itemText(const ItemContainer &item, uint row) const @@ -120,8 +120,8 @@ void HighscoresList::load(const ItemArray &items, int highlight) } //----------------------------------------------------------------------------- -HighscoresWidget::HighscoresWidget(TQWidget *tqparent) - : TQWidget(tqparent, "show_highscores_widget"), +HighscoresWidget::HighscoresWidget(TQWidget *parent) + : TQWidget(parent, "show_highscores_widget"), _scoresUrl(0), _playersUrl(0), _statsTab(0), _histoTab(0) { const ScoreInfos &s = internal->scoreInfos(); @@ -197,10 +197,10 @@ void HighscoresWidget::load(int rank) } //----------------------------------------------------------------------------- -HighscoresDialog::HighscoresDialog(int rank, TQWidget *tqparent) +HighscoresDialog::HighscoresDialog(int rank, TQWidget *parent) : KDialogBase(internal->nbGameTypes()>1 ? TreeList : Plain, i18n("Highscores"), Close|User1|User2, Close, - tqparent, "show_highscores", true, true, + parent, "show_highscores", true, true, KGuiItem(i18n("Configure..."), "configure"), KGuiItem(i18n("Export..."))), _rank(rank), _tab(0) { @@ -270,8 +270,8 @@ void HighscoresDialog::slotUser2() //----------------------------------------------------------------------------- LastMultipleScoresList::LastMultipleScoresList( - const TQValueVector<Score> &scores, TQWidget *tqparent) - : ScoresList(tqparent), _scores(scores) + const TQValueVector<Score> &scores, TQWidget *parent) + : ScoresList(parent), _scores(scores) { const ScoreInfos &s = internal->scoreInfos(); addHeader(s); @@ -307,8 +307,8 @@ TQString LastMultipleScoresList::itemText(const ItemContainer &item, //----------------------------------------------------------------------------- TotalMultipleScoresList::TotalMultipleScoresList( - const TQValueVector<Score> &scores, TQWidget *tqparent) - : ScoresList(tqparent), _scores(scores) + const TQValueVector<Score> &scores, TQWidget *parent) + : ScoresList(parent), _scores(scores) { const ScoreInfos &s = internal->scoreInfos(); addHeader(s); @@ -352,10 +352,10 @@ TQString TotalMultipleScoresList::itemText(const ItemContainer &item, //----------------------------------------------------------------------------- -ConfigDialog::ConfigDialog(TQWidget *tqparent) +ConfigDialog::ConfigDialog(TQWidget *parent) : KDialogBase(Swallow, i18n("Configure Highscores"), Ok|Apply|Cancel, Cancel, - tqparent, "configure_highscores", true, true), + parent, "configure_highscores", true, true), _saved(false), _WWHEnabled(0) { TQWidget *page = 0; @@ -516,9 +516,9 @@ bool ConfigDialog::save() } //----------------------------------------------------------------------------- -AskNameDialog::AskNameDialog(TQWidget *tqparent) +AskNameDialog::AskNameDialog(TQWidget *parent) : KDialogBase(Plain, i18n("Enter Your Nickname"), Ok | Cancel, Ok, - tqparent, "ask_name_dialog") + parent, "ask_name_dialog") { internal->hsConfig().readCurrentConfig(); diff --git a/libkdegames/highscore/kexthighscore_gui.h b/libkdegames/highscore/kexthighscore_gui.h index fc2d3912..f6b2336a 100644 --- a/libkdegames/highscore/kexthighscore_gui.h +++ b/libkdegames/highscore/kexthighscore_gui.h @@ -60,7 +60,7 @@ class ScoresList : public KListView Q_OBJECT TQ_OBJECT public: - ScoresList(TQWidget *tqparent); + ScoresList(TQWidget *parent); void addHeader(const ItemArray &); @@ -79,7 +79,7 @@ class HighscoresList : public ScoresList Q_OBJECT TQ_OBJECT public: - HighscoresList(TQWidget *tqparent); + HighscoresList(TQWidget *parent); void load(const ItemArray &, int highlight); @@ -92,7 +92,7 @@ class HighscoresWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - HighscoresWidget(TQWidget *tqparent); + HighscoresWidget(TQWidget *parent); void load(int rank); @@ -118,7 +118,7 @@ class HighscoresDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - HighscoresDialog(int rank, TQWidget *tqparent); + HighscoresDialog(int rank, TQWidget *parent); private slots: void slotUser1(); @@ -138,7 +138,7 @@ class LastMultipleScoresList : public ScoresList Q_OBJECT TQ_OBJECT public: - LastMultipleScoresList(const TQValueVector<Score> &, TQWidget *tqparent); + LastMultipleScoresList(const TQValueVector<Score> &, TQWidget *parent); private: void addLineItem(const ItemArray &, uint index, TQListViewItem *line); @@ -153,7 +153,7 @@ class TotalMultipleScoresList : public ScoresList Q_OBJECT TQ_OBJECT public: - TotalMultipleScoresList(const TQValueVector<Score> &, TQWidget *tqparent); + TotalMultipleScoresList(const TQValueVector<Score> &, TQWidget *parent); private: void addLineItem(const ItemArray &, uint index, TQListViewItem *line); @@ -169,7 +169,7 @@ class ConfigDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ConfigDialog(TQWidget *tqparent); + ConfigDialog(TQWidget *parent); bool hasBeenSaved() const { return _saved; } @@ -197,7 +197,7 @@ class AskNameDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - AskNameDialog(TQWidget *tqparent); + AskNameDialog(TQWidget *parent); TQString name() const { return _edit->text(); } bool dontAskAgain() const { return _checkbox->isChecked(); } diff --git a/libkdegames/highscore/kexthighscore_internal.cpp b/libkdegames/highscore/kexthighscore_internal.cpp index 1bd0ddbc..a679002c 100644 --- a/libkdegames/highscore/kexthighscore_internal.cpp +++ b/libkdegames/highscore/kexthighscore_internal.cpp @@ -602,15 +602,15 @@ const char *DUMMY_STRINGS[] = { const char *UNABLE_TO_CONTACT = I18N_NOOP("Unable to contact world-wide highscore server"); -bool ManagerPrivate::doQuery(const KURL &url, TQWidget *tqparent, +bool ManagerPrivate::doQuery(const KURL &url, TQWidget *parent, TQDomNamedNodeMap *map) { KIO::http_update_cache(url, true, 0); // remove cache ! TQString tmpFile; - if ( !KIO::NetAccess::download(url, tmpFile, tqparent) ) { + if ( !KIO::NetAccess::download(url, tmpFile, parent) ) { TQString details = i18n("Server URL: %1").tqarg(url.host()); - KMessageBox::detailedSorry(tqparent, i18n(UNABLE_TO_CONTACT), details); + KMessageBox::detailedSorry(parent, i18n(UNABLE_TO_CONTACT), details); return false; } @@ -618,7 +618,7 @@ bool ManagerPrivate::doQuery(const KURL &url, TQWidget *tqparent, if ( !file.open(IO_ReadOnly) ) { KIO::NetAccess::removeTempFile(tmpFile); TQString details = i18n("Unable to open temporary file."); - KMessageBox::detailedSorry(tqparent, i18n(UNABLE_TO_CONTACT), details); + KMessageBox::detailedSorry(parent, i18n(UNABLE_TO_CONTACT), details); return false; } @@ -641,24 +641,24 @@ bool ManagerPrivate::doQuery(const KURL &url, TQWidget *tqparent, TQString msg = i18n(attr.value().latin1()); TQString caption = i18n("Message from world-wide highscores " "server"); - KMessageBox::sorry(tqparent, msg, caption); + KMessageBox::sorry(parent, msg, caption); return false; } } } TQString msg = i18n("Invalid answer from world-wide highscores server."); TQString details = i18n("Raw message: %1").tqarg(content); - KMessageBox::detailedSorry(tqparent, msg, details); + KMessageBox::detailedSorry(parent, msg, details); return false; } bool ManagerPrivate::getFromQuery(const TQDomNamedNodeMap &map, const TQString &name, TQString &value, - TQWidget *tqparent) + TQWidget *parent) { TQDomAttr attr = map.namedItem(name).toAttr(); if ( attr.isNull() ) { - KMessageBox::sorry(tqparent, + KMessageBox::sorry(parent, i18n("Invalid answer from world-wide " "highscores server (missing item: %1).").tqarg(name)); return false; diff --git a/libkdegames/highscore/kexthighscore_internal.h b/libkdegames/highscore/kexthighscore_internal.h index e0aa8ca5..0bd4f9ef 100644 --- a/libkdegames/highscore/kexthighscore_internal.h +++ b/libkdegames/highscore/kexthighscore_internal.h @@ -264,11 +264,11 @@ class ManagerPrivate // return -1 if not a local best score int rank(const Score &score) const; - bool submitWorldWide(const Score &score, TQWidget *tqparent) const; - static bool doQuery(const KURL &url, TQWidget *tqparent, + bool submitWorldWide(const Score &score, TQWidget *parent) const; + static bool doQuery(const KURL &url, TQWidget *parent, TQDomNamedNodeMap *map = 0); static bool getFromQuery(const TQDomNamedNodeMap &map, const TQString &name, - TQString &value, TQWidget *tqparent); + TQString &value, TQWidget *parent); void convertToGlobal(); }; diff --git a/libkdegames/highscore/kexthighscore_item.cpp b/libkdegames/highscore/kexthighscore_item.cpp index faf7ffdf..4b48a0ee 100644 --- a/libkdegames/highscore/kexthighscore_item.cpp +++ b/libkdegames/highscore/kexthighscore_item.cpp @@ -238,7 +238,7 @@ void MultiplayerScores::addScore(uint i, const Score &score) _scores[i]._data["nb won games"] = won; } -void MultiplayerScores::show(TQWidget *tqparent) +void MultiplayerScores::show(TQWidget *parent) { // check consistency if ( _nbGames.size()<2 ) kdWarning(11002) << "less than 2 players" << endl; @@ -271,7 +271,7 @@ void MultiplayerScores::show(TQWidget *tqparent) // show the scores KDialogBase dialog(KDialogBase::Plain, i18n("Multiplayers Scores"), KDialogBase::Close, KDialogBase::Close, - tqparent, "show_multiplayers_score", true, true); + parent, "show_multiplayers_score", true, true); TQHBoxLayout *hbox = new TQHBoxLayout(dialog.plainPage(), KDialog::marginHint(), KDialog::spacingHint()); diff --git a/libkdegames/highscore/kexthighscore_item.h b/libkdegames/highscore/kexthighscore_item.h index d5faa380..b32f32e7 100644 --- a/libkdegames/highscore/kexthighscore_item.h +++ b/libkdegames/highscore/kexthighscore_item.h @@ -294,7 +294,7 @@ class KDE_EXPORT MultiplayerScores /** * Show scores. */ - void show(TQWidget *tqparent); + void show(TQWidget *parent); private: TQValueVector<uint> _nbGames; diff --git a/libkdegames/highscore/kexthighscore_tab.cpp b/libkdegames/highscore/kexthighscore_tab.cpp index 8c41227c..d47b35a6 100644 --- a/libkdegames/highscore/kexthighscore_tab.cpp +++ b/libkdegames/highscore/kexthighscore_tab.cpp @@ -39,8 +39,8 @@ namespace KExtHighscore { //----------------------------------------------------------------------------- -PlayersCombo::PlayersCombo(TQWidget *tqparent, const char *name) - : TQComboBox(tqparent, name) +PlayersCombo::PlayersCombo(TQWidget *parent, const char *name) + : TQComboBox(parent, name) { const PlayerInfos &p = internal->playerInfos(); for (uint i = 0; i<p.nbEntries(); i++) @@ -65,8 +65,8 @@ void PlayersCombo::load() } //----------------------------------------------------------------------------- -AdditionalTab::AdditionalTab(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +AdditionalTab::AdditionalTab(TQWidget *parent, const char *name) + : TQWidget(parent, name) { TQVBoxLayout *top = new TQVBoxLayout(this, KDialogBase::marginHint(), KDialogBase::spacingHint()); @@ -116,8 +116,8 @@ const char *StatisticsTab::TREND_LABELS[Nb_Trends] = { I18N_NOOP("Current:"), I18N_NOOP("Max won:"), I18N_NOOP("Max lost:") }; -StatisticsTab::StatisticsTab(TQWidget *tqparent) - : AdditionalTab(tqparent, "statistics_tab") +StatisticsTab::StatisticsTab(TQWidget *parent) + : AdditionalTab(parent, "statistics_tab") { // construct GUI TQVBoxLayout *top = static_cast<TQVBoxLayout *>(tqlayout()); @@ -205,8 +205,8 @@ void StatisticsTab::display(uint i) } //----------------------------------------------------------------------------- -HistogramTab::HistogramTab(TQWidget *tqparent) - : AdditionalTab(tqparent, "histogram_tab") +HistogramTab::HistogramTab(TQWidget *parent) + : AdditionalTab(parent, "histogram_tab") { // construct GUI TQVBoxLayout *top = static_cast<TQVBoxLayout *>(tqlayout()); diff --git a/libkdegames/highscore/kexthighscore_tab.h b/libkdegames/highscore/kexthighscore_tab.h index dc0d7536..d59afeb5 100644 --- a/libkdegames/highscore/kexthighscore_tab.h +++ b/libkdegames/highscore/kexthighscore_tab.h @@ -36,7 +36,7 @@ class PlayersCombo : public TQComboBox Q_OBJECT TQ_OBJECT public: - PlayersCombo(TQWidget *tqparent = 0, const char *name = 0); + PlayersCombo(TQWidget *parent = 0, const char *name = 0); void load(); @@ -55,7 +55,7 @@ class AdditionalTab : public TQWidget Q_OBJECT TQ_OBJECT public: - AdditionalTab(TQWidget *tqparent, const char *name); + AdditionalTab(TQWidget *parent, const char *name); virtual void load(); @@ -78,7 +78,7 @@ class StatisticsTab : public AdditionalTab Q_OBJECT TQ_OBJECT public: - StatisticsTab(TQWidget *tqparent); + StatisticsTab(TQWidget *parent); void load(); @@ -104,7 +104,7 @@ class HistogramTab : public AdditionalTab Q_OBJECT TQ_OBJECT public: - HistogramTab(TQWidget *tqparent); + HistogramTab(TQWidget *parent); void load(); diff --git a/libkdegames/highscore/khighscore.cpp b/libkdegames/highscore/khighscore.cpp index dd10f2ab..6d696020 100644 --- a/libkdegames/highscore/khighscore.cpp +++ b/libkdegames/highscore/khighscore.cpp @@ -56,14 +56,14 @@ static KStaticDeleter<KFileLock> lockSD; static KStaticDeleter<KRawConfig> configSD; -KHighscore::KHighscore(TQObject* tqparent) - : TQObject(tqparent) +KHighscore::KHighscore(TQObject* parent) + : TQObject(parent) { init(true); } -KHighscore::KHighscore(bool forceLocal, TQObject* tqparent) - : TQObject(tqparent) +KHighscore::KHighscore(bool forceLocal, TQObject* parent) + : TQObject(parent) { init(forceLocal); } diff --git a/libkdegames/highscore/khighscore.h b/libkdegames/highscore/khighscore.h index ba7a4bd0..b7b6fb5e 100644 --- a/libkdegames/highscore/khighscore.h +++ b/libkdegames/highscore/khighscore.h @@ -90,7 +90,7 @@ public: * Constructor. The highscore file is forced to be local to support * games using the old behaviour. */ - KHighscore(TQObject* tqparent = 0); + KHighscore(TQObject* parent = 0); /** * Constructor. @@ -98,10 +98,10 @@ public: * @param forceLocal if true, the local highscore file is used even * when the configuration has been set to use a system-wide file. This * is convenient for converting highscores from legacy applications. - * @param tqparent tqparent widget for this widget + * @param parent parent widget for this widget * @since 3.2 */ - KHighscore(bool forceLocal, TQObject *tqparent); + KHighscore(bool forceLocal, TQObject *parent); /** * Read the current state of the highscore file. Remember that when @@ -133,7 +133,7 @@ public: * If the config file cannot be locked, * the method waits for 1 second and, if it failed again, displays * a message box asking for retry or cancel. - * @param widget used as the tqparent of the message box. + * @param widget used as the parent of the message box. * * @return false on error or if the config file is locked by another * process. In such case, the config stays read-only. diff --git a/libkdegames/highscore/kscoredialog.cpp b/libkdegames/highscore/kscoredialog.cpp index 0a3710f4..e799883b 100644 --- a/libkdegames/highscore/kscoredialog.cpp +++ b/libkdegames/highscore/kscoredialog.cpp @@ -64,8 +64,8 @@ public: }; -KScoreDialog::KScoreDialog(int fields, TQWidget *tqparent, const char *oname) - : KDialogBase(tqparent, oname, true, i18n("High Scores"), Ok, Ok, true) +KScoreDialog::KScoreDialog(int fields, TQWidget *parent, const char *oname) + : KDialogBase(parent, oname, true, i18n("High Scores"), Ok, Ok, true) { d = new KScoreDialogPrivate(); d->edit = 0; diff --git a/libkdegames/highscore/kscoredialog.h b/libkdegames/highscore/kscoredialog.h index 35a593b3..99a9f70b 100644 --- a/libkdegames/highscore/kscoredialog.h +++ b/libkdegames/highscore/kscoredialog.h @@ -57,10 +57,10 @@ public: /** * @param fields Which fields should be listed. - * @param tqparent passed to tqparent TQWidget constructor - * @param name passed to tqparent TQWidget constructor + * @param parent passed to parent TQWidget constructor + * @param name passed to parent TQWidget constructor */ - KScoreDialog(int fields, TQWidget *tqparent=0, const char *name=0); + KScoreDialog(int fields, TQWidget *parent=0, const char *name=0); ~KScoreDialog(); diff --git a/libkdegames/kcarddialog.cpp b/libkdegames/kcarddialog.cpp index 34657c41..9317c2a7 100644 --- a/libkdegames/kcarddialog.cpp +++ b/libkdegames/kcarddialog.cpp @@ -528,8 +528,8 @@ KCardDialog::~KCardDialog() // Create the dialog -KCardDialog::KCardDialog( TQWidget *tqparent, const char *name, CardFlags mFlags) - : KDialogBase( Plain, i18n("Carddeck Selection"), Ok|Cancel, Ok, tqparent, name, true, true) +KCardDialog::KCardDialog( TQWidget *parent, const char *name, CardFlags mFlags) + : KDialogBase( Plain, i18n("Carddeck Selection"), Ok|Cancel, Ok, parent, name, true, true) { KCardDialog::init(); diff --git a/libkdegames/kcarddialog.h b/libkdegames/kcarddialog.h index e0681f5b..c3a0f018 100644 --- a/libkdegames/kcarddialog.h +++ b/libkdegames/kcarddialog.h @@ -104,11 +104,11 @@ public: /** * Constructs a card deck selection dialog. * - * @param tqparent The tqparent widget of the dialog, if any. + * @param parent The parent widget of the dialog, if any. * @param name The name of the dialog. * @param flags Specifies whether the dialog is modal or not. */ - KCardDialog (TQWidget* tqparent = NULL,const char* name = NULL, + KCardDialog (TQWidget* parent = NULL,const char* name = NULL, CardFlags flags = Both); /** * Destructs a card deck selection dialog. @@ -126,7 +126,7 @@ public: * @param carddir a reference to the directory name used as front of the * cards. The directory contains the card images as 1.png to 52.png * - * @param tqparent an optional pointer to the tqparent window of the dialog + * @param parent an optional pointer to the parent window of the dialog * * @param flags what to show * @@ -154,7 +154,7 @@ public: * * @return TQDialog::result(). */ - static int getCardDeck(TQString &deck,TQString &carddir, TQWidget *tqparent=0, + static int getCardDeck(TQString &deck,TQString &carddir, TQWidget *parent=0, CardFlags flags=Both, bool* randomDeck=0, bool* randomCardDir=0, double* scale=0, KConfig* conf=0); diff --git a/libkdegames/kchat.cpp b/libkdegames/kchat.cpp index 71471497..2a9c3913 100644 --- a/libkdegames/kchat.cpp +++ b/libkdegames/kchat.cpp @@ -36,7 +36,7 @@ public: int mFromId; }; -KChat::KChat(TQWidget* tqparent, bool twoPlayerGame) : KChatBase(tqparent, twoPlayerGame) +KChat::KChat(TQWidget* parent, bool twoPlayerGame) : KChatBase(parent, twoPlayerGame) { init(); } diff --git a/libkdegames/kchat.h b/libkdegames/kchat.h index a28578c7..f6867c68 100644 --- a/libkdegames/kchat.h +++ b/libkdegames/kchat.h @@ -39,12 +39,12 @@ class KDE_EXPORT KChat : public KChatBase TQ_OBJECT public: /** - * @param tqparent The tqparent widget for this widget. + * @param parent The parent widget for this widget. * @param twoPlayerGame If true the combo box where the player can * choose to send to a single player or to all players will not be added * as you will hardly need it in 2-player games. **/ - KChat(TQWidget* tqparent, bool twoPlayerGame = false); + KChat(TQWidget* parent, bool twoPlayerGame = false); virtual ~KChat(); diff --git a/libkdegames/kchatbase.cpp b/libkdegames/kchatbase.cpp index 4f0c9931..59babb5d 100644 --- a/libkdegames/kchatbase.cpp +++ b/libkdegames/kchatbase.cpp @@ -182,7 +182,7 @@ public: TQFont mSystemMessageFont; }; -KChatBase::KChatBase(TQWidget* tqparent, bool noComboBox) : TQFrame(tqparent) +KChatBase::KChatBase(TQWidget* parent, bool noComboBox) : TQFrame(parent) { init(noComboBox); } diff --git a/libkdegames/kchatbase.h b/libkdegames/kchatbase.h index 77a6ed4f..892e5859 100644 --- a/libkdegames/kchatbase.h +++ b/libkdegames/kchatbase.h @@ -187,12 +187,12 @@ class KDE_EXPORT KChatBase : public TQFrame TQ_OBJECT public: /** - * @param tqparent The tqparent widget for this widget. + * @param parent The parent widget for this widget. * @param noComboBox If true then the combo box where the player can * choose where to send messages to (either globally or just to some * players) will not be added. **/ - KChatBase(TQWidget* tqparent, bool noComboBox = false); + KChatBase(TQWidget* parent, bool noComboBox = false); /** * Destruct the KChatBase object diff --git a/libkdegames/kchatdialog.cpp b/libkdegames/kchatdialog.cpp index 58c90e69..7e0df7e8 100644 --- a/libkdegames/kchatdialog.cpp +++ b/libkdegames/kchatdialog.cpp @@ -55,17 +55,17 @@ class KChatDialogPrivate KChatBase* mChat; }; -KChatDialog::KChatDialog(KChatBase* chat, TQWidget* tqparent, bool modal) -// : KDialogBase(Tabbed, i18n("Configure Chat"), Ok|Default|Apply|Cancel, Ok, tqparent, 0, modal, true) - : KDialogBase(Plain, i18n("Configure Chat"), Ok|Default|Apply|Cancel, Ok, tqparent, 0, modal, true) +KChatDialog::KChatDialog(KChatBase* chat, TQWidget* parent, bool modal) +// : KDialogBase(Tabbed, i18n("Configure Chat"), Ok|Default|Apply|Cancel, Ok, parent, 0, modal, true) + : KDialogBase(Plain, i18n("Configure Chat"), Ok|Default|Apply|Cancel, Ok, parent, 0, modal, true) { init(); plugChatWidget(chat); } -KChatDialog::KChatDialog(TQWidget* tqparent, bool modal) -// : KDialogBase(Tabbed, i18n("Configure Chat"), Ok|Default|Apply|Cancel, Ok, tqparent, 0, modal, true) - : KDialogBase(Plain, i18n("Configure Chat"), Ok|Default|Apply|Cancel, Ok, tqparent, 0, modal, true) +KChatDialog::KChatDialog(TQWidget* parent, bool modal) +// : KDialogBase(Tabbed, i18n("Configure Chat"), Ok|Default|Apply|Cancel, Ok, parent, 0, modal, true) + : KDialogBase(Plain, i18n("Configure Chat"), Ok|Default|Apply|Cancel, Ok, parent, 0, modal, true) { init(); } diff --git a/libkdegames/kchatdialog.h b/libkdegames/kchatdialog.h index 5e5ff70d..8b374788 100644 --- a/libkdegames/kchatdialog.h +++ b/libkdegames/kchatdialog.h @@ -35,14 +35,14 @@ public: /** * Construct a KChatDialog widget **/ - KChatDialog(TQWidget* tqparent, bool modal = false); + KChatDialog(TQWidget* parent, bool modal = false); /** * Construct a KChatDialog widget which automatically configures the * @ref KChatBase widget. You probably want to use this as you don't * have to care about the configuration stuff yourself. **/ - KChatDialog(KChatBase* chatWidget, TQWidget* tqparent, bool modal = false); + KChatDialog(KChatBase* chatWidget, TQWidget* parent, bool modal = false); /** * Destruct the dialog 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 <[email protected]> **/ @@ -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 <[email protected]> **/ @@ -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 * <em>MUST</em> 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. <em>MUST be UNITQUE</em>! 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 <em>not</em> 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<KGamePropertyBase> 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 <TQByteArray> 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;i<buffer.size();i++) fprintf(stderr,"%02x ",buffer[i]);fprintf(stderr,"\n"); fflush(stderr); */ diff --git a/libkdegames/kgame/kmessageio.h b/libkdegames/kgame/kmessageio.h index 7d4bc92a..326476ff 100644 --- a/libkdegames/kgame/kmessageio.h +++ b/libkdegames/kgame/kmessageio.h @@ -62,7 +62,7 @@ public: /** * The usual TQObject constructor, does nothing else. **/ - KMessageIO (TQObject *tqparent = 0, const char *name = 0); + KMessageIO (TQObject *parent = 0, const char *name = 0); /** * The usual destructor, does nothing special. @@ -183,7 +183,7 @@ public: If the connection could not be established (e.g. unknown host or no server socket at this port), the signal /e connectionBroken is emitted. */ - KMessageSocket (TQString host, TQ_UINT16 port, TQObject *tqparent = 0, + KMessageSocket (TQString host, TQ_UINT16 port, TQObject *parent = 0, const char *name = 0); /** @@ -194,7 +194,7 @@ public: If the connection could not be established (e.g. unknown host or no server socket at this port), the signal /e connectionBroken is emitted. */ - KMessageSocket (TQHostAddress host, TQ_UINT16 port, TQObject *tqparent = 0, + KMessageSocket (TQHostAddress host, TQ_UINT16 port, TQObject *parent = 0, const char *name = 0); /** @@ -205,10 +205,10 @@ public: Note: The /e socket object is then owned by the /e KMessageSocket object. So don't use it otherwise any more and don't delete it. It is deleted - together with this KMessageSocket object. (Use 0 as tqparent for the TQSocket + together with this KMessageSocket object. (Use 0 as parent for the TQSocket object t ensure it is not deleted.) */ - KMessageSocket (TQSocket *socket, TQObject *tqparent = 0, const char *name = 0); + KMessageSocket (TQSocket *socket, TQObject *parent = 0, const char *name = 0); /** Uses the socket specified by the socket descriptor socketFD to do the @@ -221,7 +221,7 @@ public: manipulate the socket afterwards, especially don't close it. The socket is automatically closed when KMessageSocket is deleted. */ - KMessageSocket (int socketFD, TQObject *tqparent = 0, const char *name = 0); + KMessageSocket (int socketFD, TQObject *parent = 0, const char *name = 0); /** Destructor, closes the socket. @@ -307,7 +307,7 @@ public: If that object is already connected, the object remains unconnected. */ - KMessageDirect (KMessageDirect *partner = 0, TQObject *tqparent = 0, const char + KMessageDirect (KMessageDirect *partner = 0, TQObject *parent = 0, const char *name = 0); /** @@ -354,7 +354,7 @@ class KMessageProcess : public KMessageIO TQ_OBJECT public: - KMessageProcess(TQObject *tqparent, TQString file); + KMessageProcess(TQObject *parent, TQString file); ~KMessageProcess(); bool isConnected() const; void send (const TQByteArray &msg); @@ -393,7 +393,7 @@ class KMessageFilePipe : public KMessageIO TQ_OBJECT public: - KMessageFilePipe(TQObject *tqparent,TQFile *readFile,TQFile *writeFile); + KMessageFilePipe(TQObject *parent,TQFile *readFile,TQFile *writeFile); ~KMessageFilePipe(); bool isConnected() const; void send (const TQByteArray &msg); diff --git a/libkdegames/kgame/kmessageserver.cpp b/libkdegames/kgame/kmessageserver.cpp index 69609002..80df9207 100644 --- a/libkdegames/kgame/kmessageserver.cpp +++ b/libkdegames/kgame/kmessageserver.cpp @@ -31,8 +31,8 @@ // --------------- internal class KMessageServerSocket -KMessageServerSocket::KMessageServerSocket (TQ_UINT16 port, TQObject *tqparent) - : TQServerSocket (port, 0, tqparent) +KMessageServerSocket::KMessageServerSocket (TQ_UINT16 port, TQObject *parent) + : TQServerSocket (port, 0, parent) { } @@ -86,8 +86,8 @@ public: // ------------------ KMessageServer -KMessageServer::KMessageServer (TQ_UINT16 cookie,TQObject* tqparent) - : TQObject(tqparent, 0) +KMessageServer::KMessageServer (TQ_UINT16 cookie,TQObject* parent) + : TQObject(parent, 0) { d = new KMessageServerPrivate; d->mIsRecursive=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); diff --git a/libkdegames/kgamelcd.cpp b/libkdegames/kgamelcd.cpp index cc6aa5a8..cf079a15 100644 --- a/libkdegames/kgamelcd.cpp +++ b/libkdegames/kgamelcd.cpp @@ -28,8 +28,8 @@ //----------------------------------------------------------------------------- -KGameLCD::KGameLCD(uint nbDigits, TQWidget *tqparent, const char *name) - : TQLCDNumber(nbDigits, tqparent, name), _htime(800) +KGameLCD::KGameLCD(uint nbDigits, TQWidget *parent, const char *name) + : TQLCDNumber(nbDigits, parent, name), _htime(800) { const TQPalette &p = palette(); _fgColor = p.color(TQPalette::Active, TQColorGroup::Foreground); @@ -110,8 +110,8 @@ void KGameLCD::highlight(bool light) } //----------------------------------------------------------------------------- -KGameLCDClock::KGameLCDClock(TQWidget *tqparent, const char *name) -: KGameLCD(5, tqparent, name) +KGameLCDClock::KGameLCDClock(TQWidget *parent, const char *name) +: KGameLCD(5, parent, name) { _timerClock = new TQTimer(this); connect(_timerClock, TQT_SIGNAL(timeout()), TQT_SLOT(timeoutClock())); @@ -191,15 +191,15 @@ public: TQValueVector<TQLabel *> _leadings; }; -KGameLCDList::KGameLCDList(const TQString &title, TQWidget *tqparent, +KGameLCDList::KGameLCDList(const TQString &title, TQWidget *parent, const char *name) - : TQWidget(tqparent, name) + : TQWidget(parent, name) { init(title); } -KGameLCDList::KGameLCDList(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KGameLCDList::KGameLCDList(TQWidget *parent, const char *name) + : TQWidget(parent, name) { init(TQString()); } diff --git a/libkdegames/kgamelcd.h b/libkdegames/kgamelcd.h index 543cfef5..6b84f012 100644 --- a/libkdegames/kgamelcd.h +++ b/libkdegames/kgamelcd.h @@ -44,7 +44,7 @@ class KDE_EXPORT KGameLCD : public TQLCDNumber Q_OBJECT TQ_OBJECT public: - KGameLCD(uint nbDigits, TQWidget *tqparent = 0, const char *name = 0); + KGameLCD(uint nbDigits, TQWidget *parent = 0, const char *name = 0); ~KGameLCD(); @@ -129,7 +129,7 @@ class KDE_EXPORT KGameLCDClock : public KGameLCD Q_OBJECT TQ_OBJECT public: - KGameLCDClock(TQWidget *tqparent = 0, const char *name = 0); + KGameLCDClock(TQWidget *parent = 0, const char *name = 0); ~KGameLCDClock(); @@ -198,24 +198,24 @@ public: * Constructor. * * @param title is the content of the top label. - * @param tqparent passed to the TQWidget constructor + * @param parent passed to the TQWidget constructor * @param name passed to the TQWidget constructor */ KGameLCDList(const TQString &title, - TQWidget *tqparent = 0, const char *name = 0); - KGameLCDList(TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); + KGameLCDList(TQWidget *parent = 0, const char *name = 0); ~KGameLCDList(); /** * Append a TQLCDNumber at the bottom of the list. - * The TQLCDNumber should have the KGameLCDList as tqparent. + * The TQLCDNumber should have the KGameLCDList as parent. */ void append(TQLCDNumber *lcd); /** * Append a TQLCDNumber at the bottom of the list. - * The TQLCDNumber should have the KGameLCDList as tqparent. + * The TQLCDNumber should have the KGameLCDList as parent. */ void append(const TQString &leading, TQLCDNumber *lcd); diff --git a/libkdegames/kgameprogress.cpp b/libkdegames/kgameprogress.cpp index b814b48f..98876aa3 100644 --- a/libkdegames/kgameprogress.cpp +++ b/libkdegames/kgameprogress.cpp @@ -29,16 +29,16 @@ #include <kapplication.h> -KGameProgress::KGameProgress(TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name), +KGameProgress::KGameProgress(TQWidget *parent, const char *name) + : TQFrame(parent, name), TQRangeControl(0, 100, 1, 10, 0), orient(Qt::Horizontal) { initialize(); } -KGameProgress::KGameProgress(Qt::Orientation orientation, TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name), +KGameProgress::KGameProgress(Qt::Orientation orientation, TQWidget *parent, const char *name) + : TQFrame(parent, name), TQRangeControl(0, 100, 1, 10, 0), orient(orientation) { @@ -46,8 +46,8 @@ KGameProgress::KGameProgress(Qt::Orientation orientation, TQWidget *tqparent, co } KGameProgress::KGameProgress(int minValue, int maxValue, int value, - Qt::Orientation orientation, TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name), + Qt::Orientation orientation, TQWidget *parent, const char *name) + : TQFrame(parent, name), TQRangeControl(minValue, maxValue, 1, 10, value), orient(orientation) { diff --git a/libkdegames/kgameprogress.h b/libkdegames/kgameprogress.h index 087fc27b..834b127c 100644 --- a/libkdegames/kgameprogress.h +++ b/libkdegames/kgameprogress.h @@ -71,18 +71,18 @@ public: /** * Construct a horizontal progress bar. */ - KGameProgress(TQWidget *tqparent=0, const char *name=0); + KGameProgress(TQWidget *parent=0, const char *name=0); /** * Construct a progress bar with orientation @p orient. */ - KGameProgress(Qt::Orientation orient, TQWidget *tqparent=0, const char *name=0); + KGameProgress(Qt::Orientation orient, TQWidget *parent=0, const char *name=0); /** * Construct a progress bar with minimum, maximum and initial values. */ KGameProgress(int minValue, int maxValue, int value, Qt::Orientation, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); /** * Destruct the progress bar. diff --git a/libkdegames/kstdgameaction.cpp b/libkdegames/kstdgameaction.cpp index 4eb54bba..2aeb412e 100644 --- a/libkdegames/kstdgameaction.cpp +++ b/libkdegames/kstdgameaction.cpp @@ -33,10 +33,10 @@ KStdGameAction::~KStdGameAction() {} KAction *KStdGameAction::action(StdGameAction act_enum, const TQObject *recvr, - const char *slot, KActionCollection *tqparent, + const char *slot, KActionCollection *parent, const char *name) { - return create( act_enum, name, recvr, slot, tqparent ); + return create( act_enum, name, recvr, slot, parent ); } const char* KStdGameAction::stdName(StdGameAction act_enum) @@ -97,11 +97,11 @@ static const KStdGameActionInfo* infoPtr( KStdGameAction::StdGameAction id ) KAction* KStdGameAction::create(StdGameAction id, const char *name, const TQObject *recvr, const char *slot, - KActionCollection* tqparent ) + KActionCollection* parent ) { KAction* pAction = 0; const KStdGameActionInfo* pInfo = infoPtr( id ); - kdDebug(125) << "KStdGameAction::create( " << id << "=" << (pInfo ? pInfo->psName : (const char*)0) << ", " << tqparent << ", " << name << " )" << endl; + kdDebug(125) << "KStdGameAction::create( " << id << "=" << (pInfo ? pInfo->psName : (const char*)0) << ", " << parent << ", " << name << " )" << endl; if( pInfo ) { TQString sLabel = i18n(pInfo->psLabel); KShortcut cut = (pInfo->globalAccel==KStdAccel::AccelNone @@ -111,20 +111,20 @@ KAction* KStdGameAction::create(StdGameAction id, const char *name, switch( id ) { case LoadRecent: pAction = - new KRecentFilesAction(sLabel, cut, recvr, slot, tqparent, n); + new KRecentFilesAction(sLabel, cut, recvr, slot, parent, n); break; case Pause: case Demo: pAction = new KToggleAction( sLabel, pInfo->psIconName, cut, - recvr, slot, tqparent, n); + recvr, slot, parent, n); break; case ChooseGameType: pAction = new KSelectAction( sLabel, pInfo->psIconName, cut, - recvr, slot, tqparent, n); + recvr, slot, parent, n); break; default: pAction = new KAction( sLabel, pInfo->psIconName, cut, - recvr, slot, tqparent, n); + recvr, slot, parent, n); break; } } @@ -138,72 +138,72 @@ const char* KStdGameAction::name( StdGameAction id ) } KAction *KStdGameAction::gameNew(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(New, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(New, name, recvr, slot, parent); } KAction *KStdGameAction::load(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(Load, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(Load, name, recvr, slot, parent); } KRecentFilesAction *KStdGameAction::loadRecent(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return static_cast<KRecentFilesAction *>(KStdGameAction::create(LoadRecent, name, recvr, slot, tqparent)); } + KActionCollection *parent, const char *name ) +{ return static_cast<KRecentFilesAction *>(KStdGameAction::create(LoadRecent, name, recvr, slot, parent)); } KAction *KStdGameAction::save(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(Save, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(Save, name, recvr, slot, parent); } KAction *KStdGameAction::saveAs(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(SaveAs, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(SaveAs, name, recvr, slot, parent); } KAction *KStdGameAction::end(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(End, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(End, name, recvr, slot, parent); } KToggleAction *KStdGameAction::pause(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return static_cast<KToggleAction *>(KStdGameAction::create(Pause, name, recvr, slot, tqparent)); } + KActionCollection *parent, const char *name ) +{ return static_cast<KToggleAction *>(KStdGameAction::create(Pause, name, recvr, slot, parent)); } KAction *KStdGameAction::highscores(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(Highscores, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(Highscores, name, recvr, slot, parent); } KAction *KStdGameAction::print(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(Print, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(Print, name, recvr, slot, parent); } KAction *KStdGameAction::quit(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(Quit, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(Quit, name, recvr, slot, parent); } KAction *KStdGameAction::repeat(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(Repeat, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(Repeat, name, recvr, slot, parent); } KAction *KStdGameAction::undo(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(Undo, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(Undo, name, recvr, slot, parent); } KAction *KStdGameAction::redo(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(Redo, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(Redo, name, recvr, slot, parent); } KAction *KStdGameAction::roll(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(Roll, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(Roll, name, recvr, slot, parent); } KAction *KStdGameAction::endTurn(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(EndTurn, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(EndTurn, name, recvr, slot, parent); } KAction *KStdGameAction::carddecks(const TQObject *recvr, const char *slot, - KActionCollection *tqparent, const char *name ) -{ return KStdGameAction::create(Carddecks, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name ) +{ return KStdGameAction::create(Carddecks, name, recvr, slot, parent); } KAction *KStdGameAction::configureHighscores(const TQObject*recvr, const char *slot, - KActionCollection *tqparent, const char *name) -{ return KStdGameAction::create(ConfigureHighscores, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name) +{ return KStdGameAction::create(ConfigureHighscores, name, recvr, slot, parent); } KAction *KStdGameAction::hint(const TQObject*recvr, const char *slot, - KActionCollection *tqparent, const char *name) -{ return KStdGameAction::create(Hint, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name) +{ return KStdGameAction::create(Hint, name, recvr, slot, parent); } KToggleAction *KStdGameAction::demo(const TQObject*recvr, const char *slot, - KActionCollection *tqparent, const char *name) -{ return static_cast<KToggleAction *>(KStdGameAction::create(Demo, name, recvr, slot, tqparent)); } + KActionCollection *parent, const char *name) +{ return static_cast<KToggleAction *>(KStdGameAction::create(Demo, name, recvr, slot, parent)); } KAction *KStdGameAction::solve(const TQObject*recvr, const char *slot, - KActionCollection *tqparent, const char *name) -{ return KStdGameAction::create(Solve, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name) +{ return KStdGameAction::create(Solve, name, recvr, slot, parent); } KSelectAction *KStdGameAction::chooseGameType(const TQObject*recvr, const char *slot, - KActionCollection *tqparent, const char *name) -{ return static_cast<KSelectAction *>(KStdGameAction::create(ChooseGameType, name, recvr, slot, tqparent)); } + KActionCollection *parent, const char *name) +{ return static_cast<KSelectAction *>(KStdGameAction::create(ChooseGameType, name, recvr, slot, parent)); } KAction *KStdGameAction::restart(const TQObject*recvr, const char *slot, - KActionCollection *tqparent, const char *name) -{ return KStdGameAction::create(Restart, name, recvr, slot, tqparent); } + KActionCollection *parent, const char *name) +{ return KStdGameAction::create(Restart, name, recvr, slot, parent); } diff --git a/libkdegames/kstdgameaction.h b/libkdegames/kstdgameaction.h index cae5d81c..3ef24dc2 100644 --- a/libkdegames/kstdgameaction.h +++ b/libkdegames/kstdgameaction.h @@ -79,15 +79,15 @@ public: */ static KAction* create( StdGameAction id, const char *name, const TQObject *recvr, const char *slot, - KActionCollection* tqparent ); + KActionCollection* parent ); /** * @since 3.2 */ static KAction* create( StdGameAction id, const TQObject *recvr, const char *slot, - KActionCollection* tqparent ) - { return create( id, 0, recvr, slot, tqparent ); } + KActionCollection* parent ) + { return create( id, 0, recvr, slot, parent ); } /** @@ -96,7 +96,7 @@ public: * @deprecated */ static KAction *action(StdGameAction act_enum, const TQObject *recvr = 0, - const char *slot = 0, KActionCollection *tqparent = 0, + const char *slot = 0, KActionCollection *parent = 0, const char *name = 0L ); /** @@ -115,43 +115,43 @@ public: * Start a new game **/ static KAction *gameNew(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Load a previousely saved game */ static KAction *load(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Load a recently loaded game. */ static KRecentFilesAction *loadRecent(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Save the current game. */ static KAction *save(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Save the current game under a different filename. */ static KAction *saveAs(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Pause the game **/ static KToggleAction *pause(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Show the highscores. */ static KAction *highscores(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** @@ -159,20 +159,20 @@ public: * entry. */ static KAction *end(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Print the current screen? Game? Whatever - hardly used in games but there * is at least one example (ktuberling) */ static KAction *print(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Quit the game. */ static KAction *quit(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); @@ -180,81 +180,81 @@ public: * Repeat the last move. **/ static KAction *repeat(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Undo the last move **/ static KAction *undo(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Redo the last move (which has been undone) **/ static KAction *redo(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Roll die or dice **/ static KAction *roll(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * End the current turn (not the game). Usually to let the next player * start **/ static KAction *endTurn(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Display configure carddecks dialog. */ static KAction *carddecks(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Display configure highscores dialog. * @since 3.2 */ static KAction *configureHighscores(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Give an advice/hint. * @since 3.2 */ static KAction *hint(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Show a demo. * @since 3.2 */ static KToggleAction *demo(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Solve the game. * @since 3.2 */ static KAction *solve(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Choose game type. * @since 3.2 */ static KSelectAction *chooseGameType(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); /** * Restart game. * @since 3.2 */ static KAction *restart(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *tqparent = 0, const char *name = 0L ); + KActionCollection *parent = 0, const char *name = 0L ); }; |