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 --- libksirtet/base/board.cpp | 8 ++++---- libksirtet/base/board.h | 4 ++-- libksirtet/base/factory.h | 4 ++-- libksirtet/base/field.cpp | 8 ++++---- libksirtet/base/field.h | 2 +- libksirtet/base/inter.cpp | 8 ++++---- libksirtet/base/inter.h | 4 ++-- libksirtet/common/board.cpp | 4 ++-- libksirtet/common/board.h | 2 +- libksirtet/common/factory.h | 2 +- libksirtet/common/field.cpp | 4 ++-- libksirtet/common/field.h | 2 +- libksirtet/common/inter.cpp | 10 +++++----- libksirtet/common/inter.h | 4 ++-- libksirtet/common/misc_ui.cpp | 20 ++++++++++---------- libksirtet/common/misc_ui.h | 8 ++++---- libksirtet/lib/defines.cpp | 8 ++++---- libksirtet/lib/defines.h | 4 ++-- libksirtet/lib/keys.cpp | 4 ++-- libksirtet/lib/keys.h | 2 +- libksirtet/lib/meeting.cpp | 12 ++++++------ libksirtet/lib/meeting.h | 6 +++--- libksirtet/lib/miscui.cpp | 8 ++++---- libksirtet/lib/miscui.h | 4 ++-- libksirtet/lib/mp_board.h | 4 ++-- libksirtet/lib/mp_interface.cpp | 4 ++-- libksirtet/lib/mp_interface.h | 2 +- libksirtet/lib/mp_option.h | 4 ++-- libksirtet/lib/mp_simple_board.h | 4 ++-- libksirtet/lib/mp_simple_interface.cpp | 4 ++-- libksirtet/lib/mp_simple_interface.h | 2 +- libksirtet/lib/pline.cpp | 12 ++++++------ libksirtet/lib/pline.h | 12 ++++++------ libksirtet/lib/socket.cpp | 4 ++-- libksirtet/lib/socket.h | 2 +- libksirtet/lib/wizard.cpp | 4 ++-- libksirtet/lib/wizard.h | 2 +- 37 files changed, 101 insertions(+), 101 deletions(-) (limited to 'libksirtet') diff --git a/libksirtet/base/board.cpp b/libksirtet/base/board.cpp index 0a6d37f1..95293387 100644 --- a/libksirtet/base/board.cpp +++ b/libksirtet/base/board.cpp @@ -12,8 +12,8 @@ using namespace KGrid2D; //----------------------------------------------------------------------------- -FixedCanvasView::FixedCanvasView(TQWidget *tqparent, const char *name) - : TQCanvasView(tqparent, name, WNoAutoErase) +FixedCanvasView::FixedCanvasView(TQWidget *parent, const char *name) + : TQCanvasView(parent, name, WNoAutoErase) {} TQSize FixedCanvasView::tqsizeHint() const @@ -35,8 +35,8 @@ const BaseBoard::DirectionData BaseBoard::DIRECTION_DATA[Nb_Direction] = { { SquareBase::Up, Down } }; -BaseBoard::BaseBoard(bool graphic, TQWidget *tqparent) -: FixedCanvasView(tqparent, "board"), +BaseBoard::BaseBoard(bool graphic, TQWidget *parent) +: FixedCanvasView(parent, "board"), GenericTetris(bfactory->bbi.width, bfactory->bbi.height, bfactory->bbi.withPieces, graphic), state(GameOver), timer(this), sequences(0), main(0), _next(0), diff --git a/libksirtet/base/board.h b/libksirtet/base/board.h index e65206f8..b525ee5b 100644 --- a/libksirtet/base/board.h +++ b/libksirtet/base/board.h @@ -17,7 +17,7 @@ class KDE_EXPORT FixedCanvasView : public TQCanvasView Q_OBJECT TQ_OBJECT public: - FixedCanvasView(TQWidget *tqparent = 0, const char *name = 0); + FixedCanvasView(TQWidget *parent = 0, const char *name = 0); virtual TQSize tqsizeHint() const; @@ -40,7 +40,7 @@ class KDE_EXPORT BaseBoard : public FixedCanvasView, public GenericTetris static const DirectionData DIRECTION_DATA[Nb_Direction]; public: - BaseBoard(bool graphic, TQWidget *tqparent); + BaseBoard(bool graphic, TQWidget *parent); virtual ~BaseBoard(); void copy(const GenericTetris &); diff --git a/libksirtet/base/factory.h b/libksirtet/base/factory.h index 7df5574d..b772adb7 100644 --- a/libksirtet/base/factory.h +++ b/libksirtet/base/factory.h @@ -43,8 +43,8 @@ class KDE_EXPORT BaseFactory const MainData &mainData; const BaseBoardInfo &bbi; - virtual BaseBoard *createBoard(bool graphic, TQWidget *tqparent) = 0; - virtual BaseInterface *createInterface(TQWidget *tqparent) = 0; + virtual BaseBoard *createBoard(bool graphic, TQWidget *parent) = 0; + virtual BaseInterface *createInterface(TQWidget *parent) = 0; virtual TQWidget *createAppearanceConfig(); virtual TQWidget *createColorConfig(); diff --git a/libksirtet/base/field.cpp b/libksirtet/base/field.cpp index 6e35faf5..5f7cf10d 100644 --- a/libksirtet/base/field.cpp +++ b/libksirtet/base/field.cpp @@ -93,7 +93,7 @@ void BaseField::setMessage(const TQString &label, ButtonType type) const char *slot = (type==ResumeButton ? TQT_SLOT(pause()) : TQT_SLOT(start())); _button->connect(_button, TQT_SIGNAL(clicked()), - _widget->tqparent(), slot); + _widget->parent(), slot); _boardLayout->addWidget(_button, 0, TQt::AlignCenter); _button->show(); } @@ -135,10 +135,10 @@ void BaseField::stop(bool gameover) setMessage(msg, button); } -void BaseField::gameOver(const KExtHighscore::Score &score, TQWidget *tqparent) +void BaseField::gameOver(const KExtHighscore::Score &score, TQWidget *parent) { - KNotifyClient::event(tqparent->winId(), "game over", i18n("Game Over")); - KExtHighscore::submitScore(score, tqparent); + KNotifyClient::event(parent->winId(), "game over", i18n("Game Over")); + KExtHighscore::submitScore(score, parent); } void BaseField::scoreUpdated() diff --git a/libksirtet/base/field.h b/libksirtet/base/field.h index a60173bb..e30e0bdd 100644 --- a/libksirtet/base/field.h +++ b/libksirtet/base/field.h @@ -22,7 +22,7 @@ class KDE_EXPORT BaseField virtual ~BaseField() {} virtual KExtHighscore::Score currentScore() const = 0; - static void gameOver(const KExtHighscore::Score &, TQWidget *tqparent); + static void gameOver(const KExtHighscore::Score &, TQWidget *parent); virtual void setArcade(); bool isArcade() const; diff --git a/libksirtet/base/inter.cpp b/libksirtet/base/inter.cpp index c573ef78..658e7c47 100644 --- a/libksirtet/base/inter.cpp +++ b/libksirtet/base/inter.cpp @@ -3,13 +3,13 @@ #include -void BaseInterface::showHighscores(TQWidget *tqparent) +void BaseInterface::showHighscores(TQWidget *parent) { if ( !_isPaused() ) _pause(); - _showHighscores(tqparent); + _showHighscores(parent); } -void BaseInterface::_showHighscores(TQWidget *tqparent) +void BaseInterface::_showHighscores(TQWidget *parent) { - KExtHighscore::show(tqparent); + KExtHighscore::show(parent); } diff --git a/libksirtet/base/inter.h b/libksirtet/base/inter.h index 21c81db0..3bf394db 100644 --- a/libksirtet/base/inter.h +++ b/libksirtet/base/inter.h @@ -14,10 +14,10 @@ public: virtual void _pause() = 0; virtual bool _isPaused() const = 0; - void showHighscores(TQWidget *tqparent); + void showHighscores(TQWidget *parent); protected: - virtual void _showHighscores(TQWidget *tqparent); + virtual void _showHighscores(TQWidget *parent); }; #endif diff --git a/libksirtet/common/board.cpp b/libksirtet/common/board.cpp index 93851b87..7a0802ad 100644 --- a/libksirtet/common/board.cpp +++ b/libksirtet/common/board.cpp @@ -11,8 +11,8 @@ #include "commonprefs.h" -Board::Board(bool graphic, GiftPool *gp, TQWidget *tqparent) - : BaseBoard(graphic, tqparent), +Board::Board(bool graphic, GiftPool *gp, TQWidget *parent) + : BaseBoard(graphic, parent), _giftPool(gp), aiEngine(0) {} diff --git a/libksirtet/common/board.h b/libksirtet/common/board.h index 5f38df9e..77c9224e 100644 --- a/libksirtet/common/board.h +++ b/libksirtet/common/board.h @@ -13,7 +13,7 @@ class LIBKSIRTET_EXPORT Board : public BaseBoard Q_OBJECT TQ_OBJECT public: - Board(bool graphic, GiftPool *, TQWidget *tqparent); + Board(bool graphic, GiftPool *, TQWidget *parent); virtual ~Board(); void setType(bool computer); diff --git a/libksirtet/common/factory.h b/libksirtet/common/factory.h index 5cd0cdbf..2d02dcb2 100644 --- a/libksirtet/common/factory.h +++ b/libksirtet/common/factory.h @@ -25,7 +25,7 @@ class LIBKSIRTET_EXPORT CommonFactory : public BaseFactory const CommonBoardInfo &cbi; - virtual BaseField *createField(TQWidget *tqparent) = 0; + virtual BaseField *createField(TQWidget *parent) = 0; virtual AI *createAI() = 0; TQWidget *createAIConfig(); diff --git a/libksirtet/common/field.cpp b/libksirtet/common/field.cpp index ea6a3ffc..8b1d3f7b 100644 --- a/libksirtet/common/field.cpp +++ b/libksirtet/common/field.cpp @@ -19,8 +19,8 @@ #include "commonprefs.h" -Field::Field(TQWidget *tqparent) -: MPSimpleBoard(tqparent), BaseField(this) +Field::Field(TQWidget *parent) +: MPSimpleBoard(parent), BaseField(this) { // column 1 // score LCD diff --git a/libksirtet/common/field.h b/libksirtet/common/field.h index 69d11bfb..cfba3d41 100644 --- a/libksirtet/common/field.h +++ b/libksirtet/common/field.h @@ -20,7 +20,7 @@ class LIBKSIRTET_EXPORT Field : public MPSimpleBoard, public BaseField Q_OBJECT TQ_OBJECT public: - Field(TQWidget *tqparent); + Field(TQWidget *parent); public slots: void moveLeft(); diff --git a/libksirtet/common/inter.cpp b/libksirtet/common/inter.cpp index e81f7347..c5630108 100644 --- a/libksirtet/common/inter.cpp +++ b/libksirtet/common/inter.cpp @@ -33,8 +33,8 @@ const int Interface::KEYCODE_TWO[Nb_Actions] = { Key_F, Key_G, Key_D, Key_Space, Key_E, Key_C, SHIFT+Key_F, SHIFT+Key_G }; -Interface::Interface(const MPGameInfo &gi, TQWidget *tqparent) - : MPSimpleInterface(gi, Nb_Actions, ACTION_DATA, tqparent) +Interface::Interface(const MPGameInfo &gi, TQWidget *parent) + : MPSimpleInterface(gi, Nb_Actions, ACTION_DATA, parent) { setDefaultKeycodes(1, 0, KEYCODE_ONE); setDefaultKeycodes(2, 0, KEYCODE_TWO); @@ -91,10 +91,10 @@ void Interface::_sendPlayData() } } -void Interface::_showHighscores(TQWidget *tqparent) +void Interface::_showHighscores(TQWidget *parent) { - if ( !server() || nbPlayers()!=1 ) _scores.show(tqparent); - else BaseInterface::_showHighscores(tqparent); + if ( !server() || nbPlayers()!=1 ) _scores.show(parent); + else BaseInterface::_showHighscores(parent); } void Interface::_showGameOverData() diff --git a/libksirtet/common/inter.h b/libksirtet/common/inter.h index fb8a8349..daffc3e9 100644 --- a/libksirtet/common/inter.h +++ b/libksirtet/common/inter.h @@ -17,7 +17,7 @@ class LIBKSIRTET_EXPORT Interface : public MPSimpleInterface, public BaseInterfa Q_OBJECT TQ_OBJECT public: - Interface(const MPGameInfo &, TQWidget *tqparent); + Interface(const MPGameInfo &, TQWidget *parent); signals: void settingsChanged(); @@ -28,7 +28,7 @@ public slots: void settingsChangedSlot() { emit settingsChanged(); } protected: - void _showHighscores(TQWidget *tqparent); + void _showHighscores(TQWidget *parent); private: TQMemArray _data; diff --git a/libksirtet/common/misc_ui.cpp b/libksirtet/common/misc_ui.cpp index 6e9cffec..6638e67a 100644 --- a/libksirtet/common/misc_ui.cpp +++ b/libksirtet/common/misc_ui.cpp @@ -24,8 +24,8 @@ const uint LED_HEIGHT = 15; const uint LED_SPACING = 5; /*****************************************************************************/ -ShowNextPiece::ShowNextPiece(BaseBoard *board, TQWidget *tqparent) - : FixedCanvasView(tqparent, "show_next_piece") +ShowNextPiece::ShowNextPiece(BaseBoard *board, TQWidget *parent) + : FixedCanvasView(parent, "show_next_piece") { setCanvas(board->next()); setFrameStyle(TQFrame::Panel | TQFrame::Sunken); @@ -33,8 +33,8 @@ ShowNextPiece::ShowNextPiece(BaseBoard *board, TQWidget *tqparent) } /*****************************************************************************/ -Shadow::Shadow(BaseBoard *board, TQWidget *tqparent) - : TQWidget(tqparent, "shadow"), _xOffset(board->frameWidth()), +Shadow::Shadow(BaseBoard *board, TQWidget *parent) + : TQWidget(parent, "shadow"), _xOffset(board->frameWidth()), _board(board), _show(false) { KZoomMainWindow::addWidget(this); @@ -81,8 +81,8 @@ void Shadow::paintEvent(TQPaintEvent *) class Led : public TQWidget { public: - Led(const TQColor &c, TQWidget *tqparent) - : TQWidget(tqparent), col(c), _on(FALSE) {} + Led(const TQColor &c, TQWidget *parent) + : TQWidget(parent), col(c), _on(FALSE) {} TQSizePolicy sizePolicy() const { return TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); } @@ -105,8 +105,8 @@ class Led : public TQWidget bool _on; }; -GiftPool::GiftPool(TQWidget *tqparent) - : TQHBox(tqparent, "gift_pool"), nb(0), ready(false) +GiftPool::GiftPool(TQWidget *parent) + : TQHBox(parent, "gift_pool"), nb(0), ready(false) { setSpacing(LED_SPACING); leds.resize(cfactory->cbi.nbGiftLeds); @@ -171,10 +171,10 @@ void GiftPool::reset() } //----------------------------------------------------------------------------- -PlayerProgress::PlayerProgress(BaseBoard *board, TQWidget *tqparent, +PlayerProgress::PlayerProgress(BaseBoard *board, TQWidget *parent, const char *name) : KGameProgress(0, board->matrix().height(), 0, Qt::Vertical, - tqparent, name), _board(board) + parent, name), _board(board) { setBackgroundColor(lightGray); setTextEnabled(false); diff --git a/libksirtet/common/misc_ui.h b/libksirtet/common/misc_ui.h index 61b87b96..708bd484 100644 --- a/libksirtet/common/misc_ui.h +++ b/libksirtet/common/misc_ui.h @@ -16,7 +16,7 @@ class LIBKSIRTET_EXPORT ShowNextPiece : public FixedCanvasView Q_OBJECT TQ_OBJECT public: - ShowNextPiece(BaseBoard *, TQWidget *tqparent); + ShowNextPiece(BaseBoard *, TQWidget *parent); }; /*****************************************************************************/ @@ -25,7 +25,7 @@ class LIBKSIRTET_EXPORT Shadow : public TQWidget Q_OBJECT TQ_OBJECT public: - Shadow(BaseBoard *, TQWidget *tqparent); + Shadow(BaseBoard *, TQWidget *parent); virtual TQSize tqsizeHint() const; virtual TQSizePolicy sizePolicy() const; @@ -47,7 +47,7 @@ class LIBKSIRTET_EXPORT GiftPool : public TQHBox Q_OBJECT TQ_OBJECT public: - GiftPool(TQWidget *tqparent); + GiftPool(TQWidget *parent); virtual TQSize tqsizeHint() const; virtual TQSizePolicy sizePolicy() const; @@ -73,7 +73,7 @@ class LIBKSIRTET_EXPORT PlayerProgress : public KGameProgress Q_OBJECT TQ_OBJECT public: - PlayerProgress(BaseBoard *board, TQWidget *tqparent = 0, const char *name = 0); + PlayerProgress(BaseBoard *board, TQWidget *parent = 0, const char *name = 0); virtual TQSize tqsizeHint() const; virtual TQSizePolicy sizePolicy() const; diff --git a/libksirtet/lib/defines.cpp b/libksirtet/lib/defines.cpp index 3b3ec229..7eef441e 100644 --- a/libksirtet/lib/defines.cpp +++ b/libksirtet/lib/defines.cpp @@ -2,12 +2,12 @@ #include -void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *tqparent) +void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *parent) { TQString str; if ( msg2.isNull() ) str = msg1; else str = i18n("%1:\n%2").tqarg(msg1).tqarg(msg2); - KMessageBox::error(tqparent, str); + KMessageBox::error(parent, str); } TQString socketError(const KExtendedSocket *socket) @@ -16,9 +16,9 @@ TQString socketError(const KExtendedSocket *socket) } bool checkSocket(int res, const KExtendedSocket *socket, - const TQString &msg, TQWidget *tqparent) + const TQString &msg, TQWidget *parent) { if ( res==0 ) return false; - errorBox(msg, socketError(socket), tqparent); + errorBox(msg, socketError(socket), parent); return true; } diff --git a/libksirtet/lib/defines.h b/libksirtet/lib/defines.h index db936b10..a6728a38 100644 --- a/libksirtet/lib/defines.h +++ b/libksirtet/lib/defines.h @@ -16,10 +16,10 @@ #define MP_SERVER_ADDRESS "Server address" #define MP_PORT "Port" -void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *tqparent); +void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *parent); TQString socketError(const KExtendedSocket *socket); bool checkSocket(int res, const KExtendedSocket *, - const TQString &msg, TQWidget *tqparent); + const TQString &msg, TQWidget *parent); #define R_ERROR_BOX(msg1, msg2) { \ errorBox(msg1, msg2, this); \ diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp index 48dbb025..599f7372 100644 --- a/libksirtet/lib/keys.cpp +++ b/libksirtet/lib/keys.cpp @@ -7,8 +7,8 @@ KeyData::KeyData(uint maxNb, uint nbActions, const ActionData *data, - TQObject *tqparent) - : TQObject(tqparent), _maxNb(maxNb) + TQObject *parent) + : TQObject(parent), _maxNb(maxNb) { _data.duplicate(data, nbActions); diff --git a/libksirtet/lib/keys.h b/libksirtet/lib/keys.h index 16e25118..a5227a9b 100644 --- a/libksirtet/lib/keys.h +++ b/libksirtet/lib/keys.h @@ -13,7 +13,7 @@ class KeyData : public TQObject TQ_OBJECT public: KeyData(uint maxNb, uint nbActions, const ActionData *, - TQObject *tqparent); + TQObject *parent); void setKeycodes(uint nb, uint i, const int *keycodes); void setCurrentNb(uint nb); diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp index d9b3028a..5e0e679f 100644 --- a/libksirtet/lib/meeting.cpp +++ b/libksirtet/lib/meeting.cpp @@ -14,10 +14,10 @@ NetMeeting::NetMeeting(const cId &_id, Socket *socket, MPOptionWidget *option, - bool _server, TQWidget *tqparent, const char * name) + bool _server, TQWidget *parent, const char * name) : KDialogBase(Plain, i18n("Network Meeting"), (_server ? Ok|Cancel|Help : Cancel|Help), - (_server ? Ok : Cancel), tqparent, name), + (_server ? Ok : Cancel), parent, name), server(_server), ow(option), id(_id), socketRemoved(FALSE) { sm.append(socket, SocketManager::ReadWrite); @@ -213,8 +213,8 @@ void NetMeeting::message(const TQString &str) /** ServerNetMeeting *********************************************************/ ServerNetMeeting::ServerNetMeeting(const cId &id, const RemoteHostData &r, MPOptionWidget *option, - TQPtrList &arhd, TQWidget *tqparent, const char * name) -: NetMeeting(id, r.socket, option, TRUE, tqparent, name), rhd(arhd) + TQPtrList &arhd, TQWidget *parent, const char * name) +: NetMeeting(id, r.socket, option, TRUE, parent, name), rhd(arhd) { connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)), TQT_SLOT(newHost(int))); players.append(Accepted); // server @@ -448,8 +448,8 @@ void ServerNetMeeting::optionsChanged() /** ClientNetMeeting *********************************************************/ ClientNetMeeting::ClientNetMeeting(const cId &id, const RemoteHostData &rhd, MPOptionWidget *option, - TQWidget *tqparent, const char * name) -: NetMeeting(id, rhd.socket, option, FALSE, tqparent, name), bds(rhd.bds) + TQWidget *parent, const char * name) +: NetMeeting(id, rhd.socket, option, FALSE, parent, name), bds(rhd.bds) { connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)), TQT_SLOT(readNotifier(int))); diff --git a/libksirtet/lib/meeting.h b/libksirtet/lib/meeting.h index cc8356fc..a1cdc8e0 100644 --- a/libksirtet/lib/meeting.h +++ b/libksirtet/lib/meeting.h @@ -19,7 +19,7 @@ class NetMeeting : public KDialogBase // "gameName" and "gameId" are TQByteArray because they are // used for ID comparing between games. NetMeeting(const cId &id, Socket *, MPOptionWidget *option, bool server, - TQWidget *tqparent = 0, const char * name = 0); + TQWidget *parent = 0, const char * name = 0); virtual ~NetMeeting(); protected slots: @@ -84,7 +84,7 @@ class ServerNetMeeting : public NetMeeting ServerNetMeeting(const cId &id, const RemoteHostData &rhd, MPOptionWidget *options, TQPtrList &arhd, - TQWidget *tqparent = 0, const char * name = 0); + TQWidget *parent = 0, const char * name = 0); private slots: void newHost(int); @@ -115,7 +115,7 @@ class ClientNetMeeting : public NetMeeting public: ClientNetMeeting(const cId &id, const RemoteHostData &rhd, MPOptionWidget *options, - TQWidget *tqparent = 0, const char * name = 0); + TQWidget *parent = 0, const char * name = 0); private slots: void textChanged(const TQString &text); diff --git a/libksirtet/lib/miscui.cpp b/libksirtet/lib/miscui.cpp index 7bc8e48b..dde70adb 100644 --- a/libksirtet/lib/miscui.cpp +++ b/libksirtet/lib/miscui.cpp @@ -8,8 +8,8 @@ //----------------------------------------------------------------------------- MeetingCheckBox::MeetingCheckBox(Type type, bool owner, bool server, - TQWidget *tqparent) - : TQWidget(tqparent, "meeting_check_box") + TQWidget *parent) + : TQWidget(parent, "meeting_check_box") { TQVBoxLayout *vbox = new TQVBoxLayout(this); @@ -46,8 +46,8 @@ void MeetingCheckBox::changedSlot() //----------------------------------------------------------------------------- PlayerComboBox::PlayerComboBox(Type type, bool canBeEmpty, bool acceptAI, - TQWidget *tqparent) - : TQComboBox(tqparent, "player_combo_box") + TQWidget *parent) + : TQComboBox(parent, "player_combo_box") { insertItem(i18n("Human")); if (acceptAI) insertItem(i18n("AI")); diff --git a/libksirtet/lib/miscui.h b/libksirtet/lib/miscui.h index 3bc7fd32..d8d67002 100644 --- a/libksirtet/lib/miscui.h +++ b/libksirtet/lib/miscui.h @@ -12,7 +12,7 @@ class MeetingCheckBox : public TQWidget TQ_OBJECT public: enum Type { Ready, NotReady, Excluded }; - MeetingCheckBox(Type, bool owner, bool server, TQWidget *tqparent); + MeetingCheckBox(Type, bool owner, bool server, TQWidget *parent); void setType(Type); Type type() const; @@ -34,7 +34,7 @@ class PlayerComboBox : public TQComboBox TQ_OBJECT public: enum Type { Human = 0, AI, None }; - PlayerComboBox(Type, bool canBeNone, bool acceptAI, TQWidget *tqparent); + PlayerComboBox(Type, bool canBeNone, bool acceptAI, TQWidget *parent); Type type() const { return (Type)currentItem(); } diff --git a/libksirtet/lib/mp_board.h b/libksirtet/lib/mp_board.h index 2578e927..3f7e7212 100644 --- a/libksirtet/lib/mp_board.h +++ b/libksirtet/lib/mp_board.h @@ -13,8 +13,8 @@ class MPBoard : public TQWidget TQ_OBJECT public: - MPBoard(TQWidget *tqparent, const char *name=0) - : TQWidget(tqparent, name) {} + MPBoard(TQWidget *parent, const char *name=0) + : TQWidget(parent, name) {} virtual ~MPBoard() {} /** diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp index 6683ba00..e28ebdf8 100644 --- a/libksirtet/lib/mp_interface.cpp +++ b/libksirtet/lib/mp_interface.cpp @@ -21,8 +21,8 @@ /*****************************************************************************/ MPInterface::MPInterface(const MPGameInfo &_gameInfo, uint nbActions, const ActionData *data, - TQWidget *tqparent, const char *name) -: TQWidget(tqparent, name), internal(0), gameInfo(_gameInfo), nbLocalHumans(0) + TQWidget *parent, const char *name) +: TQWidget(parent, name), internal(0), gameInfo(_gameInfo), nbLocalHumans(0) { Q_ASSERT( gameInfo.maxNbLocalPlayers>=1 ); diff --git a/libksirtet/lib/mp_interface.h b/libksirtet/lib/mp_interface.h index ea70736f..1beaa442 100644 --- a/libksirtet/lib/mp_interface.h +++ b/libksirtet/lib/mp_interface.h @@ -83,7 +83,7 @@ class MPInterface : public TQWidget */ MPInterface(const MPGameInfo &gameInfo, uint nbActions, const ActionData *data, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); virtual ~MPInterface(); public slots: diff --git a/libksirtet/lib/mp_option.h b/libksirtet/lib/mp_option.h index 3d7468b5..bca42bfa 100644 --- a/libksirtet/lib/mp_option.h +++ b/libksirtet/lib/mp_option.h @@ -38,8 +38,8 @@ class MPOptionWidget : public TQWidget TQ_OBJECT public: - MPOptionWidget(bool Server, TQWidget *tqparent = 0, const char *name = 0) - : TQWidget(tqparent, name), server(Server) {} + MPOptionWidget(bool Server, TQWidget *parent = 0, const char *name = 0) + : TQWidget(parent, name), server(Server) {} virtual ~MPOptionWidget() {} bool isServer() const { return server; } diff --git a/libksirtet/lib/mp_simple_board.h b/libksirtet/lib/mp_simple_board.h index 24a7654f..f01291f0 100644 --- a/libksirtet/lib/mp_simple_board.h +++ b/libksirtet/lib/mp_simple_board.h @@ -12,8 +12,8 @@ class KDE_EXPORT MPSimpleBoard : public MPBoard TQ_OBJECT public: - MPSimpleBoard(TQWidget *tqparent = 0, const char *name = 0) - : MPBoard(tqparent, name) {} + MPSimpleBoard(TQWidget *parent = 0, const char *name = 0) + : MPBoard(parent, name) {} virtual ~MPSimpleBoard() {} void init(bool AI, bool multiplayers, bool server, bool first, diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp index e863b069..17515fb0 100644 --- a/libksirtet/lib/mp_simple_interface.cpp +++ b/libksirtet/lib/mp_simple_interface.cpp @@ -13,8 +13,8 @@ MPSimpleInterface::MPSimpleInterface(const MPGameInfo &gi, uint nbActions, const ActionData *data, - TQWidget *tqparent, const char *name) -: MPInterface(gi, nbActions, data, tqparent, name), state(SS_Standby) + TQWidget *parent, const char *name) +: MPInterface(gi, nbActions, data, parent, name), state(SS_Standby) {} void MPSimpleInterface::init() diff --git a/libksirtet/lib/mp_simple_interface.h b/libksirtet/lib/mp_simple_interface.h index 04cb014c..fbe4ba1d 100644 --- a/libksirtet/lib/mp_simple_interface.h +++ b/libksirtet/lib/mp_simple_interface.h @@ -12,7 +12,7 @@ class MPSimpleInterface : public MPInterface public: MPSimpleInterface(const MPGameInfo &gi, uint nbActions, const ActionData *data, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); bool isPaused() const { return state==SS_Pause; } diff --git a/libksirtet/lib/pline.cpp b/libksirtet/lib/pline.cpp index 94e9c50e..3a63a0b0 100644 --- a/libksirtet/lib/pline.cpp +++ b/libksirtet/lib/pline.cpp @@ -9,8 +9,8 @@ #define THIN_BORDER 4 MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, - TQWidget *tqparent, const char *name) -: TQFrame(tqparent, name) + TQWidget *parent, const char *name) +: TQFrame(parent, name) { setFrameStyle(Panel | (serverLine ? Raised : Plain)); @@ -84,8 +84,8 @@ void MeetingLine::data(ExtData &ed) const PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt, bool humanSetting, bool AISetting, bool canBeEmpty, bool acceptAI, - TQWidget *tqparent, const char *name) -: TQFrame(tqparent, name), hs(humanSetting), as(AISetting) + TQWidget *parent, const char *name) +: TQFrame(parent, name), hs(humanSetting), as(AISetting) { setFrameStyle(Panel | Raised); @@ -128,8 +128,8 @@ void PlayerLine::setSlot() } /*****************************************************************************/ -GWidgetList::GWidgetList(uint interval, TQWidget *tqparent, const char * name) - : TQWidget(tqparent, name), vbl(this, interval) +GWidgetList::GWidgetList(uint interval, TQWidget *parent, const char * name) + : TQWidget(parent, name), vbl(this, interval) { widgets.setAutoDelete(TRUE); } diff --git a/libksirtet/lib/pline.h b/libksirtet/lib/pline.h index 9cef8d29..5bba6c4b 100644 --- a/libksirtet/lib/pline.h +++ b/libksirtet/lib/pline.h @@ -20,7 +20,7 @@ class MeetingLine : public TQFrame public: MeetingLine(bool isOwner, bool readerIsServer, bool serverLine, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); MeetingCheckBox::Type type() const { return tcb->type(); } void setType(MeetingCheckBox::Type type) { tcb->setType(type); } @@ -58,7 +58,7 @@ class PlayerLine : public TQFrame PlayerLine(PlayerComboBox::Type type, const TQString &txt, bool humanSetting, bool AISetting, bool canBeEmpty, bool acceptAI, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); PlayerComboBox::Type type() const { return pcb->type(); } TQString name() const { return edit->text(); } @@ -86,13 +86,13 @@ class GWidgetList : public TQWidget TQ_OBJECT public: - GWidgetList(uint interval, TQWidget *tqparent = 0, const char * name = 0); + GWidgetList(uint interval, TQWidget *parent = 0, const char * name = 0); void remove(uint i); uint size() const { return widgets.count(); } protected: - /** The widget must be created with this widget as tqparent. */ + /** The widget must be created with this widget as parent. */ void append(TQWidget *); TQWidget *widget(uint i) { return widgets.at(i); } @@ -105,8 +105,8 @@ template class WidgetList : public GWidgetList { public: - WidgetList(uint interval, TQWidget *tqparent=0, const char *name=0) - : GWidgetList(interval, tqparent, name) {} + WidgetList(uint interval, TQWidget *parent=0, const char *name=0) + : GWidgetList(interval, parent, name) {} void append(Type *w) { GWidgetList::append(w); } Type *widget(uint i) { return (Type *)GWidgetList::widget(i); } diff --git a/libksirtet/lib/socket.cpp b/libksirtet/lib/socket.cpp index 7dd74f74..6defc94b 100644 --- a/libksirtet/lib/socket.cpp +++ b/libksirtet/lib/socket.cpp @@ -21,13 +21,13 @@ #endif Socket::Socket(KExtendedSocket *s, bool createNotifier, - TQObject *tqparent, const char *name) + TQObject *parent, const char *name) : _socket(s), _notifier(0) { Q_ASSERT(s); if (createNotifier) { _notifier = new TQSocketNotifier(s->fd(), TQSocketNotifier::Read, - tqparent, name); + parent, name); _notifier->setEnabled(FALSE); } } diff --git a/libksirtet/lib/socket.h b/libksirtet/lib/socket.h index 75538670..01dac726 100644 --- a/libksirtet/lib/socket.h +++ b/libksirtet/lib/socket.h @@ -12,7 +12,7 @@ class Socket { public: Socket(KExtendedSocket *, bool createNotifier = FALSE, - TQObject *tqparent = 0, const char *name = 0); + TQObject *parent = 0, const char *name = 0); /** close the socket */ ~Socket(); diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp index a059cfa2..29508e26 100644 --- a/libksirtet/lib/wizard.cpp +++ b/libksirtet/lib/wizard.cpp @@ -32,8 +32,8 @@ #define MAX_USER_PORT 65535 MPWizard::MPWizard(const MPGameInfo &gi, ConnectionData &_cd, - TQWidget *tqparent, const char *name) -: KWizard(tqparent, name, TRUE), cd(_cd) + TQWidget *parent, const char *name) +: KWizard(parent, name, TRUE), cd(_cd) { // setupTypePage(); // #### REMOVE NETWORK GAMES UNTIL FIXED type = Local; diff --git a/libksirtet/lib/wizard.h b/libksirtet/lib/wizard.h index 42623ec7..3de9f1b7 100644 --- a/libksirtet/lib/wizard.h +++ b/libksirtet/lib/wizard.h @@ -23,7 +23,7 @@ class MPWizard : public KWizard public: MPWizard(const MPGameInfo &gi, ConnectionData &cd, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); void showPage(TQWidget *page); -- cgit v1.2.3