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 | |
| parent | 24c5cdc2737fe0044b11a12359606973eb93fc0b (diff) | |
| download | tdegames-a13e26c2.tar.gz tdegames-a13e26c2.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
453 files changed, 1418 insertions, 1418 deletions
diff --git a/atlantik/atlanticd/atlanticclient.cpp b/atlantik/atlanticd/atlanticclient.cpp index a3baf2e6..0e4e3e12 100644 --- a/atlantik/atlanticd/atlanticclient.cpp +++ b/atlantik/atlanticd/atlanticclient.cpp @@ -20,7 +20,7 @@ #include "atlanticclient.h" #include "atlanticclient.moc" -AtlanticClient::AtlanticClient(TQObject *tqparent, const char *name) : TQSocket(tqparent, name) +AtlanticClient::AtlanticClient(TQObject *parent, const char *name) : TQSocket(parent, name) { connect(this, TQT_SIGNAL(readyRead()), this, TQT_SLOT(readData())); } diff --git a/atlantik/atlanticd/atlanticclient.h b/atlantik/atlanticd/atlanticclient.h index 7b4dc19a..05f1058a 100644 --- a/atlantik/atlanticd/atlanticclient.h +++ b/atlantik/atlanticd/atlanticclient.h @@ -25,7 +25,7 @@ Q_OBJECT TQ_OBJECT public: - AtlanticClient(TQObject *tqparent = 0, const char *name = 0); + AtlanticClient(TQObject *parent = 0, const char *name = 0); void sendData(const TQString &data); private slots: diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp index 2ad1bf98..7d2f8e9f 100644 --- a/atlantik/client/atlantik.cpp +++ b/atlantik/client/atlantik.cpp @@ -64,7 +64,7 @@ #include "selectgame_widget.h" #include "selectconfiguration_widget.h" -LogTextEdit::LogTextEdit( TQWidget *tqparent, const char *name ) : TQTextEdit( tqparent, name ) +LogTextEdit::LogTextEdit( TQWidget *parent, const char *name ) : TQTextEdit( parent, name ) { #ifdef KDE_3_2_FEATURES m_clear = KStdAction::clear( TQT_TQOBJECT(this), TQT_SLOT( clear() ), 0 ); diff --git a/atlantik/client/atlantik.h b/atlantik/client/atlantik.h index 24b989d3..7e8ff1b0 100644 --- a/atlantik/client/atlantik.h +++ b/atlantik/client/atlantik.h @@ -74,7 +74,7 @@ Q_OBJECT TQ_OBJECT public: - LogTextEdit( TQWidget *tqparent = 0, const char *name = 0 ); + LogTextEdit( TQWidget *parent = 0, const char *name = 0 ); virtual ~LogTextEdit(); TQPopupMenu *createPopupMenu( const TQPoint & pos ); diff --git a/atlantik/client/configdlg.cpp b/atlantik/client/configdlg.cpp index b5d1ecae..d6f32a9a 100644 --- a/atlantik/client/configdlg.cpp +++ b/atlantik/client/configdlg.cpp @@ -40,9 +40,9 @@ #include "atlantik.h" #include "configdlg.moc" -ConfigDialog::ConfigDialog(Atlantik* tqparent, const char *name) : KDialogBase(IconList, i18n("Configure Atlantik"), Ok|Cancel, Ok, tqparent, "config_atlantik", false, name) +ConfigDialog::ConfigDialog(Atlantik* parent, const char *name) : KDialogBase(IconList, i18n("Configure Atlantik"), Ok|Cancel, Ok, parent, "config_atlantik", false, name) { - m_parent = tqparent; + m_parent = parent; p_general = addPage(i18n("General"), i18n("General"), BarIcon("configure", KIcon::SizeMedium)); p_p13n = addPage(i18n("Personalization"), i18n("Personalization"), BarIcon("personal", KIcon::SizeMedium)); p_board = addPage(i18n("Board"), i18n("Board"), BarIcon("monop_board", KIcon::SizeMedium)); @@ -111,21 +111,21 @@ AtlantikConfig ConfigDialog::config() return m_parent->config(); } -ConfigPlayer::ConfigPlayer(ConfigDialog* configDialog, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +ConfigPlayer::ConfigPlayer(ConfigDialog* configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_configDialog = configDialog; - TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); - TQLabel *label = new TQLabel(i18n("Player name:"), tqparent); + TQLabel *label = new TQLabel(i18n("Player name:"), parent); tqlayout->addWidget(label); - m_playerName = new TQLineEdit(tqparent); + m_playerName = new TQLineEdit(parent); tqlayout->addWidget(m_playerName); - TQLabel *label2 = new TQLabel(i18n("Player image:"), tqparent); + TQLabel *label2 = new TQLabel(i18n("Player image:"), parent); tqlayout->addWidget(label2); - m_playerIcon = new KPushButton(tqparent, "playerIcon"); + m_playerIcon = new KPushButton(parent, "playerIcon"); tqlayout->addWidget(m_playerIcon); connect( m_playerIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseImage()) ); @@ -182,12 +182,12 @@ void ConfigPlayer::reset() setImage(); } -ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_configDialog = configDialog; - TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); - m_connectOnStart = new TQCheckBox(i18n("Request list of Internet servers on start-up"), tqparent); + m_connectOnStart = new TQCheckBox(i18n("Request list of Internet servers on start-up"), parent); tqlayout->addWidget(m_connectOnStart); TQString message=i18n( @@ -195,7 +195,7 @@ ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *tqpar "request a list of Internet servers.\n"); TQWhatsThis::add(m_connectOnStart, message); - m_hideDevelopmentServers = new TQCheckBox(i18n("Hide development servers"), tqparent); + m_hideDevelopmentServers = new TQCheckBox(i18n("Hide development servers"), parent); tqlayout->addWidget(m_hideDevelopmentServers); message=i18n( @@ -225,12 +225,12 @@ void ConfigMonopigator::reset() m_hideDevelopmentServers->setChecked(m_configDialog->config().hideDevelopmentServers); } -ConfigGeneral::ConfigGeneral(ConfigDialog *configDialog, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +ConfigGeneral::ConfigGeneral(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_configDialog = configDialog; - TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); - m_chatTimestamps = new TQCheckBox(i18n("Show timestamps in chat messages"), tqparent); + m_chatTimestamps = new TQCheckBox(i18n("Show timestamps in chat messages"), parent); tqlayout->addWidget(m_chatTimestamps); TQString message=i18n( @@ -253,12 +253,12 @@ void ConfigGeneral::reset() m_chatTimestamps->setChecked(m_configDialog->config().chatTimestamps); } -ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_configDialog = configDialog; - TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); - TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Game tqStatus Feedback"), tqparent); + TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Game tqStatus Feedback"), parent); tqlayout->addWidget(box); m_indicateUnowned = new TQCheckBox(i18n("Display title deed card on unowned properties"), box); @@ -291,7 +291,7 @@ ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *tqparent, const c "will have a Quartz effect similar to the Quartz KWin style.\n"); TQWhatsThis::add(m_quartzEffects, message); -// box = new TQGroupBox(1, Qt::Horizontal, i18n("Size"), tqparent); +// box = new TQGroupBox(1, Qt::Horizontal, i18n("Size"), parent); // tqlayout->addWidget(box); tqlayout->addStretch(1); diff --git a/atlantik/client/configdlg.h b/atlantik/client/configdlg.h index c28e3a98..305a9b8f 100644 --- a/atlantik/client/configdlg.h +++ b/atlantik/client/configdlg.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - ConfigPlayer(ConfigDialog *configDialog, TQWidget *tqparent, const char *name=0); + ConfigPlayer(ConfigDialog *configDialog, TQWidget *parent, const char *name=0); TQString playerName(); TQString playerImage(); @@ -62,7 +62,7 @@ Q_OBJECT TQ_OBJECT public: - ConfigBoard(ConfigDialog *configDialog, TQWidget *tqparent, const char *name=0); + ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const char *name=0); bool indicateUnowned(); bool highliteUnowned(); @@ -83,7 +83,7 @@ Q_OBJECT TQ_OBJECT public: - ConfigMonopigator(ConfigDialog *dialog, TQWidget *tqparent, const char *name = 0); + ConfigMonopigator(ConfigDialog *dialog, TQWidget *parent, const char *name = 0); bool connectOnStart(); bool hideDevelopmentServers(); @@ -101,7 +101,7 @@ Q_OBJECT TQ_OBJECT public: - ConfigGeneral(ConfigDialog *dialog, TQWidget *tqparent, const char *name = 0); + ConfigGeneral(ConfigDialog *dialog, TQWidget *parent, const char *name = 0); bool chatTimestamps(); @@ -118,7 +118,7 @@ Q_OBJECT TQ_OBJECT public: - ConfigDialog(Atlantik *tqparent, const char *name=0); + ConfigDialog(Atlantik *parent, const char *name=0); bool chatTimestamps(); bool indicateUnowned(); diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp index 2821253a..9636e6e2 100644 --- a/atlantik/client/eventlogwidget.cpp +++ b/atlantik/client/eventlogwidget.cpp @@ -47,8 +47,8 @@ TQPtrList<Event> EventLog::events() return m_events; } -EventLogWidget::EventLogWidget(EventLog *eventLog, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name, +EventLogWidget::EventLogWidget(EventLog *eventLog, TQWidget *parent, const char *name) + : TQWidget(parent, name, WType_Dialog | WStyle_Customize | WStyle_DialogBorder | WStyle_Title | WStyle_Minimize | WStyle_ContextHelp ) { diff --git a/atlantik/client/eventlogwidget.h b/atlantik/client/eventlogwidget.h index 3b2d1883..753a59fc 100644 --- a/atlantik/client/eventlogwidget.h +++ b/atlantik/client/eventlogwidget.h @@ -55,7 +55,7 @@ Q_OBJECT public: enum EventLogType { Default, Net_In, Net_Out }; - EventLogWidget(EventLog *eventLog, TQWidget *tqparent=0, const char *name = 0); + EventLogWidget(EventLog *eventLog, TQWidget *parent=0, const char *name = 0); public slots: void addEvent(Event *event); diff --git a/atlantik/client/monopigator.cpp b/atlantik/client/monopigator.cpp index 1fe68cef..e07a184a 100644 --- a/atlantik/client/monopigator.cpp +++ b/atlantik/client/monopigator.cpp @@ -108,12 +108,12 @@ void Monopigator::processData(const TQByteArray &data, bool okSoFar) } } -MonopigatorEntry::MonopigatorEntry(TQListView *tqparent, TQString host, TQString latency, TQString version, TQString users, TQString port, TQString ip) : TQObject(), TQListViewItem(tqparent, host, latency, version, users, port) +MonopigatorEntry::MonopigatorEntry(TQListView *parent, TQString host, TQString latency, TQString version, TQString users, TQString port, TQString ip) : TQObject(), TQListViewItem(parent, host, latency, version, users, port) { m_isDev = ( version.find( TQRegExp("(CVS|-dev)") ) != -1 ) ? true : false; setEnabled(false); - tqparent->sort(); + parent->sort(); if ( !ip.isEmpty() ) host = ip; diff --git a/atlantik/client/monopigator.h b/atlantik/client/monopigator.h index c785b980..abdc2b7a 100644 --- a/atlantik/client/monopigator.h +++ b/atlantik/client/monopigator.h @@ -62,7 +62,7 @@ Q_OBJECT TQ_OBJECT public: - MonopigatorEntry(TQListView *tqparent, TQString host, TQString latency, TQString version, TQString users, TQString port, TQString ip); + MonopigatorEntry(TQListView *parent, TQString host, TQString latency, TQString version, TQString users, TQString port, TQString ip); int compare(TQListViewItem *i, int col, bool ascending) const; bool isDev() const; diff --git a/atlantik/client/selectconfiguration_widget.cpp b/atlantik/client/selectconfiguration_widget.cpp index 1cb7a142..700856f2 100644 --- a/atlantik/client/selectconfiguration_widget.cpp +++ b/atlantik/client/selectconfiguration_widget.cpp @@ -33,7 +33,7 @@ #include "selectconfiguration_widget.moc" -SelectConfiguration::SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +SelectConfiguration::SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_atlanticCore = atlanticCore; m_game = 0; diff --git a/atlantik/client/selectconfiguration_widget.h b/atlantik/client/selectconfiguration_widget.h index 0ad747d0..88108f8f 100644 --- a/atlantik/client/selectconfiguration_widget.h +++ b/atlantik/client/selectconfiguration_widget.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name=0); + SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *parent, const char *name=0); void setCanStart(const bool &canStart); TQString hostToConnect() const; diff --git a/atlantik/client/selectgame_widget.cpp b/atlantik/client/selectgame_widget.cpp index e634b3c2..a4072044 100644 --- a/atlantik/client/selectgame_widget.cpp +++ b/atlantik/client/selectgame_widget.cpp @@ -29,7 +29,7 @@ #include "selectgame_widget.h" -SelectGame::SelectGame(AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +SelectGame::SelectGame(AtlanticCore *atlanticCore, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_atlanticCore = atlanticCore; diff --git a/atlantik/client/selectgame_widget.h b/atlantik/client/selectgame_widget.h index 42ec3350..5b9a523d 100644 --- a/atlantik/client/selectgame_widget.h +++ b/atlantik/client/selectgame_widget.h @@ -33,7 +33,7 @@ Q_OBJECT TQ_OBJECT public: - SelectGame(AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name=0); + SelectGame(AtlanticCore *atlanticCore, TQWidget *parent, const char *name=0); void initPage(); bool validateNext(); diff --git a/atlantik/client/selectserver_widget.cpp b/atlantik/client/selectserver_widget.cpp index 2404ebd1..3b5bcf1a 100644 --- a/atlantik/client/selectserver_widget.cpp +++ b/atlantik/client/selectserver_widget.cpp @@ -28,7 +28,7 @@ #include "selectserver_widget.moc" -SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServers, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServers, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_hideDevelopmentServers = hideDevelopmentServers; diff --git a/atlantik/client/selectserver_widget.h b/atlantik/client/selectserver_widget.h index 7e4ba45d..f663422d 100644 --- a/atlantik/client/selectserver_widget.h +++ b/atlantik/client/selectserver_widget.h @@ -35,7 +35,7 @@ Q_OBJECT TQ_OBJECT public: - SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServers, TQWidget *tqparent, const char *name=0); + SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServers, TQWidget *parent, const char *name=0); virtual ~SelectServer(); void initPage(); diff --git a/atlantik/libatlantic/atlantic_core.cpp b/atlantik/libatlantic/atlantic_core.cpp index c73b6e0f..9139e6ed 100644 --- a/atlantik/libatlantic/atlantic_core.cpp +++ b/atlantik/libatlantic/atlantic_core.cpp @@ -26,7 +26,7 @@ #include "player.h" #include "trade.h" -AtlanticCore::AtlanticCore(TQObject *tqparent, const char *name) : TQObject(tqparent, name) +AtlanticCore::AtlanticCore(TQObject *parent, const char *name) : TQObject(parent, name) { m_playerSelf = 0; } diff --git a/atlantik/libatlantic/atlantic_core.h b/atlantik/libatlantic/atlantic_core.h index 2ea9f25c..b0b4aeda 100644 --- a/atlantik/libatlantic/atlantic_core.h +++ b/atlantik/libatlantic/atlantic_core.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - AtlanticCore(TQObject *tqparent, const char *name); + AtlanticCore(TQObject *parent, const char *name); void reset(bool deletePermanents = false); diff --git a/atlantik/libatlantikui/auction_widget.cpp b/atlantik/libatlantikui/auction_widget.cpp index 2bb582fe..d4d7bdfa 100644 --- a/atlantik/libatlantikui/auction_widget.cpp +++ b/atlantik/libatlantikui/auction_widget.cpp @@ -33,7 +33,7 @@ #include "auction_widget.moc" -AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_atlanticCore = atlanticCore; diff --git a/atlantik/libatlantikui/auction_widget.h b/atlantik/libatlantikui/auction_widget.h index 5a21c95b..8c77d025 100644 --- a/atlantik/libatlantikui/auction_widget.h +++ b/atlantik/libatlantikui/auction_widget.h @@ -39,7 +39,7 @@ Q_OBJECT TQ_OBJECT public: - AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWidget *tqparent, const char *name=0); + AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWidget *parent, const char *name=0); private slots: void auctionChanged(); diff --git a/atlantik/libatlantikui/board.cpp b/atlantik/libatlantikui/board.cpp index 6b48b40d..c2c8fded 100644 --- a/atlantik/libatlantikui/board.cpp +++ b/atlantik/libatlantikui/board.cpp @@ -35,7 +35,7 @@ #include "board.h" #include "board.moc" -AtlantikBoard::AtlantikBoard(AtlanticCore *atlanticCore, int maxEstates, DisplayMode mode, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +AtlantikBoard::AtlantikBoard(AtlanticCore *atlanticCore, int maxEstates, DisplayMode mode, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_atlanticCore = atlanticCore; m_maxEstates = maxEstates; diff --git a/atlantik/libatlantikui/board.h b/atlantik/libatlantikui/board.h index 6240568d..c9e160ac 100644 --- a/atlantik/libatlantikui/board.h +++ b/atlantik/libatlantikui/board.h @@ -40,7 +40,7 @@ Q_OBJECT public: enum DisplayMode { Play, Edit }; - AtlantikBoard(AtlanticCore *atlanticCore, int maxEstates, DisplayMode mode, TQWidget *tqparent, const char *name=0); + AtlantikBoard(AtlanticCore *atlanticCore, int maxEstates, DisplayMode mode, TQWidget *parent, const char *name=0); ~AtlantikBoard(); void reset(); diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp index ca859eb6..c92b5cc2 100644 --- a/atlantik/libatlantikui/estatedetails.cpp +++ b/atlantik/libatlantikui/estatedetails.cpp @@ -39,7 +39,7 @@ #include "estatedetails.h" #include "kwrappedlistviewitem.h" -EstateDetails::EstateDetails(Estate *estate, TQString text, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +EstateDetails::EstateDetails(Estate *estate, TQString text, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_pixmap = 0; m_quartzBlocks = 0; diff --git a/atlantik/libatlantikui/estatedetails.h b/atlantik/libatlantikui/estatedetails.h index 315bfa5f..3ecdf77f 100644 --- a/atlantik/libatlantikui/estatedetails.h +++ b/atlantik/libatlantikui/estatedetails.h @@ -38,7 +38,7 @@ class EstateDetails : public TQWidget TQ_OBJECT public: - EstateDetails(Estate *estate, TQString text, TQWidget *tqparent, const char *name = 0); + EstateDetails(Estate *estate, TQString text, TQWidget *parent, const char *name = 0); ~EstateDetails(); Estate *estate() { return m_estate; } diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp index 19eec4d5..472f9125 100644 --- a/atlantik/libatlantikui/estateview.cpp +++ b/atlantik/libatlantikui/estateview.cpp @@ -36,7 +36,7 @@ #include "estateview.moc" #include "config.h" -EstateView::EstateView(Estate *estate, EstateOrientation orientation, const TQString &_icon, bool indicateUnowned, bool highliteUnowned, bool darkenMortgaged, bool quartzEffects, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name, WResizeNoErase) +EstateView::EstateView(Estate *estate, EstateOrientation orientation, const TQString &_icon, bool indicateUnowned, bool highliteUnowned, bool darkenMortgaged, bool quartzEffects, TQWidget *parent, const char *name) : TQWidget(parent, name, WResizeNoErase) { m_estate = estate; m_orientation = orientation; diff --git a/atlantik/libatlantikui/estateview.h b/atlantik/libatlantikui/estateview.h index a24d6888..5b0de0e4 100644 --- a/atlantik/libatlantikui/estateview.h +++ b/atlantik/libatlantikui/estateview.h @@ -35,7 +35,7 @@ Q_OBJECT TQ_OBJECT public: - EstateView(Estate *estate, EstateOrientation orientation, const TQString &, bool indicateUnowned, bool highliteUnowned, bool darkenMortgaged, bool quartzEffects, TQWidget *tqparent, const char *name = 0); + EstateView(Estate *estate, EstateOrientation orientation, const TQString &, bool indicateUnowned, bool highliteUnowned, bool darkenMortgaged, bool quartzEffects, TQWidget *parent, const char *name = 0); void setViewProperties(bool indicateUnowned, bool highliteUnowned, bool darkenMortgaged, bool quartzEffects); Estate *estate() { return m_estate; } void updatePE(); diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.cpp b/atlantik/libatlantikui/kwrappedlistviewitem.cpp index 12801aab..38c0d636 100644 --- a/atlantik/libatlantikui/kwrappedlistviewitem.cpp +++ b/atlantik/libatlantikui/kwrappedlistviewitem.cpp @@ -31,16 +31,16 @@ #include "kwrappedlistviewitem.h" -KWrappedListViewItem::KWrappedListViewItem( TQListView *tqparent, TQString text, TQString t2 ) -: TQObject(), KListViewItem( tqparent ) +KWrappedListViewItem::KWrappedListViewItem( TQListView *parent, TQString text, TQString t2 ) +: TQObject(), KListViewItem( parent ) { - init( tqparent, text, t2 ); + init( parent, text, t2 ); } -KWrappedListViewItem::KWrappedListViewItem( TQListView *tqparent, TQListViewItem *after, TQString text, TQString t2 ) -: TQObject(), KListViewItem( tqparent, after ) +KWrappedListViewItem::KWrappedListViewItem( TQListView *parent, TQListViewItem *after, TQString text, TQString t2 ) +: TQObject(), KListViewItem( parent, after ) { - init( tqparent, text, t2 ); + init( parent, text, t2 ); } void KWrappedListViewItem::setup() @@ -91,11 +91,11 @@ void KWrappedListViewItem::wrapColumn( int c ) delete wrap; } -void KWrappedListViewItem::init( TQListView *tqparent, TQString text, TQString t2 ) +void KWrappedListViewItem::init( TQListView *parent, TQString text, TQString t2 ) { m_wrapColumn = 0; setMultiLinesEnabled( true ); - tqparent->setResizeMode( TQListView::LastColumn ); + parent->setResizeMode( TQListView::LastColumn ); m_origText = text; @@ -110,7 +110,7 @@ void KWrappedListViewItem::init( TQListView *tqparent, TQString text, TQString t wrapColumn( m_wrapColumn ); - connect( tqparent->header(), TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(wrapColumn(int))); + connect( parent->header(), TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(wrapColumn(int))); } #include "kwrappedlistviewitem.moc" diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.h b/atlantik/libatlantikui/kwrappedlistviewitem.h index 0107fef3..dea51256 100644 --- a/atlantik/libatlantikui/kwrappedlistviewitem.h +++ b/atlantik/libatlantikui/kwrappedlistviewitem.h @@ -38,8 +38,8 @@ Q_OBJECT TQ_OBJECT public: - KWrappedListViewItem( TQListView *tqparent, TQString text, TQString=TQString() ); - KWrappedListViewItem( TQListView *tqparent, TQListViewItem *after, TQString text, TQString=TQString() ); + KWrappedListViewItem( TQListView *parent, TQString text, TQString=TQString() ); + KWrappedListViewItem( TQListView *parent, TQListViewItem *after, TQString text, TQString=TQString() ); void setup(); // int width(const TQFontMetrics& fm, const TQListView* lv, int c) const; @@ -47,7 +47,7 @@ private slots: void wrapColumn( int c ); private: - void init( TQListView *tqparent, TQString text, TQString=TQString() ); + void init( TQListView *parent, TQString text, TQString=TQString() ); TQString m_origText; int m_wrapColumn; }; diff --git a/atlantik/libatlantikui/portfolioestate.cpp b/atlantik/libatlantikui/portfolioestate.cpp index 9b55b565..1117b6e8 100644 --- a/atlantik/libatlantikui/portfolioestate.cpp +++ b/atlantik/libatlantikui/portfolioestate.cpp @@ -21,7 +21,7 @@ #include "portfolioestate.moc" #include "estate.h" -PortfolioEstate::PortfolioEstate(Estate *estate, Player *player, bool alwaysOwned, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +PortfolioEstate::PortfolioEstate(Estate *estate, Player *player, bool alwaysOwned, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_estate = estate; m_player = player; diff --git a/atlantik/libatlantikui/portfolioestate.h b/atlantik/libatlantikui/portfolioestate.h index 93ddde8d..546b332a 100644 --- a/atlantik/libatlantikui/portfolioestate.h +++ b/atlantik/libatlantikui/portfolioestate.h @@ -32,7 +32,7 @@ Q_OBJECT TQ_OBJECT public: - PortfolioEstate(Estate *estate, Player *player, bool alwaysOwned, TQWidget *tqparent, const char *name = 0); + PortfolioEstate(Estate *estate, Player *player, bool alwaysOwned, TQWidget *parent, const char *name = 0); Estate *estate() { return m_estate; } static TQPixmap drawPixmap(Estate *estate, Player *player = 0, bool alwaysOwned = true); diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp index 83d2b0d2..f73d2999 100644 --- a/atlantik/libatlantikui/portfolioview.cpp +++ b/atlantik/libatlantikui/portfolioview.cpp @@ -40,7 +40,7 @@ #define PE_MARGINH 2 #define ICONSIZE 48 -PortfolioView::PortfolioView(AtlanticCore *core, Player *player, TQColor activeColor, TQColor inactiveColor, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +PortfolioView::PortfolioView(AtlanticCore *core, Player *player, TQColor activeColor, TQColor inactiveColor, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_atlanticCore = core; m_player = player; diff --git a/atlantik/libatlantikui/portfolioview.h b/atlantik/libatlantikui/portfolioview.h index d07aacda..39893f87 100644 --- a/atlantik/libatlantikui/portfolioview.h +++ b/atlantik/libatlantikui/portfolioview.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - PortfolioView(AtlanticCore *core, Player *_player, TQColor activeColor, TQColor inactiveColor, TQWidget *tqparent, const char *name = 0); + PortfolioView(AtlanticCore *core, Player *_player, TQColor activeColor, TQColor inactiveColor, TQWidget *parent, const char *name = 0); ~PortfolioView(); void buildPortfolio(); diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp index 0a4f5193..d6df61dc 100644 --- a/atlantik/libatlantikui/token.cpp +++ b/atlantik/libatlantikui/token.cpp @@ -33,11 +33,11 @@ #define TOKEN_ICONSIZE 32 -Token::Token(Player *player, AtlantikBoard *tqparent, const char *name) : TQWidget(tqparent, name) +Token::Token(Player *player, AtlantikBoard *parent, const char *name) : TQWidget(parent, name) { setBackgroundMode(NoBackground); // avoid flickering - m_parentBoard = tqparent; + m_parentBoard = parent; m_player = player; connect(m_player, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged())); diff --git a/atlantik/libatlantikui/token.h b/atlantik/libatlantikui/token.h index ea45888d..84a2dbef 100644 --- a/atlantik/libatlantikui/token.h +++ b/atlantik/libatlantikui/token.h @@ -31,7 +31,7 @@ Q_OBJECT TQ_OBJECT public: - Token (Player *player, AtlantikBoard *tqparent, const char *name = 0); + Token (Player *player, AtlantikBoard *parent, const char *name = 0); ~Token(); Player *player(); void setLocation(Estate *estate); diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp index bf4eeac6..d6cfe4d4 100644 --- a/atlantik/libatlantikui/trade_widget.cpp +++ b/atlantik/libatlantikui/trade_widget.cpp @@ -44,8 +44,8 @@ #include "trade_widget.moc" -TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name, +TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *parent, const char *name) + : TQWidget(parent, name, WType_Dialog | WStyle_Customize | WStyle_DialogBorder | WStyle_Title | WStyle_Minimize | WStyle_ContextHelp ) { diff --git a/atlantik/libatlantikui/trade_widget.h b/atlantik/libatlantikui/trade_widget.h index ebaba426..8c967f40 100644 --- a/atlantik/libatlantikui/trade_widget.h +++ b/atlantik/libatlantikui/trade_widget.h @@ -42,7 +42,7 @@ Q_OBJECT TQ_OBJECT public: - TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *tqparent=0, const char *name = 0); + TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *parent=0, const char *name = 0); Trade *trade() { return mTrade; } diff --git a/kasteroids/ledmeter.cpp b/kasteroids/ledmeter.cpp index d2250c28..e323d6fd 100644 --- a/kasteroids/ledmeter.cpp +++ b/kasteroids/ledmeter.cpp @@ -8,7 +8,7 @@ #include "ledmeter.h" #include "ledmeter.moc" -KALedMeter::KALedMeter( TQWidget *tqparent ) : TQFrame( tqparent ) +KALedMeter::KALedMeter( TQWidget *parent ) : TQFrame( parent ) { mCRanges.setAutoDelete( true ); mRange = 100; diff --git a/kasteroids/ledmeter.h b/kasteroids/ledmeter.h index 7547bcd1..c913350b 100644 --- a/kasteroids/ledmeter.h +++ b/kasteroids/ledmeter.h @@ -16,7 +16,7 @@ class KALedMeter : public TQFrame Q_OBJECT TQ_OBJECT public: - KALedMeter( TQWidget *tqparent ); + KALedMeter( TQWidget *parent ); int range() const { return mRange; } void setRange( int r ); diff --git a/kasteroids/view.cpp b/kasteroids/view.cpp index 0fea036b..8b90aa9c 100644 --- a/kasteroids/view.cpp +++ b/kasteroids/view.cpp @@ -63,8 +63,8 @@ kas_animations [] = -KAsteroidsView::KAsteroidsView( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), +KAsteroidsView::KAsteroidsView( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), field(640, 440), view(&field,this) { diff --git a/kasteroids/view.h b/kasteroids/view.h index 48b72e9f..dd4590d1 100644 --- a/kasteroids/view.h +++ b/kasteroids/view.h @@ -22,7 +22,7 @@ class KAsteroidsView : public TQWidget Q_OBJECT TQ_OBJECT public: - KAsteroidsView( TQWidget *tqparent = 0, const char *name = 0 ); + KAsteroidsView( TQWidget *parent = 0, const char *name = 0 ); virtual ~KAsteroidsView(); int refreshRate; diff --git a/katomic/configbox.cpp b/katomic/configbox.cpp index 30c77dd3..ad524023 100644 --- a/katomic/configbox.cpp +++ b/katomic/configbox.cpp @@ -16,8 +16,8 @@ extern Options settings; -ConfigBox::ConfigBox ( TQWidget *tqparent, const char *name) - : KDialogBase ( tqparent, name, true, i18n("Configure"), Ok | Cancel, Ok, true ) +ConfigBox::ConfigBox ( TQWidget *parent, const char *name) + : KDialogBase ( parent, name, true, i18n("Configure"), Ok | Cancel, Ok, true ) { TQWidget *page = makeMainWidget(); diff --git a/katomic/feld.cpp b/katomic/feld.cpp index 48150efd..dcddf606 100644 --- a/katomic/feld.cpp +++ b/katomic/feld.cpp @@ -26,8 +26,8 @@ extern Options settings; -Feld::Feld( TQWidget *tqparent, const char *name ) : - TQWidget( tqparent, name ), +Feld::Feld( TQWidget *parent, const char *name ) : + TQWidget( parent, name ), data(locate("appdata", "pics/abilder.png")), undoBegin (0), undoSize (0), redoSize (0) { diff --git a/katomic/feld.h b/katomic/feld.h index 6383441c..66b1499d 100644 --- a/katomic/feld.h +++ b/katomic/feld.h @@ -33,7 +33,7 @@ class Feld : public TQWidget TQ_OBJECT public: - Feld (TQWidget *tqparent=0, const char *name=0); + Feld (TQWidget *parent=0, const char *name=0); ~Feld (); enum Direction { None = 0, diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp index 2bda7d0f..064037ef 100644 --- a/katomic/gamewidget.cpp +++ b/katomic/gamewidget.cpp @@ -167,8 +167,8 @@ void GameWidget::restartLevel() updateLevel(level); } -GameWidget::GameWidget ( TQWidget *tqparent, const char* name ) - : TQWidget( tqparent, name ) +GameWidget::GameWidget ( TQWidget *parent, const char* name ) + : TQWidget( parent, name ) { level = 1; nlevels = KGlobal::dirs()->findAllResources("appdata", "levels/level_*", diff --git a/katomic/gamewidget.h b/katomic/gamewidget.h index 839faa17..7e6411c8 100644 --- a/katomic/gamewidget.h +++ b/katomic/gamewidget.h @@ -17,7 +17,7 @@ class GameWidget : public TQWidget public: - GameWidget ( TQWidget *tqparent, const char *name=0 ); + GameWidget ( TQWidget *parent, const char *name=0 ); ~GameWidget(); diff --git a/katomic/molek.cpp b/katomic/molek.cpp index 7e6484ea..6731962f 100644 --- a/katomic/molek.cpp +++ b/katomic/molek.cpp @@ -26,7 +26,7 @@ extern int level; -Molek::Molek( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), +Molek::Molek( TQWidget *parent, const char *name ) : TQWidget( parent, name ), data(locate("appdata", "pics/molek.png")) { setBackgroundColor (TQColor (0, 0, 0)); diff --git a/katomic/molek.h b/katomic/molek.h index 4100fe46..ae102f53 100644 --- a/katomic/molek.h +++ b/katomic/molek.h @@ -26,7 +26,7 @@ class Molek : public TQWidget TQ_OBJECT public: - Molek (TQWidget *tqparent=0, const char *name=0); + Molek (TQWidget *parent=0, const char *name=0); ~Molek (); void load(const KSimpleConfig& config); diff --git a/kbackgammon/engines/fibs/kbgfibs.cpp b/kbackgammon/engines/fibs/kbgfibs.cpp index c99b19f0..57eb6666 100644 --- a/kbackgammon/engines/fibs/kbgfibs.cpp +++ b/kbackgammon/engines/fibs/kbgfibs.cpp @@ -642,7 +642,7 @@ bool KBgEngineFIBS::queryClose() if (connection->state() == TQSocket::Idle) return true; - switch (KMessageBox::warningYesNoCancel((TQWidget *)tqparent(),i18n("Still connected. Log out first?"),TQString(),i18n("Log Out"), i18n("Stay Connected"))) { + switch (KMessageBox::warningYesNoCancel((TQWidget *)parent(),i18n("Still connected. Log out first?"),TQString(),i18n("Log Out"), i18n("Stay Connected"))) { case KMessageBox::Yes : disconnectFIBS(); return true; @@ -731,7 +731,7 @@ void KBgEngineFIBS::away() bool ret; TQString msg = KLineEditDlg::getText(i18n("Please type the message that should be displayed to other\n" "users while you are away."), - lastAway, &ret, (TQWidget *)tqparent()); + lastAway, &ret, (TQWidget *)parent()); if (ret) { lastAway = msg; emit serverString("away " + msg); @@ -1052,7 +1052,7 @@ bool KBgEngineFIBS::queryConnection(const bool newlogin) msg = KLineEditDlg::getText(i18n("Enter the name of the server you want to connect to.\n" "This should almost always be \"fibs.com\"."), - infoFIBS[FIBSHost], &ret, (TQWidget *)tqparent()); + infoFIBS[FIBSHost], &ret, (TQWidget *)parent()); if (ret) infoFIBS[FIBSHost] = msg; @@ -1064,7 +1064,7 @@ bool KBgEngineFIBS::queryConnection(const bool newlogin) msg = KLineEditDlg::getText(i18n("Enter the port number on the server. " "It should almost always be \"4321\"."), - infoFIBS[FIBSPort], &ret, (TQWidget *)tqparent()); + infoFIBS[FIBSPort], &ret, (TQWidget *)parent()); if (ret) infoFIBS[FIBSPort] = msg; @@ -1088,7 +1088,7 @@ bool KBgEngineFIBS::queryConnection(const bool newlogin) first = true; do { msg = (KLineEditDlg::getText(text, infoFIBS[FIBSUser], &ret, - (TQWidget *)tqparent())).stripWhiteSpace(); + (TQWidget *)parent())).stripWhiteSpace(); if (first) { text += i18n("The login may not contain spaces or colons!"); first = false; @@ -1400,7 +1400,7 @@ void KBgEngineFIBS::handleMessageConnect(const TQString &line, const TQString &r if (rxCollect.isEmpty()) { rxtqStatus = RxIgnore; int ret = KMessageBox::warningContinueCancel - ((TQWidget *)tqparent(), i18n("There was a problem with " + ((TQWidget *)parent(), i18n("There was a problem with " "your login and password. " "You can reenter\n" "your login and password and " @@ -1574,7 +1574,7 @@ void KBgEngineFIBS::handleMessageNewLogin(const TQString &line) do { msg = (KLineEditDlg::getText(text, infoFIBS[FIBSUser], &ret, - (TQWidget *)tqparent())).stripWhiteSpace(); + (TQWidget *)parent())).stripWhiteSpace(); if (first) { text += i18n("\n\nThe login may not contain spaces or colons!"); first = false; @@ -2091,13 +2091,13 @@ void KBgEngineFIBS::handleMessageNormal(TQString &line, TQString &rawline) /* * Constructor */ -KBgEngineFIBS::KBgEngineFIBS(TQWidget *tqparent, TQString *name, TQPopupMenu *pmenu) - : KBgEngine(tqparent, name, pmenu) +KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmenu) + : KBgEngine(parent, name, pmenu) { /* * No connection, not playing, ready for login */ - connection = new TQSocket(TQT_TQOBJECT(tqparent), "fibs connection"); + connection = new TQSocket(TQT_TQOBJECT(parent), "fibs connection"); playing = false; login = true; diff --git a/kbackgammon/engines/fibs/kbgfibs.h b/kbackgammon/engines/fibs/kbgfibs.h index d044c642..24555ef2 100644 --- a/kbackgammon/engines/fibs/kbgfibs.h +++ b/kbackgammon/engines/fibs/kbgfibs.h @@ -67,7 +67,7 @@ public: /** * Constructor */ - KBgEngineFIBS(TQWidget *tqparent = 0, TQString *name = 0, TQPopupMenu *pmenu = 0); + KBgEngineFIBS(TQWidget *parent = 0, TQString *name = 0, TQPopupMenu *pmenu = 0); /** * Destructor diff --git a/kbackgammon/engines/fibs/kbgfibschat.cpp b/kbackgammon/engines/fibs/kbgfibschat.cpp index f4dce656..c3490cec 100644 --- a/kbackgammon/engines/fibs/kbgfibschat.cpp +++ b/kbackgammon/engines/fibs/kbgfibschat.cpp @@ -71,10 +71,10 @@ public: /* * Constructor */ - KLBT(TQWidget *tqparent, const TQString &text = TQString(), const TQString &player = TQString()) + KLBT(TQWidget *parent, const TQString &text = TQString(), const TQString &player = TQString()) : TQListBoxText(text) { - w = tqparent; + w = parent; n = new TQString(player); t = new TQSimpleRichText(text, w->font()); @@ -189,8 +189,8 @@ public: /* * Constructor of the chat window. */ -KBgChat::KBgChat(TQWidget *tqparent, const char *name) - : KChat(tqparent, false) +KBgChat::KBgChat(TQWidget *parent, const char *name) + : KChat(parent, false) { d = new KBgChatPrivate(); KActionCollection* actions = new KActionCollection(this); diff --git a/kbackgammon/engines/fibs/kbgfibschat.h b/kbackgammon/engines/fibs/kbgfibschat.h index a34a0c93..edfafc98 100644 --- a/kbackgammon/engines/fibs/kbgfibschat.h +++ b/kbackgammon/engines/fibs/kbgfibschat.h @@ -62,7 +62,7 @@ public: /** * Constructor */ - KBgChat(TQWidget *tqparent = 0, const char *name = 0); + KBgChat(TQWidget *parent = 0, const char *name = 0); /** * Destructor diff --git a/kbackgammon/engines/fibs/kplayerlist.cpp b/kbackgammon/engines/fibs/kplayerlist.cpp index 72714f4c..e79e1118 100644 --- a/kbackgammon/engines/fibs/kplayerlist.cpp +++ b/kbackgammon/engines/fibs/kplayerlist.cpp @@ -79,7 +79,7 @@ public: /* * Constructor */ - KFibsPlayerListLVI(KFibsPlayerList *tqparent) : KListViewItem(tqparent) { _plist = tqparent; } + KFibsPlayerListLVI(KFibsPlayerList *parent) : KListViewItem(parent) { _plist = parent; } /* * Destructor @@ -200,8 +200,8 @@ public: /* * Construct the playerlist and do some initial setup */ -KFibsPlayerList::KFibsPlayerList(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name) + : KListView(parent, name) { d = new KFibsPlayerListPrivate(); KActionCollection* actions = new KActionCollection(this); diff --git a/kbackgammon/engines/fibs/kplayerlist.h b/kbackgammon/engines/fibs/kplayerlist.h index 7fe45218..793e1b39 100644 --- a/kbackgammon/engines/fibs/kplayerlist.h +++ b/kbackgammon/engines/fibs/kplayerlist.h @@ -64,7 +64,7 @@ public: /** * Constructor */ - KFibsPlayerList(TQWidget *tqparent = 0, const char *name = 0); + KFibsPlayerList(TQWidget *parent = 0, const char *name = 0); /** * Destructor diff --git a/kbackgammon/engines/generic/kbgengine.cpp b/kbackgammon/engines/generic/kbgengine.cpp index ac217bd0..a066a8c3 100644 --- a/kbackgammon/engines/generic/kbgengine.cpp +++ b/kbackgammon/engines/generic/kbgengine.cpp @@ -33,8 +33,8 @@ /* * Constructor initializes the TQObject */ -KBgEngine::KBgEngine(TQWidget *tqparent, TQString *name, TQPopupMenu *pmenu) - : TQObject(tqparent, name->local8Bit()) +KBgEngine::KBgEngine(TQWidget *parent, TQString *name, TQPopupMenu *pmenu) + : TQObject(parent, name->local8Bit()) { menu = pmenu; cl = -1; diff --git a/kbackgammon/engines/generic/kbgengine.h b/kbackgammon/engines/generic/kbgengine.h index c43b31b5..48855265 100644 --- a/kbackgammon/engines/generic/kbgengine.h +++ b/kbackgammon/engines/generic/kbgengine.h @@ -69,7 +69,7 @@ public: /** * Constructor */ - KBgEngine (TQWidget * tqparent = 0, TQString * name = 0, TQPopupMenu * pmenu = 0); + KBgEngine (TQWidget * parent = 0, TQString * name = 0, TQPopupMenu * pmenu = 0); /** * Destructor diff --git a/kbackgammon/engines/gnubg/kbggnubg.cpp b/kbackgammon/engines/gnubg/kbggnubg.cpp index 1ddc3664..3ad42dd7 100644 --- a/kbackgammon/engines/gnubg/kbggnubg.cpp +++ b/kbackgammon/engines/gnubg/kbggnubg.cpp @@ -275,7 +275,7 @@ void KBgEngineGNU::newGame() /* * If there is a game running we warn the user first */ - if (gameRunning && (KMessageBox::warningYesNo((TQWidget *)tqparent(), + if (gameRunning && (KMessageBox::warningYesNo((TQWidget *)parent(), i18n("A game is currently in progress. " "Starting a new one will terminate it."), TQString(), i18n("Start New Game"), i18n("Continue Old Game")) @@ -422,8 +422,8 @@ void KBgEngineGNU::saveConfig() /* * Constructor */ -KBgEngineGNU::KBgEngineGNU(TQWidget *tqparent, TQString *name, TQPopupMenu *pmenu) - : KBgEngine(tqparent, name, pmenu) +KBgEngineGNU::KBgEngineGNU(TQWidget *parent, TQString *name, TQPopupMenu *pmenu) + : KBgEngine(parent, name, pmenu) { // obsolete nameUS = "US"; @@ -503,7 +503,7 @@ void KBgEngineGNU::startGNU() resAction->setEnabled(false); if (!gnubg.start(KProcess::NotifyOnExit, KProcess::All)) - KMessageBox::information((TQWidget *)tqparent(), + KMessageBox::information((TQWidget *)parent(), i18n("Could not start the GNU Backgammon process.\n" "Make sure the program is in your PATH and is " "called \"gnubg\".\n" diff --git a/kbackgammon/engines/gnubg/kbggnubg.h b/kbackgammon/engines/gnubg/kbggnubg.h index 78b4566e..59c133ef 100644 --- a/kbackgammon/engines/gnubg/kbggnubg.h +++ b/kbackgammon/engines/gnubg/kbggnubg.h @@ -51,7 +51,7 @@ public: /* * Constructor and destructor */ - KBgEngineGNU(TQWidget *tqparent = 0, TQString *name = 0, TQPopupMenu *pmenu = 0); + KBgEngineGNU(TQWidget *parent = 0, TQString *name = 0, TQPopupMenu *pmenu = 0); virtual ~KBgEngineGNU(); /** diff --git a/kbackgammon/engines/nextgen/kbggame.cpp b/kbackgammon/engines/nextgen/kbggame.cpp index d00c1966..0aed48c2 100644 --- a/kbackgammon/engines/nextgen/kbggame.cpp +++ b/kbackgammon/engines/nextgen/kbggame.cpp @@ -31,8 +31,8 @@ /* * Constructor */ -KBgGame::KBgGame(int cookie, TQObject *tqparent) - : KGame(cookie, tqparent) +KBgGame::KBgGame(int cookie, TQObject *parent) + : KGame(cookie, parent) { // do nothing... } diff --git a/kbackgammon/engines/nextgen/kbggame.h b/kbackgammon/engines/nextgen/kbggame.h index 255a3483..4dd6abd3 100644 --- a/kbackgammon/engines/nextgen/kbggame.h +++ b/kbackgammon/engines/nextgen/kbggame.h @@ -46,7 +46,7 @@ public: enum MsgID {Text, Cmd, MaxMsg}; - KBgGame(int cookie = 42, TQObject *tqparent = 0); + KBgGame(int cookie = 42, TQObject *parent = 0); protected: diff --git a/kbackgammon/engines/nextgen/kbgng.cpp b/kbackgammon/engines/nextgen/kbgng.cpp index f2f04066..e0c1aed5 100644 --- a/kbackgammon/engines/nextgen/kbgng.cpp +++ b/kbackgammon/engines/nextgen/kbgng.cpp @@ -51,8 +51,8 @@ /* * Constructor */ -KBgEngineNg::KBgEngineNg(TQWidget *tqparent, TQString *name, TQPopupMenu *pmenu) - : KBgEngine(tqparent, name, pmenu) +KBgEngineNg::KBgEngineNg(TQWidget *parent, TQString *name, TQPopupMenu *pmenu) + : KBgEngine(parent, name, pmenu) { // get a new game initGame(); @@ -140,7 +140,7 @@ void KBgEngineNg::setGame() "65535."); port_s.setNum(_port); do { - port_s = KLineEditDlg::getText(label, port_s, &ret, (TQWidget *)tqparent()); + port_s = KLineEditDlg::getText(label, port_s, &ret, (TQWidget *)parent()); if (!ret) return; port = port_s.toUShort(&ret); @@ -159,7 +159,7 @@ void KBgEngineNg::setGame() label = i18n("Type the name of the server you want to connect to:"); host_s = _host; do { - host_s = KLineEditDlg::getText(label, host_s, &ret, (TQWidget *)tqparent()); + host_s = KLineEditDlg::getText(label, host_s, &ret, (TQWidget *)parent()); if (!ret) return; } while (host_s.isEmpty()); @@ -168,7 +168,7 @@ void KBgEngineNg::setGame() "number should be between 1024 and 65535.").tqarg(host_s); port_s.setNum(_port); do { - port_s = KLineEditDlg::getText(label, port_s, &ret, (TQWidget *)tqparent()); + port_s = KLineEditDlg::getText(label, port_s, &ret, (TQWidget *)parent()); if (!ret) return; port = port_s.toUShort(&ret); @@ -546,10 +546,10 @@ void KBgEngineNg::changeName() while (!_player[i]->isVirtual() && name.isEmpty()) { if (i == 0) name = KLineEditDlg::getText(i18n("Type the name of the first player:"), - _name[i], &ok, (TQWidget *)tqparent()); + _name[i], &ok, (TQWidget *)parent()); else name = KLineEditDlg::getText(i18n("Type the name of the second player:"), - _name[i], &ok, (TQWidget *)tqparent()); + _name[i], &ok, (TQWidget *)parent()); if (!ok) return; _player[i]->setName(name); } diff --git a/kbackgammon/engines/nextgen/kbgng.h b/kbackgammon/engines/nextgen/kbgng.h index 12c94140..670a7849 100644 --- a/kbackgammon/engines/nextgen/kbgng.h +++ b/kbackgammon/engines/nextgen/kbgng.h @@ -58,7 +58,7 @@ public: /* * Constructor and destructor */ - KBgEngineNg( TQWidget *tqparent = 0, TQString *name = 0, TQPopupMenu *pmenu = 0); + KBgEngineNg( TQWidget *parent = 0, TQString *name = 0, TQPopupMenu *pmenu = 0); virtual ~KBgEngineNg(); /** @@ -245,7 +245,7 @@ private: /** * Create the i-th player. Legal values for i are 0 and 1. The - * name of the player is taken from @ref _name and the tqparent of + * name of the player is taken from @ref _name and the parent of * the player is @ref _player. That means that the players are * automatically deleted. */ diff --git a/kbackgammon/engines/offline/kbgoffline.cpp b/kbackgammon/engines/offline/kbgoffline.cpp index 8dd93a7c..604d196e 100644 --- a/kbackgammon/engines/offline/kbgoffline.cpp +++ b/kbackgammon/engines/offline/kbgoffline.cpp @@ -106,8 +106,8 @@ public: /* * Constructor */ -KBgEngineOffline::KBgEngineOffline(TQWidget *tqparent, TQString *name, TQPopupMenu *pmenu) - : KBgEngine(tqparent, name, pmenu) +KBgEngineOffline::KBgEngineOffline(TQWidget *parent, TQString *name, TQPopupMenu *pmenu) + : KBgEngine(parent, name, pmenu) { d = new KBgEngineOfflinePrivate(); @@ -282,7 +282,7 @@ void KBgEngineOffline::newGame() /* * If there is a game running we warn the user first */ - if (d->mGameFlag && (KMessageBox::warningYesNo((TQWidget *)tqparent(), + if (d->mGameFlag && (KMessageBox::warningYesNo((TQWidget *)parent(), i18n("A game is currently in progress. " "Starting a new one will terminate it."), TQString(), i18n("Start New Game"), @@ -397,7 +397,7 @@ bool KBgEngineOffline::queryPlayerName(int w) } do { - *name = KLineEditDlg::getText(text, *name, &ret, (TQWidget *)tqparent()); + *name = KLineEditDlg::getText(text, *name, &ret, (TQWidget *)parent()); if (!ret) break; } while (name->isEmpty()); @@ -645,7 +645,7 @@ void KBgEngineOffline::cube() if (d->mRollFlag && d->mGame[0].cube(w) > 0) { emit allowCommand(Cube, false); - if (KMessageBox::questionYesNo((TQWidget *)tqparent(), + if (KMessageBox::questionYesNo((TQWidget *)parent(), i18n("%1 has doubled. %2, do you accept the double?"). arg((w == THEM) ? d->mName[1] : d->mName[0]). arg((w == US) ? d->mName[1] : d->mName[0]), @@ -695,7 +695,7 @@ bool KBgEngineOffline::queryClose() if (!d->mGameFlag) return true; - switch (KMessageBox::warningContinueCancel((TQWidget *)tqparent(), + switch (KMessageBox::warningContinueCancel((TQWidget *)parent(), i18n("In the middle of a game. " "Really quit?"), TQString(), KStdGuiItem::quit())) { case KMessageBox::Continue : diff --git a/kbackgammon/engines/offline/kbgoffline.h b/kbackgammon/engines/offline/kbgoffline.h index a0217920..8c12f858 100644 --- a/kbackgammon/engines/offline/kbgoffline.h +++ b/kbackgammon/engines/offline/kbgoffline.h @@ -56,7 +56,7 @@ public: /** * Constructor */ - KBgEngineOffline(TQWidget *tqparent = 0, TQString *name = 0, TQPopupMenu *pmenu = 0); + KBgEngineOffline(TQWidget *parent = 0, TQString *name = 0, TQPopupMenu *pmenu = 0); /** * Destructor diff --git a/kbackgammon/kbgboard.cpp b/kbackgammon/kbgboard.cpp index a065ec40..ba2d1829 100644 --- a/kbackgammon/kbgboard.cpp +++ b/kbackgammon/kbgboard.cpp @@ -248,8 +248,8 @@ void KBgBoardSetup::getSetupPages(KDialogBase *nb) /* * Empty constructor calls the board constructor */ -KBgBoardSetup::KBgBoardSetup(TQWidget *tqparent, const char *name, TQPopupMenu *menu) - : KBgBoard(tqparent, name, menu) +KBgBoardSetup::KBgBoardSetup(TQWidget *parent, const char *name, TQPopupMenu *menu) + : KBgBoard(parent, name, menu) { // empty } @@ -1610,8 +1610,8 @@ KBgBoardField::~KBgBoardField() * This is the constructor of the bars. It calls the base class' constructor * and defines the TQWhatsThis string. */ -KBgBoardBar::KBgBoardBar(TQWidget * tqparent, int numID) - : KBgBoardCell(tqparent, numID) +KBgBoardBar::KBgBoardBar(TQWidget * parent, int numID) + : KBgBoardCell(parent, numID) { TQWhatsThis::add(this, i18n("This is the bar of the backgammon board.\n\n" "Checkers that have been kicked from the board are put " @@ -1627,8 +1627,8 @@ KBgBoardBar::KBgBoardBar(TQWidget * tqparent, int numID) * This is the constructor of regular fields. It calls the base class' constructor * and defines the TQWhatsThis string. */ -KBgBoardField::KBgBoardField(TQWidget * tqparent, int numID) - : KBgBoardCell(tqparent, numID) +KBgBoardField::KBgBoardField(TQWidget * parent, int numID) + : KBgBoardCell(parent, numID) { TQWhatsThis::add(this, i18n("This is a regular field of the backgammon board.\n\n" "Checkers can be placed on this field and if the current state " @@ -1641,8 +1641,8 @@ KBgBoardField::KBgBoardField(TQWidget * tqparent, int numID) * This is the constructor of the homes. It calls the base class' constructor * and defines the TQWhatsThis string. */ -KBgBoardHome::KBgBoardHome(TQWidget * tqparent, int numID) - : KBgBoardCell(tqparent, numID) +KBgBoardHome::KBgBoardHome(TQWidget * parent, int numID) + : KBgBoardCell(parent, numID) { TQWhatsThis::add(this, i18n("This part of the backgammon board is the home.\n\n" "Depending on the direction of the game, one of the homes " @@ -1734,10 +1734,10 @@ int KBgBoard::getTurn() const * This is the constructor of the basic cells. It initializes the cell * to a sane state and connects a signal to the board. */ -KBgBoardCell::KBgBoardCell(TQWidget * tqparent, int numID) - : TQLabel(tqparent) +KBgBoardCell::KBgBoardCell(TQWidget * parent, int numID) + : TQLabel(parent) { - board = (KBgBoard *)tqparent; + board = (KBgBoard *)parent; direction = +1; color = -1; @@ -1749,7 +1749,7 @@ KBgBoardCell::KBgBoardCell(TQWidget * tqparent, int numID) mouseButton = Qt::NoButton; dragInProgress = false; - connect(tqparent, TQT_SIGNAL(finishedUpdate()), this, TQT_SLOT(refresh())); + connect(parent, TQT_SIGNAL(finishedUpdate()), this, TQT_SLOT(refresh())); } /* @@ -1854,7 +1854,7 @@ void KBgBoard::updateField(int f, int v) } /* - * This function displays the context menu our tqparent may have given us + * This function displays the context menu our parent may have given us */ void KBgBoard::showContextMenu() { @@ -2162,10 +2162,10 @@ void KBgBoardCell::mouseMoveEvent(TQMouseEvent *) board->drawSimpleChecker(&tmp, 0, 0, pcs, getCheckerDiameter()); tmp.end(); pix.setMask(pix.createHeuristicMask()); - TQBitmap tqmask = *(pix.tqmask()); + TQBitmap mask = *(pix.mask()); TQBitmap newCursor; newCursor = pix; - board->replaceCursor(TQCursor(newCursor, tqmask)); + board->replaceCursor(TQCursor(newCursor, mask)); if (board->getEditMode()) board->storeTurn(pcs); getPiece(); @@ -2653,7 +2653,7 @@ void KBgBoard::redoMove() } /* - * This function performs and undo for the last move and updates the tqparent + * This function performs and undo for the last move and updates the parent * of the board by calling sendMove() after the undo. */ void KBgBoard::undoMove() @@ -2823,8 +2823,8 @@ void KBgBoard::getRollDice(const int w) * You have to change the status by passing a KBgtqStatus * object to setState(...) before you can play! */ -KBgBoard::KBgBoard(TQWidget *tqparent, const char *name, TQPopupMenu *menu) - : TQWidget(tqparent, name) +KBgBoard::KBgBoard(TQWidget *parent, const char *name, TQPopupMenu *menu) + : TQWidget(parent, name) { /* * The following lines set up internal bookkeeping data. @@ -2838,7 +2838,7 @@ KBgBoard::KBgBoard(TQWidget *tqparent, const char *name, TQPopupMenu *menu) checkerDiam = MINIMUM_CHECKER_SIZE; /* - * We may be initialized with a popup menu by our tqparent. + * We may be initialized with a popup menu by our parent. */ contextMenu = menu; diff --git a/kbackgammon/kbgboard.h b/kbackgammon/kbgboard.h index c73c6fac..f91ab93b 100644 --- a/kbackgammon/kbgboard.h +++ b/kbackgammon/kbgboard.h @@ -110,7 +110,7 @@ class KBgBoard : public TQWidget /** * Constructor and destructor. Parameter as usual. */ - KBgBoard(TQWidget *tqparent = 0, const char *name = 0, + KBgBoard(TQWidget *parent = 0, const char *name = 0, TQPopupMenu *menu = 0); virtual ~KBgBoard(); @@ -469,7 +469,7 @@ class KBgBoardCell : public TQLabel /** * Constructor and destructor */ - KBgBoardCell(TQWidget * tqparent, int numID); + KBgBoardCell(TQWidget * parent, int numID); virtual ~KBgBoardCell(); /** @@ -560,7 +560,7 @@ protected: /** * the board and the pieces are one unit (none makes - * sense without the other). So the pieces know and access their tqparent. + * sense without the other). So the pieces know and access their parent. */ KBgBoard *board; void checkAndMakeShortMove(TQMouseEvent *e, int m); @@ -635,7 +635,7 @@ class KBgBoardHome : public KBgBoardCell /** * Constructor and destructor */ - KBgBoardHome( TQWidget * tqparent, int numID); + KBgBoardHome( TQWidget * parent, int numID); virtual ~KBgBoardHome(); /** @@ -698,7 +698,7 @@ class KBgBoardBar : public KBgBoardCell /** * Constructor */ - KBgBoardBar( TQWidget * tqparent, int numID ); + KBgBoardBar( TQWidget * parent, int numID ); /** * Destructor @@ -734,7 +734,7 @@ class KBgBoardField : public KBgBoardCell /** * Constructor and destructor */ - KBgBoardField( TQWidget * tqparent, int numID); + KBgBoardField( TQWidget * parent, int numID); virtual ~KBgBoardField(); /** @@ -911,7 +911,7 @@ public: /** * Constructor */ - KBgBoardSetup(TQWidget *tqparent = 0, const char *name = 0, + KBgBoardSetup(TQWidget *parent = 0, const char *name = 0, TQPopupMenu *menu = 0); /** diff --git a/kbackgammon/kbgtextview.cpp b/kbackgammon/kbgtextview.cpp index 30b8b671..a2199b05 100644 --- a/kbackgammon/kbgtextview.cpp +++ b/kbackgammon/kbgtextview.cpp @@ -36,8 +36,8 @@ /* * Constructor */ -KBgTextView::KBgTextView(TQWidget *tqparent, const char *name) - : KTextBrowser(tqparent, name) +KBgTextView::KBgTextView(TQWidget *parent, const char *name) + : KTextBrowser(parent, name) { clear(); setLinkUnderline(true); diff --git a/kbackgammon/kbgtextview.h b/kbackgammon/kbgtextview.h index 87d783a0..bb784129 100644 --- a/kbackgammon/kbgtextview.h +++ b/kbackgammon/kbgtextview.h @@ -43,7 +43,7 @@ public: /** * Constructor */ - KBgTextView(TQWidget *tqparent = 0, const char *name = 0); + KBgTextView(TQWidget *parent = 0, const char *name = 0); /** * Destructor diff --git a/kbattleship/kbattleship/kbattlefield.cpp b/kbattleship/kbattleship/kbattlefield.cpp index bb6cbd5a..dc567d2b 100644 --- a/kbattleship/kbattleship/kbattlefield.cpp +++ b/kbattleship/kbattleship/kbattlefield.cpp @@ -20,10 +20,10 @@ #include "kbattlefield.h" -KBattleField::KBattleField(TQWidget *tqparent, bool grid) : KGridWidget(tqparent, grid) +KBattleField::KBattleField(TQWidget *parent, bool grid) : KGridWidget(parent, grid) { - m_parent = tqparent; - m_width = tqparent->width(); + m_parent = parent; + m_width = parent->width(); m_canDraw = true; m_ownfieldx = 10; @@ -91,7 +91,7 @@ void KBattleField::drawOwnField() if(!m_canDraw) return; - KBattleshipWindow *window = static_cast<KBattleshipWindow *>(TQT_TQWIDGET(m_parent->tqparent()->tqparent())); + KBattleshipWindow *window = static_cast<KBattleshipWindow *>(TQT_TQWIDGET(m_parent->parent()->parent())); KShip *ship = 0; int data; @@ -151,7 +151,7 @@ void KBattleField::drawEnemyField() if(!m_canDraw) return; - KBattleshipWindow *window = static_cast<KBattleshipWindow *>(TQT_TQWIDGET(m_parent->tqparent()->tqparent())); + KBattleshipWindow *window = static_cast<KBattleshipWindow *>(TQT_TQWIDGET(m_parent->parent()->parent())); for(int i = 0; i != m_enemyfieldx; i++) { diff --git a/kbattleship/kbattleship/kbattlefield.h b/kbattleship/kbattleship/kbattlefield.h index 51c62198..94bcf3f5 100644 --- a/kbattleship/kbattleship/kbattlefield.h +++ b/kbattleship/kbattleship/kbattlefield.h @@ -27,7 +27,7 @@ class KBattleField : public KGridWidget { public: enum{FREE, WATER, HIT, DEATH, BORDER, SHIP1P1, SHIP2P1, SHIP2P2, SHIP3P1, SHIP3P2, SHIP3P3, SHIP4P1, SHIP4P2, SHIP4P3, SHIP4P4}; - KBattleField(TQWidget *tqparent, bool grid); + KBattleField(TQWidget *parent, bool grid); void clearOwnField(); void clearEnemyField(); diff --git a/kbattleship/kbattleship/kbattleshipview.cpp b/kbattleship/kbattleship/kbattleshipview.cpp index 2c4bb1ca..3e70a2a4 100644 --- a/kbattleship/kbattleship/kbattleshipview.cpp +++ b/kbattleship/kbattleship/kbattleshipview.cpp @@ -22,8 +22,8 @@ #include "kbattleship.h" #include "kbattleshipview.moc" -KBattleshipView::KBattleshipView(TQWidget *tqparent, const char *name, bool draw) - : TQWidget(tqparent, name, WResizeNoErase), m_drawGrid(draw) +KBattleshipView::KBattleshipView(TQWidget *parent, const char *name, bool draw) + : TQWidget(parent, name, WResizeNoErase), m_drawGrid(draw) { setFixedSize(20 * 32 + 30, 10 * 32 + 20); setBackgroundMode(NoBackground); diff --git a/kbattleship/kbattleship/kbattleshipview.h b/kbattleship/kbattleship/kbattleshipview.h index 7e65b9f3..3e1cf83f 100644 --- a/kbattleship/kbattleship/kbattleshipview.h +++ b/kbattleship/kbattleship/kbattleshipview.h @@ -35,7 +35,7 @@ class KBattleshipView : public TQWidget Q_OBJECT TQ_OBJECT public: - KBattleshipView(TQWidget *tqparent = 0, const char *name = 0, bool draw = false); + KBattleshipView(TQWidget *parent = 0, const char *name = 0, bool draw = false); ~KBattleshipView(); KBattleField *field() { return m_battlefield; } diff --git a/kbattleship/kbattleship/kbchooserstrategy.cpp b/kbattleship/kbattleship/kbchooserstrategy.cpp index fc832086..6473e73b 100644 --- a/kbattleship/kbattleship/kbchooserstrategy.cpp +++ b/kbattleship/kbattleship/kbchooserstrategy.cpp @@ -25,7 +25,7 @@ #define MAX_CHILD_NUM 4 -KBChooserStrategy::KBChooserStrategy(KBStrategy *tqparent) : KBStrategy(tqparent) +KBChooserStrategy::KBChooserStrategy(KBStrategy *parent) : KBStrategy(parent) { m_destroyer = new KBDestroyShipStrategy(this); m_destroying = false; diff --git a/kbattleship/kbattleship/kbchooserstrategy.h b/kbattleship/kbattleship/kbchooserstrategy.h index c2df5103..5ac7d7c2 100644 --- a/kbattleship/kbattleship/kbchooserstrategy.h +++ b/kbattleship/kbattleship/kbchooserstrategy.h @@ -25,7 +25,7 @@ class KBChooserStrategy : public KBStrategy { public: - KBChooserStrategy(KBStrategy *tqparent = 0); + KBChooserStrategy(KBStrategy *parent = 0); virtual ~KBChooserStrategy(); virtual void init(KBattleField *field, const TQRect &field_rect); diff --git a/kbattleship/kbattleship/kbdestroyshipstrategy.cpp b/kbattleship/kbattleship/kbdestroyshipstrategy.cpp index 528d18b2..a3882963 100644 --- a/kbattleship/kbattleship/kbdestroyshipstrategy.cpp +++ b/kbattleship/kbattleship/kbdestroyshipstrategy.cpp @@ -17,7 +17,7 @@ #include "kbdestroyshipstrategy.h" -KBDestroyShipStrategy::KBDestroyShipStrategy(KBStrategy *tqparent) : KBStrategy(tqparent) +KBDestroyShipStrategy::KBDestroyShipStrategy(KBStrategy *parent) : KBStrategy(parent) { m_working = false; } diff --git a/kbattleship/kbattleship/kbdestroyshipstrategy.h b/kbattleship/kbattleship/kbdestroyshipstrategy.h index c6e758a3..41503be1 100644 --- a/kbattleship/kbattleship/kbdestroyshipstrategy.h +++ b/kbattleship/kbattleship/kbdestroyshipstrategy.h @@ -23,7 +23,7 @@ class KBDestroyShipStrategy : public KBStrategy { public: - KBDestroyShipStrategy(KBStrategy *tqparent = 0); + KBDestroyShipStrategy(KBStrategy *parent = 0); virtual void init(KBattleField *field, const TQRect &field_rect); virtual const TQPoint nextShot(); diff --git a/kbattleship/kbattleship/kbdiagonalshotstrategy.cpp b/kbattleship/kbattleship/kbdiagonalshotstrategy.cpp index 0f5e6284..db83bc75 100644 --- a/kbattleship/kbattleship/kbdiagonalshotstrategy.cpp +++ b/kbattleship/kbattleship/kbdiagonalshotstrategy.cpp @@ -16,7 +16,7 @@ #include "kbdiagonalshotstrategy.h" -KBDiagonalShotStrategy::KBDiagonalShotStrategy(KBStrategy *tqparent) : KBStrategy(tqparent) +KBDiagonalShotStrategy::KBDiagonalShotStrategy(KBStrategy *parent) : KBStrategy(parent) { m_column = 0; m_row = 0; diff --git a/kbattleship/kbattleship/kbdiagonalshotstrategy.h b/kbattleship/kbattleship/kbdiagonalshotstrategy.h index 47af1240..e328fad2 100644 --- a/kbattleship/kbattleship/kbdiagonalshotstrategy.h +++ b/kbattleship/kbattleship/kbdiagonalshotstrategy.h @@ -23,7 +23,7 @@ class KBDiagonalShotStrategy : public KBStrategy { public: enum Direction {LEFTUP, LEFTDOWN, RIGHTUP, RIGHTDOWN}; - KBDiagonalShotStrategy(KBStrategy *tqparent = 0); + KBDiagonalShotStrategy(KBStrategy *parent = 0); virtual const TQPoint nextShot(); virtual bool hasMoreShots(); diff --git a/kbattleship/kbattleship/kbdiagonalwrapstrategy.cpp b/kbattleship/kbattleship/kbdiagonalwrapstrategy.cpp index 7f0a305e..7055403b 100644 --- a/kbattleship/kbattleship/kbdiagonalwrapstrategy.cpp +++ b/kbattleship/kbattleship/kbdiagonalwrapstrategy.cpp @@ -17,11 +17,11 @@ #include <krandomsequence.h> #include "kbdiagonalwrapstrategy.h" -KBDiagonalWrapStrategy::KBDiagonalWrapStrategy(KBStrategy *tqparent) : KBStrategy(tqparent) +KBDiagonalWrapStrategy::KBDiagonalWrapStrategy(KBStrategy *parent) : KBStrategy(parent) { m_child = new KBDiagonalShotStrategy(this); - if(tqparent == 0) + if(parent == 0) { m_destroyer = new KBDestroyShipStrategy(this); m_destroying = false; diff --git a/kbattleship/kbattleship/kbdiagonalwrapstrategy.h b/kbattleship/kbattleship/kbdiagonalwrapstrategy.h index 26c271d1..f4a7c28d 100644 --- a/kbattleship/kbattleship/kbdiagonalwrapstrategy.h +++ b/kbattleship/kbattleship/kbdiagonalwrapstrategy.h @@ -24,7 +24,7 @@ class KBDiagonalWrapStrategy : public KBStrategy { public: - KBDiagonalWrapStrategy(KBStrategy *tqparent = 0); + KBDiagonalWrapStrategy(KBStrategy *parent = 0); virtual ~KBDiagonalWrapStrategy(); virtual void init(KBattleField *field, const TQRect &field_rect); diff --git a/kbattleship/kbattleship/kbhorizontalstepstrategy.cpp b/kbattleship/kbattleship/kbhorizontalstepstrategy.cpp index 63ee74fa..a6e931da 100644 --- a/kbattleship/kbattleship/kbhorizontalstepstrategy.cpp +++ b/kbattleship/kbattleship/kbhorizontalstepstrategy.cpp @@ -17,10 +17,10 @@ #include <krandomsequence.h> #include "kbhorizontalstepstrategy.h" -KBHorizontalStepStrategy::KBHorizontalStepStrategy(KBStrategy *tqparent) : KBStrategy(tqparent) +KBHorizontalStepStrategy::KBHorizontalStepStrategy(KBStrategy *parent) : KBStrategy(parent) { m_child = 0; - if(tqparent == 0) // only the master destroys ships + if(parent == 0) // only the master destroys ships { m_destroyer = new KBDestroyShipStrategy(this); m_destroying = false; diff --git a/kbattleship/kbattleship/kbhorizontalstepstrategy.h b/kbattleship/kbattleship/kbhorizontalstepstrategy.h index 21bfac4e..80ec7b72 100644 --- a/kbattleship/kbattleship/kbhorizontalstepstrategy.h +++ b/kbattleship/kbattleship/kbhorizontalstepstrategy.h @@ -23,7 +23,7 @@ class KBHorizontalStepStrategy : public KBStrategy { public: - KBHorizontalStepStrategy(KBStrategy *tqparent = 0); + KBHorizontalStepStrategy(KBStrategy *parent = 0); virtual ~KBHorizontalStepStrategy(); virtual void init(KBattleField *field, const TQRect &field_rect); diff --git a/kbattleship/kbattleship/kbrandomshotstrategy.cpp b/kbattleship/kbattleship/kbrandomshotstrategy.cpp index 901fbe75..62416350 100644 --- a/kbattleship/kbattleship/kbrandomshotstrategy.cpp +++ b/kbattleship/kbattleship/kbrandomshotstrategy.cpp @@ -16,7 +16,7 @@ #include "kbrandomshotstrategy.h" -KBRandomShotStrategy::KBRandomShotStrategy(KBStrategy *tqparent) : KBStrategy(tqparent) +KBRandomShotStrategy::KBRandomShotStrategy(KBStrategy *parent) : KBStrategy(parent) { m_destroyer = new KBDestroyShipStrategy(this); m_destroying = false; diff --git a/kbattleship/kbattleship/kbrandomshotstrategy.h b/kbattleship/kbattleship/kbrandomshotstrategy.h index 79e15018..141961b9 100644 --- a/kbattleship/kbattleship/kbrandomshotstrategy.h +++ b/kbattleship/kbattleship/kbrandomshotstrategy.h @@ -25,7 +25,7 @@ class KBRandomShotStrategy : public KBStrategy { public: - KBRandomShotStrategy(KBStrategy *tqparent = 0); + KBRandomShotStrategy(KBStrategy *parent = 0); virtual ~KBRandomShotStrategy(); virtual void init(KBattleField *field, const TQRect &field_rect); diff --git a/kbattleship/kbattleship/kbstrategy.cpp b/kbattleship/kbattleship/kbstrategy.cpp index e7ce823a..be445559 100644 --- a/kbattleship/kbattleship/kbstrategy.cpp +++ b/kbattleship/kbattleship/kbstrategy.cpp @@ -17,9 +17,9 @@ #include "kbstrategy.h" -KBStrategy::KBStrategy(KBStrategy *tqparent) +KBStrategy::KBStrategy(KBStrategy *parent) { - m_parent = tqparent; + m_parent = parent; m_viableShots = 0; } diff --git a/kbattleship/kbattleship/kbstrategy.h b/kbattleship/kbattleship/kbstrategy.h index 04ade696..9c4cdf15 100644 --- a/kbattleship/kbattleship/kbstrategy.h +++ b/kbattleship/kbattleship/kbstrategy.h @@ -26,7 +26,7 @@ class KBStrategy { public: enum{FREE, SHOT, SHIP}; - KBStrategy(KBStrategy *tqparent = 0); + KBStrategy(KBStrategy *parent = 0); virtual ~KBStrategy(); virtual const TQPoint nextShot() = 0; diff --git a/kbattleship/kbattleship/kbverticalstepstrategy.cpp b/kbattleship/kbattleship/kbverticalstepstrategy.cpp index a9784463..7642ccaf 100644 --- a/kbattleship/kbattleship/kbverticalstepstrategy.cpp +++ b/kbattleship/kbattleship/kbverticalstepstrategy.cpp @@ -18,11 +18,11 @@ #include <krandomsequence.h> #include "kbverticalstepstrategy.h" -KBVerticalStepStrategy::KBVerticalStepStrategy(KBStrategy *tqparent) : KBStrategy(tqparent) +KBVerticalStepStrategy::KBVerticalStepStrategy(KBStrategy *parent) : KBStrategy(parent) { m_child = 0; - if(tqparent == 0) // only the master destroys ships + if(parent == 0) // only the master destroys ships { m_destroyer = new KBDestroyShipStrategy(this); m_destroying = false; diff --git a/kbattleship/kbattleship/kbverticalstepstrategy.h b/kbattleship/kbattleship/kbverticalstepstrategy.h index 642210ca..a5d614c6 100644 --- a/kbattleship/kbattleship/kbverticalstepstrategy.h +++ b/kbattleship/kbattleship/kbverticalstepstrategy.h @@ -24,7 +24,7 @@ class KBVerticalStepStrategy : public KBStrategy { public: - KBVerticalStepStrategy(KBStrategy *tqparent = 0); + KBVerticalStepStrategy(KBStrategy *parent = 0); virtual ~KBVerticalStepStrategy(); virtual void init(KBattleField *field, const TQRect &field_rect); diff --git a/kbattleship/kbattleship/kchatwidget.cpp b/kbattleship/kbattleship/kchatwidget.cpp index 1e9dd005..ef545cd2 100644 --- a/kbattleship/kbattleship/kchatwidget.cpp +++ b/kbattleship/kbattleship/kchatwidget.cpp @@ -18,7 +18,7 @@ #include <kapplication.h> #include "kchatwidget.moc" -KChatWidget::KChatWidget(TQWidget *tqparent, const char *name) : chatDlg(tqparent, name) +KChatWidget::KChatWidget(TQWidget *parent, const char *name) : chatDlg(parent, name) { connect(sendBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotComputeMessage())); connect(commentEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotComputeMessage())); diff --git a/kbattleship/kbattleship/kchatwidget.h b/kbattleship/kbattleship/kchatwidget.h index 574e8648..1c75a497 100644 --- a/kbattleship/kbattleship/kchatwidget.h +++ b/kbattleship/kbattleship/kchatwidget.h @@ -29,7 +29,7 @@ class KChatWidget : public chatDlg Q_OBJECT TQ_OBJECT public: - KChatWidget(TQWidget *tqparent = 0, const char *name = 0); + KChatWidget(TQWidget *parent = 0, const char *name = 0); void clear(); void setNickname(const TQString &nickname) { m_currentNickname = nickname; } diff --git a/kbattleship/kbattleship/kclientdialog.cpp b/kbattleship/kbattleship/kclientdialog.cpp index 37cd7fe7..f52e9472 100644 --- a/kbattleship/kbattleship/kclientdialog.cpp +++ b/kbattleship/kbattleship/kclientdialog.cpp @@ -25,8 +25,8 @@ #include "kbattleshipserver.h" // for BATTLESHIP_SERVICE #include "kclientdialog.moc" -KClientDialog::KClientDialog(TQWidget *tqparent, const char *name) - : KDialogBase(Plain, i18n("Connect to Server"), Ok|Cancel, Ok, tqparent, name, true, false, KGuiItem(i18n("&Connect"))) +KClientDialog::KClientDialog(TQWidget *parent, const char *name) + : KDialogBase(Plain, i18n("Connect to Server"), Ok|Cancel, Ok, parent, name, true, false, KGuiItem(i18n("&Connect"))) { TQFrame* page = plainPage(); TQGridLayout* pageLayout = new TQGridLayout(page, 1, 1, 0, 0); diff --git a/kbattleship/kbattleship/kclientdialog.h b/kbattleship/kbattleship/kclientdialog.h index f46018ab..b128d8be 100644 --- a/kbattleship/kbattleship/kclientdialog.h +++ b/kbattleship/kbattleship/kclientdialog.h @@ -34,7 +34,7 @@ class KClientDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KClientDialog(TQWidget *tqparent = 0, const char *name = 0); + KClientDialog(TQWidget *parent = 0, const char *name = 0); ~KClientDialog(); TQString port() const; diff --git a/kbattleship/kbattleship/kgridwidget.cpp b/kbattleship/kbattleship/kgridwidget.cpp index cb6e573e..b848484b 100644 --- a/kbattleship/kbattleship/kgridwidget.cpp +++ b/kbattleship/kbattleship/kgridwidget.cpp @@ -26,10 +26,10 @@ #include "kbattlefield.h" #include "kgridwidget.h" -KGridWidget::KGridWidget(TQWidget *tqparent, bool draw) : m_drawGrid(draw) +KGridWidget::KGridWidget(TQWidget *parent, bool draw) : m_drawGrid(draw) { - m_doubleBuffer = new TQPixmap(tqparent->width(), tqparent->height()); - m_parent = tqparent; + m_doubleBuffer = new TQPixmap(parent->width(), parent->height()); + m_parent = parent; cleanBuffer(); cacheImages(); diff --git a/kbattleship/kbattleship/kgridwidget.h b/kbattleship/kbattleship/kgridwidget.h index 96ecde3a..1026695b 100644 --- a/kbattleship/kbattleship/kgridwidget.h +++ b/kbattleship/kbattleship/kgridwidget.h @@ -23,7 +23,7 @@ class KGridWidget { public: - KGridWidget(TQWidget *tqparent, bool draw); + KGridWidget(TQWidget *parent, bool draw); ~KGridWidget(); void enableGrid() { m_drawGrid = true; } diff --git a/kbattleship/kbattleship/konnectionhandling.cpp b/kbattleship/kbattleship/konnectionhandling.cpp index dc1a5880..45a2a452 100644 --- a/kbattleship/kbattleship/konnectionhandling.cpp +++ b/kbattleship/kbattleship/konnectionhandling.cpp @@ -19,7 +19,7 @@ extern const char *protocolVersion; -KonnectionHandling::KonnectionHandling(TQWidget *tqparent, KBattleshipServer *server) : TQObject(tqparent) +KonnectionHandling::KonnectionHandling(TQWidget *parent, KBattleshipServer *server) : TQObject(parent) { m_kbserver = server; m_kbclient = 0; @@ -31,7 +31,7 @@ KonnectionHandling::KonnectionHandling(TQWidget *tqparent, KBattleshipServer *se connect(server, TQT_SIGNAL(sigMessageSent(KMessage *)), this, TQT_SLOT(slotMessageSent(KMessage *))); } -KonnectionHandling::KonnectionHandling(TQWidget *tqparent, KBattleshipClient *client) : TQObject(tqparent) +KonnectionHandling::KonnectionHandling(TQWidget *parent, KBattleshipClient *client) : TQObject(parent) { m_kbclient = client; m_kbserver = 0; diff --git a/kbattleship/kbattleship/konnectionhandling.h b/kbattleship/kbattleship/konnectionhandling.h index 598225c5..941f1384 100644 --- a/kbattleship/kbattleship/konnectionhandling.h +++ b/kbattleship/kbattleship/konnectionhandling.h @@ -33,8 +33,8 @@ class KonnectionHandling : public TQObject TQ_OBJECT public: enum{SERVER, CLIENT}; - KonnectionHandling(TQWidget *tqparent, KBattleshipServer *server); - KonnectionHandling(TQWidget *tqparent, KBattleshipClient *client); + KonnectionHandling(TQWidget *parent, KBattleshipServer *server); + KonnectionHandling(TQWidget *parent, KBattleshipClient *client); int type() { return m_type; } diff --git a/kbattleship/kbattleship/kserverdialog.cpp b/kbattleship/kbattleship/kserverdialog.cpp index 2574757f..d8fa1b1d 100644 --- a/kbattleship/kbattleship/kserverdialog.cpp +++ b/kbattleship/kbattleship/kserverdialog.cpp @@ -21,8 +21,8 @@ #include "kserverdialog.h" -KServerDialog::KServerDialog(TQWidget *tqparent, const char *name) : - KDialogBase(Plain, i18n("Start Server"), Ok|Cancel, Ok, tqparent, name, true, false, KGuiItem(i18n("&Start"))) +KServerDialog::KServerDialog(TQWidget *parent, const char *name) : + KDialogBase(Plain, i18n("Start Server"), Ok|Cancel, Ok, parent, name, true, false, KGuiItem(i18n("&Start"))) { TQFrame* page = plainPage(); TQGridLayout* pageLayout = new TQGridLayout(page, 1, 1, 0, 0); diff --git a/kbattleship/kbattleship/kserverdialog.h b/kbattleship/kbattleship/kserverdialog.h index ad7cc499..c6a85aa2 100644 --- a/kbattleship/kbattleship/kserverdialog.h +++ b/kbattleship/kbattleship/kserverdialog.h @@ -33,7 +33,7 @@ class KServerDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KServerDialog(TQWidget *tqparent = 0, const char *name = 0); + KServerDialog(TQWidget *parent = 0, const char *name = 0); TQString port() const; TQString nickname() const; diff --git a/kbattleship/kbattleship/kstatdialog.cpp b/kbattleship/kbattleship/kstatdialog.cpp index 28b9c142..03bc7d41 100644 --- a/kbattleship/kbattleship/kstatdialog.cpp +++ b/kbattleship/kbattleship/kstatdialog.cpp @@ -19,7 +19,7 @@ #include <tqlabel.h> #include "kstatdialog.moc" -KStatDialog::KStatDialog(TQWidget *tqparent, const char *name) : statDlg(tqparent, name) +KStatDialog::KStatDialog(TQWidget *parent, const char *name) : statDlg(parent, name) { } diff --git a/kbattleship/kbattleship/kstatdialog.h b/kbattleship/kbattleship/kstatdialog.h index 172b7e47..86f39012 100644 --- a/kbattleship/kbattleship/kstatdialog.h +++ b/kbattleship/kbattleship/kstatdialog.h @@ -25,7 +25,7 @@ class KStatDialog : public statDlg Q_OBJECT TQ_OBJECT public: - KStatDialog(TQWidget *tqparent = 0, const char *name = 0); + KStatDialog(TQWidget *parent = 0, const char *name = 0); void setShot(); void setShot(int shot); diff --git a/kblackbox/kbbgame.cpp b/kblackbox/kbbgame.cpp index f13c0106..988a74fd 100644 --- a/kblackbox/kbbgame.cpp +++ b/kblackbox/kbbgame.cpp @@ -174,7 +174,7 @@ KBBGame::~KBBGame() kConf->writeEntry( "tutorial", (int) tutorial ); delete gameBoard; - // All the rest has "this" for tqparent so it doesn't need to be deleted. + // All the rest has "this" for parent so it doesn't need to be deleted. } diff --git a/kblackbox/kbbgfx.cpp b/kblackbox/kbbgfx.cpp index 26d47952..bedde374 100644 --- a/kblackbox/kbbgfx.cpp +++ b/kblackbox/kbbgfx.cpp @@ -22,8 +22,8 @@ Constructs a KBBGraphic widget. */ -KBBGraphic::KBBGraphic( TQPixmap **p, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +KBBGraphic::KBBGraphic( TQPixmap **p, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { int i; diff --git a/kblackbox/kbbgfx.h b/kblackbox/kbbgfx.h index 5eca56c9..77bca3d3 100644 --- a/kblackbox/kbbgfx.h +++ b/kblackbox/kbbgfx.h @@ -55,7 +55,7 @@ class KBBGraphic : public TQWidget Q_OBJECT TQ_OBJECT public: - KBBGraphic( TQPixmap** p=0, TQWidget* tqparent=0, const char* name=0 ); + KBBGraphic( TQPixmap** p=0, TQWidget* parent=0, const char* name=0 ); ~KBBGraphic(); friend class KBBGame; diff --git a/kbounce/game.cpp b/kbounce/game.cpp index 84cfae2f..065b2657 100644 --- a/kbounce/game.cpp +++ b/kbounce/game.cpp @@ -136,8 +136,8 @@ bool Ball::collide( double dx, double dy ) /*************************************************************************/ -Wall::Wall( JezzField *field, int x, int y, Direction dir, int tile, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), m_dir( dir ), m_field( field ), m_startX( x ), m_startY( y ), +Wall::Wall( JezzField *field, int x, int y, Direction dir, int tile, TQObject *parent, const char *name ) + : TQObject( parent, name ), m_dir( dir ), m_field( field ), m_startX( x ), m_startY( y ), m_tile( tile ), m_delay( MS2TICKS(WALL_DELAY)/2 ), m_active( true ) { //kdDebug(12008) << "Wall::Wall" << endl; @@ -236,8 +236,8 @@ void Wall::fill( bool black ) /*************************************************************************/ -JezzField::JezzField( const TQPixmap &tiles, const TQPixmap &background, TQObject* tqparent, const char* name ) - : TQCanvas( tqparent, name ), m_tiles( tiles ) +JezzField::JezzField( const TQPixmap &tiles, const TQPixmap &background, TQObject* parent, const char* name ) + : TQCanvas( parent, name ), m_tiles( tiles ) { setPixmaps( tiles, background ); } @@ -314,8 +314,8 @@ void JezzField::setPixmaps( const TQPixmap &tiles, const TQPixmap &background ) /*************************************************************************/ -JezzView::JezzView(TQCanvas* viewing, TQWidget* tqparent, const char* name, WFlags f) - : TQCanvasView( viewing, tqparent, name, f ), m_vertical( false ) +JezzView::JezzView(TQCanvas* viewing, TQWidget* parent, const char* name, WFlags f) + : TQCanvasView( viewing, parent, name, f ), m_vertical( false ) { setResizePolicy( AutoOne ); setHScrollBarMode( AlwaysOff ); @@ -340,8 +340,8 @@ void JezzView::viewportMouseReleaseEvent( TQMouseEvent *ev ) /*************************************************************************/ -JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), m_wall1( 0 ), m_wall2( 0 ), +JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), m_wall1( 0 ), m_wall2( 0 ), m_text( 0 ), m_running( false ), m_percent( 0 ), m_pictured( false ) { TQString path = kapp->dirs()->findResourceDir( "data", "kbounce/pics/ball0000.png" ) + "kbounce/pics/"; diff --git a/kbounce/game.h b/kbounce/game.h index d07516de..7cdd1c39 100644 --- a/kbounce/game.h +++ b/kbounce/game.h @@ -58,7 +58,7 @@ public: enum Direction { Up, Down, Left, Right }; Wall( JezzField *field, int x, int y, Direction dir, int tile, - TQObject *tqparent=0, const char *name=0 ); + TQObject *parent=0, const char *name=0 ); void finish(); void fill( bool black ); @@ -89,7 +89,7 @@ class JezzField : public TQCanvas Q_OBJECT TQ_OBJECT public: - JezzField( const TQPixmap &tiles, const TQPixmap &background, TQObject* tqparent = 0, const char* name = 0 ); + JezzField( const TQPixmap &tiles, const TQPixmap &background, TQObject* parent = 0, const char* name = 0 ); void setGameTile( int x, int y, bool black ); void setBackground( const TQPixmap &background ); @@ -115,7 +115,7 @@ class JezzView : public TQCanvasView Q_OBJECT TQ_OBJECT public: - JezzView(TQCanvas* viewing=0, TQWidget* tqparent=0, const char* name=0, WFlags f=0); + JezzView(TQCanvas* viewing=0, TQWidget* parent=0, const char* name=0, WFlags f=0); signals: void buildWall( int x, int y, bool vertical ); @@ -134,7 +134,7 @@ class JezzGame : public TQWidget TQ_OBJECT public: - JezzGame( const TQPixmap &background, int ballNum, TQWidget *tqparent=0, const char *name=0 ); + JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent=0, const char *name=0 ); ~JezzGame(); int percent(); diff --git a/kenolaba/Ball.cpp b/kenolaba/Ball.cpp index b0584287..39448305 100644 --- a/kenolaba/Ball.cpp +++ b/kenolaba/Ball.cpp @@ -213,8 +213,8 @@ BallPosition::BallPosition(int xp,int yp, Ball* d) /* Class BallWidget */ -BallWidget::BallWidget( int _freq, int bFr, TQWidget *tqparent, const char *name ) - : TQWidget(tqparent,name), positions(MAX_POSITION), animations(MAX_ANIMATION) +BallWidget::BallWidget( int _freq, int bFr, TQWidget *parent, const char *name ) + : TQWidget(parent,name), positions(MAX_POSITION), animations(MAX_ANIMATION) { int i; @@ -421,8 +421,8 @@ void BallWidget::animate() /* Ball Test */ -BallTest::BallTest( TQWidget *tqparent, const char *name ) - : BallWidget(10,2,tqparent,name) +BallTest::BallTest( TQWidget *parent, const char *name ) + : BallWidget(10,2,parent,name) { int w,h; diff --git a/kenolaba/Ball.h b/kenolaba/Ball.h index 25fd13eb..9cdfe344 100644 --- a/kenolaba/Ball.h +++ b/kenolaba/Ball.h @@ -100,7 +100,7 @@ class BallWidget : public TQWidget TQ_OBJECT public: - BallWidget(int _freq, int bFr, TQWidget *tqparent = 0, const char *name = 0); + BallWidget(int _freq, int bFr, TQWidget *parent = 0, const char *name = 0); ~BallWidget(); void createBlending(int, int, Ball* , Ball* ); @@ -143,7 +143,7 @@ class BallTest: public BallWidget Q_OBJECT TQ_OBJECT public: - BallTest(TQWidget *tqparent=0, const char *name=0 ); + BallTest(TQWidget *parent=0, const char *name=0 ); protected: void mousePressEvent( TQMouseEvent * ); void mouseReleaseEvent( TQMouseEvent * ); diff --git a/kenolaba/BoardWidget.cpp b/kenolaba/BoardWidget.cpp index af4a103a..9462b8d5 100644 --- a/kenolaba/BoardWidget.cpp +++ b/kenolaba/BoardWidget.cpp @@ -34,8 +34,8 @@ #include "bitmaps/Arrow6" #include "bitmaps/Arrow6Mask" -BoardWidget::BoardWidget(Board& b, TQWidget *tqparent, const char *name) - : BallWidget(10,9,tqparent, name), board(b) +BoardWidget::BoardWidget(Board& b, TQWidget *parent, const char *name) + : BallWidget(10,9,parent, name), board(b) { pList =0; gettingMove = false; diff --git a/kenolaba/BoardWidget.h b/kenolaba/BoardWidget.h index 2f123fc9..bc323aa8 100644 --- a/kenolaba/BoardWidget.h +++ b/kenolaba/BoardWidget.h @@ -18,7 +18,7 @@ class BoardWidget : public BallWidget TQ_OBJECT public: - BoardWidget(Board&, TQWidget *tqparent = 0, const char *name = 0); + BoardWidget(Board&, TQWidget *parent = 0, const char *name = 0); ~BoardWidget(); void createPos(int , int , int , Ball*); diff --git a/kenolaba/EvalDlgImpl.cpp b/kenolaba/EvalDlgImpl.cpp index 14d0d0ac..9efc5bea 100644 --- a/kenolaba/EvalDlgImpl.cpp +++ b/kenolaba/EvalDlgImpl.cpp @@ -19,8 +19,8 @@ #include "Board.h" #include "EvalScheme.h" -EvalDlgImpl::EvalDlgImpl(TQWidget* tqparent, Board* board) - :EvalDlg(tqparent) +EvalDlgImpl::EvalDlgImpl(TQWidget* parent, Board* board) + :EvalDlg(parent) { _board = board; _origScheme = board->evalScheme(); diff --git a/kenolaba/EvalDlgImpl.h b/kenolaba/EvalDlgImpl.h index 07cb57a9..a34205e4 100644 --- a/kenolaba/EvalDlgImpl.h +++ b/kenolaba/EvalDlgImpl.h @@ -17,7 +17,7 @@ class EvalDlgImpl: public EvalDlg TQ_OBJECT public: - EvalDlgImpl(TQWidget* tqparent, Board* board); + EvalDlgImpl(TQWidget* parent, Board* board); ~EvalDlgImpl(); EvalScheme* evalScheme() { return _scheme; } diff --git a/kfouleggs/board.cpp b/kfouleggs/board.cpp index e719ce2f..5383c619 100644 --- a/kfouleggs/board.cpp +++ b/kfouleggs/board.cpp @@ -9,8 +9,8 @@ using namespace KGrid2D; -FEBoard::FEBoard(bool graphic, TQWidget *tqparent) -: Board(graphic, new GiftPool(tqparent), tqparent), +FEBoard::FEBoard(bool graphic, TQWidget *parent) +: Board(graphic, new GiftPool(parent), parent), _field(matrix().width(), matrix().height()), _chainedPuyos(4) { init(); diff --git a/kfouleggs/board.h b/kfouleggs/board.h index e3b4229e..174d1dd7 100644 --- a/kfouleggs/board.h +++ b/kfouleggs/board.h @@ -9,7 +9,7 @@ class FEBoard : public Board Q_OBJECT TQ_OBJECT public: - FEBoard(bool graphic, TQWidget *tqparent); + FEBoard(bool graphic, TQWidget *parent); void copy(const GenericTetris &); void start(const GTInitData &); diff --git a/kfouleggs/field.cpp b/kfouleggs/field.cpp index 997e4f48..ae9bcdce 100644 --- a/kfouleggs/field.cpp +++ b/kfouleggs/field.cpp @@ -10,8 +10,8 @@ #include "board.h" -FEField::FEField(TQWidget *tqparent) - : Field(tqparent) +FEField::FEField(TQWidget *parent) + : Field(parent) { Board *b = static_cast<Board *>(board); TQWhatsThis::add(b->giftPool(), i18n("Display the amount of foul eggs sent by your opponent.")); diff --git a/kfouleggs/field.h b/kfouleggs/field.h index 59cdcee8..9eed0ebd 100644 --- a/kfouleggs/field.h +++ b/kfouleggs/field.h @@ -10,7 +10,7 @@ class FEField : public Field Q_OBJECT TQ_OBJECT public: - FEField(TQWidget *tqparent); + FEField(TQWidget *parent); private slots: virtual void removedUpdated(); diff --git a/kfouleggs/main.cpp b/kfouleggs/main.cpp index ce083c7c..89295d08 100644 --- a/kfouleggs/main.cpp +++ b/kfouleggs/main.cpp @@ -65,9 +65,9 @@ FEFactory::FEFactory() : CommonFactory(MAIN_DATA, BASE_BOARD_INFO, COMMON_BOARD_INFO) {} -BaseInterface *FEFactory::createInterface(TQWidget *tqparent) +BaseInterface *FEFactory::createInterface(TQWidget *parent) { - return new Interface(MP_GAME_INFO, tqparent); + return new Interface(MP_GAME_INFO, parent); } diff --git a/kfouleggs/main.h b/kfouleggs/main.h index 12aca31f..b38f3fb9 100644 --- a/kfouleggs/main.h +++ b/kfouleggs/main.h @@ -15,11 +15,11 @@ class FEFactory : public CommonFactory FEFactory(); protected: - virtual BaseBoard *createBoard(bool graphic, TQWidget *tqparent) - { return new FEBoard(graphic, tqparent); } - virtual BaseField *createField(TQWidget *tqparent) - { return new FEField(tqparent); } - virtual BaseInterface *createInterface(TQWidget *tqparent); + virtual BaseBoard *createBoard(bool graphic, TQWidget *parent) + { return new FEBoard(graphic, parent); } + virtual BaseField *createField(TQWidget *parent) + { return new FEField(parent); } + virtual BaseInterface *createInterface(TQWidget *parent); virtual AI *createAI() { return new FEAI; } }; diff --git a/kgoldrunner/src/kgrcanvas.cpp b/kgoldrunner/src/kgrcanvas.cpp index 907463e5..b56c2453 100644 --- a/kgoldrunner/src/kgrcanvas.cpp +++ b/kgoldrunner/src/kgrcanvas.cpp @@ -34,8 +34,8 @@ class KGoldrunner; -KGrCanvas::KGrCanvas (TQWidget * tqparent, const char *name) - : TQCanvasView (0, tqparent, name) +KGrCanvas::KGrCanvas (TQWidget * parent, const char *name) + : TQCanvasView (0, parent, name) { setBackgroundMode (NoBackground); m = new TQCursor (); // For handling the mouse. diff --git a/kgoldrunner/src/kgrcanvas.h b/kgoldrunner/src/kgrcanvas.h index cfabc408..410a8115 100644 --- a/kgoldrunner/src/kgrcanvas.h +++ b/kgoldrunner/src/kgrcanvas.h @@ -33,7 +33,7 @@ class KGrCanvas : public TQCanvasView Q_OBJECT TQ_OBJECT public: - KGrCanvas (TQWidget * tqparent = 0, const char *name = 0); + KGrCanvas (TQWidget * parent = 0, const char *name = 0); virtual ~KGrCanvas(); void changeLandscape (const TQString & name); diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp index ac6c5ce4..9a5ecb44 100644 --- a/kgoldrunner/src/kgrdialog.cpp +++ b/kgoldrunner/src/kgrdialog.cpp @@ -29,16 +29,16 @@ #ifdef KGR_PORTABLE KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex, TQPtrList<KGrCollection> & gamesList, KGrGame * theGame, - TQWidget * tqparent, const char * name) - : TQDialog (tqparent, name, TRUE, + TQWidget * parent, const char * name) + : TQDialog (parent, name, TRUE, WStyle_Customize | WStyle_NormalBorder | WStyle_Title) #else KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex, TQPtrList<KGrCollection> & gamesList, KGrGame * theGame, - TQWidget * tqparent, const char * name) + TQWidget * parent, const char * name) : KDialogBase (KDialogBase::Plain, i18n("Select Game"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help, - KDialogBase::Ok, tqparent, name) + KDialogBase::Ok, parent, name) #endif { slAction = action; @@ -47,7 +47,7 @@ KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex, collections = gamesList; game = theGame; collection = collections.at(defaultGame); - slParent = tqparent; + slParent = parent; #ifdef KGR_PORTABLE int margin = 10; @@ -117,7 +117,7 @@ KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex, grid->addMultiCellWidget (thumbNail, 1, 3, 2, 2); // Set thumbnail cell size to about 1/5 of game cell size. - int cellSize = tqparent->width() / (5 * (FIELDWIDTH + 4)); + int cellSize = parent->width() / (5 * (FIELDWIDTH + 4)); thumbNail-> setFixedWidth ((FIELDWIDTH * cellSize) + 2); thumbNail-> setFixedHeight ((FIELDHEIGHT * cellSize) + 2); @@ -130,10 +130,10 @@ KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex, OK = new TQPushButton (i18n("&OK"), buttons); CANCEL = new TQPushButton (i18n("&Cancel"), buttons); - TQPoint p = tqparent->mapToGlobal (TQPoint (0,0)); + TQPoint p = parent->mapToGlobal (TQPoint (0,0)); // Base the tqgeometry of the dialog box on the playing area. - int cell = tqparent->width() / (FIELDWIDTH + 4); + int cell = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+2*cell, p.y()+2*cell); dad-> setMinimumSize ((FIELDWIDTH*cell/2), (FIELDHEIGHT-1)*cell); @@ -486,15 +486,15 @@ void KGrSLDialog::slotHelp () #ifdef KGR_PORTABLE KGrNHDialog::KGrNHDialog(const TQString & levelName, const TQString & levelHint, - TQWidget * tqparent, const char * name) - : TQDialog (tqparent, name, TRUE, + TQWidget * parent, const char * name) + : TQDialog (parent, name, TRUE, WStyle_Customize | WStyle_NormalBorder | WStyle_Title) #else KGrNHDialog::KGrNHDialog(const TQString & levelName, const TQString & levelHint, - TQWidget * tqparent, const char * name) + TQWidget * parent, const char * name) : KDialogBase (KDialogBase::Plain, i18n("Edit Name & Hint"), KDialogBase::Ok | KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name) + KDialogBase::Ok, parent, name) #endif { #ifdef KGR_PORTABLE @@ -538,8 +538,8 @@ KGrNHDialog::KGrNHDialog(const TQString & levelName, const TQString & levelHint, #endif // Base the tqgeometry of the text box on the playing area. - TQPoint p = tqparent->mapToGlobal (TQPoint (0,0)); - int c = tqparent->width() / (FIELDWIDTH + 4); + TQPoint p = parent->mapToGlobal (TQPoint (0,0)); + int c = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+4*c, p.y()+4*c); mle-> setMinimumSize ((FIELDWIDTH*c/2), (FIELDHEIGHT/2)*c); @@ -573,16 +573,16 @@ KGrNHDialog::~KGrNHDialog() #ifdef KGR_PORTABLE KGrECDialog::KGrECDialog (int action, int collnIndex, TQPtrList<KGrCollection> & gamesList, - TQWidget * tqparent, const char * name) - : TQDialog (tqparent, name, TRUE, + TQWidget * parent, const char * name) + : TQDialog (parent, name, TRUE, WStyle_Customize | WStyle_NormalBorder | WStyle_Title) #else KGrECDialog::KGrECDialog (int action, int collnIndex, TQPtrList<KGrCollection> & gamesList, - TQWidget * tqparent, const char * name) + TQWidget * parent, const char * name) : KDialogBase (KDialogBase::Plain, i18n("Edit Game Info"), KDialogBase::Ok | KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name) + KDialogBase::Ok, parent, name) #endif { collections = gamesList; @@ -640,10 +640,10 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, OK = new TQPushButton (i18n("&OK"), buttons); CANCEL = new TQPushButton (i18n("&Cancel"), buttons); - TQPoint p = tqparent->mapToGlobal (TQPoint (0,0)); + TQPoint p = parent->mapToGlobal (TQPoint (0,0)); // Base the tqgeometry of the dialog box on the playing area. - int cell = tqparent->width() / (FIELDWIDTH + 4); + int cell = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+2*cell, p.y()+2*cell); dad-> setMinimumSize ((FIELDWIDTH*cell/2), (FIELDHEIGHT-1)*cell); #endif @@ -750,16 +750,16 @@ void KGrECDialog::ecSetTrad () {ecSetRules ('T');} #ifdef KGR_PORTABLE KGrLGDialog::KGrLGDialog (TQFile * savedGames, TQPtrList<KGrCollection> & collections, - TQWidget * tqparent, const char * name) - : TQDialog (tqparent, name, TRUE, + TQWidget * parent, const char * name) + : TQDialog (parent, name, TRUE, WStyle_Customize | WStyle_NormalBorder | WStyle_Title) #else KGrLGDialog::KGrLGDialog (TQFile * savedGames, TQPtrList<KGrCollection> & collections, - TQWidget * tqparent, const char * name) + TQWidget * parent, const char * name) : KDialogBase (KDialogBase::Plain, i18n("Select Saved Game"), KDialogBase::Ok | KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name) + KDialogBase::Ok, parent, name) #endif { #ifdef KGR_PORTABLE @@ -803,8 +803,8 @@ KGrLGDialog::KGrLGDialog (TQFile * savedGames, dad-> setCaption (i18n("Select Saved Game")); // Base the tqgeometry of the list box on the playing area. - TQPoint p = tqparent->mapToGlobal (TQPoint (0,0)); - int c = tqparent->width() / (FIELDWIDTH + 4); + TQPoint p = parent->mapToGlobal (TQPoint (0,0)); + int c = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+2*c, p.y()+2*c); lgList-> setMinimumHeight ((FIELDHEIGHT/2)*c); OK-> setMaximumWidth (4*c); @@ -858,26 +858,26 @@ void KGrLGDialog::lgSelect (int n) *********************** CENTRALISED MESSAGE FUNCTIONS ************************ *******************************************************************************/ -void KGrMessage::information (TQWidget * tqparent, const TQString &caption, const TQString &text) +void KGrMessage::information (TQWidget * parent, const TQString &caption, const TQString &text) { #ifdef KGR_PORTABLE // Force TQt to do word-wrapping (but it ignores "\n" line-breaks). - TQMessageBox::information (tqparent, caption, + TQMessageBox::information (parent, caption, "<qt>" + text + "</qt>"); #else // KDE does word-wrapping and will observe "\n" line-breaks. - KMessageBox::information (tqparent, text, caption); + KMessageBox::information (parent, text, caption); #endif } -int KGrMessage::warning (TQWidget * tqparent, TQString caption, TQString text, +int KGrMessage::warning (TQWidget * parent, TQString caption, TQString text, TQString label0, TQString label1, TQString label2) { int ans = 0; #ifdef KGR_PORTABLE // Display a box with 2 or 3 buttons, depending on if label2 is empty or not. // Force TQt to do word-wrapping (but it ignores "\n" line-breaks). - ans = TQMessageBox::warning (tqparent, caption, + ans = TQMessageBox::warning (parent, caption, "<qt>" + text + "</qt>", label0, label1, label2, 0, (label2.isEmpty()) ? 1 : 2); @@ -885,13 +885,13 @@ int KGrMessage::warning (TQWidget * tqparent, TQString caption, TQString text, // KDE does word-wrapping and will observe "\n" line-breaks. if (label2.isEmpty()) { // Display a box with 2 buttons. - ans = KMessageBox::questionYesNo (tqparent, text, caption, + ans = KMessageBox::questionYesNo (parent, text, caption, label0, label1); ans = (ans == KMessageBox::Yes) ? 0 : 1; } else { // Display a box with 3 buttons. - ans = KMessageBox::questionYesNoCancel (tqparent, text, caption, + ans = KMessageBox::questionYesNoCancel (parent, text, caption, label0, label1); if (ans == KMessageBox::Cancel) ans = 2; @@ -906,12 +906,12 @@ int KGrMessage::warning (TQWidget * tqparent, TQString caption, TQString text, /********************** WORD-WRAPPED MESSAGE BOX ************************/ /******************************************************************************/ -void KGrMessage::wrapped (TQWidget * tqparent, TQString title, TQString contents) +void KGrMessage::wrapped (TQWidget * parent, TQString title, TQString contents) { #ifndef KGR_PORTABLE - KMessageBox::information (tqparent, contents, title); + KMessageBox::information (parent, contents, title); #else - TQDialog * mm = new TQDialog (tqparent, "wrappedMessage", TRUE, + TQDialog * mm = new TQDialog (parent, "wrappedMessage", TRUE, WStyle_Customize | WStyle_NormalBorder | WStyle_Title); int margin = 10; @@ -943,8 +943,8 @@ void KGrMessage::wrapped (TQWidget * tqparent, TQString title, TQString contents mm-> setCaption (title); // Base the tqgeometry of the text box on the playing area. - TQPoint p = tqparent->mapToGlobal (TQPoint (0,0)); - int c = tqparent->width() / (FIELDWIDTH + 4); + TQPoint p = parent->mapToGlobal (TQPoint (0,0)); + int c = parent->width() / (FIELDWIDTH + 4); mm-> move (p.x()+4*c, p.y()+4*c); mle-> setMinimumSize ((FIELDWIDTH*c/2), (FIELDHEIGHT/2)*c); OK-> setMaximumWidth (3*c); diff --git a/kgoldrunner/src/kgrdialog.h b/kgoldrunner/src/kgrdialog.h index cbf4735a..cfa65de6 100644 --- a/kgoldrunner/src/kgrdialog.h +++ b/kgoldrunner/src/kgrdialog.h @@ -62,7 +62,7 @@ Q_OBJECT public: KGrSLDialog (int action, int requestedLevel, int collnIndex, TQPtrList<KGrCollection> & gamesList, KGrGame * theGame, - TQWidget * tqparent = 0, const char *name = 0); + TQWidget * parent = 0, const char *name = 0); ~KGrSLDialog(); int selectedLevel() {return (number->value());} @@ -117,7 +117,7 @@ Q_OBJECT TQ_OBJECT public: KGrNHDialog (const TQString & levelName, const TQString & levelHint, - TQWidget * tqparent = 0, const char * name = 0); + TQWidget * parent = 0, const char * name = 0); ~KGrNHDialog(); TQString getName() {return (nhName->text());} @@ -143,7 +143,7 @@ Q_OBJECT public: KGrECDialog (int action, int collnIndex, TQPtrList<KGrCollection> & gamesList, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); ~KGrECDialog(); TQString getName() {return (ecName->text());} @@ -195,7 +195,7 @@ Q_OBJECT TQ_OBJECT public: KGrLGDialog (TQFile * savedGames, TQPtrList<KGrCollection> & collections, - TQWidget * tqparent, const char * name); + TQWidget * parent, const char * name); TQString getCurrentText() {return (lgList->currentText());} private slots: @@ -213,10 +213,10 @@ private: class KGrMessage : public TQDialog { public: - static void information (TQWidget * tqparent, const TQString &caption, const TQString &text); - static int warning (TQWidget * tqparent, TQString caption, TQString text, + static void information (TQWidget * parent, const TQString &caption, const TQString &text); + static int warning (TQWidget * parent, TQString caption, TQString text, TQString label0, TQString label1, TQString label2 = ""); - static void wrapped (TQWidget * tqparent, TQString caption, TQString text); + static void wrapped (TQWidget * parent, TQString caption, TQString text); }; #endif diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp index 930bd83f..a52abe01 100644 --- a/kgoldrunner/src/kgrgame.cpp +++ b/kgoldrunner/src/kgrgame.cpp @@ -2226,10 +2226,10 @@ bool KGrGame::ownerOK (Owner o) /********************** CLASS TO DISPLAY THUMBNAIL ***********************/ /******************************************************************************/ -KGrThumbNail::KGrThumbNail (TQWidget * tqparent, const char * name) - : TQFrame (tqparent, name) +KGrThumbNail::KGrThumbNail (TQWidget * parent, const char * name) + : TQFrame (parent, name) { - // Let the tqparent do all the work. We need a class here so that + // Let the parent do all the work. We need a class here so that // TQFrame::drawContents (TQPainter *) can be re-implemented and // the thumbnail can be automatically re-painted when required. } @@ -2588,12 +2588,12 @@ bool KGrGame::saveCollections (Owner o) /********************** WORD-WRAPPED MESSAGE BOX ************************/ /******************************************************************************/ -void KGrGame::myMessage (TQWidget * tqparent, TQString title, TQString contents) +void KGrGame::myMessage (TQWidget * parent, TQString title, TQString contents) { // Halt the game while the message is displayed. setMessageFreeze (TRUE); - KGrMessage::wrapped (tqparent, title, contents); + KGrMessage::wrapped (parent, title, contents); // Unfreeze the game, but only if it was previously unfrozen. setMessageFreeze (FALSE); diff --git a/kgoldrunner/src/kgrgame.h b/kgoldrunner/src/kgrgame.h index 2f440b87..2b0f26c8 100644 --- a/kgoldrunner/src/kgrgame.h +++ b/kgoldrunner/src/kgrgame.h @@ -265,7 +265,7 @@ private: /********************** WORD-WRAPPED MESSAGE BOX ************************/ /******************************************************************************/ - void myMessage (TQWidget * tqparent, TQString title, TQString contents); + void myMessage (TQWidget * parent, TQString title, TQString contents); }; /******************************************************************************/ @@ -275,7 +275,7 @@ private: class KGrThumbNail : public TQFrame { public: - KGrThumbNail (TQWidget *tqparent = 0, const char *name = 0); + KGrThumbNail (TQWidget *parent = 0, const char *name = 0); void setFilePath (TQString &, TQLabel *); // Set filepath and name field. static TQColor backgroundColor; diff --git a/kjumpingcube/kcubeboxwidget.cpp b/kjumpingcube/kcubeboxwidget.cpp index 57aecd15..815acb6d 100644 --- a/kjumpingcube/kcubeboxwidget.cpp +++ b/kjumpingcube/kcubeboxwidget.cpp @@ -30,8 +30,8 @@ #include "prefs.h" -KCubeBoxWidget::KCubeBoxWidget(const int d,TQWidget *tqparent,const char *name) - : TQWidget(tqparent,name), +KCubeBoxWidget::KCubeBoxWidget(const int d,TQWidget *parent,const char *name) + : TQWidget(parent,name), CubeBoxBase<KCubeWidget>(d) { init(); @@ -39,8 +39,8 @@ KCubeBoxWidget::KCubeBoxWidget(const int d,TQWidget *tqparent,const char *name) -KCubeBoxWidget::KCubeBoxWidget(CubeBox& box,TQWidget *tqparent,const char *name) - :TQWidget(tqparent,name), +KCubeBoxWidget::KCubeBoxWidget(CubeBox& box,TQWidget *parent,const char *name) + :TQWidget(parent,name), CubeBoxBase<KCubeWidget>(box.dim()) { init(); @@ -57,8 +57,8 @@ KCubeBoxWidget::KCubeBoxWidget(CubeBox& box,TQWidget *tqparent,const char *name) -KCubeBoxWidget::KCubeBoxWidget(const KCubeBoxWidget& box,TQWidget *tqparent,const char *name) - :TQWidget(tqparent,name), +KCubeBoxWidget::KCubeBoxWidget(const KCubeBoxWidget& box,TQWidget *parent,const char *name) + :TQWidget(parent,name), CubeBoxBase<KCubeWidget>(box.dim()) { init(); diff --git a/kjumpingcube/kcubeboxwidget.h b/kjumpingcube/kcubeboxwidget.h index e8d0553e..d1cc160c 100644 --- a/kjumpingcube/kcubeboxwidget.h +++ b/kjumpingcube/kcubeboxwidget.h @@ -53,10 +53,10 @@ class KCubeBoxWidget : public TQWidget , public CubeBoxBase<KCubeWidget> Q_OBJECT TQ_OBJECT public: - KCubeBoxWidget(const int dim=1,TQWidget *tqparent=0,const char *name=0); + KCubeBoxWidget(const int dim=1,TQWidget *parent=0,const char *name=0); - KCubeBoxWidget(CubeBox& box, TQWidget *tqparent=0,const char *name=0); - KCubeBoxWidget(const KCubeBoxWidget& box,TQWidget *tqparent=0,const char *name=0); + KCubeBoxWidget(CubeBox& box, TQWidget *parent=0,const char *name=0); + KCubeBoxWidget(const KCubeBoxWidget& box,TQWidget *parent=0,const char *name=0); virtual ~KCubeBoxWidget(); KCubeBoxWidget& operator= (CubeBox& box); diff --git a/kjumpingcube/kcubewidget.cpp b/kjumpingcube/kcubewidget.cpp index d4556eac..9757da99 100644 --- a/kjumpingcube/kcubewidget.cpp +++ b/kjumpingcube/kcubewidget.cpp @@ -73,9 +73,9 @@ TQPalette KCubeWidget::color(Owner forWhom) ** public functions ** ** ****************************************************** */ -KCubeWidget::KCubeWidget(TQWidget* tqparent,const char* name +KCubeWidget::KCubeWidget(TQWidget* parent,const char* name ,Owner owner,int value,int max) - : TQFrame(tqparent,name), + : TQFrame(parent,name), Cube(owner,value,max) { setFrameStyle(Panel|Raised); @@ -85,7 +85,7 @@ KCubeWidget::KCubeWidget(TQWidget* tqparent,const char* name setCoordinates(0,0); //initialize hintTimer - // will be automatically destroyed by the tqparent + // will be automatically destroyed by the parent hintTimer = new TQTimer(this); hintCounter=0; connect(hintTimer,TQT_SIGNAL(timeout()),TQT_SLOT(hint())); diff --git a/kjumpingcube/kcubewidget.h b/kjumpingcube/kcubewidget.h index 3f578c13..2dc333d1 100644 --- a/kjumpingcube/kcubewidget.h +++ b/kjumpingcube/kcubewidget.h @@ -39,7 +39,7 @@ class KCubeWidget : public TQFrame , public Cube public: /** constructs a new KCubeWidget*/ - KCubeWidget(TQWidget* tqparent=0,const char* name=0 + KCubeWidget(TQWidget* parent=0,const char* name=0 ,Owner owner=Cube::Nobody,int value=1,int max=0); virtual ~KCubeWidget(); diff --git a/klickety/board.cpp b/klickety/board.cpp index 4b531b5b..a251687c 100644 --- a/klickety/board.cpp +++ b/klickety/board.cpp @@ -26,8 +26,8 @@ void KLBoard::contentsMouseReleaseEvent(TQMouseEvent *e) } } -KLBoard::KLBoard(TQWidget *tqparent) - : BaseBoard(true, tqparent), +KLBoard::KLBoard(TQWidget *parent) + : BaseBoard(true, parent), field(matrix().width(), matrix().height()), empty(matrix().width()), blocked(false) diff --git a/klickety/board.h b/klickety/board.h index f67e4926..8b7edf7e 100644 --- a/klickety/board.h +++ b/klickety/board.h @@ -9,7 +9,7 @@ class KLBoard : public BaseBoard Q_OBJECT TQ_OBJECT public: - KLBoard(TQWidget *tqparent); + KLBoard(TQWidget *parent); void start(const GTInitData &data); diff --git a/klickety/field.cpp b/klickety/field.cpp index 1c497eb2..19d7d6ff 100644 --- a/klickety/field.cpp +++ b/klickety/field.cpp @@ -11,8 +11,8 @@ #include "base/board.h" -Field::Field(TQWidget *tqparent) - : TQWidget(tqparent, "field"), BaseField(this) +Field::Field(TQWidget *parent) + : TQWidget(parent, "field"), BaseField(this) { KGameLCDList *sc = new KGameLCDList(i18n("Remaining blocks"), this); showScore = new KGameLCD(3, sc); @@ -37,7 +37,7 @@ Field::Field(TQWidget *tqparent) connect(board, TQT_SIGNAL(gameOverSignal()), TQT_SLOT(gameOver())); settingsChanged(); - connect(tqparent, TQT_SIGNAL(settingsChanged()), TQT_SLOT(settingsChanged())); + connect(parent, TQT_SIGNAL(settingsChanged()), TQT_SLOT(settingsChanged())); TQTimer::singleShot(0, this, TQT_SLOT(start())); } diff --git a/klickety/field.h b/klickety/field.h index 64951006..50484e4b 100644 --- a/klickety/field.h +++ b/klickety/field.h @@ -13,7 +13,7 @@ class Field : public TQWidget, public BaseField, public BaseInterface Q_OBJECT TQ_OBJECT public: - Field(TQWidget *tqparent); + Field(TQWidget *parent); private slots: void scoreUpdatedSlot() { scoreUpdated(); } diff --git a/klickety/main.h b/klickety/main.h index 6ff71a4c..a15252eb 100644 --- a/klickety/main.h +++ b/klickety/main.h @@ -13,10 +13,10 @@ class KLFactory : public BaseFactory KLFactory(); protected: - virtual BaseBoard *createBoard(bool, TQWidget *tqparent) - { return new KLBoard(tqparent); } - virtual BaseInterface *createInterface(TQWidget *tqparent) - { return new Field(tqparent); } + virtual BaseBoard *createBoard(bool, TQWidget *parent) + { return new KLBoard(parent); } + virtual BaseInterface *createInterface(TQWidget *parent) + { return new Field(parent); } }; class KLMainWindow : public BaseMainWindow diff --git a/klines/field.cpp b/klines/field.cpp index 22211b76..088febc2 100644 --- a/klines/field.cpp +++ b/klines/field.cpp @@ -19,8 +19,8 @@ #include "cfg.h" #include "field.moc" -Field::Field(TQWidget* tqparent, const char* name) - : TQWidget( tqparent, name ) +Field::Field(TQWidget* parent, const char* name) + : TQWidget( parent, name ) { clearField(); } diff --git a/klines/field.h b/klines/field.h index c93bac4b..c662d788 100644 --- a/klines/field.h +++ b/klines/field.h @@ -36,7 +36,7 @@ public: void saveUndo(); protected: - Field(TQWidget* tqparent, const char* name); + Field(TQWidget* parent, const char* name); ~Field(); void putBall(int x, int y, int color); diff --git a/klines/linesboard.cpp b/klines/linesboard.cpp index fe7faee1..4de4f474 100644 --- a/klines/linesboard.cpp +++ b/klines/linesboard.cpp @@ -34,8 +34,8 @@ Constructs a LinesBoard widget. */ -LinesBoard::LinesBoard( BallPainter * abPainter, TQWidget* tqparent, const char* name ) - : Field( tqparent, name ) +LinesBoard::LinesBoard( BallPainter * abPainter, TQWidget* parent, const char* name ) + : Field( parent, name ) { demoLabel = 0; bGameOver = false; diff --git a/klines/linesboard.h b/klines/linesboard.h index 4a6b3979..b340ea86 100644 --- a/klines/linesboard.h +++ b/klines/linesboard.h @@ -34,7 +34,7 @@ class LinesBoard : public Field Q_OBJECT TQ_OBJECT public: - LinesBoard( BallPainter * abPainter, TQWidget* tqparent=0, const char* name=0 ); + LinesBoard( BallPainter * abPainter, TQWidget* parent=0, const char* name=0 ); ~LinesBoard(); int width(); diff --git a/klines/mwidget.cpp b/klines/mwidget.cpp index 9f66345d..1492d390 100644 --- a/klines/mwidget.cpp +++ b/klines/mwidget.cpp @@ -24,8 +24,8 @@ #include "ballpainter.h" -MainWidget::MainWidget( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name ) +MainWidget::MainWidget( TQWidget* parent, const char* name ) + : TQFrame( parent, name ) { TQBoxLayout *grid = new TQHBoxLayout( this, 5 ); //(rows,col) bPainter = new BallPainter(); @@ -36,7 +36,7 @@ MainWidget::MainWidget( TQWidget* tqparent, const char* name ) TQBoxLayout *right = new TQVBoxLayout(grid, 2); TQLabel *label = new TQLabel(i18n("Next balls:"), this); lPrompt = new LinesPrompt(bPainter, this); - connect(lPrompt, TQT_SIGNAL(PromptPressed()), tqparent, TQT_SLOT(switchPrompt())); + connect(lPrompt, TQT_SIGNAL(PromptPressed()), parent, TQT_SLOT(switchPrompt())); right->addWidget( label, 0, TQt::AlignBottom | TQt::AlignHCenter ); right->addWidget( lPrompt, 0, TQt::AlignTop | TQt::AlignHCenter ); diff --git a/klines/mwidget.h b/klines/mwidget.h index 11133a2f..174ff10e 100644 --- a/klines/mwidget.h +++ b/klines/mwidget.h @@ -36,7 +36,7 @@ class MainWidget : public TQFrame BallPainter *bPainter; public: - MainWidget( TQWidget* tqparent=0, const char* name=0 ); + MainWidget( TQWidget* parent=0, const char* name=0 ); ~MainWidget(); LinesBoard * GetLsb(); LinesPrompt * GetPrompt(); diff --git a/klines/prompt.cpp b/klines/prompt.cpp index 1233abf5..7424b35d 100644 --- a/klines/prompt.cpp +++ b/klines/prompt.cpp @@ -19,8 +19,8 @@ #include "prompt.h" #include "prompt.moc" -LinesPrompt::LinesPrompt( BallPainter * abPainter, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +LinesPrompt::LinesPrompt( BallPainter * abPainter, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { bPainter = abPainter; diff --git a/klines/prompt.h b/klines/prompt.h index e1decfd5..ce76bdce 100644 --- a/klines/prompt.h +++ b/klines/prompt.h @@ -34,7 +34,7 @@ class LinesPrompt : public TQWidget void mousePressEvent( TQMouseEvent* ); public: - LinesPrompt( BallPainter * abPainter, TQWidget * tqparent=0, const char * name=0 ); + LinesPrompt( BallPainter * abPainter, TQWidget * parent=0, const char * name=0 ); ~LinesPrompt(); void setPrompt(bool enabled); diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp index 833718c3..cc80831c 100644 --- a/kmahjongg/Editor.cpp +++ b/kmahjongg/Editor.cpp @@ -41,11 +41,11 @@ Editor::Editor ( - TQWidget* tqparent, + TQWidget* parent, const char* name ) : - TQDialog( tqparent, name, true, 0 ), tiles(false) + TQDialog( parent, name, true, 0 ), tiles(false) { clean= true; diff --git a/kmahjongg/Editor.h b/kmahjongg/Editor.h index a42f237d..1cd06853 100644 --- a/kmahjongg/Editor.h +++ b/kmahjongg/Editor.h @@ -23,7 +23,7 @@ public: Editor ( - TQWidget* tqparent = NULL, + TQWidget* parent = NULL, const char* name = NULL ); diff --git a/kmahjongg/GameTimer.cpp b/kmahjongg/GameTimer.cpp index d4fc4009..f3ce4f52 100644 --- a/kmahjongg/GameTimer.cpp +++ b/kmahjongg/GameTimer.cpp @@ -8,11 +8,11 @@ // -// Constructs a GameTimer widget with a tqparent and a name. +// Constructs a GameTimer widget with a parent and a name. // -GameTimer::GameTimer( TQWidget *tqparent, const char *name ) - : TQLCDNumber( tqparent, name ) +GameTimer::GameTimer( TQWidget *parent, const char *name ) + : TQLCDNumber( parent, name ) { showingColon = false; setNumDigits(7); diff --git a/kmahjongg/GameTimer.h b/kmahjongg/GameTimer.h index cae1961e..e9bdb4c6 100644 --- a/kmahjongg/GameTimer.h +++ b/kmahjongg/GameTimer.h @@ -26,7 +26,7 @@ class GameTimer: public TQLCDNumber Q_OBJECT TQ_OBJECT public: - GameTimer( TQWidget *tqparent=0, const char *name=0 ); + GameTimer( TQWidget *parent=0, const char *name=0 ); int toInt(); TQString toString() {return theTimer.toString();} diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp index 856ed7fb..c38e53b1 100644 --- a/kmahjongg/HighScore.cpp +++ b/kmahjongg/HighScore.cpp @@ -43,11 +43,11 @@ int defTimes[numScores] = {ages, ages-1, ages-2, ages-3, HighScore::HighScore ( - TQWidget* tqparent, + TQWidget* parent, const char* name ) : - TQDialog( tqparent, name, true, 0 ) + TQDialog( parent, name, true, 0 ) { // form the target name diff --git a/kmahjongg/HighScore.h b/kmahjongg/HighScore.h index bd593c09..a154b3e1 100644 --- a/kmahjongg/HighScore.h +++ b/kmahjongg/HighScore.h @@ -35,7 +35,7 @@ public: HighScore ( - TQWidget* tqparent = NULL, + TQWidget* parent = NULL, const char* name = NULL ); diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp index 0904c750..ff635e5c 100644 --- a/kmahjongg/Preview.cpp +++ b/kmahjongg/Preview.cpp @@ -19,7 +19,7 @@ static const char * themeMagicV1_0= "kmahjongg-theme-v1.0"; -Preview::Preview(TQWidget* tqparent) : KDialogBase(tqparent), m_tiles(true) +Preview::Preview(TQWidget* parent) : KDialogBase(parent), m_tiles(true) { KPushButton *loadButton; TQGroupBox *group; @@ -421,8 +421,8 @@ void Preview::saveTheme() { fclose(outFile); } -FrameImage::FrameImage (TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name) +FrameImage::FrameImage (TQWidget *parent, const char *name) + : TQFrame(parent, name) { rx = -1; thePixmap = new TQPixmap(); diff --git a/kmahjongg/Preview.h b/kmahjongg/Preview.h index a987b7d2..2b0adb54 100644 --- a/kmahjongg/Preview.h +++ b/kmahjongg/Preview.h @@ -17,7 +17,7 @@ class FrameImage: public TQFrame Q_OBJECT TQ_OBJECT public: - FrameImage(TQWidget *tqparent=NULL, const char *name = NULL); + FrameImage(TQWidget *parent=NULL, const char *name = NULL); ~FrameImage(); void setGeometry(int x, int y, int w, int h); TQPixmap *getPreviewPixmap() {return thePixmap;} @@ -49,7 +49,7 @@ class Preview: public KDialogBase public: enum PreviewType {background, tileset, board, theme}; - Preview(TQWidget* tqparent); + Preview(TQWidget* parent); ~Preview(); void initialise(const PreviewType type); diff --git a/kmahjongg/Tileset.cpp b/kmahjongg/Tileset.cpp index b8c6ec2f..bec2d959 100644 --- a/kmahjongg/Tileset.cpp +++ b/kmahjongg/Tileset.cpp @@ -195,7 +195,7 @@ void Tileset::createPixmap(TQRgb *src, TQPixmap &dest, bool scale, bool shadow) } - // create the pixmap and initialise the drawing tqmask + // create the pixmap and initialise the drawing mask if (!scale) { dest.convertFromImage(buff); dest.setMask(maskBits); diff --git a/kmahjongg/Tileset.h b/kmahjongg/Tileset.h index c93cf102..93fc0832 100644 --- a/kmahjongg/Tileset.h +++ b/kmahjongg/Tileset.h @@ -61,8 +61,8 @@ class Tileset { private: - TQBitmap maskBits; // xbm tqmask for the tile - TQBitmap maskBitsMini; // xbm tqmask for the tile + TQBitmap maskBits; // xbm mask for the tile + TQBitmap maskBitsMini; // xbm mask for the tile TQRgb* tiles; // Buffer containing all tiles (unselected glyphs) TQRgb* selectedTiles; // Buffer containing all tiles (selected glyphs) diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp index 615091ab..aca8c302 100644 --- a/kmahjongg/boardwidget.cpp +++ b/kmahjongg/boardwidget.cpp @@ -14,8 +14,8 @@ * Constructor. * Loads tileset and background bitmaps. */ -BoardWidget::BoardWidget( TQWidget* tqparent, const char *name ) - : TQWidget( tqparent, name ), theTiles(false) +BoardWidget::BoardWidget( TQWidget* parent, const char *name ) + : TQWidget( parent, name ), theTiles(false) { setBackgroundColor( TQColor( 0,0,0 ) ); @@ -882,7 +882,7 @@ int BoardWidget::tileAt(int x, int y, int z) { bool BoardWidget::generateSolvableGame() { // Initially we want to mark positions on layer 0 so that we have only - // one free position per aptqparent horizontal line. + // one free position per apparent horizontal line. for (int i = 0; i < numTiles; i++) { // Pick a random tile on layer 0 @@ -894,7 +894,7 @@ bool BoardWidget::generateSolvableGame() { } } while (tilePositions[position].e != 0); - // If there are no other free positions on the same aptqparent + // If there are no other free positions on the same apparent // horizontal line, we can mark that position as free. if (onlyFreeInLine(position)) { positionDepends[position].free = true; @@ -965,7 +965,7 @@ bool BoardWidget::generateSolvableGame() { // --------------------------------------------------------- // Determines whether it is ok to mark this position as "free" because -// there are no other positions marked "free" in its aptqparent horizontal +// there are no other positions marked "free" in its apparent horizontal // line. bool BoardWidget::onlyFreeInLine(int position) { @@ -1104,7 +1104,7 @@ void BoardWidget::updateDepend(int position) { } } - // If position is first free on aptqparent horizontal, it is + // If position is first free on apparent horizontal, it is // now free to be filled. if (onlyFreeInLine(position)) { positionDepends[position].free = true; diff --git a/kmahjongg/boardwidget.h b/kmahjongg/boardwidget.h index 749f5452..bee14b49 100644 --- a/kmahjongg/boardwidget.h +++ b/kmahjongg/boardwidget.h @@ -92,7 +92,7 @@ class BoardWidget : public TQWidget TQ_OBJECT public: - BoardWidget( TQWidget* tqparent = 0, const char *name = 0 ); + BoardWidget( TQWidget* parent = 0, const char *name = 0 ); ~BoardWidget(); void calculateNewGame(int num = -1 ); diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp index 49246f92..8bd9b107 100644 --- a/kmahjongg/kmahjongg.cpp +++ b/kmahjongg/kmahjongg.cpp @@ -57,8 +57,8 @@ int is_paused = 0; /** Constructor. */ -KMahjongg::KMahjongg( TQWidget* tqparent, const char *name) - : KMainWindow(tqparent, name) +KMahjongg::KMahjongg( TQWidget* parent, const char *name) + : KMainWindow(parent, name) { boardEditor = 0; diff --git a/kmahjongg/kmahjongg.h b/kmahjongg/kmahjongg.h index 54c5ca92..e7b9492b 100644 --- a/kmahjongg/kmahjongg.h +++ b/kmahjongg/kmahjongg.h @@ -54,7 +54,7 @@ class KMahjongg : public KMainWindow TQ_OBJECT public: - KMahjongg( TQWidget* tqparent = 0, const char *name = 0); + KMahjongg( TQWidget* parent = 0, const char *name = 0); ~KMahjongg(); public slots: diff --git a/kmines/dialogs.cpp b/kmines/dialogs.cpp index a81c8d91..7fb5dec9 100644 --- a/kmines/dialogs.cpp +++ b/kmines/dialogs.cpp @@ -61,8 +61,8 @@ void Smiley::setMood(Mood mood) } //----------------------------------------------------------------------------- -DigitalClock::DigitalClock(TQWidget *tqparent) -: KGameLCDClock(tqparent, "digital_clock") +DigitalClock::DigitalClock(TQWidget *parent) +: KGameLCDClock(parent, "digital_clock") { setFrameStyle(Panel | Sunken); setDefaultBackgroundColor(black); diff --git a/kmines/dialogs.h b/kmines/dialogs.h index f900f7e6..799074f6 100644 --- a/kmines/dialogs.h +++ b/kmines/dialogs.h @@ -36,8 +36,8 @@ class Smiley : public TQPushButton, public KMines Q_OBJECT TQ_OBJECT public: - Smiley(TQWidget *tqparent, const char *name = 0) - : TQPushButton(TQString(), tqparent, name) {} + Smiley(TQWidget *parent, const char *name = 0) + : TQPushButton(TQString(), parent, name) {} public slots: void setMood(Mood); @@ -52,7 +52,7 @@ class DigitalClock : public KGameLCDClock Q_OBJECT TQ_OBJECT public: - DigitalClock(TQWidget *tqparent); + DigitalClock(TQWidget *parent); void reset(bool customGame); diff --git a/kmines/field.cpp b/kmines/field.cpp index 582e6663..035b3708 100644 --- a/kmines/field.cpp +++ b/kmines/field.cpp @@ -44,8 +44,8 @@ const Field::ActionData Field::ACTION_DATA[Nb_Actions] = { { "UnsetUncertain", "unset_uncertain", I18N_NOOP("Question mark unset") } }; -Field::Field(TQWidget *tqparent) - : FieldFrame(tqparent), _state(Init), _solvingState(Regular), _level(Level::Easy) +Field::Field(TQWidget *parent) + : FieldFrame(parent), _state(Init), _solvingState(Regular), _level(Level::Easy) {} void Field::readSettings() diff --git a/kmines/field.h b/kmines/field.h index 4d17358f..2c21348b 100644 --- a/kmines/field.h +++ b/kmines/field.h @@ -37,7 +37,7 @@ class Field : public FieldFrame, public BaseField static const ActionData ACTION_DATA[Nb_Actions]; public: - Field(TQWidget *tqparent); + Field(TQWidget *parent); virtual TQSize tqsizeHint() const; diff --git a/kmines/frame.cpp b/kmines/frame.cpp index b5c154b0..5eee07ba 100644 --- a/kmines/frame.cpp +++ b/kmines/frame.cpp @@ -26,8 +26,8 @@ #include "settings.h" -FieldFrame::FieldFrame(TQWidget *tqparent) - : TQFrame(tqparent, "field"), _button(0) +FieldFrame::FieldFrame(TQWidget *parent) + : TQFrame(parent, "field"), _button(0) { setFrameStyle( TQFrame::Box | TQFrame::Raised ); setLineWidth(2); @@ -39,18 +39,18 @@ void FieldFrame::adjustSize() setFixedSize(tqsizeHint()); _button.resize(Settings::caseSize(), Settings::caseSize()); - TQBitmap tqmask; + TQBitmap mask; for (uint i=0; i<Nb_Pixmap_Types; i++) { - TQPixmap mask_pm = tqmask; + TQPixmap mask_pm = mask; drawPixmap(mask_pm, (PixmapType)i, true); drawPixmap(_pixmaps[i], (PixmapType)i, false); - _pixmaps[i].setMask(tqmask); + _pixmaps[i].setMask(mask); } for (uint i=0; i<Nb_Advised; i++) { - TQPixmap mask_pm = tqmask; + TQPixmap mask_pm = mask; drawAdvised(mask_pm, i, true); drawAdvised(_advised[i], i, false); - _advised[i].setMask(tqmask); + _advised[i].setMask(mask); } TQFont f = font(); @@ -59,44 +59,44 @@ void FieldFrame::adjustSize() setFont(f); } -void FieldFrame::initPixmap(TQPixmap &pix, bool tqmask) const +void FieldFrame::initPixmap(TQPixmap &pix, bool mask) const { pix.resize(Settings::caseSize(), Settings::caseSize()); - if (tqmask) pix.fill(color0); + if (mask) pix.fill(color0); } -void FieldFrame::drawPixmap(TQPixmap &pix, PixmapType type, bool tqmask) const +void FieldFrame::drawPixmap(TQPixmap &pix, PixmapType type, bool mask) const { - initPixmap(pix, tqmask); + initPixmap(pix, mask); TQPainter p(&pix); if ( type==FlagPixmap ) { p.setWindow(0, 0, 16, 16); - p.setPen( (tqmask ? color1 : black) ); + p.setPen( (mask ? color1 : black) ); p.drawLine(6, 13, 14, 13); p.drawLine(8, 12, 12, 12); p.drawLine(9, 11, 11, 11); p.drawLine(10, 2, 10, 10); - if (!tqmask) p.setPen(black); - p.setBrush( (tqmask ? color1 : Settings::color(Settings::EnumType::flag)) ); + if (!mask) p.setPen(black); + p.setBrush( (mask ? color1 : Settings::color(Settings::EnumType::flag)) ); p.drawRect(4, 3, 6, 5); return; } p.setWindow(0, 0, 20, 20); if ( type==ExplodedPixmap ) - p.fillRect(2, 2, 16, 16, (tqmask ? color1 : Settings::color(Settings::EnumType::explosion))); - TQPen pen(tqmask ? color1 : black, 1); + p.fillRect(2, 2, 16, 16, (mask ? color1 : Settings::color(Settings::EnumType::explosion))); + TQPen pen(mask ? color1 : black, 1); p.setPen(pen); - p.setBrush(tqmask ? color1 : black); + p.setBrush(mask ? color1 : black); p.drawLine(10,3,10,18); p.drawLine(3,10,18,10); p.drawLine(5, 5, 16, 16); p.drawLine(5, 15, 15, 5); p.drawEllipse(5, 5, 11, 11); - p.fillRect(8, 8, 2, 2, (tqmask ? color1 : white)); + p.fillRect(8, 8, 2, 2, (mask ? color1 : white)); if ( type==ErrorPixmap ) { - if (!tqmask) { + if (!mask) { pen.setColor(Settings::color(Settings::EnumType::error)); p.setPen(pen); } @@ -109,12 +109,12 @@ void FieldFrame::drawPixmap(TQPixmap &pix, PixmapType type, bool tqmask) const } } -void FieldFrame::drawAdvised(TQPixmap &pix, uint i, bool tqmask) const +void FieldFrame::drawAdvised(TQPixmap &pix, uint i, bool mask) const { - initPixmap(pix, tqmask); + initPixmap(pix, mask); TQPainter p(&pix); p.setWindow(0, 0, 16, 16); - p.setPen( TQPen(tqmask ? color1 : Settings::mineColor(i), 2) ); + p.setPen( TQPen(mask ? color1 : Settings::mineColor(i), 2) ); p.drawRect(3, 3, 11, 11); } diff --git a/kmines/frame.h b/kmines/frame.h index a271eb90..18efb76b 100644 --- a/kmines/frame.h +++ b/kmines/frame.h @@ -30,7 +30,7 @@ class TQPainter; class FieldFrame : public TQFrame, public KMines { public: - FieldFrame(TQWidget *tqparent); + FieldFrame(TQWidget *parent); protected: enum PixmapType { FlagPixmap = 0, MinePixmap, ExplodedPixmap, @@ -48,9 +48,9 @@ class FieldFrame : public TQFrame, public KMines TQPixmap _pixmaps[Nb_Pixmap_Types]; TQPixmap _advised[Nb_Advised]; - void drawPixmap(TQPixmap &, PixmapType, bool tqmask) const; - void drawAdvised(TQPixmap &, uint i, bool tqmask) const; - void initPixmap(TQPixmap &, bool tqmask) const; + void drawPixmap(TQPixmap &, PixmapType, bool mask) const; + void drawAdvised(TQPixmap &, uint i, bool mask) const; + void initPixmap(TQPixmap &, bool mask) const; }; #endif diff --git a/kmines/solver/advFastRules.cpp b/kmines/solver/advFastRules.cpp index 56b97b72..79c42bba 100644 --- a/kmines/solver/advFastRules.cpp +++ b/kmines/solver/advFastRules.cpp @@ -159,9 +159,9 @@ void AdviseFast::RuleSet::addGeneral(Coord p){ int AdviseFast::Rule::leaks = 0; #endif -AdviseFast::Rule::Rule(RuleSet *tqparent) : - _parent(tqparent), - _facts(tqparent->facts) +AdviseFast::Rule::Rule(RuleSet *parent) : + _parent(parent), + _facts(parent->facts) { #if defined(DEBUG) && DEBUG >= 2 cout << "Rule::Rule, leaks = " << ++leaks << endl; @@ -177,8 +177,8 @@ AdviseFast::Rule::~Rule() AdviseFast::GeneralRule::GeneralRule( Coord fact, - RuleSet *tqparent) : - Rule(tqparent), + RuleSet *parent) : + Rule(parent), _fact(fact) {} @@ -242,8 +242,8 @@ bool AdviseFast::GeneralRule::apply(CoordSet *) AdviseFast::EmptyRule::EmptyRule( Coord fact, - RuleSet *tqparent) : - Rule(tqparent), + RuleSet *parent) : + Rule(parent), _fact(fact) {} @@ -285,8 +285,8 @@ bool AdviseFast::EmptyRule::apply( AdviseFast::FullRule::FullRule( Coord fact, - RuleSet *tqparent) : - Rule(tqparent), + RuleSet *parent) : + Rule(parent), _fact(fact) {} @@ -336,8 +336,8 @@ bool AdviseFast::FullRule::apply( AdviseFast::InclusionRule::InclusionRule( Coord bigger, Coord smaller, - RuleSet *tqparent) : - Rule(tqparent), + RuleSet *parent) : + Rule(parent), _bigger(bigger), _smaller(smaller) {} @@ -402,8 +402,8 @@ bool AdviseFast::InclusionRule::apply( AdviseFast::IntersectionRule::IntersectionRule( Coord bigger, Coord smaller, - RuleSet *tqparent) : - Rule(tqparent), + RuleSet *parent) : + Rule(parent), _bigger(bigger), _smaller(smaller) {} diff --git a/kmines/solver/headerP.h b/kmines/solver/headerP.h index 6cecd458..984e3113 100644 --- a/kmines/solver/headerP.h +++ b/kmines/solver/headerP.h @@ -107,7 +107,7 @@ namespace AdviseFast { */ class RuleSet; struct Rule { - Rule(RuleSet *tqparent); + Rule(RuleSet *parent); virtual ~Rule(); virtual bool apply(CoordSet *surePoints) = 0; diff --git a/kmines/solver/solver.cpp b/kmines/solver/solver.cpp index 36519043..0c90b747 100644 --- a/kmines/solver/solver.cpp +++ b/kmines/solver/solver.cpp @@ -50,8 +50,8 @@ class SolverPrivate #endif }; -Solver::Solver(TQObject *tqparent) - : TQObject(tqparent) +Solver::Solver(TQObject *parent) + : TQObject(parent) { d = new SolverPrivate; @@ -186,9 +186,9 @@ bool Solver::solveOneStep(BaseField &field) //----------------------------------------------------------------------------- -SolvingRateDialog::SolvingRateDialog(const BaseField &field, TQWidget *tqparent) +SolvingRateDialog::SolvingRateDialog(const BaseField &field, TQWidget *parent) : KDialogBase(Plain, i18n("Compute Solving Rate"), Ok|Close, - Close, tqparent, "compute_solving_rate", true, true), + Close, parent, "compute_solving_rate", true, true), _refField(field) { connect(&_solver, TQT_SIGNAL(solvingDone(bool)), TQT_SLOT(solvingDone(bool))); diff --git a/kmines/solver/solver.h b/kmines/solver/solver.h index 07b8881a..a5305aa3 100644 --- a/kmines/solver/solver.h +++ b/kmines/solver/solver.h @@ -34,7 +34,7 @@ class Solver : public TQObject Q_OBJECT TQ_OBJECT public: - Solver(TQObject *tqparent = 0); + Solver(TQObject *parent = 0); ~Solver(); /** A method to advice a point placement */ @@ -65,7 +65,7 @@ class SolvingRateDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - SolvingRateDialog(const BaseField &field, TQWidget *tqparent); + SolvingRateDialog(const BaseField &field, TQWidget *parent); private slots: void step(); diff --git a/kmines/status.cpp b/kmines/status.cpp index 6d20bf97..31fd7b36 100644 --- a/kmines/status.cpp +++ b/kmines/status.cpp @@ -45,8 +45,8 @@ #include "version.h" -tqStatus::tqStatus(TQWidget *tqparent) - : TQWidget(tqparent, "status"), _oldLevel(Level::Easy) +tqStatus::tqStatus(TQWidget *parent) + : TQWidget(parent, "status"), _oldLevel(Level::Easy) { _timer = new TQTimer(this); connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(replayStep())); diff --git a/kmines/status.h b/kmines/status.h index 3626473a..a91fcda9 100644 --- a/kmines/status.h +++ b/kmines/status.h @@ -35,7 +35,7 @@ class tqStatus : public TQWidget, public KMines Q_OBJECT TQ_OBJECT public : - tqStatus(TQWidget *tqparent); + tqStatus(TQWidget *parent); const Level ¤tLevel() const { return _field->level(); } bool isPlaying() const { return _field->gameState()==Playing; } diff --git a/knetwalk/src/cell.cpp b/knetwalk/src/cell.cpp index 7df96806..2847f4d2 100644 --- a/knetwalk/src/cell.cpp +++ b/knetwalk/src/cell.cpp @@ -69,7 +69,7 @@ void Cell::initPixmaps() } } -Cell::Cell(TQWidget* tqparent, int i) : TQWidget(tqparent, 0, WNoAutoErase) +Cell::Cell(TQWidget* parent, int i) : TQWidget(parent, 0, WNoAutoErase) { angle = 0; light = 0; diff --git a/knetwalk/src/cell.h b/knetwalk/src/cell.h index f2423362..6d8e2f75 100644 --- a/knetwalk/src/cell.h +++ b/knetwalk/src/cell.h @@ -24,7 +24,7 @@ class Cell : public TQWidget TQ_OBJECT public: enum Dirs { Free = 0, U = 1, R = 2, D = 4, L = 8, None = 16 }; - Cell(TQWidget* tqparent, int i); + Cell(TQWidget* parent, int i); int index() const; void rotate(int a); void setDirs(Dirs d); diff --git a/knetwalk/src/mainwindow.cpp b/knetwalk/src/mainwindow.cpp index 21de29c0..dbce60a4 100644 --- a/knetwalk/src/mainwindow.cpp +++ b/knetwalk/src/mainwindow.cpp @@ -52,8 +52,8 @@ static TQMap<Cell::Dirs, Cell::Dirs> contrdirs; -MainWindow::MainWindow(TQWidget *tqparent, const char* name, WFlags /*fl*/) : - KMainWindow(tqparent, name, WStyle_NoBorder) +MainWindow::MainWindow(TQWidget *parent, const char* name, WFlags /*fl*/) : + KMainWindow(parent, name, WStyle_NoBorder) { m_clickcount = 0; diff --git a/knetwalk/src/mainwindow.h b/knetwalk/src/mainwindow.h index 40402930..11118e0e 100644 --- a/knetwalk/src/mainwindow.h +++ b/knetwalk/src/mainwindow.h @@ -29,7 +29,7 @@ class MainWindow : public KMainWindow Q_OBJECT TQ_OBJECT public: - MainWindow(TQWidget *tqparent=0, const char* name=0, WFlags fl=0); + MainWindow(TQWidget *parent=0, const char* name=0, WFlags fl=0); protected: virtual void closeEvent(TQCloseEvent*); private: diff --git a/kolf/canvasitem.h b/kolf/canvasitem.h index 277fb15d..276e1dce 100644 --- a/kolf/canvasitem.h +++ b/kolf/canvasitem.h @@ -125,7 +125,7 @@ public: * returns a Config that can be used to configure this item by the user. * The default implementation returns one that says 'No configuration options'. */ - virtual Config *config(TQWidget *tqparent) { return new DefaultConfig(tqparent); } + virtual Config *config(TQWidget *parent) { return new DefaultConfig(parent); } /** * returns other items that should be moveable (besides this one of course). */ diff --git a/kolf/config.cpp b/kolf/config.cpp index 54618a45..0d9aafae 100644 --- a/kolf/config.cpp +++ b/kolf/config.cpp @@ -6,8 +6,8 @@ #include "config.h" -Config::Config(TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name) +Config::Config(TQWidget *parent, const char *name) + : TQFrame(parent, name) { startedUp = false; } @@ -33,15 +33,15 @@ void Config::changed() emit modified(); } -MessageConfig::MessageConfig(TQString text, TQWidget *tqparent, const char *name) - : Config(tqparent, name) +MessageConfig::MessageConfig(TQString text, TQWidget *parent, const char *name) + : Config(parent, name) { TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); tqlayout->addWidget(new TQLabel(text, this)); } -DefaultConfig::DefaultConfig(TQWidget *tqparent, const char *name) - : MessageConfig(i18n("No configuration options"), tqparent, name) +DefaultConfig::DefaultConfig(TQWidget *parent, const char *name) + : MessageConfig(i18n("No configuration options"), parent, name) { } diff --git a/kolf/config.h b/kolf/config.h index 5ca9892f..c53428a7 100644 --- a/kolf/config.h +++ b/kolf/config.h @@ -9,7 +9,7 @@ class Config : public TQFrame TQ_OBJECT public: - Config(TQWidget *tqparent, const char *name = 0); + Config(TQWidget *parent, const char *name = 0); void ctorDone(); signals: @@ -29,7 +29,7 @@ class MessageConfig : public Config TQ_OBJECT public: - MessageConfig(TQString text, TQWidget *tqparent, const char *name = 0); + MessageConfig(TQString text, TQWidget *parent, const char *name = 0); }; // internal @@ -39,7 +39,7 @@ class DefaultConfig : public MessageConfig TQ_OBJECT public: - DefaultConfig(TQWidget *tqparent, const char *name = 0); + DefaultConfig(TQWidget *parent, const char *name = 0); }; #endif diff --git a/kolf/editor.cpp b/kolf/editor.cpp index 88e3c375..ab8b1d0c 100644 --- a/kolf/editor.cpp +++ b/kolf/editor.cpp @@ -9,8 +9,8 @@ #include "editor.h" #include "game.h" -Editor::Editor(ObjectList *list, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +Editor::Editor(ObjectList *list, TQWidget *parent, const char *name) + : TQWidget(parent, name) { this->list = list; config = 0; diff --git a/kolf/floater.cpp b/kolf/floater.cpp index 1d33a2ca..fe6e6344 100644 --- a/kolf/floater.cpp +++ b/kolf/floater.cpp @@ -39,9 +39,9 @@ void FloaterGuide::setPoints(int xa, int ya, int xb, int yb) } } -Config *FloaterGuide::config(TQWidget *tqparent) +Config *FloaterGuide::config(TQWidget *parent) { - return floater->config(tqparent); + return floater->config(parent); } ///////////////////////// @@ -253,8 +253,8 @@ void Floater::firstMove(int x, int y) ///////////////////////// -FloaterConfig::FloaterConfig(Floater *floater, TQWidget *tqparent) - : BridgeConfig(floater, tqparent) +FloaterConfig::FloaterConfig(Floater *floater, TQWidget *parent) + : BridgeConfig(floater, parent) { this->floater = floater; m_vtqlayout->addStretch(); diff --git a/kolf/floater.h b/kolf/floater.h index fbbe10ec..e5b174ed 100644 --- a/kolf/floater.h +++ b/kolf/floater.h @@ -10,7 +10,7 @@ class FloaterConfig : public BridgeConfig TQ_OBJECT public: - FloaterConfig(Floater *floater, TQWidget *tqparent); + FloaterConfig(Floater *floater, TQWidget *parent); private slots: void speedChanged(int news); @@ -25,7 +25,7 @@ public: FloaterGuide(Floater *floater, TQCanvas *canvas) : Wall(canvas) { this->floater = floater; almostDead = false; } virtual void setPoints(int xa, int ya, int xb, int yb); virtual void moveBy(double dx, double dy); - virtual Config *config(TQWidget *tqparent); + virtual Config *config(TQWidget *parent); virtual void aboutToDelete(); virtual void aboutToDie(); @@ -52,7 +52,7 @@ public: virtual void editModeChanged(bool changed); virtual bool moveable() const { return false; } virtual void moveBy(double dx, double dy); - virtual Config *config(TQWidget *tqparent) { return new FloaterConfig(this, tqparent); } + virtual Config *config(TQWidget *parent) { return new FloaterConfig(this, parent); } virtual TQPtrList<TQCanvasItem> moveableItems() const; virtual void advance(int phase); void setSpeed(int news); diff --git a/kolf/game.cpp b/kolf/game.cpp index 32ebb9be..9ff1ed73 100644 --- a/kolf/game.cpp +++ b/kolf/game.cpp @@ -101,13 +101,13 @@ void RectPoint::moveBy(double dx, double dy) rect->newSize(nw, nh); } -Config *RectPoint::config(TQWidget *tqparent) +Config *RectPoint::config(TQWidget *parent) { CanvasItem *citem = dynamic_cast<CanvasItem *>(rect); if (citem) - return citem->config(tqparent); + return citem->config(parent); else - return CanvasItem::config(tqparent); + return CanvasItem::config(parent); } ///////////////////////// @@ -192,8 +192,8 @@ void Arrow::updateSelf() ///////////////////////// -BridgeConfig::BridgeConfig(Bridge *bridge, TQWidget *tqparent) - : Config(tqparent) +BridgeConfig::BridgeConfig(Bridge *bridge, TQWidget *parent) + : Config(parent) { this->bridge = bridge; @@ -401,8 +401,8 @@ void Bridge::setSize(int width, int height) ///////////////////////// -WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *tqparent) - : BridgeConfig(windmill, tqparent) +WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *parent) + : BridgeConfig(windmill, parent) { this->windmill = windmill; m_vtqlayout->addStretch(); @@ -639,8 +639,8 @@ void Sign::draw(TQPainter &painter) ///////////////////////// -SignConfig::SignConfig(Sign *sign, TQWidget *tqparent) - : BridgeConfig(sign, tqparent) +SignConfig::SignConfig(Sign *sign, TQWidget *parent) + : BridgeConfig(sign, parent) { this->sign = sign; m_vtqlayout->addStretch(); @@ -658,8 +658,8 @@ void SignConfig::textChanged(const TQString &text) ///////////////////////// -EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *tqparent) - : Config(tqparent), slow1(0), fast1(0), slow2(0), fast2(0), slider1(0), slider2(0) +EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent) + : Config(parent), slow1(0), fast1(0), slow2(0), fast2(0), slider1(0), slider2(0) { this->ellipse = ellipse; @@ -812,9 +812,9 @@ void Ellipse::save(KConfig *cfg) cfg->writeEntry("height", height()); } -Config *Ellipse::config(TQWidget *tqparent) +Config *Ellipse::config(TQWidget *parent) { - return new EllipseConfig(this, tqparent); + return new EllipseConfig(this, parent); } void Ellipse::aboutToSave() @@ -1492,15 +1492,15 @@ void BlackHoleExit::hideInfo() arrow->tqsetVisible(false); } -Config *BlackHoleExit::config(TQWidget *tqparent) +Config *BlackHoleExit::config(TQWidget *parent) { - return blackHole->config(tqparent); + return blackHole->config(parent); } ///////////////////////// -BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *tqparent) - : Config(tqparent) +BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent) + : Config(parent) { this->blackHole = blackHole; TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); @@ -1954,8 +1954,8 @@ void Wall::save(KConfig *cfg) ///////////////////////// -HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *tqparent) - : Config(tqparent) +HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent) + : Config(parent) { this->holeInfo = holeInfo; @@ -2139,8 +2139,8 @@ void StrokeCircle::draw(TQPainter &p) ///////////////////////////////////////// -KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWidget *tqparent, const char *name ) - : TQCanvasView(tqparent, name) +KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWidget *parent, const char *name ) + : TQCanvasView(parent, name) { // for mouse control setMouseTracking(true); diff --git a/kolf/game.h b/kolf/game.h index ec986c52..e1766802 100644 --- a/kolf/game.h +++ b/kolf/game.h @@ -142,7 +142,7 @@ public: RectPoint(TQColor color, RectItem *, TQCanvas *canvas); void dontMove() { dontmove = true; } virtual void moveBy(double dx, double dy); - virtual Config *config(TQWidget *tqparent); + virtual Config *config(TQWidget *parent); virtual bool deleteable() const { return false; } virtual bool cornerResize() const { return true; } virtual CanvasItem *itemToDelete() { return dynamic_cast<CanvasItem *>(rect); } @@ -181,7 +181,7 @@ public: virtual void save(KConfig *cfg); virtual void load(KConfig *cfg); - virtual Config *config(TQWidget *tqparent); + virtual Config *config(TQWidget *parent); protected: RectPoint *point; @@ -321,7 +321,7 @@ class BlackHoleConfig : public Config TQ_OBJECT public: - BlackHoleConfig(BlackHole *blackHole, TQWidget *tqparent); + BlackHoleConfig(BlackHole *blackHole, TQWidget *parent); private slots: void degChanged(int); @@ -346,7 +346,7 @@ public: virtual void hideInfo(); void updateArrowAngle(); void updateArrowLength(); - virtual Config *config(TQWidget *tqparent); + virtual Config *config(TQWidget *parent); BlackHole *blackHole; protected: @@ -386,7 +386,7 @@ public: virtual bool place(Ball *ball, bool wasCenter); virtual void save(KConfig *cfg); virtual void load(KConfig *cfg); - virtual Config *config(TQWidget *tqparent) { return new BlackHoleConfig(this, tqparent); } + virtual Config *config(TQWidget *parent) { return new BlackHoleConfig(this, parent); } virtual TQPtrList<TQCanvasItem> moveableItems() const; double minSpeed() const { return m_minSpeed; } double maxSpeed() const { return m_maxSpeed; } @@ -479,7 +479,7 @@ public: virtual bool collision(Ball *ball, long int id); virtual CanvasItem *itemToDelete() { return wall; } virtual void clean(); - virtual Config *config(TQWidget *tqparent) { return wall->config(tqparent); } + virtual Config *config(TQWidget *parent) { return wall->config(parent); } void dontMove() { dontmove = true; }; void updateVisible(); @@ -581,7 +581,7 @@ public: void doSave(KConfig *cfg); virtual void newSize(int width, int height); virtual void setGame(KolfGame *game); - virtual Config *config(TQWidget *tqparent) { return new BridgeConfig(this, tqparent); } + virtual Config *config(TQWidget *parent) { return new BridgeConfig(this, parent); } void setSize(int width, int height); virtual TQPtrList<TQCanvasItem> moveableItems() const; @@ -621,7 +621,7 @@ class SignConfig : public BridgeConfig TQ_OBJECT public: - SignConfig(Sign *sign, TQWidget *tqparent); + SignConfig(Sign *sign, TQWidget *parent); private slots: void textChanged(const TQString &); @@ -637,7 +637,7 @@ public: TQString text() const { return m_text; } virtual void draw(TQPainter &painter); virtual bool vStrut() const { return false; } - virtual Config *config(TQWidget *tqparent) { return new SignConfig(this, tqparent); } + virtual Config *config(TQWidget *parent) { return new SignConfig(this, parent); } virtual void save(KConfig *cfg); virtual void load(KConfig *cfg); @@ -670,7 +670,7 @@ class WindmillConfig : public BridgeConfig TQ_OBJECT public: - WindmillConfig(Windmill *windmill, TQWidget *tqparent); + WindmillConfig(Windmill *windmill, TQWidget *parent); private slots: void speedChanged(int news); @@ -688,7 +688,7 @@ public: virtual void save(KConfig *cfg); virtual void load(KConfig *cfg); virtual void setGame(KolfGame *game); - virtual Config *config(TQWidget *tqparent) { return new WindmillConfig(this, tqparent); } + virtual Config *config(TQWidget *parent) { return new WindmillConfig(this, parent); } void setSize(int width, int height); virtual void moveBy(double dx, double dy); void setSpeed(int news); @@ -749,7 +749,7 @@ public: TQString name() const { return m_name; } TQString untranslatedName() const { return m_untranslatedName; } - virtual Config *config(TQWidget *tqparent) { return new HoleConfig(this, tqparent); } + virtual Config *config(TQWidget *parent) { return new HoleConfig(this, parent); } void borderWallsChanged(bool yes); bool borderWalls() const { return m_borderWalls; } @@ -804,7 +804,7 @@ class KDE_EXPORT KolfGame : public TQCanvasView TQ_OBJECT public: - KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWidget *tqparent=0, const char *name=0 ); + KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWidget *parent=0, const char *name=0 ); ~KolfGame(); void setObjects(ObjectList *obj) { this->obj = obj; } void setFilename(const TQString &filename); diff --git a/kolf/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp index 1dfe8a79..99d86cf8 100644 --- a/kolf/kcomboboxdialog.cpp +++ b/kolf/kcomboboxdialog.cpp @@ -34,8 +34,8 @@ #include "kcomboboxdialog.h" -KComboBoxDialog::KComboBoxDialog( const TQString &_text, const TQStringList &_items, const TQString& _value, bool showDontAskAgain, TQWidget *tqparent ) - : KDialogBase( Plain, TQString(), Ok, Ok, tqparent, 0L, true, true ) +KComboBoxDialog::KComboBoxDialog( const TQString &_text, const TQStringList &_items, const TQString& _value, bool showDontAskAgain, TQWidget *parent ) + : KDialogBase( Plain, TQString(), Ok, Ok, parent, 0L, true, true ) { TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), marginHint(), spacingHint() ); TQLabel *label = new TQLabel(_text, plainPage() ); @@ -76,12 +76,12 @@ bool KComboBoxDialog::dontAskAgainChecked() return false; } -TQString KComboBoxDialog::getItem( const TQString &_text, const TQStringList &_items, const TQString& _value, const TQString &dontAskAgainName, TQWidget *tqparent ) +TQString KComboBoxDialog::getItem( const TQString &_text, const TQStringList &_items, const TQString& _value, const TQString &dontAskAgainName, TQWidget *parent ) { - return getItem( _text, TQString(), _items, _value, dontAskAgainName, tqparent ); + return getItem( _text, TQString(), _items, _value, dontAskAgainName, parent ); } -TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_caption, const TQStringList &_items, const TQString& _value, const TQString &dontAskAgainName, TQWidget *tqparent ) +TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_caption, const TQStringList &_items, const TQString& _value, const TQString &dontAskAgainName, TQWidget *parent ) { TQString prevAnswer; if ( !dontAskAgainName.isEmpty() ) @@ -94,7 +94,7 @@ TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_capti return prevAnswer; } - KComboBoxDialog dlg( _text, _items, _value, !dontAskAgainName.isNull(), tqparent ); + KComboBoxDialog dlg( _text, _items, _value, !dontAskAgainName.isNull(), parent ); if ( !_caption.isNull() ) dlg.setCaption( _caption ); @@ -115,9 +115,9 @@ TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_capti return text; } -TQString KComboBoxDialog::getText(const TQString &_caption, const TQString &_text, const TQString &_value, bool *ok, TQWidget *tqparent, const TQString &configName, KConfig *config) +TQString KComboBoxDialog::getText(const TQString &_caption, const TQString &_text, const TQString &_value, bool *ok, TQWidget *parent, const TQString &configName, KConfig *config) { - KComboBoxDialog dlg(_text, TQStringList(), _value, false, tqparent); + KComboBoxDialog dlg(_text, TQStringList(), _value, false, parent); if ( !_caption.isNull() ) dlg.setCaption( _caption ); diff --git a/kolf/kcomboboxdialog.h b/kolf/kcomboboxdialog.h index 91097f16..8db79122 100644 --- a/kolf/kcomboboxdialog.h +++ b/kolf/kcomboboxdialog.h @@ -52,7 +52,7 @@ public: * @param _text Text of the label * @param _value Initial value of the combobox */ - KComboBoxDialog( const TQString &_text, const TQStringList& _items, const TQString& _value = TQString(), bool showDontAskAgain = false, TQWidget *tqparent = 0 ); + KComboBoxDialog( const TQString &_text, const TQStringList& _items, const TQString& _value = TQString(), bool showDontAskAgain = false, TQWidget *parent = 0 ); virtual ~KComboBoxDialog(); /** @@ -73,7 +73,7 @@ public: * @param _value Initial value of the inputline * @param dontAskAgainName Name for saving whether the user doesn't want to be asked again; use TQString() to disable */ - static TQString getItem( const TQString &_text, const TQStringList &_items, const TQString& _value = TQString(), const TQString &dontAskAgainName = TQString(), TQWidget *tqparent = 0 ); + static TQString getItem( const TQString &_text, const TQStringList &_items, const TQString& _value = TQString(), const TQString &dontAskAgainName = TQString(), TQWidget *parent = 0 ); /** * Static convenience function to get input from the user. @@ -85,7 +85,7 @@ public: * @param _value Initial value of the inputline * @param dontAskAgainName Name for saving whether the user doesn't want to be asked again; use TQString() to disable */ - static TQString getItem( const TQString &_text, const TQString &_caption, const TQStringList &_items, const TQString& _value = TQString(), const TQString &dontAskAgainName = TQString(), TQWidget *tqparent = 0 ); + static TQString getItem( const TQString &_text, const TQString &_caption, const TQStringList &_items, const TQString& _value = TQString(), const TQString &dontAskAgainName = TQString(), TQWidget *parent = 0 ); /** * Static convenience method. @@ -96,13 +96,13 @@ public: * @param _text Text of the label * @param _value Initial value of the inputline * @param ok Variable to store whether the user hit OK - * @param tqparent Parent widget for the dialog + * @param parent Parent widget for the dialog * @param configName Name of the dialog for saving the completion and history * @parma config KConfig for saving the completion and history */ static TQString getText(const TQString &_caption, const TQString &_text, const TQString &_value = TQString(), - bool *ok = 0, TQWidget *tqparent = 0, + bool *ok = 0, TQWidget *parent = 0, const TQString &configName = TQString(), KConfig *config = KGlobal::config()); diff --git a/kolf/kvolumecontrol.cpp b/kolf/kvolumecontrol.cpp index b2028b77..e2aaa464 100644 --- a/kolf/kvolumecontrol.cpp +++ b/kolf/kvolumecontrol.cpp @@ -5,14 +5,14 @@ #include "kvolumecontrol.h" -KVolumeControl::KVolumeControl(Arts::SoundServerV2 server, KPlayObject *tqparent) - : TQObject(tqparent) +KVolumeControl::KVolumeControl(Arts::SoundServerV2 server, KPlayObject *parent) + : TQObject(parent) { init(server); } -KVolumeControl::KVolumeControl(double vol, Arts::SoundServerV2 server, KPlayObject *tqparent) - : TQObject(tqparent) +KVolumeControl::KVolumeControl(double vol, Arts::SoundServerV2 server, KPlayObject *parent) + : TQObject(parent) { init(server); setVolume(vol); @@ -42,8 +42,8 @@ void KVolumeControl::init(Arts::SoundServerV2 server) } volumeControl.start(); - Arts::connect((static_cast<KPlayObject *>(tqparent()))->object(), "left", volumeControl, "inleft"); - Arts::connect((static_cast<KPlayObject *>(tqparent()))->object(), "right", volumeControl, "inright"); + Arts::connect((static_cast<KPlayObject *>(parent()))->object(), "left", volumeControl, "inleft"); + Arts::connect((static_cast<KPlayObject *>(parent()))->object(), "right", volumeControl, "inright"); Arts::connect(volumeControl, manager); } diff --git a/kolf/kvolumecontrol.h b/kolf/kvolumecontrol.h index 190b3beb..82e70e90 100644 --- a/kolf/kvolumecontrol.h +++ b/kolf/kvolumecontrol.h @@ -12,8 +12,8 @@ Q_OBJECT TQ_OBJECT public: - KVolumeControl(Arts::SoundServerV2 server, KPlayObject *tqparent); - KVolumeControl(double vol, Arts::SoundServerV2 server, KPlayObject *tqparent); + KVolumeControl(Arts::SoundServerV2 server, KPlayObject *parent); + KVolumeControl(double vol, Arts::SoundServerV2 server, KPlayObject *parent); ~KVolumeControl(); void setVolume(double); diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp index 5badc856..8ee1f7c7 100644 --- a/kolf/newgame.cpp +++ b/kolf/newgame.cpp @@ -35,8 +35,8 @@ #include "newgame.h" #include "game.h" -NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *tqparent, const char *_name) - : KDialogBase(KDialogBase::TreeList, i18n("New Game"), Ok | Cancel, Ok, tqparent, _name) +NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_name) + : KDialogBase(KDialogBase::TreeList, i18n("New Game"), Ok | Cancel, Ok, parent, _name) { this->enableCourses = enableCourses; @@ -311,8 +311,8 @@ void NewGameDialog::enableButtons() ///////////////////////// -PlayerEditor::PlayerEditor(TQString startName, TQColor startColor, TQWidget *tqparent, const char *_name) - : TQWidget(tqparent, _name) +PlayerEditor::PlayerEditor(TQString startName, TQColor startColor, TQWidget *parent, const char *_name) + : TQWidget(parent, _name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this, KDialogBase::spacingHint()); diff --git a/kolf/newgame.h b/kolf/newgame.h index ce5b8060..4d0d1af5 100644 --- a/kolf/newgame.h +++ b/kolf/newgame.h @@ -30,7 +30,7 @@ class PlayerEditor : public TQWidget TQ_OBJECT public: - PlayerEditor(TQString name = TQString(), TQColor = red, TQWidget *tqparent = 0, const char *_name = 0); + PlayerEditor(TQString name = TQString(), TQColor = red, TQWidget *parent = 0, const char *_name = 0); TQColor color() { return colorButton->color(); } TQString name() { return editor->text(); } void setColor(TQColor col) { colorButton->setColor(col); } @@ -54,7 +54,7 @@ class NewGameDialog : public KDialogBase TQ_OBJECT public: - NewGameDialog(bool enableCourses, TQWidget *tqparent, const char *_name = 0); + NewGameDialog(bool enableCourses, TQWidget *parent, const char *_name = 0); TQPtrList<PlayerEditor> *players() { return &editors; } bool competition() { return mode->isChecked(); } TQString course() { return currentCourse; } diff --git a/kolf/object.h b/kolf/object.h index 74464bb6..b04822a8 100644 --- a/kolf/object.h +++ b/kolf/object.h @@ -13,7 +13,7 @@ class Object : public TQObject TQ_OBJECT public: - Object(TQObject *tqparent = 0, const char *name = 0) : TQObject(tqparent, name) { m_addOnNewHole = false; } + Object(TQObject *parent = 0, const char *name = 0) : TQObject(parent, name) { m_addOnNewHole = false; } virtual TQCanvasItem *newObject(TQCanvas * /*canvas*/) { return 0; } TQString name() { return m_name; } TQString _name() { return m__name; } diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp index 18d3ca5b..10a26b9c 100644 --- a/kolf/objects/poolball/poolball.cpp +++ b/kolf/objects/poolball/poolball.cpp @@ -54,8 +54,8 @@ void PoolBall::draw(TQPainter &p) Ball::draw(p); } -PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *tqparent) - : Config(tqparent), m_poolBall(poolBall) +PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *parent) + : Config(parent), m_poolBall(poolBall) { TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); @@ -78,9 +78,9 @@ void PoolBallConfig::numberChanged(int newNumber) changed(); } -Config *PoolBall::config(TQWidget *tqparent) +Config *PoolBall::config(TQWidget *parent) { - return new PoolBallConfig(this, tqparent); + return new PoolBallConfig(this, parent); } #include "poolball.moc" diff --git a/kolf/objects/poolball/poolball.h b/kolf/objects/poolball/poolball.h index fac2ef11..db09f7bd 100644 --- a/kolf/objects/poolball/poolball.h +++ b/kolf/objects/poolball/poolball.h @@ -30,7 +30,7 @@ public: virtual bool deleteable() const { return true; } - virtual Config *config(TQWidget *tqparent); + virtual Config *config(TQWidget *parent); virtual void saveState(StateDB *); virtual void save(KConfig *cfg); virtual void loadState(StateDB *); @@ -51,7 +51,7 @@ class PoolBallConfig : public Config TQ_OBJECT public: - PoolBallConfig(PoolBall *poolBall, TQWidget *tqparent); + PoolBallConfig(PoolBall *poolBall, TQWidget *parent); private slots: void numberChanged(int); diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp index 38a40f22..bb3af320 100644 --- a/kolf/objects/test/test.cpp +++ b/kolf/objects/test/test.cpp @@ -14,7 +14,7 @@ #include "test.h" K_EXPORT_COMPONENT_FACTORY(libkolftest, TestFactory) -TQObject *TestFactory::createObject (TQObject * /*tqparent*/, const char * /*name*/, const char * /*classname*/, const TQStringList & /*args*/) +TQObject *TestFactory::createObject (TQObject * /*parent*/, const char * /*name*/, const char * /*classname*/, const TQStringList & /*args*/) { return new TestObj; } Test::Test(TQCanvas *canvas) @@ -65,8 +65,8 @@ void Test::load(KConfig *cfg) setSwitchEvery(cfg->readNumEntry("switchEvery", 50)); } -TestConfig::TestConfig(Test *test, TQWidget *tqparent) - : Config(tqparent), m_test(test) +TestConfig::TestConfig(Test *test, TQWidget *parent) + : Config(parent), m_test(test) { TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); @@ -96,9 +96,9 @@ void TestConfig::switchEveryChanged(int news) changed(); } -Config *Test::config(TQWidget *tqparent) +Config *Test::config(TQWidget *parent) { - return new TestConfig(this, tqparent); + return new TestConfig(this, parent); } #include "test.moc" diff --git a/kolf/objects/test/test.h b/kolf/objects/test/test.h index c8fa6838..d4f00f41 100644 --- a/kolf/objects/test/test.h +++ b/kolf/objects/test/test.h @@ -24,7 +24,7 @@ class Test : public TQCanvasEllipse, public CanvasItem public: Test(TQCanvas *canvas); - virtual Config *config(TQWidget *tqparent); + virtual Config *config(TQWidget *parent); virtual void save(KConfig *cfg); virtual void load(KConfig *cfg); @@ -44,7 +44,7 @@ class TestConfig : public Config TQ_OBJECT public: - TestConfig(Test *test, TQWidget *tqparent); + TestConfig(Test *test, TQWidget *parent); private slots: void switchEveryChanged(int news); diff --git a/kolf/printdialogpage.cpp b/kolf/printdialogpage.cpp index dfec9c96..e60de7ea 100644 --- a/kolf/printdialogpage.cpp +++ b/kolf/printdialogpage.cpp @@ -8,8 +8,8 @@ #include "printdialogpage.h" -PrintDialogPage::PrintDialogPage(TQWidget *tqparent, const char *name) - : KPrintDialogPage( tqparent, name ) +PrintDialogPage::PrintDialogPage(TQWidget *parent, const char *name) + : KPrintDialogPage( parent, name ) { setTitle(i18n("Kolf Options")); diff --git a/kolf/printdialogpage.h b/kolf/printdialogpage.h index 4869ea53..ea2fe9f8 100644 --- a/kolf/printdialogpage.h +++ b/kolf/printdialogpage.h @@ -14,7 +14,7 @@ class PrintDialogPage : public KPrintDialogPage TQ_OBJECT public: - PrintDialogPage(TQWidget *tqparent = 0, const char *name = 0); + PrintDialogPage(TQWidget *parent = 0, const char *name = 0); //reimplement virtual functions void getOptions(TQMap<TQString, TQString> &opts, bool incldef = false); diff --git a/kolf/scoreboard.cpp b/kolf/scoreboard.cpp index cdd5759b..717dbc36 100644 --- a/kolf/scoreboard.cpp +++ b/kolf/scoreboard.cpp @@ -9,8 +9,8 @@ #include "scoreboard.h" -ScoreBoard::ScoreBoard(TQWidget *tqparent, const char *name) - : TQTable(1, 1, tqparent, name) +ScoreBoard::ScoreBoard(TQWidget *parent, const char *name) + : TQTable(1, 1, parent, name) { vh = verticalHeader(); hh = horizontalHeader(); diff --git a/kolf/scoreboard.h b/kolf/scoreboard.h index f15a323a..8f558e0e 100644 --- a/kolf/scoreboard.h +++ b/kolf/scoreboard.h @@ -12,7 +12,7 @@ class ScoreBoard : public TQTable TQ_OBJECT public: - ScoreBoard(TQWidget *tqparent = 0, const char *name = 0); + ScoreBoard(TQWidget *parent = 0, const char *name = 0); int total(int id, TQString &name); public slots: diff --git a/kolf/slope.cpp b/kolf/slope.cpp index 7d9db148..db79cff8 100644 --- a/kolf/slope.cpp +++ b/kolf/slope.cpp @@ -507,7 +507,7 @@ void Slope::updatePixmap() } bpainter.drawPolygon(r); - // tqmask is drawn + // mask is drawn pixmap.setMask(bitmap); } @@ -517,8 +517,8 @@ void Slope::updatePixmap() ///////////////////////// -SlopeConfig::SlopeConfig(Slope *slope, TQWidget *tqparent) - : Config(tqparent) +SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent) + : Config(parent) { this->slope = slope; TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); diff --git a/kolf/slope.h b/kolf/slope.h index c829ad36..5b025edb 100644 --- a/kolf/slope.h +++ b/kolf/slope.h @@ -12,7 +12,7 @@ class SlopeConfig : public Config TQ_OBJECT public: - SlopeConfig(Slope *slope, TQWidget *tqparent); + SlopeConfig(Slope *slope, TQWidget *parent); private slots: void setGradient(const TQString &text); @@ -36,7 +36,7 @@ public: virtual void editModeChanged(bool changed); virtual bool canBeMovedByOthers() const { return !stuckOnGround; } virtual TQPtrList<TQCanvasItem> moveableItems() const; - virtual Config *config(TQWidget *tqparent) { return new SlopeConfig(this, tqparent); } + virtual Config *config(TQWidget *parent) { return new SlopeConfig(this, parent); } void setSize(int, int); virtual void newSize(int width, int height); diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc index e2194089..b78053e4 100644 --- a/konquest/fleetdlg.cc +++ b/konquest/fleetdlg.cc @@ -8,7 +8,7 @@ #include "fleetdlg.h" -FleetDlgListViewItem::FleetDlgListViewItem(TQListView *tqparent, TQString s1, TQString s2, TQString s3, TQString s4, TQString s5) : TQListViewItem(tqparent, s1, s2, s3, s4, s5) +FleetDlgListViewItem::FleetDlgListViewItem(TQListView *parent, TQString s1, TQString s2, TQString s3, TQString s4, TQString s5) : TQListViewItem(parent, s1, s2, s3, s4, s5) { } @@ -35,8 +35,8 @@ int FleetDlgListViewItem::compare(TQListViewItem *i, int col, bool) const } -FleetDlg::FleetDlg( TQWidget *tqparent, AttackFleetList *fleets ) - : TQDialog(tqparent, "FleetDlg", true ), fleetList(fleets) +FleetDlg::FleetDlg( TQWidget *parent, AttackFleetList *fleets ) + : TQDialog(parent, "FleetDlg", true ), fleetList(fleets) { setCaption( kapp->makeStdCaption(i18n("Fleet Overview")) ); diff --git a/konquest/fleetdlg.h b/konquest/fleetdlg.h index a823cf0c..a82ebfa9 100644 --- a/konquest/fleetdlg.h +++ b/konquest/fleetdlg.h @@ -10,14 +10,14 @@ class FleetDlgListViewItem : public TQListViewItem { public: - FleetDlgListViewItem(TQListView *tqparent, TQString s1, TQString s2, TQString s3, TQString s4, TQString s5); + FleetDlgListViewItem(TQListView *parent, TQString s1, TQString s2, TQString s3, TQString s4, TQString s5); int compare(TQListViewItem *i, int col, bool) const; }; class FleetDlg : public TQDialog { public: - FleetDlg( TQWidget *tqparent, AttackFleetList *fleets ); + FleetDlg( TQWidget *parent, AttackFleetList *fleets ); private: void init(); diff --git a/konquest/gameboard.cc b/konquest/gameboard.cc index 96433e02..9f1d1a7f 100644 --- a/konquest/gameboard.cc +++ b/konquest/gameboard.cc @@ -33,8 +33,8 @@ /********************************************************************* Game Board *********************************************************************/ -GameBoard::GameBoard( TQWidget *tqparent ) - : TQWidget( tqparent ), gameInProgress( false ), gameState( NONE ) +GameBoard::GameBoard( TQWidget *parent ) + : TQWidget( parent ), gameInProgress( false ), gameState( NONE ) { TQColorGroup cg( white, black, green.light(), green.dark(), green, green.dark(75), green.dark() ); TQPalette palette( cg, cg, cg ); diff --git a/konquest/gameboard.h b/konquest/gameboard.h index 7826d00f..e429a4a4 100644 --- a/konquest/gameboard.h +++ b/konquest/gameboard.h @@ -27,7 +27,7 @@ class GameBoard : public TQWidget TQ_OBJECT public: - GameBoard( TQWidget *tqparent ); + GameBoard( TQWidget *parent ); virtual ~GameBoard(); bool isGameInProgress(void) const { return gameInProgress; } diff --git a/konquest/gameenddlg.cc b/konquest/gameenddlg.cc index 2c31869e..726f0561 100644 --- a/konquest/gameenddlg.cc +++ b/konquest/gameenddlg.cc @@ -11,10 +11,10 @@ #include "gameenddlg.h" #include "gameenddlg.moc" -GameEndDlg::GameEndDlg( TQWidget *tqparent ) +GameEndDlg::GameEndDlg( TQWidget *parent ) : KDialogBase( i18n("Out of Turns"), KDialogBase::Yes|KDialogBase::No, KDialogBase::Yes, KDialogBase::No, - tqparent, "end_game_dialog", true, true ) + parent, "end_game_dialog", true, true ) { TQVBox *page = makeVBoxMainWidget(); diff --git a/konquest/gameenddlg.h b/konquest/gameenddlg.h index 4836a795..19ad48f3 100644 --- a/konquest/gameenddlg.h +++ b/konquest/gameenddlg.h @@ -12,7 +12,7 @@ class GameEndDlg : public KDialogBase TQ_OBJECT public: - GameEndDlg( TQWidget *tqparent ); + GameEndDlg( TQWidget *parent ); virtual ~GameEndDlg(); int extraTurns(); diff --git a/konquest/int_validator.cc b/konquest/int_validator.cc index 06315b18..dd96ca82 100644 --- a/konquest/int_validator.cc +++ b/konquest/int_validator.cc @@ -3,8 +3,8 @@ #include "int_validator.h" #include "int_validator.moc" -IntValidator::IntValidator( TQWidget *tqparent, const char *name ) : - TQValidator( TQT_TQOBJECT(tqparent), name ) +IntValidator::IntValidator( TQWidget *parent, const char *name ) : + TQValidator( TQT_TQOBJECT(parent), name ) { #ifdef INT_MIN v_bottom = INT_MIN; @@ -14,8 +14,8 @@ IntValidator::IntValidator( TQWidget *tqparent, const char *name ) : v_top = INT_MIN; } -IntValidator::IntValidator( int bottom, int top, TQWidget *tqparent, const char *name ) : -TQValidator( TQT_TQOBJECT(tqparent), name ) +IntValidator::IntValidator( int bottom, int top, TQWidget *parent, const char *name ) : +TQValidator( TQT_TQOBJECT(parent), name ) { v_bottom = bottom; v_top = top; diff --git a/konquest/int_validator.h b/konquest/int_validator.h index 4f995158..f1c48ff6 100644 --- a/konquest/int_validator.h +++ b/konquest/int_validator.h @@ -10,8 +10,8 @@ class IntValidator : public TQValidator TQ_OBJECT public: - IntValidator( TQWidget *tqparent, const char *name = 0 ); - IntValidator( int bottom, int top, TQWidget *tqparent, const char *name = 0 ); + IntValidator( TQWidget *parent, const char *name = 0 ); + IntValidator( int bottom, int top, TQWidget *parent, const char *name = 0 ); virtual ~IntValidator(); diff --git a/konquest/map_widget.cc b/konquest/map_widget.cc index e6d8512c..3d0cd67e 100644 --- a/konquest/map_widget.cc +++ b/konquest/map_widget.cc @@ -9,8 +9,8 @@ #include <kglobal.h> #include "map_widget.moc" -ConquestMap::ConquestMap( Map *newMap, TQWidget *tqparent ) - : TQGridView( tqparent ), +ConquestMap::ConquestMap( Map *newMap, TQWidget *parent ) + : TQGridView( parent ), SECTOR_HEIGHT( 28 ), SECTOR_WIDTH( 28 ), BOARD_HEIGHT( newMap->getRows() * SECTOR_HEIGHT ), BOARD_WIDTH( newMap->getColumns() * SECTOR_WIDTH ), diff --git a/konquest/map_widget.h b/konquest/map_widget.h index e408b2dd..4f274a47 100644 --- a/konquest/map_widget.h +++ b/konquest/map_widget.h @@ -20,7 +20,7 @@ class ConquestMap : public TQGridView // Constructors public: - ConquestMap( Map *newMap, TQWidget *tqparent = 0 ); + ConquestMap( Map *newMap, TQWidget *parent = 0 ); virtual ~ConquestMap(); // Interface diff --git a/konquest/minimap.cc b/konquest/minimap.cc index c08e7282..a287ab79 100644 --- a/konquest/minimap.cc +++ b/konquest/minimap.cc @@ -7,8 +7,8 @@ #include "minimap.h" #include "minimap.moc" -MiniMap::MiniMap( TQWidget *tqparent, const char *name ) - : TQGridView( tqparent, name ), +MiniMap::MiniMap( TQWidget *parent, const char *name ) + : TQGridView( parent, name ), SECTOR_HEIGHT( 12 ), SECTOR_WIDTH( 12 ), BOARD_HEIGHT( 10 * SECTOR_HEIGHT ), BOARD_WIDTH( 10 * SECTOR_WIDTH ), diff --git a/konquest/minimap.h b/konquest/minimap.h index 33d90ef2..f285133f 100644 --- a/konquest/minimap.h +++ b/konquest/minimap.h @@ -18,7 +18,7 @@ class MiniMap : public TQGridView // Constructors public: - MiniMap( TQWidget *tqparent = 0, const char* name = 0 ); + MiniMap( TQWidget *parent = 0, const char* name = 0 ); virtual ~MiniMap(); void setMap( Map *newMap ); diff --git a/konquest/newgamedlg.cc b/konquest/newgamedlg.cc index fffe17d4..a3d2718b 100644 --- a/konquest/newgamedlg.cc +++ b/konquest/newgamedlg.cc @@ -25,9 +25,9 @@ New Game Dialog Members ************************************************************************/ -NewGameDlg::NewGameDlg( TQWidget *tqparent, Map *pmap, PlayerList *players, +NewGameDlg::NewGameDlg( TQWidget *parent, Map *pmap, PlayerList *players, Player *neutralPlayer, PlanetList *planets ) - : KDialogBase( tqparent, "new_game_dialog", true, i18n("Start New Game"), + : KDialogBase( parent, "new_game_dialog", true, i18n("Start New Game"), KDialogBase::Ok|KDialogBase::Default|KDialogBase::Cancel, KDialogBase::NoDefault, true ), plrList(players), plnetList(planets), neutral(neutralPlayer), map(pmap) diff --git a/konquest/newgamedlg.h b/konquest/newgamedlg.h index b3c93b2c..874373fe 100644 --- a/konquest/newgamedlg.h +++ b/konquest/newgamedlg.h @@ -18,7 +18,7 @@ class NewGameDlg : public KDialogBase TQ_OBJECT public: - NewGameDlg( TQWidget *tqparent, Map *map, PlayerList *playerList, + NewGameDlg( TQWidget *parent, Map *map, PlayerList *playerList, Player *neutralPlayer, PlanetList *planetList ); int turns( void ); diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc index a9f03034..9343fb81 100644 --- a/konquest/planet_info.cc +++ b/konquest/planet_info.cc @@ -9,8 +9,8 @@ #include <kglobal.h> #include "planet_info.moc" -PlanetInfo::PlanetInfo( TQWidget *tqparent, TQPalette palette ) - : TQFrame( tqparent ) +PlanetInfo::PlanetInfo( TQWidget *parent, TQPalette palette ) + : TQFrame( parent ) { setPalette( palette ); diff --git a/konquest/planet_info.h b/konquest/planet_info.h index c4386cee..ade4b9b7 100644 --- a/konquest/planet_info.h +++ b/konquest/planet_info.h @@ -26,7 +26,7 @@ class PlanetInfo : public TQFrame TQ_OBJECT public: - PlanetInfo( TQWidget *tqparent, TQPalette palette ); + PlanetInfo( TQWidget *parent, TQPalette palette ); virtual ~PlanetInfo(); void setPlanetList( PlanetList &newPlanets ); diff --git a/konquest/scoredlg.cc b/konquest/scoredlg.cc index 3400032e..843867bb 100644 --- a/konquest/scoredlg.cc +++ b/konquest/scoredlg.cc @@ -6,7 +6,7 @@ #include "scoredlg.h" -ScoreDlgListViewItem::ScoreDlgListViewItem(TQListView *tqparent, TQString s1, TQString s2, TQString s3, TQString s4, TQString s5, TQString s6) : TQListViewItem(tqparent, s1, s2, s3, s4, s5, s6) +ScoreDlgListViewItem::ScoreDlgListViewItem(TQListView *parent, TQString s1, TQString s2, TQString s3, TQString s4, TQString s5, TQString s6) : TQListViewItem(parent, s1, s2, s3, s4, s5, s6) { } @@ -27,8 +27,8 @@ int ScoreDlgListViewItem::compare(TQListViewItem *i, int col, bool) const } -ScoreDlg::ScoreDlg( TQWidget *tqparent, const TQString& title, PlayerList *players ) - : TQDialog(tqparent, "ScoreDlg", true ), plrList(players) +ScoreDlg::ScoreDlg( TQWidget *parent, const TQString& title, PlayerList *players ) + : TQDialog(parent, "ScoreDlg", true ), plrList(players) { setCaption( kapp->makeStdCaption(title) ); diff --git a/konquest/scoredlg.h b/konquest/scoredlg.h index 88b7911d..22fbc549 100644 --- a/konquest/scoredlg.h +++ b/konquest/scoredlg.h @@ -10,7 +10,7 @@ class ScoreDlgListViewItem : public TQListViewItem { public: - ScoreDlgListViewItem(TQListView *tqparent, TQString s1, TQString s2, TQString s3, TQString s4, TQString s5, TQString s6); + ScoreDlgListViewItem(TQListView *parent, TQString s1, TQString s2, TQString s3, TQString s4, TQString s5, TQString s6); int compare(TQListViewItem *i, int col, bool) const; }; @@ -18,7 +18,7 @@ class ScoreDlg : public TQDialog { public: - ScoreDlg( TQWidget *tqparent, const TQString& title, PlayerList *players ); + ScoreDlg( TQWidget *parent, const TQString& title, PlayerList *players ); private: void init(); diff --git a/kpat/card.h b/kpat/card.h index 88b4fec3..109f3e87 100644 --- a/kpat/card.h +++ b/kpat/card.h @@ -54,7 +54,7 @@ public: enum Rank { None = 0, Ace = 1, Two, Three, Four, Five, Six, Seven, Eight, Nine, Ten, Jack, Queen, King }; - Card( Rank r, Suit s, TQCanvas *tqparent=0); + Card( Rank r, Suit s, TQCanvas *parent=0); virtual ~Card(); // Properties of the card. diff --git a/kpat/clock.cpp b/kpat/clock.cpp index dec72cc0..7fcb94b4 100644 --- a/kpat/clock.cpp +++ b/kpat/clock.cpp @@ -4,8 +4,8 @@ #include <assert.h> #include "cardmaps.h" -Clock::Clock( KMainWindow* tqparent, const char *name ) - : Dealer( tqparent, name ) +Clock::Clock( KMainWindow* parent, const char *name ) + : Dealer( parent, name ) { const int dist_x = cardMap::CARDX() * 11 / 10 + 1; const int dist_y = cardMap::CARDY() * 11 / 10 + 1; @@ -85,7 +85,7 @@ static class LocalDealerInfo11 : public DealerInfo { public: LocalDealerInfo11() : DealerInfo(I18N_NOOP("G&randfather's Clock"), 11) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Clock(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Clock(parent); } } gfi11; #include "clock.moc" diff --git a/kpat/clock.h b/kpat/clock.h index 8aaead34..0107fec8 100644 --- a/kpat/clock.h +++ b/kpat/clock.h @@ -8,7 +8,7 @@ class Clock : public Dealer { TQ_OBJECT public: - Clock( KMainWindow* tqparent=0, const char* name=0); + Clock( KMainWindow* parent=0, const char* name=0); virtual bool checkAdd ( int checkIndex, const Pile *c1, const CardList& c2) const; virtual bool startAutoDrop() { return false; } diff --git a/kpat/computation.cpp b/kpat/computation.cpp index 0da5f226..22f104aa 100644 --- a/kpat/computation.cpp +++ b/kpat/computation.cpp @@ -27,8 +27,8 @@ #include <assert.h> #include "cardmaps.h" -Computation::Computation( KMainWindow *tqparent, const char *name ) - :Dealer( tqparent, name) +Computation::Computation( KMainWindow *parent, const char *name ) + :Dealer( parent, name) { deck = Deck::new_deck(this); deck->hide(); @@ -114,7 +114,7 @@ static class LocalDealerInfo6 : public DealerInfo { public: LocalDealerInfo6() : DealerInfo(I18N_NOOP("&Calculation"), 6) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Computation(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Computation(parent); } } ldi6; #include "computation.moc" diff --git a/kpat/computation.h b/kpat/computation.h index ea988f2d..b1658d57 100644 --- a/kpat/computation.h +++ b/kpat/computation.h @@ -33,7 +33,7 @@ class Computation : public Dealer { TQ_OBJECT public: - Computation( KMainWindow *tqparent = 0, const char *name=0 ); + Computation( KMainWindow *parent = 0, const char *name=0 ); virtual void restart(); diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp index c1ae25e7..d3cdecad 100644 --- a/kpat/dealer.cpp +++ b/kpat/dealer.cpp @@ -116,7 +116,7 @@ void Dealer::setupActions() { ahint = new KAction( i18n("&Hint"), TQString::tqfromLatin1("wizard"), Key_H, TQT_TQOBJECT(this), TQT_SLOT(hint()), - tqparent()->actionCollection(), "game_hint"); + parent()->actionCollection(), "game_hint"); actionlist.append(ahint); } else ahint = 0; @@ -124,7 +124,7 @@ void Dealer::setupActions() { if (actions() & Dealer::Demo) { ademo = new KToggleAction( i18n("&Demo"), TQString::tqfromLatin1("1rightarrow"), CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(toggleDemo()), - tqparent()->actionCollection(), "game_demo"); + parent()->actionCollection(), "game_demo"); actionlist.append(ademo); } else ademo = 0; @@ -132,12 +132,12 @@ void Dealer::setupActions() { if (actions() & Dealer::Redeal) { aredeal = new KAction (i18n("&Redeal"), TQString::tqfromLatin1("queue"), 0, TQT_TQOBJECT(this), TQT_SLOT(redeal()), - tqparent()->actionCollection(), "game_redeal"); + parent()->actionCollection(), "game_redeal"); actionlist.append(aredeal); } else aredeal = 0; - tqparent()->guiFactory()->plugActionList( tqparent(), TQString::tqfromLatin1("game_actions"), actionlist); + parent()->guiFactory()->plugActionList( parent(), TQString::tqfromLatin1("game_actions"), actionlist); } Dealer::~Dealer() @@ -145,7 +145,7 @@ Dealer::~Dealer() if (!_won) countLoss(); clearHints(); - tqparent()->guiFactory()->unplugActionList( tqparent(), TQString::tqfromLatin1("game_actions")); + parent()->guiFactory()->unplugActionList( parent(), TQString::tqfromLatin1("game_actions")); while (!piles.isEmpty()) delete piles.first(); // removes itself @@ -154,9 +154,9 @@ Dealer::~Dealer() s_instance = 0; } -KMainWindow *Dealer::tqparent() const +KMainWindow *Dealer::parent() const { - return dynamic_cast<KMainWindow*>(TQCanvasView::tqparent()); + return dynamic_cast<KMainWindow*>(TQCanvasView::parent()); } @@ -735,7 +735,7 @@ State *Dealer::getState() s.it = c; s.source = c->source(); if (!s.source) { - kdDebug(11111) << c->name() << " has no tqparent\n"; + kdDebug(11111) << c->name() << " has no parent\n"; assert(false); } s.source_index = c->source()->indexOf(c); diff --git a/kpat/dealer.h b/kpat/dealer.h index 63b5bde9..5c4e60f1 100644 --- a/kpat/dealer.h +++ b/kpat/dealer.h @@ -35,7 +35,7 @@ public: } const char *name; uint gameindex; - virtual Dealer *createGame(KMainWindow *tqparent) = 0; + virtual Dealer *createGame(KMainWindow *parent) = 0; }; class CardState; @@ -61,7 +61,7 @@ class Dealer: public TQCanvasView public: - Dealer( KMainWindow* tqparent = 0, const char* name = 0 ); + Dealer( KMainWindow* parent = 0, const char* name = 0 ); virtual ~Dealer(); static const Dealer *instance(); @@ -171,7 +171,7 @@ protected: // it's not const because it changes the random seed virtual MoveHint *chooseHint(); - KMainWindow *tqparent() const; + KMainWindow *parent() const; bool waiting() const { return _waiting != 0; } void setWaiting(bool w); diff --git a/kpat/deck.cpp b/kpat/deck.cpp index 860a88b7..c2b6e0e5 100644 --- a/kpat/deck.cpp +++ b/kpat/deck.cpp @@ -10,8 +10,8 @@ const int NumberOfCards = 52; Deck *Deck::my_deck = 0; -Deck::Deck( Dealer* tqparent, int m, int s ) - : Pile( 0, tqparent ), mult( m ) +Deck::Deck( Dealer* parent, int m, int s ) + : Pile( 0, parent ), mult( m ) { _deck = new Card * [mult*NumberOfCards]; Q_CHECK_PTR (_deck); @@ -44,9 +44,9 @@ Deck::~Deck() // ---------------------------------------------------------------- -Deck *Deck::new_deck( Dealer *tqparent, int m, int s ) +Deck *Deck::new_deck( Dealer *parent, int m, int s ) { - my_deck = new Deck(tqparent, m, s); + my_deck = new Deck(parent, m, s); return my_deck; } diff --git a/kpat/deck.h b/kpat/deck.h index eb13268c..f5239fe0 100644 --- a/kpat/deck.h +++ b/kpat/deck.h @@ -13,11 +13,11 @@ class Deck: public Pile { private: - Deck( Dealer* tqparent = 0, int m = 1, int s = 4 ); + Deck( Dealer* parent = 0, int m = 1, int s = 4 ); virtual ~Deck(); public: - static Deck *new_deck( Dealer *tqparent = 0, int m = 1, int s = 4 ); + static Deck *new_deck( Dealer *parent = 0, int m = 1, int s = 4 ); static Deck *deck() { return my_deck; } static const long n; diff --git a/kpat/fortyeight.cpp b/kpat/fortyeight.cpp index e3e72385..1747b647 100644 --- a/kpat/fortyeight.cpp +++ b/kpat/fortyeight.cpp @@ -5,8 +5,8 @@ #include <assert.h> #include "cardmaps.h" -HorLeftPile::HorLeftPile( int _index, Dealer* tqparent) - : Pile(_index, tqparent) +HorLeftPile::HorLeftPile( int _index, Dealer* parent) + : Pile(_index, parent) { // TODO: create a pile that moves the cards together when filling space setHSpread( cardMap::CARDX() / 11 + 1 ); @@ -27,8 +27,8 @@ void HorLeftPile::initSizes() } -Fortyeight::Fortyeight( KMainWindow* tqparent, const char* name) - : Dealer(tqparent,name) +Fortyeight::Fortyeight( KMainWindow* parent, const char* name) + : Dealer(parent,name) { deck = Deck::new_deck(this, 2); @@ -194,7 +194,7 @@ static class LocalDealerInfo8 : public DealerInfo { public: LocalDealerInfo8() : DealerInfo(I18N_NOOP("Forty && &Eight"), 8) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Fortyeight(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Fortyeight(parent); } } ldi9; //-------------------------------------------------------------------------// diff --git a/kpat/fortyeight.h b/kpat/fortyeight.h index 4489ffb1..3bb43b2b 100644 --- a/kpat/fortyeight.h +++ b/kpat/fortyeight.h @@ -9,7 +9,7 @@ class HorLeftPile : public Pile TQ_OBJECT public: - HorLeftPile( int _index, Dealer* tqparent = 0); + HorLeftPile( int _index, Dealer* parent = 0); virtual TQSize cardOffset( bool _spread, bool _facedown, const Card *before) const; virtual void initSizes(); }; @@ -20,7 +20,7 @@ class Fortyeight : public Dealer TQ_OBJECT public: - Fortyeight( KMainWindow* tqparent=0, const char* name=0); + Fortyeight( KMainWindow* parent=0, const char* name=0); virtual bool isGameLost() const; public slots: diff --git a/kpat/freecell-solver/USAGE b/kpat/freecell-solver/USAGE index 9cffe4e1..16f5c93d 100644 --- a/kpat/freecell-solver/USAGE +++ b/kpat/freecell-solver/USAGE @@ -67,7 +67,7 @@ program with some effort on the programmer's part. This option will display the moves in standard notation in which every move consists of two characters and there are ten moves in a line. Naturally, -this option will only become aptqparent if the display moves is specified. +this option will only become apparent if the display moves is specified. (it does not implicitly specify it, though). For more information regarding standard notation refer to the following @@ -89,7 +89,7 @@ are needed to move from one to another. The standard notation option applies to it to. --pi --display-tqparent-iter +-pi --display-parent-iter This option (assuming the -s and -i options are specified) will also display the iteration index of the state from which the current state @@ -217,34 +217,34 @@ Freecell Tests: '2' - put freecell cards on top of stacks. '3' - put non-top stack cards in the foundations. '4' - move stack cards to different stacks. -'5' - move stack cards to a tqparent card on the same stack. +'5' - move stack cards to a parent card on the same stack. '6' - move sequences of cards onto free stacks. '7' - put freecell cards on empty stacks. -'8' - move cards to a different tqparent. +'8' - move cards to a different parent. '9' - empty an entire stack into the freecells. Atomic Freecell Tests: 'A' - move a stack card to an empty stack. -'B' - move a stack card to a tqparent on a different stack. +'B' - move a stack card to a parent on a different stack. 'C' - move a stack card to a freecell. -'D' - move a freecell card to a tqparent. +'D' - move a freecell card to a parent. 'E' - move a freecell card to an empty stack. Simple Simon Tests: 'a' - move a full sequence to the foundations. -'b' - move a sequence to a true tqparent of his. -'c' - move a whole stack sequence to a false tqparent (in order to clear +'b' - move a sequence to a true parent of his. +'c' - move a whole stack sequence to a false parent (in order to clear the stack) -'d' - move a sequence to a true tqparent that has some cards above it. -'e' - move a sequence with some cards above it to a true tqparent. -'f' - move a sequence with a junk sequence above it to a true tqparent that +'d' - move a sequence to a true parent that has some cards above it. +'e' - move a sequence with some cards above it to a true parent. +'f' - move a sequence with a junk sequence above it to a true parent that has some cards above it. -'g' - move a whole stack sequence to a false tqparent which has some +'g' - move a whole stack sequence to a false parent which has some cards above it. -'h' - move a sequence to a tqparent on the same stack. +'h' - move a sequence to a parent on the same stack. Manipulating the tests order can be very helpful to the quick solution of a given board. If you found that a certain board cannot be solved in @@ -332,7 +332,7 @@ used in all the normal scans. --reparent-states This option specifies that states that were encountered whose depth in the -states graph can be improved should be reparented to the new tqparent. This +states graph can be improved should be reparented to the new parent. This option can possibly make solutions shorter. diff --git a/kpat/freecell-solver/caas.c b/kpat/freecell-solver/caas.c index 4d359a40..8e8f5ebb 100644 --- a/kpat/freecell-solver/caas.c +++ b/kpat/freecell-solver/caas.c @@ -63,7 +63,7 @@ if (hash_value_int < 0) \ { \ /* \ - * This is a bit tqmask that nullifies the sign bit of the \ + * This is a bit mask that nullifies the sign bit of the \ * number so it will always be positive \ * */ \ hash_value_int &= (~(1<<((sizeof(hash_value_int)<<3)-1))); \ @@ -92,7 +92,7 @@ if (hash_value_int < 0) \ { \ /* \ - * This is a bit tqmask that nullifies the sign bit of the \ + * This is a bit mask that nullifies the sign bit of the \ * number so it will always be positive \ * */ \ hash_value_int &= (~(1<<((sizeof(hash_value_int)<<3)-1))); \ @@ -333,7 +333,7 @@ static GCC_INLINE void freecell_solver_cache_stacks( if (hash_value_int < 0) { /* - * This is a bit tqmask that nullifies the sign bit of the + * This is a bit mask that nullifies the sign bit of the * number so it will always be positive * */ hash_value_int &= (~(1<<((sizeof(hash_value_int)<<3)-1))); @@ -437,7 +437,7 @@ void freecell_solver_cache_talon( if (hash_value_int < 0) { /* - * This is a bit tqmask that nullifies the sign bit of the + * This is a bit mask that nullifies the sign bit of the * number so it will always be positive * */ hash_value_int &= (~(1<<((sizeof(hash_value_int)<<3)-1))); @@ -529,9 +529,9 @@ GCC_INLINE int freecell_solver_check_and_add_state( if (check) { /* The new state was not found in the cache, and it was already inserted */ - if (new_state->tqparent) + if (new_state->parent) { - new_state->tqparent->num_active_tqchildren++; + new_state->parent->num_active_tqchildren++; } instance->num_states_in_collection++; diff --git a/kpat/freecell-solver/fcs.h b/kpat/freecell-solver/fcs.h index b865a3f0..63db42a6 100644 --- a/kpat/freecell-solver/fcs.h +++ b/kpat/freecell-solver/fcs.h @@ -170,7 +170,7 @@ typedef struct freecell_solver_instance * The debug_iter_output variables provide a programmer programmable way * to debug the algorithm while it is running. This works well for DFS * and Soft-DFS scans but at present support for A* and BFS is not - * too good, as its hard to tell which state came from which tqparent state. + * too good, as its hard to tell which state came from which parent state. * * debug_iter_output is a flag that indicates whether to use this feature * at all. diff --git a/kpat/freecell-solver/fcs_hash.c b/kpat/freecell-solver/fcs_hash.c index 2ae2d60b..fde7a03f 100644 --- a/kpat/freecell-solver/fcs_hash.c +++ b/kpat/freecell-solver/fcs_hash.c @@ -53,7 +53,7 @@ SFO_hash_t * freecell_solver_hash_init( hash = (SFO_hash_t *)malloc(sizeof(SFO_hash_t)); hash->size = size; - hash->size_bittqmask = size-1; + hash->size_bitmask = size-1; hash->num_elems = 0; @@ -87,7 +87,7 @@ void * freecell_solver_hash_insert( SFO_hash_symlink_item_t * item, * last_item; /* Get the index of the appropriate chain in the hash table */ - place = hash_value & (hash->size_bittqmask); + place = hash_value & (hash->size_bitmask); list = &(hash->entries[place]); /* If first_item is non-existent */ @@ -220,7 +220,7 @@ static void SFO_hash_rehash( SFO_hash_t * hash ) { - int old_size, new_size, new_size_bittqmask; + int old_size, new_size, new_size_bitmask; int i; #if 0 SFO_hash_t * new_hash; @@ -242,7 +242,7 @@ static void SFO_hash_rehash( old_size = hash->size; new_size = old_size << 1; - new_size_bittqmask = new_size - 1; + new_size_bitmask = new_size - 1; new_entries = calloc(new_size, sizeof(SFO_hash_symlink_t)); @@ -254,7 +254,7 @@ static void SFO_hash_rehash( while(item != NULL) { /* The place in the new hash table */ - place = item->hash_value & new_size_bittqmask; + place = item->hash_value & new_size_bitmask; /* Store the next item in the linked list in a safe place, so we can retrieve it after the assignment */ @@ -280,7 +280,7 @@ static void SFO_hash_rehash( #endif hash->entries = new_entries; hash->size = new_size; - hash->size_bittqmask = new_size_bittqmask; + hash->size_bitmask = new_size_bitmask; } #else diff --git a/kpat/freecell-solver/fcs_hash.h b/kpat/freecell-solver/fcs_hash.h index 77d746f0..fbe6c78c 100644 --- a/kpat/freecell-solver/fcs_hash.h +++ b/kpat/freecell-solver/fcs_hash.h @@ -53,8 +53,8 @@ struct SFO_hash_struct /* The size of the hash table */ int size; - /* A bit tqmask that extract the lowest bits out of the hash value */ - int size_bittqmask; + /* A bit mask that extract the lowest bits out of the hash value */ + int size_bitmask; /* The number of elements stored inside the hash */ int num_elems; /* A context to pass to the comparison function */ diff --git a/kpat/freecell-solver/freecell.c b/kpat/freecell-solver/freecell.c index fca09078..159772ff 100644 --- a/kpat/freecell-solver/freecell.c +++ b/kpat/freecell-solver/freecell.c @@ -243,7 +243,7 @@ int freecell_solver_sfs_move_freecell_cards_on_top_of_stacks( { src_card = fcs_freecell_card(state, fc); - /* If the freecell is not empty and dest_card is its tqparent + /* If the freecell is not empty and dest_card is its parent * */ if ( (fcs_card_card_num(src_card) != 0) && fcs_is_parent_card(src_card,dest_card) ) @@ -533,7 +533,7 @@ int freecell_solver_sfs_move_stack_cards_to_a_parent_on_the_same_stack( sequences_are_built_by = instance->sequences_are_built_by; /* - * Now let's try to move a stack card to a tqparent card which is found + * Now let's try to move a stack card to a parent card which is found * on the same stack. * */ for (stack=0;stack<state_stacks_num;stack++) @@ -547,7 +547,7 @@ int freecell_solver_sfs_move_stack_cards_to_a_parent_on_the_same_stack( card = fcs_stack_card(state, stack, c); - /* Do not move cards that are already found above a suitable tqparent */ + /* Do not move cards that are already found above a suitable parent */ a = 1; if (c != 0) { @@ -1368,7 +1368,7 @@ int freecell_solver_sfs_move_cards_to_a_different_parent( fcs_move_init(temp_move); - /* This time try to move cards that are already on top of a tqparent to a different tqparent */ + /* This time try to move cards that are already on top of a parent to a different parent */ for (stack=0;stack<state_stacks_num;stack++) { @@ -1398,7 +1398,7 @@ int freecell_solver_sfs_move_cards_to_a_different_parent( card = fcs_stack_card(state, stack, c); - /* Do not move cards that are already found above a suitable tqparent */ + /* Do not move cards that are already found above a suitable parent */ a = 1; if (c != 0) { @@ -1697,7 +1697,7 @@ int freecell_solver_sfs_yukon_move_card_to_parent( if (fcs_is_parent_card(card, dest_card)) { /* We can move it there - now let's check to see - * if it is already above a suitable tqparent. */ + * if it is already above a suitable parent. */ if ((c == 0) || (! fcs_is_parent_card(card, fcs_stack_card(state, stack, c-1)))) { diff --git a/kpat/freecell-solver/intrface.c b/kpat/freecell-solver/intrface.c index 44aa29a0..9fb09840 100644 --- a/kpat/freecell-solver/intrface.c +++ b/kpat/freecell-solver/intrface.c @@ -796,7 +796,7 @@ static void trace_solution( s1 = instance->final_state; /* Retrace the step from the current state to its parents */ - while (s1->tqparent != NULL) + while (s1->parent != NULL) { /* Mark the state as part of the non-optimized solution */ s1->visited |= FCS_VISITED_IN_SOLUTION_PATH; @@ -811,8 +811,8 @@ static void trace_solution( } /* Duplicate the state to a freshly malloced memory */ - /* Move to the tqparent state */ - s1 = s1->tqparent; + /* Move to the parent state */ + s1 = s1->parent; } /* There's one more state than there are move stacks */ s1->visited |= FCS_VISITED_IN_SOLUTION_PATH; @@ -915,7 +915,7 @@ int freecell_solver_solve_instance( state_copy_ptr->depth = 0; state_copy_ptr->moves_to_parent = NULL; state_copy_ptr->visited = 0; - state_copy_ptr->tqparent = NULL; + state_copy_ptr->parent = NULL; memset(&(state_copy_ptr->scan_visited), '\0', sizeof(state_copy_ptr->scan_visited)); instance->state_copy_ptr = state_copy_ptr; diff --git a/kpat/freecell-solver/lookup2.c b/kpat/freecell-solver/lookup2.c index c5886304..6ab9ae7e 100644 --- a/kpat/freecell-solver/lookup2.c +++ b/kpat/freecell-solver/lookup2.c @@ -19,7 +19,7 @@ Note: #define hashsize(n) ((ub4)1<<(n)) -#define hashtqmask(n) (hashsize(n)-1) +#define hashmask(n) (hashsize(n)-1) /* -------------------------------------------------------------------- diff --git a/kpat/freecell-solver/main.c b/kpat/freecell-solver/main.c index 181039b6..4a47f300 100644 --- a/kpat/freecell-solver/main.c +++ b/kpat/freecell-solver/main.c @@ -169,8 +169,8 @@ help_screen_t help_screens[] = { "-snx --standard-notation-extended\n" " Display the moves in extended standard notation while specifying the\n" " number of cards moved if applicable\n" -"-pi --display-tqparent-iter \n" -" Display the index of the tqparent iteration of each state in the\n" +"-pi --display-parent-iter \n" +" Display the index of the parent iteration of each state in the\n" " run-time dump.\n" "\n" "--freecells-num [Freecells\' Number]\n" @@ -227,33 +227,33 @@ help_screen_t help_screens[] = { " '2' - put freecell cards on top of stacks.\n" " '3' - put non-top stack cards in the foundations.\n" " '4' - move stack cards to different stacks.\n" -" '5' - move stack cards to a tqparent card on the same stack.\n" +" '5' - move stack cards to a parent card on the same stack.\n" " '6' - move sequences of cards onto free stacks.\n" " '7' - put freecell cards on empty stacks.\n" -" '8' - move cards to a different tqparent.\n" +" '8' - move cards to a different parent.\n" " '9' - empty an entire stack into the freecells.\n" "\n" " Atomic Freecell Tests:\n" "\n" " 'A' - move a stack card to an empty stack.\n" -" 'B' - move a stack card to a tqparent on a different stack.\n" +" 'B' - move a stack card to a parent on a different stack.\n" " 'C' - move a stack card to a freecell.\n" -" 'D' - move a freecel card to a tqparent.\n" +" 'D' - move a freecel card to a parent.\n" " 'E' - move a freecel card to an empty stack.\n" "\n" " Simple Simon Tests:\n" "\n" " 'a' - move a full sequence to the foundations.\n" -" 'b' - move a sequence to a true tqparent of his.\n" -" 'c' - move a whole stack sequence to a false tqparent (in order to\n" +" 'b' - move a sequence to a true parent of his.\n" +" 'c' - move a whole stack sequence to a false parent (in order to\n" " clear the stack)\n" -" 'd' - move a sequence to a true tqparent that has some cards above it.\n" -" 'e' - move a sequence with some cards above it to a true tqparent.\n" -" 'f' - move a sequence with a junk sequence above it to a true tqparent\n" +" 'd' - move a sequence to a true parent that has some cards above it.\n" +" 'e' - move a sequence with some cards above it to a true parent.\n" +" 'f' - move a sequence with a junk sequence above it to a true parent\n" " that has some cards above it.\n" -" 'g' - move a whole stack sequence to a false tqparent which has some\n" +" 'g' - move a whole stack sequence to a false parent which has some\n" " cards above it.\n" -" 'h' - move a sequence to a tqparent on the same stack.\n" +" 'h' - move a sequence to a parent on the same stack.\n" "\n" " Tests are grouped with parenthesis or square brackets. Each group\n" " will be randomized as a whole by the random-dfs scan.\n" @@ -313,7 +313,7 @@ help_screen_t help_screens[] = { "\n" "\n" "--reparent-states\n" -" Retqparent states that have a larger depth than that of the state\n" +" Reparent states that have a larger depth than that of the state\n" " from which they were reached a posteriori.\n" "--calc-real-depth\n" " If --reparent-states is enabled, then explictly calculate the real\n" @@ -498,7 +498,7 @@ static int cmd_line_callback( dc->display_moves = 1; dc->display_states = 1; } - else if ((!strcmp(argv[arg], "-pi")) || (!strcmp(argv[arg], "--display-tqparent-iter"))) + else if ((!strcmp(argv[arg], "-pi")) || (!strcmp(argv[arg], "--display-parent-iter"))) { dc->display_parent_iter_num = 1; } @@ -588,7 +588,7 @@ static char * known_parameters[] = { "-sn", "--standard-notation", "-snx", "--standard-notation-extended", "-sam", "--display-states-and-moves", - "-pi", "--display-tqparent-iter", + "-pi", "--display-parent-iter", "--reset", NULL }; diff --git a/kpat/freecell-solver/pqueue.c b/kpat/freecell-solver/pqueue.c index 7cacf8ff..90afc168 100644 --- a/kpat/freecell-solver/pqueue.c +++ b/kpat/freecell-solver/pqueue.c @@ -73,7 +73,7 @@ int freecell_solver_PQueuePush( PTQUEUE *pq, void *item, pq_rating_t r) i = (++CurrentSize); - /* while the tqparent of the space we're putting the new node into is worse than + /* while the parent of the space we're putting the new node into is worse than our new node, swap the space with the worse node. We keep doing that until we get to a worse node or until we get to the top diff --git a/kpat/freecell-solver/pqueue.h b/kpat/freecell-solver/pqueue.h index d4cfd7a3..875741ae 100644 --- a/kpat/freecell-solver/pqueue.h +++ b/kpat/freecell-solver/pqueue.h @@ -43,7 +43,7 @@ typedef struct _PTQUEUE /* given an index to any element in a binary tree stored in a linear array with the root at 1 and a "sentinel" value at 0 these macros are useful in making the code clearer */ -/* the tqparent is always given by index/2 */ +/* the parent is always given by index/2 */ #define PTQ_PARENT_INDEX(i) ((i)>>1) #define PTQ_FIRST_ENTRY (1) diff --git a/kpat/freecell-solver/scans.c b/kpat/freecell-solver/scans.c index 31a5dd18..a4368873 100644 --- a/kpat/freecell-solver/scans.c +++ b/kpat/freecell-solver/scans.c @@ -406,7 +406,7 @@ int freecell_solver_soft_dfs_or_random_dfs_do_solve_or_resume( freecell_solver_increase_dfs_max_depth(soft_thread); /* Initialize the initial state to indicate it is the first */ - ptr_state_with_locations_orig->tqparent = NULL; + ptr_state_with_locations_orig->parent = NULL; ptr_state_with_locations_orig->moves_to_parent = NULL; ptr_state_with_locations_orig->depth = 0; @@ -692,7 +692,7 @@ int freecell_solver_soft_dfs_or_random_dfs_do_solve_or_resume( ptr_recurse_into_state_with_locations->visited_iter = instance->num_times; #if 0 - ptr_recurse_into_state_with_locations->tqparent = ptr_state_with_locations; + ptr_recurse_into_state_with_locations->parent = ptr_state_with_locations; #endif /* @@ -958,7 +958,7 @@ int freecell_solver_a_star_or_bfs_do_solve_or_resume( if (!resume) { /* Initialize the first element to indicate it is the first */ - ptr_state_with_locations_orig->tqparent = NULL; + ptr_state_with_locations_orig->parent = NULL; ptr_state_with_locations_orig->moves_to_parent = NULL; ptr_state_with_locations_orig->depth = 0; } @@ -1027,9 +1027,9 @@ int freecell_solver_a_star_or_bfs_do_solve_or_resume( ptr_state_with_locations->depth, (void*)instance, ptr_state_with_locations, - ((ptr_state_with_locations->tqparent == NULL) ? + ((ptr_state_with_locations->parent == NULL) ? 0 : - ptr_state_with_locations->tqparent->visited_iter + ptr_state_with_locations->parent->visited_iter ) ); } diff --git a/kpat/freecell-solver/simpsim.c b/kpat/freecell-solver/simpsim.c index 5ef8a411..f603ba39 100644 --- a/kpat/freecell-solver/simpsim.c +++ b/kpat/freecell-solver/simpsim.c @@ -19,16 +19,16 @@ #endif -#define fcs_is_ss_false_parent(tqparent, child) \ - (fcs_card_card_num(tqparent) == fcs_card_card_num(child)+1) +#define fcs_is_ss_false_parent(parent, child) \ + (fcs_card_card_num(parent) == fcs_card_card_num(child)+1) #define fcs_suit_is_ss_true_parent(parent_suit, child_suit) \ ((parent_suit) == (child_suit)) -#define fcs_is_ss_true_parent(tqparent, child) \ +#define fcs_is_ss_true_parent(parent, child) \ ( \ - fcs_is_ss_false_parent(tqparent,child) && \ - (fcs_suit_is_ss_true_parent(fcs_card_suit(tqparent),fcs_card_suit(child))) \ + fcs_is_ss_false_parent(parent,child) && \ + (fcs_suit_is_ss_true_parent(fcs_card_suit(parent),fcs_card_suit(child))) \ ) /* @@ -185,7 +185,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_true_parent( if (cards_num > 0) { /* Loop on the cards in the stack and try to look for a true - * tqparent on top one of the stacks */ + * parent on top one of the stacks */ card = fcs_stack_card(state,stack,cards_num-1); card_num = fcs_card_card_num(card); suit = fcs_card_suit(card); @@ -208,7 +208,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_true_parent( (fcs_card_card_num(dest_card) == (card_num+1)) ) { - /* This is a suitable tqparent - let's check if we + /* This is a suitable parent - let's check if we * have enough empty stacks to make the move feasible */ if (calc_max_sequence_move(0, num_freestacks) >= num_true_seqs) { @@ -334,7 +334,7 @@ int freecell_solver_sfs_simple_simon_move_whole_stack_sequence_to_false_parent( (fcs_is_ss_false_parent(dest_card, card)) ) { - /* This is a suitable tqparent - let's check if we + /* This is a suitable parent - let's check if we * have enough empty stacks to make the move feasible */ if (calc_max_sequence_move(0, num_freestacks) >= num_true_seqs) { @@ -387,7 +387,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_true_parent_with_some_card * dest_cards_num - the number of cards in "ds" * dc - the index of the current card in "ds". * num_separate_false_seqs - this variable tells how many distinct false - * sequences exist above the true tqparent + * sequences exist above the true parent * above_num_true_seqs[] - the number of true sequences in each false * sequence * seq_points[] - the separation points of the false sequences (i.e: where @@ -451,7 +451,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_true_parent_with_some_card (fcs_card_card_num(dest_card) == (card_num+1)) ) { - /* This is a suitable tqparent - let's check if there's a sequence above it. */ + /* This is a suitable parent - let's check if there's a sequence above it. */ /* * above_c - the height of the card that is to be checked. @@ -504,7 +504,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_true_parent_with_some_card int clear_junk_dest_stack = -1; - /* Let's try to find a suitable tqparent on top one of the stacks */ + /* Let's try to find a suitable parent on top one of the stacks */ for(clear_junk_dest_stack=0; clear_junk_dest_stack < state_stacks_num; clear_junk_dest_stack++ @@ -573,7 +573,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_true_parent_with_some_card /* * We can do it - so let's move everything. * Notice that we only put the child in a different stack - * then the tqparent and let it move to the tqparent in the + * then the parent and let it move to the parent in the * next iteration of the program * */ @@ -743,7 +743,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_with_some_cards_above_to_true (fcs_card_card_num(dest_card) == (card_num+1)) ) { - /* This is a suitable tqparent - let's check if we + /* This is a suitable parent - let's check if we * have enough empty stacks to make the move feasible */ for(a=0;a<state_stacks_num;a++) @@ -761,7 +761,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_with_some_cards_above_to_true int clear_junk_dest_stack = -1; - /* Let's try to find a suitable tqparent on top one of the stacks */ + /* Let's try to find a suitable parent on top one of the stacks */ for(clear_junk_dest_stack=0; clear_junk_dest_stack < state_stacks_num; clear_junk_dest_stack++ @@ -1013,7 +1013,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_with_junk_seq_above_to_true_p (fcs_card_card_num(dest_card) == (card_num+1)) ) { - /* This is a suitable tqparent - let's check if there's a sequence above it. */ + /* This is a suitable parent - let's check if there's a sequence above it. */ int above_c; fcs_card_t above_card, up_above_card; @@ -1068,7 +1068,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_with_junk_seq_above_to_true_p above_num_true_seqs[false_seq_index] ); - /* Let's try to find a suitable tqparent on top one of the stacks */ + /* Let's try to find a suitable parent on top one of the stacks */ for(clear_junk_dest_stack=0; clear_junk_dest_stack < state_stacks_num; clear_junk_dest_stack++ @@ -1218,7 +1218,7 @@ int freecell_solver_sfs_simple_simon_move_whole_stack_sequence_to_false_parent_w * dest_cards_num - the number of cards in it. * dc - the height of the card in "ds". * num_separate_false_seqs - this variable tells how many distinct false - * sequences exist above the false tqparent + * sequences exist above the false parent * above_num_true_seqs[] - the number of true sequences in each false * sequence * seq_points[] - the separation points of the false sequences (i.e: where @@ -1291,7 +1291,7 @@ int freecell_solver_sfs_simple_simon_move_whole_stack_sequence_to_false_parent_w (fcs_card_card_num(dest_card) == (card_num+1)) ) { - /* This is a suitable tqparent - let's check if there's a sequence above it. */ + /* This is a suitable parent - let's check if there's a sequence above it. */ int above_c; fcs_card_t above_card, up_above_card; @@ -1341,7 +1341,7 @@ int freecell_solver_sfs_simple_simon_move_whole_stack_sequence_to_false_parent_w above_num_true_seqs[false_seq_index]; - /* Let's try to find a suitable tqparent on top one of the stacks */ + /* Let's try to find a suitable parent on top one of the stacks */ for(clear_junk_dest_stack=0; clear_junk_dest_stack < state_stacks_num; clear_junk_dest_stack++ @@ -1380,7 +1380,7 @@ int freecell_solver_sfs_simple_simon_move_whole_stack_sequence_to_false_parent_w if (false_seq_index == num_separate_false_seqs) { - /* This is a suitable tqparent - let's check if we + /* This is a suitable parent - let's check if we * have enough empty stacks to make the move feasible */ if (calc_max_sequence_move(0, num_freestacks) >= num_true_seqs) { @@ -1468,7 +1468,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_parent_on_the_same_stack( cards_num = fcs_stack_len(state, stack); if (cards_num > 2) { - /* Search for a tqparent card */ + /* Search for a parent card */ for(pc=0; pc < cards_num-1 ; pc++) { parent_card = fcs_stack_card(state, stack, pc); @@ -1492,7 +1492,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_parent_on_the_same_stack( ) ) { - /* We have a matching tqparent and child cards */ + /* We have a matching parent and child cards */ #if 0 printf("Stack %i, Parent %i, Child %i\n", stack, pc, cc); fflush(stdout); @@ -1559,7 +1559,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_parent_on_the_same_stack( above_num_true_seqs[num_separate_false_seqs] = child_num_true_seqs; seq_points[num_separate_false_seqs++] = cc; - /* Add the cards between the tqparent and the child to the seq_points */ + /* Add the cards between the parent and the child to the seq_points */ above_card = fcs_stack_card(state, stack, cc-1); above_num_true_seqs[num_separate_false_seqs] = 1; @@ -1599,7 +1599,7 @@ int freecell_solver_sfs_simple_simon_move_sequence_to_parent_on_the_same_stack( int clear_junk_dest_stack = -1; - /* Let's try to find a suitable tqparent on top one of the stacks */ + /* Let's try to find a suitable parent on top one of the stacks */ for(clear_junk_dest_stack=0; clear_junk_dest_stack < state_stacks_num; clear_junk_dest_stack++ diff --git a/kpat/freecell-solver/state.h b/kpat/freecell-solver/state.h index 7b312b42..302d6d9a 100644 --- a/kpat/freecell-solver/state.h +++ b/kpat/freecell-solver/state.h @@ -72,7 +72,7 @@ struct fcs_struct_state_with_locations_t fcs_state_t s; int stack_locs[MAX_NUM_STACKS]; int fc_locs[MAX_NUM_FREECELLS]; - struct fcs_struct_state_with_locations_t * tqparent; + struct fcs_struct_state_with_locations_t * parent; fcs_move_stack_t * moves_to_parent; int depth; int visited; @@ -232,7 +232,7 @@ struct fcs_struct_state_with_locations_t fcs_state_t s; char stack_locs[MAX_NUM_STACKS]; char fc_locs[MAX_NUM_FREECELLS]; - struct fcs_struct_state_with_locations_t * tqparent; + struct fcs_struct_state_with_locations_t * parent; fcs_move_stack_t * moves_to_parent; int depth; int visited; @@ -484,7 +484,7 @@ struct fcs_struct_state_with_locations_t fcs_state_t s; fcs_locs_t stack_locs[MAX_NUM_STACKS]; fcs_locs_t fc_locs[MAX_NUM_FREECELLS]; - struct fcs_struct_state_with_locations_t * tqparent; + struct fcs_struct_state_with_locations_t * parent; fcs_move_stack_t * moves_to_parent; int depth; /* diff --git a/kpat/freecell-solver/test_arr.h b/kpat/freecell-solver/test_arr.h index 821ccd98..911ff511 100644 --- a/kpat/freecell-solver/test_arr.h +++ b/kpat/freecell-solver/test_arr.h @@ -26,19 +26,19 @@ typedef int (*freecell_solver_solve_for_state_test_t)( extern freecell_solver_solve_for_state_test_t freecell_solver_sfs_tests[FCS_TESTS_NUM]; /* - * This macro determines if child can be placed above tqparent. + * This macro determines if child can be placed above parent. * * The variable sequences_are_built_by has to be initialized to * the sequences_are_built_by member of the instance. * * */ -#define fcs_is_parent_card(child, tqparent) \ - ((fcs_card_card_num(child)+1 == fcs_card_card_num(tqparent)) && \ +#define fcs_is_parent_card(child, parent) \ + ((fcs_card_card_num(child)+1 == fcs_card_card_num(parent)) && \ ((sequences_are_built_by == FCS_SEQ_BUILT_BY_RANK) ? \ 1 : \ ((sequences_are_built_by == FCS_SEQ_BUILT_BY_SUIT) ? \ - (fcs_card_suit(child) == fcs_card_suit(tqparent)) : \ - ((fcs_card_suit(child) & 0x1) != (fcs_card_suit(tqparent)&0x1)) \ + (fcs_card_suit(child) == fcs_card_suit(parent)) : \ + ((fcs_card_suit(child) & 0x1) != (fcs_card_suit(parent)&0x1)) \ )) \ ) @@ -58,7 +58,7 @@ extern freecell_solver_solve_for_state_test_t freecell_solver_sfs_tests[FCS_TEST /* Count the number of states until the original state. */ \ while(ptr_state != NULL) \ { \ - ptr_state = ptr_state->tqparent; \ + ptr_state = ptr_state->parent; \ this_real_depth++; \ } \ this_real_depth--; \ @@ -68,14 +68,14 @@ extern freecell_solver_solve_for_state_test_t freecell_solver_sfs_tests[FCS_TEST { \ ptr_state->depth = this_real_depth; \ this_real_depth--; \ - ptr_state = ptr_state->tqparent; \ + ptr_state = ptr_state->parent; \ } \ } \ } \ /* * This macro marks a state as a dead end, and afterwards propogates - * this information to its tqparent and ancestor states. + * this information to its parent and ancestor states. * */ #define mark_as_dead_end(ptr_state_input) \ { \ @@ -84,7 +84,7 @@ extern freecell_solver_solve_for_state_test_t freecell_solver_sfs_tests[FCS_TEST fcs_state_with_locations_t * ptr_state = (ptr_state_input); \ /* Mark as a dead end */ \ ptr_state->visited |= FCS_VISITED_DEAD_END; \ - ptr_state = ptr_state->tqparent; \ + ptr_state = ptr_state->parent; \ if (ptr_state != NULL) \ { \ /* Decrease the refcount of the state */ \ @@ -93,8 +93,8 @@ extern freecell_solver_solve_for_state_test_t freecell_solver_sfs_tests[FCS_TEST { \ /* Mark as dead end */ \ ptr_state->visited |= FCS_VISITED_DEAD_END; \ - /* Go to its tqparent state */ \ - ptr_state = ptr_state->tqparent; \ + /* Go to its parent state */ \ + ptr_state = ptr_state->parent; \ if (ptr_state == NULL) \ { \ break; \ diff --git a/kpat/freecell-solver/tests.h b/kpat/freecell-solver/tests.h index fbf78262..0293ed85 100644 --- a/kpat/freecell-solver/tests.h +++ b/kpat/freecell-solver/tests.h @@ -58,7 +58,7 @@ extern "C" { /* Some A* and BFS parameters that need to be initialized in \ * the derived state. \ * */ \ - ptr_new_state_with_locations->tqparent = ptr_state_with_locations; \ + ptr_new_state_with_locations->parent = ptr_state_with_locations; \ ptr_new_state_with_locations->moves_to_parent = moves; \ /* Make sure depth is consistent with the game graph. \ * I.e: the depth of every newly discovered state is derived from \ @@ -103,11 +103,11 @@ fcs_move_stack_push(moves, temp_move); \ { \ fcs_state_ia_release(hard_thread); \ calculate_real_depth(existing_state); \ - /* Re-tqparent the existing state to this one. \ + /* Re-parent the existing state to this one. \ * \ * What it means is that if the depth of the state if it \ * can be reached from this one is lower than what it \ - * already have, then re-assign its tqparent to this state. \ + * already have, then re-assign its parent to this state. \ * */ \ if (reparent && \ (existing_state->depth > ptr_state_with_locations->depth+1)) \ @@ -119,15 +119,15 @@ fcs_move_stack_push(moves, temp_move); \ ); \ if (!(existing_state->visited & FCS_VISITED_DEAD_END)) \ { \ - if ((--existing_state->tqparent->num_active_tqchildren) == 0) \ + if ((--existing_state->parent->num_active_tqchildren) == 0) \ { \ mark_as_dead_end( \ - existing_state->tqparent \ + existing_state->parent \ ); \ } \ ptr_state_with_locations->num_active_tqchildren++; \ } \ - existing_state->tqparent = ptr_state_with_locations; \ + existing_state->parent = ptr_state_with_locations; \ existing_state->depth = ptr_state_with_locations->depth + 1; \ } \ fcs_derived_states_list_add_state( \ diff --git a/kpat/freecell.cpp b/kpat/freecell.cpp index 9e67633a..74d00b68 100644 --- a/kpat/freecell.cpp +++ b/kpat/freecell.cpp @@ -49,8 +49,8 @@ void FreecellPile::moveCards(CardList &c, Pile *to) //-------------------------------------------------------------------------// FreecellBase::FreecellBase( int decks, int stores, int freecells, int fill, bool unlimit, - KMainWindow* tqparent, const char* name) - : Dealer(tqparent,name), + KMainWindow* parent, const char* name) + : Dealer(parent,name), solver_instance(0), es_filling(fill), solver_ret(FCS_STATE_NOT_BEGAN_YET), unlimited_move(unlimit) { @@ -813,12 +813,12 @@ bool FreecellBase::checkRemove(int checkIndex, const Pile *p, const Card *c) con class Freecell : public FreecellBase { public: - Freecell( KMainWindow* tqparent=0, const char* name=0); + Freecell( KMainWindow* parent=0, const char* name=0); virtual void deal(); }; -Freecell::Freecell( KMainWindow* tqparent, const char* name) - : FreecellBase(1, 8, 4, FCS_ES_FILLED_BY_ANY_CARD, false, tqparent, name) +Freecell::Freecell( KMainWindow* parent, const char* name) + : FreecellBase(1, 8, 4, FCS_ES_FILLED_BY_ANY_CARD, false, parent, name) { for (int i = 0; i < 8; i++) store[i]->move(8 + ( cardMap::CARDX() * 11 / 10 + 1 ) * i, 8 + cardMap::CARDY() * 11 / 10); @@ -846,7 +846,7 @@ static class LocalDealerInfo3 : public DealerInfo { public: LocalDealerInfo3() : DealerInfo(I18N_NOOP("&Freecell"), 3) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Freecell(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Freecell(parent); } } ldi8; //-------------------------------------------------------------------------// diff --git a/kpat/freecell.h b/kpat/freecell.h index 5d354eda..5b769249 100644 --- a/kpat/freecell.h +++ b/kpat/freecell.h @@ -27,7 +27,7 @@ class FreecellPile : public Pile { public: - FreecellPile(int _index, Dealer* tqparent = 0) : Pile(_index, tqparent) {} + FreecellPile(int _index, Dealer* parent = 0) : Pile(_index, parent) {} virtual void moveCards(CardList &c, Pile *to); }; @@ -38,7 +38,7 @@ class FreecellBase : public Dealer public: FreecellBase( int decks, int stores, int freecells, int es_filling, bool unlimited_move, - KMainWindow* tqparent=0, const char* name=0); + KMainWindow* parent=0, const char* name=0); void moveCards(CardList &c, FreecellPile *from, Pile *to); TQString solverFormat() const; virtual ~FreecellBase(); diff --git a/kpat/golf.cpp b/kpat/golf.cpp index b06caf68..053525da 100644 --- a/kpat/golf.cpp +++ b/kpat/golf.cpp @@ -4,8 +4,8 @@ #include <kdebug.h> #include "cardmaps.h" -HorRightPile::HorRightPile( int _index, Dealer* tqparent) - : Pile(_index, tqparent) +HorRightPile::HorRightPile( int _index, Dealer* parent) + : Pile(_index, parent) { } @@ -19,8 +19,8 @@ TQSize HorRightPile::cardOffset( bool _spread, bool, const Card *) const //-------------------------------------------------------------------------// -Golf::Golf( KMainWindow* tqparent, const char* _name) - : Dealer( tqparent, _name ) +Golf::Golf( KMainWindow* parent, const char* _name) + : Dealer( parent, _name ) { const int dist_x = cardMap::CARDX() * 11 / 10 + 1; const int pile_dist = 10 + 3 * cardMap::CARDY(); @@ -158,7 +158,7 @@ static class LocalDealerInfo13 : public DealerInfo { public: LocalDealerInfo13() : DealerInfo(I18N_NOOP("Go&lf"), 12) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Golf(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Golf(parent); } } ldi13; //-------------------------------------------------------------------------// diff --git a/kpat/golf.h b/kpat/golf.h index 275cd8b5..68937eb0 100644 --- a/kpat/golf.h +++ b/kpat/golf.h @@ -9,7 +9,7 @@ class HorRightPile : public Pile TQ_OBJECT public: - HorRightPile( int _index, Dealer* tqparent = 0); + HorRightPile( int _index, Dealer* parent = 0); virtual TQSize cardOffset( bool _spread, bool _facedown, const Card *before) const; }; @@ -19,7 +19,7 @@ class Golf : public Dealer TQ_OBJECT public: - Golf( KMainWindow* tqparent=0, const char* name=0); + Golf( KMainWindow* parent=0, const char* name=0); void deal(); virtual void restart(); virtual bool isGameLost() const; diff --git a/kpat/grandf.cpp b/kpat/grandf.cpp index 5ada2ea6..c15c6103 100644 --- a/kpat/grandf.cpp +++ b/kpat/grandf.cpp @@ -25,8 +25,8 @@ #include <assert.h> #include "cardmaps.h" -Grandf::Grandf( KMainWindow* tqparent, const char *name ) - : Dealer( tqparent, name ) +Grandf::Grandf( KMainWindow* parent, const char *name ) + : Dealer( parent, name ) { deck = Deck::new_deck(this); deck->hide(); @@ -221,7 +221,7 @@ static class LocalDealerInfo1 : public DealerInfo { public: LocalDealerInfo1() : DealerInfo(I18N_NOOP("&Grandfather"), 1) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Grandf(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Grandf(parent); } } gfdi; #include "grandf.moc" diff --git a/kpat/grandf.h b/kpat/grandf.h index 24e64c5c..e2ff1939 100644 --- a/kpat/grandf.h +++ b/kpat/grandf.h @@ -39,7 +39,7 @@ class Grandf : public Dealer { TQ_OBJECT public: - Grandf( KMainWindow* tqparent=0, const char* name=0); + Grandf( KMainWindow* parent=0, const char* name=0); public slots: void redeal(); diff --git a/kpat/gypsy.cpp b/kpat/gypsy.cpp index 9c37b6b6..5432336a 100644 --- a/kpat/gypsy.cpp +++ b/kpat/gypsy.cpp @@ -3,8 +3,8 @@ #include "deck.h" #include "cardmaps.h" -Gypsy::Gypsy( KMainWindow* tqparent, const char *name ) - : Dealer( tqparent, name ) +Gypsy::Gypsy( KMainWindow* parent, const char *name ) + : Dealer( parent, name ) { const int dist_x = cardMap::CARDX() * 11 / 10 + 1; const int dist_y = cardMap::CARDY() * 11 / 10 + 1; @@ -111,7 +111,7 @@ static class LocalDealerInfo7 : public DealerInfo { public: LocalDealerInfo7() : DealerInfo(I18N_NOOP("Gy&psy"), 7) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Gypsy(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Gypsy(parent); } } gyfdi; #include "gypsy.moc" diff --git a/kpat/gypsy.h b/kpat/gypsy.h index 5ead4175..90adff42 100644 --- a/kpat/gypsy.h +++ b/kpat/gypsy.h @@ -14,7 +14,7 @@ class Gypsy : public Dealer { TQ_OBJECT public: - Gypsy( KMainWindow* tqparent=0, const char* name=0); + Gypsy( KMainWindow* parent=0, const char* name=0); virtual bool isGameLost() const; public slots: diff --git a/kpat/idiot.cpp b/kpat/idiot.cpp index e86e8059..3ac49ef5 100644 --- a/kpat/idiot.cpp +++ b/kpat/idiot.cpp @@ -25,8 +25,8 @@ #include "cardmaps.h" -Idiot::Idiot( KMainWindow* tqparent, const char* _name) - : Dealer( tqparent, _name ) +Idiot::Idiot( KMainWindow* parent, const char* _name) + : Dealer( parent, _name ) { // Create the deck to the left. m_deck = Deck::new_deck( this ); @@ -227,7 +227,7 @@ static class LocalDealerInfo2 : public DealerInfo { public: LocalDealerInfo2() : DealerInfo(I18N_NOOP("&Aces Up"), 2) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Idiot(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Idiot(parent); } } ldi4; diff --git a/kpat/idiot.h b/kpat/idiot.h index 147e2fec..21d68b88 100644 --- a/kpat/idiot.h +++ b/kpat/idiot.h @@ -33,7 +33,7 @@ class Idiot: public Dealer public: - Idiot( KMainWindow* tqparent = 0, const char* name = 0 ); + Idiot( KMainWindow* parent = 0, const char* name = 0 ); virtual bool isGameWon() const; diff --git a/kpat/kings.cpp b/kpat/kings.cpp index 22faf307..7654a88f 100644 --- a/kpat/kings.cpp +++ b/kpat/kings.cpp @@ -6,8 +6,8 @@ #include "freecell-solver/fcs_enums.h" #include "cardmaps.h" -Kings::Kings( KMainWindow* tqparent, const char *name ) - : FreecellBase( 2, 8, 8, FCS_ES_FILLED_BY_KINGS_ONLY, true, tqparent, name ) +Kings::Kings( KMainWindow* parent, const char *name ) + : FreecellBase( 2, 8, 8, FCS_ES_FILLED_BY_KINGS_ONLY, true, parent, name ) { const int dist_x = cardMap::CARDX() * 11 / 10 + 1; @@ -125,7 +125,7 @@ static class LocalDealerInfo12 : public DealerInfo { public: LocalDealerInfo12() : DealerInfo(I18N_NOOP("&The Kings"), 12) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Kings(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Kings(parent); } } gfdi12; #endif diff --git a/kpat/kings.h b/kpat/kings.h index dc49e8c3..10afa8d6 100644 --- a/kpat/kings.h +++ b/kpat/kings.h @@ -12,7 +12,7 @@ class Kings : public FreecellBase { TQ_OBJECT public: - Kings( KMainWindow* tqparent=0, const char* name=0); + Kings( KMainWindow* parent=0, const char* name=0); virtual bool isGameLost() const; public slots: diff --git a/kpat/klondike.cpp b/kpat/klondike.cpp index 93514d2f..dcf4c1f8 100644 --- a/kpat/klondike.cpp +++ b/kpat/klondike.cpp @@ -32,8 +32,8 @@ class KlondikePile : public Pile { public: - KlondikePile( int _index, Dealer* tqparent) - : Pile(_index, tqparent) {} + KlondikePile( int _index, Dealer* parent) + : Pile(_index, parent) {} void clearSpread() { cardlist.clear(); } @@ -50,8 +50,8 @@ private: CardList cardlist; }; -Klondike::Klondike( bool easy, KMainWindow* tqparent, const char* _name ) - : Dealer( tqparent, _name ) +Klondike::Klondike( bool easy, KMainWindow* parent, const char* _name ) + : Dealer( parent, _name ) { // The units of the follwoing constants are pixels const int margin = 10; // between card piles and board edge @@ -481,14 +481,14 @@ static class LocalDealerInfo0 : public DealerInfo { public: LocalDealerInfo0() : DealerInfo(I18N_NOOP("&Klondike"), 0) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Klondike(true, tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Klondike(true, parent); } } ldi0; static class LocalDealerInfo14 : public DealerInfo { public: LocalDealerInfo14() : DealerInfo(I18N_NOOP("Klondike (&draw 3)"), 13) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Klondike(false, tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Klondike(false, parent); } } ldi14; diff --git a/kpat/klondike.h b/kpat/klondike.h index ad4fcdcd..959244ea 100644 --- a/kpat/klondike.h +++ b/kpat/klondike.h @@ -36,7 +36,7 @@ class Klondike : public Dealer { TQ_OBJECT public: - Klondike( bool easy, KMainWindow* tqparent=0, const char* name=0); + Klondike( bool easy, KMainWindow* parent=0, const char* name=0); public: virtual void restart(); diff --git a/kpat/mod3.cpp b/kpat/mod3.cpp index 9f92643f..45a8d026 100644 --- a/kpat/mod3.cpp +++ b/kpat/mod3.cpp @@ -26,8 +26,8 @@ //-------------------------------------------------------------------------// -Mod3::Mod3( KMainWindow* tqparent, const char* _name) - : Dealer( tqparent, _name ) +Mod3::Mod3( KMainWindow* parent, const char* _name) + : Dealer( parent, _name ) { const int dist_x = cardMap::CARDX() * 11 / 10 + 1; const int dist_y = cardMap::CARDY() * 11 / 10 + 1; @@ -301,7 +301,7 @@ static class LocalDealerInfo5 : public DealerInfo { public: LocalDealerInfo5() : DealerInfo(I18N_NOOP("M&od3"), 5) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Mod3(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Mod3(parent); } } ldi5; //-------------------------------------------------------------------------// diff --git a/kpat/mod3.h b/kpat/mod3.h index cb6047ce..60b9172a 100644 --- a/kpat/mod3.h +++ b/kpat/mod3.h @@ -31,7 +31,7 @@ class Mod3 : public Dealer TQ_OBJECT public: - Mod3( KMainWindow* tqparent=0, const char* name=0); + Mod3( KMainWindow* parent=0, const char* name=0); void deal(); diff --git a/kpat/napoleon.cpp b/kpat/napoleon.cpp index 1429fbdb..7f7c7f95 100644 --- a/kpat/napoleon.cpp +++ b/kpat/napoleon.cpp @@ -22,8 +22,8 @@ #include "deck.h" #include "cardmaps.h" -Napoleon::Napoleon( KMainWindow* tqparent, const char* _name ) - : Dealer( tqparent, _name ) +Napoleon::Napoleon( KMainWindow* parent, const char* _name ) + : Dealer( parent, _name ) { deck = Deck::new_deck( this ); connect(deck, TQT_SIGNAL(clicked(Card *)), TQT_SLOT(deal1(Card*))); @@ -198,7 +198,7 @@ static class LocalDealerInfo4 : public DealerInfo { public: LocalDealerInfo4() : DealerInfo(I18N_NOOP("&Napoleon's Tomb"), 4) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Napoleon(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Napoleon(parent); } } ldi3; #include "napoleon.moc" diff --git a/kpat/napoleon.h b/kpat/napoleon.h index d097d6ac..dd7b9d90 100644 --- a/kpat/napoleon.h +++ b/kpat/napoleon.h @@ -28,7 +28,7 @@ class Napoleon : public Dealer { Q_OBJECT TQ_OBJECT public: - Napoleon (KMainWindow* tqparent=0, const char* name=0); + Napoleon (KMainWindow* parent=0, const char* name=0); virtual void restart(); virtual void getHints(); diff --git a/kpat/pile.h b/kpat/pile.h index 3580eefe..c30e7c20 100644 --- a/kpat/pile.h +++ b/kpat/pile.h @@ -41,7 +41,7 @@ public: static const int autoTurnTop; static const int wholeColumn; - Pile( int _index, Dealer* tqparent = 0); + Pile( int _index, Dealer* parent = 0); virtual ~Pile(); Dealer *dealer() const { return m_dealer; } diff --git a/kpat/simon.cpp b/kpat/simon.cpp index fd3c3604..287ecd00 100644 --- a/kpat/simon.cpp +++ b/kpat/simon.cpp @@ -5,8 +5,8 @@ #include <assert.h> #include "cardmaps.h" -Simon::Simon( KMainWindow* tqparent, const char *name ) - : Dealer( tqparent, name ) +Simon::Simon( KMainWindow* parent, const char *name ) + : Dealer( parent, name ) { deck = Deck::new_deck(this); deck->move(10, 10); @@ -150,7 +150,7 @@ static class LocalDealerInfo9 : public DealerInfo { public: LocalDealerInfo9() : DealerInfo(I18N_NOOP("&Simple Simon"), 9) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Simon(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Simon(parent); } } gfi9; #include "simon.moc" diff --git a/kpat/simon.h b/kpat/simon.h index b20bfde8..14eefa20 100644 --- a/kpat/simon.h +++ b/kpat/simon.h @@ -8,7 +8,7 @@ class Simon : public Dealer { TQ_OBJECT public: - Simon( KMainWindow* tqparent=0, const char* name=0); + Simon( KMainWindow* parent=0, const char* name=0); public slots: void deal(); diff --git a/kpat/spider.cpp b/kpat/spider.cpp index 5c367c04..c8e6abc5 100644 --- a/kpat/spider.cpp +++ b/kpat/spider.cpp @@ -48,8 +48,8 @@ void SpiderPile::moveCards(CardList &c, Pile *to) //-------------------------------------------------------------------------// -Spider::Spider(int suits, KMainWindow* tqparent, const char* _name) - : Dealer(tqparent, _name) +Spider::Spider(int suits, KMainWindow* parent, const char* _name) + : Dealer(parent, _name) { const int dist_x = cardMap::CARDX() * 11 / 10 + 1; const int dist_y = cardMap::CARDY() * 11 / 10 + 1; @@ -459,21 +459,21 @@ static class LocalDealerInfo15 : public DealerInfo { public: LocalDealerInfo15() : DealerInfo(I18N_NOOP("S&pider (Easy)"), 14) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Spider(1, tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Spider(1, parent); } } ldi15; static class LocalDealerInfo16 : public DealerInfo { public: LocalDealerInfo16() : DealerInfo(I18N_NOOP("Spider (&Medium)"), 15) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Spider(2, tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Spider(2, parent); } } ldi16; static class LocalDealerInfo17 : public DealerInfo { public: LocalDealerInfo17() : DealerInfo(I18N_NOOP("Spider (&Hard)"), 16) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Spider(4, tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Spider(4, parent); } } ldi17; //-------------------------------------------------------------------------// diff --git a/kpat/spider.h b/kpat/spider.h index 81bf84b2..a3b591a6 100644 --- a/kpat/spider.h +++ b/kpat/spider.h @@ -26,7 +26,7 @@ class SpiderPile : public Pile { public: - SpiderPile(int _index, Dealer* tqparent = 0) : Pile(_index, tqparent) {} + SpiderPile(int _index, Dealer* parent = 0) : Pile(_index, parent) {} virtual void moveCards(CardList &c, Pile *to); CardList getRun(); }; @@ -37,7 +37,7 @@ class Spider : public Dealer TQ_OBJECT public: - Spider(int suits, KMainWindow *tqparent=0, const char *name=0); + Spider(int suits, KMainWindow *parent=0, const char *name=0); void deal(); void dealRow(); void checkPileDeck(Pile *to); diff --git a/kpat/yukon.cpp b/kpat/yukon.cpp index 1d3a6157..859b3746 100644 --- a/kpat/yukon.cpp +++ b/kpat/yukon.cpp @@ -5,8 +5,8 @@ #include <assert.h> #include "cardmaps.h" -Yukon::Yukon( KMainWindow* tqparent, const char *name ) - : Dealer( tqparent, name ) +Yukon::Yukon( KMainWindow* parent, const char *name ) + : Dealer( parent, name ) { const int dist_x = cardMap::CARDX() * 11 / 10 + 1; const int dist_y = cardMap::CARDY() * 11 / 10 + 1; @@ -124,7 +124,7 @@ static class LocalDealerInfo10 : public DealerInfo { public: LocalDealerInfo10() : DealerInfo(I18N_NOOP("&Yukon"), 10) {} - virtual Dealer *createGame(KMainWindow *tqparent) { return new Yukon(tqparent); } + virtual Dealer *createGame(KMainWindow *parent) { return new Yukon(parent); } } gfi10; #include "yukon.moc" diff --git a/kpat/yukon.h b/kpat/yukon.h index c9b4e5c9..dbfcea6f 100644 --- a/kpat/yukon.h +++ b/kpat/yukon.h @@ -8,7 +8,7 @@ class Yukon : public Dealer { TQ_OBJECT public: - Yukon( KMainWindow* tqparent=0, const char* name=0); + Yukon( KMainWindow* parent=0, const char* name=0); virtual bool isGameLost() const; public slots: diff --git a/kpoker/betbox.cpp b/kpoker/betbox.cpp index 304c4543..cbdcad12 100644 --- a/kpoker/betbox.cpp +++ b/kpoker/betbox.cpp @@ -24,8 +24,8 @@ #include "betbox.h" -BetBox::BetBox(TQWidget* tqparent, const char* name) - : TQGroupBox(tqparent, name) +BetBox::BetBox(TQWidget* parent, const char* name) + : TQGroupBox(parent, name) { TQVBoxLayout* topLayout = new TQVBoxLayout(this, 1, 1); TQGridLayout* g = new TQGridLayout(topLayout, 2, 2, 1); diff --git a/kpoker/betbox.h b/kpoker/betbox.h index e3c52ce9..8b335e03 100644 --- a/kpoker/betbox.h +++ b/kpoker/betbox.h @@ -36,7 +36,7 @@ class BetBox : public TQGroupBox TQ_OBJECT public: - BetBox(TQWidget* tqparent = 0, const char* name = 0); + BetBox(TQWidget* parent = 0, const char* name = 0); ~BetBox(); diff --git a/kpoker/kpaint.cpp b/kpoker/kpaint.cpp index 67029656..2dcc5dbf 100644 --- a/kpoker/kpaint.cpp +++ b/kpoker/kpaint.cpp @@ -38,8 +38,8 @@ TQPixmap *CardImages::m_cardPixmaps; TQPixmap *CardImages::m_deck; -CardImages::CardImages(TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name) +CardImages::CardImages(TQWidget* parent, const char* name) + : TQWidget(parent, name) { m_cardPixmaps = new TQPixmap[numCards]; m_deck = new TQPixmap; @@ -109,8 +109,8 @@ CardImages::loadDeck(TQString path) extern CardImages *cardImages; -CardWidget::CardWidget( TQWidget *tqparent, const char *name ) - : TQPushButton( tqparent, name ) +CardWidget::CardWidget( TQWidget *parent, const char *name ) + : TQPushButton( parent, name ) { m_held = false; @@ -173,8 +173,8 @@ void CardWidget::repaintDeck() setPixmap(*m_pm); setFixedSize(cardImages->getWidth(), cardImages->getHeight()); - ((TQWidget*) tqparent())->tqlayout()->tqinvalidate(); - ((TQWidget*) tqparent())->setFixedSize( ((TQWidget*) tqparent())->tqsizeHint()); + ((TQWidget*) parent())->tqlayout()->tqinvalidate(); + ((TQWidget*) parent())->setFixedSize( ((TQWidget*) parent())->tqsizeHint()); } diff --git a/kpoker/kpaint.h b/kpoker/kpaint.h index 512ce776..fe1440ee 100644 --- a/kpoker/kpaint.h +++ b/kpoker/kpaint.h @@ -39,7 +39,7 @@ class CardImages : public TQWidget TQ_OBJECT public: - CardImages( TQWidget *tqparent = 0, const char *name = 0 ); + CardImages( TQWidget *parent = 0, const char *name = 0 ); ~CardImages(); // FIXME: Use CardValue instead of int when the cards are in their @@ -70,7 +70,7 @@ class CardWidget : public TQPushButton TQ_OBJECT public: - CardWidget( TQWidget *tqparent=0, const char *name=0 ); + CardWidget( TQWidget *parent=0, const char *name=0 ); /** * Paints the deck if cardType = 0 or the card specified in cardType diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp index 295a3c06..92a7df5c 100644 --- a/kpoker/kpoker.cpp +++ b/kpoker/kpoker.cpp @@ -159,8 +159,8 @@ CardImages *cardImages; // Class kpok -kpok::kpok(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), +kpok::kpok(TQWidget *parent, const char *name) + : TQWidget(parent, name), m_game(&m_random) { TQString version; diff --git a/kpoker/kpoker.h b/kpoker/kpoker.h index 94b82db2..7eec697a 100644 --- a/kpoker/kpoker.h +++ b/kpoker/kpoker.h @@ -173,7 +173,7 @@ class kpok : public TQWidget TQ_OBJECT public: - kpok(TQWidget * tqparent = 0, const char *name = 0); + kpok(TQWidget * parent = 0, const char *name = 0); virtual ~kpok(); TQString getName (int playerNr); diff --git a/kpoker/newgamedlg.cpp b/kpoker/newgamedlg.cpp index 7237567a..ef2bfe0a 100644 --- a/kpoker/newgamedlg.cpp +++ b/kpoker/newgamedlg.cpp @@ -34,9 +34,9 @@ #include "newgamedlg.h" -NewGameDlg::NewGameDlg(TQWidget* tqparent) +NewGameDlg::NewGameDlg(TQWidget* parent) : KDialogBase(Plain, i18n("New Game"), - Ok|Cancel, Ok, tqparent, 0, true, true) + Ok|Cancel, Ok, parent, 0, true, true) { TQVBoxLayout *topLayout = new TQVBoxLayout(plainPage(), spacingHint()); TQHBoxLayout *l = new TQHBoxLayout(topLayout); diff --git a/kpoker/newgamedlg.h b/kpoker/newgamedlg.h index 09b9460d..22662b55 100644 --- a/kpoker/newgamedlg.h +++ b/kpoker/newgamedlg.h @@ -42,7 +42,7 @@ class NewGameDlg : public KDialogBase TQ_OBJECT public: - NewGameDlg(TQWidget* tqparent = 0); + NewGameDlg(TQWidget* parent = 0); ~NewGameDlg(); /** diff --git a/kpoker/optionsdlg.cpp b/kpoker/optionsdlg.cpp index 85c00b2c..5fdfbfcf 100644 --- a/kpoker/optionsdlg.cpp +++ b/kpoker/optionsdlg.cpp @@ -28,9 +28,9 @@ #include "defines.h" -OptionsDlg::OptionsDlg(TQWidget* tqparent, const char* name, int _players) +OptionsDlg::OptionsDlg(TQWidget* parent, const char* name, int _players) : KDialogBase(Plain, i18n("Options")/*?*/, Ok|Cancel, Ok, - tqparent, name, true, true) + parent, name, true, true) { TQVBoxLayout* topLayout = new TQVBoxLayout(plainPage(), spacingHint()); maxBet = 0; diff --git a/kpoker/optionsdlg.h b/kpoker/optionsdlg.h index 8aa6b8ff..5c62ef19 100644 --- a/kpoker/optionsdlg.h +++ b/kpoker/optionsdlg.h @@ -42,7 +42,7 @@ class OptionsDlg : public KDialogBase TQ_OBJECT public: - OptionsDlg(TQWidget* tqparent = 0, const char* name = 0, int _players = 1); + OptionsDlg(TQWidget* parent = 0, const char* name = 0, int _players = 1); ~OptionsDlg(); void init(int _drawDelay, int _maxBetOrCashPerRound, int minBet = -1); diff --git a/kpoker/playerbox.cpp b/kpoker/playerbox.cpp index 3c60c9bb..530ebd81 100644 --- a/kpoker/playerbox.cpp +++ b/kpoker/playerbox.cpp @@ -30,8 +30,8 @@ #include "kpaint.h" -PlayerBox::PlayerBox(bool playerOne, TQWidget* tqparent, const char* name) - : TQGroupBox(tqparent, name) +PlayerBox::PlayerBox(bool playerOne, TQWidget* parent, const char* name) + : TQGroupBox(parent, name) { TQHBoxLayout* l = new TQHBoxLayout(this, PLAYERBOX_BORDERS, PLAYERBOX_HDISTANCEOFWIDGETS); diff --git a/kpoker/playerbox.h b/kpoker/playerbox.h index bd4c7d75..a0205ed0 100644 --- a/kpoker/playerbox.h +++ b/kpoker/playerbox.h @@ -35,7 +35,7 @@ class PlayerBox : public TQGroupBox TQ_OBJECT public: - PlayerBox(bool playerOne, TQWidget* tqparent = 0, const char* name = 0); + PlayerBox(bool playerOne, TQWidget* parent = 0, const char* name = 0); ~PlayerBox(); void cardClicked(int no); diff --git a/kreversi/board.cpp b/kreversi/board.cpp index 727d8d2d..d24dccd1 100644 --- a/kreversi/board.cpp +++ b/kreversi/board.cpp @@ -71,8 +71,8 @@ const uint CHIP_SIZE = 36; // class KReversiBoardView -QReversiBoardView::QReversiBoardView(TQWidget *tqparent, QReversiGame *krgame) - : TQWidget(tqparent, "board"), +QReversiBoardView::QReversiBoardView(TQWidget *parent, QReversiGame *krgame) + : TQWidget(parent, "board"), chiptype(Unloaded) { m_krgame = krgame; diff --git a/kreversi/board.h b/kreversi/board.h index 68f211d4..0b217d8c 100644 --- a/kreversi/board.h +++ b/kreversi/board.h @@ -60,7 +60,7 @@ class QReversiBoardView : public TQWidget { public: - QReversiBoardView(TQWidget *tqparent, QReversiGame *game); + QReversiBoardView(TQWidget *parent, QReversiGame *game); ~QReversiBoardView(); // starts all: emits some signal, so it can't be called from diff --git a/kreversi/qreversigame.cpp b/kreversi/qreversigame.cpp index 361adbd8..3e940ca2 100644 --- a/kreversi/qreversigame.cpp +++ b/kreversi/qreversigame.cpp @@ -44,8 +44,8 @@ // class QReversiGame -QReversiGame::QReversiGame(TQObject *tqparent) - : TQObject(tqparent), Game() +QReversiGame::QReversiGame(TQObject *parent) + : TQObject(parent), Game() { } diff --git a/kreversi/qreversigame.h b/kreversi/qreversigame.h index e3b8893a..d10c5650 100644 --- a/kreversi/qreversigame.h +++ b/kreversi/qreversigame.h @@ -67,7 +67,7 @@ class QReversiGame : public TQObject, public Game { TQ_OBJECT public: - QReversiGame(TQObject *tqparent = 0); + QReversiGame(TQObject *parent = 0); ~QReversiGame(); // Methods dealing with the game diff --git a/kreversi/qreversigameview.cpp b/kreversi/qreversigameview.cpp index 87b29a60..f661d62c 100644 --- a/kreversi/qreversigameview.cpp +++ b/kreversi/qreversigameview.cpp @@ -71,8 +71,8 @@ // class StatusWidget -StatusWidget::StatusWidget(const TQString &text, TQWidget *tqparent) - : TQWidget(tqparent, "status_widget") +StatusWidget::StatusWidget(const TQString &text, TQWidget *parent) + : TQWidget(parent, "status_widget") { TQHBoxLayout *hbox = new TQHBoxLayout(this, 0, KDialog::spacingHint()); TQLabel *label; @@ -122,8 +122,8 @@ void StatusWidget::setScore(uint s) // class QReversiGameView -QReversiGameView::QReversiGameView(TQWidget *tqparent, QReversiGame *game) - : TQWidget(tqparent, "gameview") +QReversiGameView::QReversiGameView(TQWidget *parent, QReversiGame *game) + : TQWidget(parent, "gameview") { // Store a pointer to the game. m_game = game; diff --git a/kreversi/qreversigameview.h b/kreversi/qreversigameview.h index 4f7696b6..53d258d7 100644 --- a/kreversi/qreversigameview.h +++ b/kreversi/qreversigameview.h @@ -61,7 +61,7 @@ class StatusWidget : public TQWidget TQ_OBJECT public: - StatusWidget(const TQString &text, TQWidget *tqparent); + StatusWidget(const TQString &text, TQWidget *parent); void setText(const TQString &string); void setPixmap(const TQPixmap &pixmap); @@ -82,7 +82,7 @@ class QReversiGameView : public TQWidget { public: - QReversiGameView(TQWidget *tqparent, QReversiGame *game); + QReversiGameView(TQWidget *parent, QReversiGame *game); ~QReversiGameView(); // Proxy methods for the board view diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp index 28329b06..3a3f1120 100644 --- a/ksame/KSameWidget.cpp +++ b/ksame/KSameWidget.cpp @@ -46,8 +46,8 @@ static int default_colors=3; #define Board KScoreDialog::Custom1 -KSameWidget::KSameWidget(TQWidget *tqparent, const char* name, WFlags fl) : - KMainWindow(tqparent,name,fl) +KSameWidget::KSameWidget(TQWidget *parent, const char* name, WFlags fl) : + KMainWindow(parent,name,fl) { KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(m_new()), actionCollection(), "game_new"); restart = new KAction(i18n("&Restart This Board"), CTRL+Key_R, TQT_TQOBJECT(this), diff --git a/ksame/KSameWidget.h b/ksame/KSameWidget.h index 0d7f833b..ff24c2b0 100644 --- a/ksame/KSameWidget.h +++ b/ksame/KSameWidget.h @@ -32,7 +32,7 @@ class KSameWidget: public KMainWindow { TQ_OBJECT public: - KSameWidget(TQWidget *tqparent=0, const char* name=0, WFlags fl=0); + KSameWidget(TQWidget *parent=0, const char* name=0, WFlags fl=0); private slots: /* File Menu */ diff --git a/ksame/StoneWidget.cpp b/ksame/StoneWidget.cpp index 3109c33e..586aeefd 100644 --- a/ksame/StoneWidget.cpp +++ b/ksame/StoneWidget.cpp @@ -46,8 +46,8 @@ struct StoneSlice { }; -StoneWidget::StoneWidget( TQWidget *tqparent, int x, int y ) - : TQWidget(tqparent,"StoneWidget"), stonefield(x,y) +StoneWidget::StoneWidget( TQWidget *parent, int x, int y ) + : TQWidget(parent,"StoneWidget"), stonefield(x,y) { setBackgroundPixmap(TQPixmap(locate("wallpaper", "Time-For-Lunch-2.jpg"))); TQPixmap stonemap(locate("appdata", "stones.png")); @@ -65,7 +65,7 @@ StoneWidget::StoneWidget( TQWidget *tqparent, int x, int y ) stone_height=stonemap.height()/maxcolors; map = new StoneSlice*[maxcolors]; - TQBitmap tqmask; + TQBitmap mask; for (int c = 0; c < maxcolors; c++) { map[c] = new StoneSlice[maxslices]; @@ -77,8 +77,8 @@ StoneWidget::StoneWidget( TQWidget *tqparent, int x, int y ) c*stone_height, stone_width,stone_height,CopyROP,false); TQImage im = map[c][s].stone.convertToImage(); - tqmask.convertFromImage(im.createHeuristicMask()); - map[c][s].stone.setMask(tqmask); + mask.convertFromImage(im.createHeuristicMask()); + map[c][s].stone.setMask(mask); } } diff --git a/ksame/StoneWidget.h b/ksame/StoneWidget.h index 01e64ebe..616ef835 100644 --- a/ksame/StoneWidget.h +++ b/ksame/StoneWidget.h @@ -47,7 +47,7 @@ class StoneWidget : public TQWidget { StoneSlice **map; public: - StoneWidget( TQWidget *tqparent=0, int x=10,int y=10); + StoneWidget( TQWidget *parent=0, int x=10,int y=10); ~StoneWidget(); unsigned int board(); diff --git a/kshisen/app.cpp b/kshisen/app.cpp index 8717d767..47f59f1b 100644 --- a/kshisen/app.cpp +++ b/kshisen/app.cpp @@ -62,7 +62,7 @@ #include "prefs.h" #include "settings.h" -App::App(TQWidget *tqparent, const char *name) : KMainWindow(tqparent, name), +App::App(TQWidget *parent, const char *name) : KMainWindow(parent, name), cheat(false) { highscoreTable = new KHighscore(TQT_TQOBJECT(this)); diff --git a/kshisen/app.h b/kshisen/app.h index 917f9d1a..546a58f3 100644 --- a/kshisen/app.h +++ b/kshisen/app.h @@ -65,7 +65,7 @@ class App : public KMainWindow TQ_OBJECT public: - App(TQWidget *tqparent = 0, const char *name=0); + App(TQWidget *parent = 0, const char *name=0); private slots: void loadSettings(); diff --git a/kshisen/board.cpp b/kshisen/board.cpp index d568b825..4173ad4e 100644 --- a/kshisen/board.cpp +++ b/kshisen/board.cpp @@ -57,8 +57,8 @@ static int size_x[5] = {14, 18, 24, 26, 30}; static int size_y[5] = { 6, 8, 12, 14, 16}; static int DELAY[5] = {1000, 750, 500, 250, 125}; -Board::Board(TQWidget *tqparent, const char *name) : - TQWidget(tqparent, name, WResizeNoErase), field(0), +Board::Board(TQWidget *parent, const char *name) : + TQWidget(parent, name, WResizeNoErase), field(0), _x_tiles(0), _y_tiles(0), _delay(125), paused(false), gravity_flag(true), _solvable_flag(true), diff --git a/kshisen/board.h b/kshisen/board.h index d6b3940a..1a1f5ab6 100644 --- a/kshisen/board.h +++ b/kshisen/board.h @@ -73,7 +73,7 @@ class Board : public TQWidget TQ_OBJECT public: - Board(TQWidget *tqparent = 0, const char *name=0); + Board(TQWidget *parent = 0, const char *name=0); ~Board(); virtual void paintEvent(TQPaintEvent *); diff --git a/ksirtet/ksirtet/board.cpp b/ksirtet/ksirtet/board.cpp index 00126e68..f50aa1a4 100644 --- a/ksirtet/ksirtet/board.cpp +++ b/ksirtet/ksirtet/board.cpp @@ -8,8 +8,8 @@ using namespace KGrid2D; -KSBoard::KSBoard(bool graphic, TQWidget *tqparent) - : Board(graphic, new GiftPool(tqparent), tqparent), +KSBoard::KSBoard(bool graphic, TQWidget *parent) + : Board(graphic, new GiftPool(parent), parent), filled(matrix().height()), linesRemoved(4) { init(); diff --git a/ksirtet/ksirtet/board.h b/ksirtet/ksirtet/board.h index a1ac1612..3c3e712d 100644 --- a/ksirtet/ksirtet/board.h +++ b/ksirtet/ksirtet/board.h @@ -9,7 +9,7 @@ class KSBoard : public Board Q_OBJECT TQ_OBJECT public: - KSBoard(bool graphic, TQWidget *tqparent); + KSBoard(bool graphic, TQWidget *parent); void copy(const GenericTetris &); void start(const GTInitData &); diff --git a/ksirtet/ksirtet/field.cpp b/ksirtet/ksirtet/field.cpp index 1f7cbbc4..918fa8f1 100644 --- a/ksirtet/ksirtet/field.cpp +++ b/ksirtet/ksirtet/field.cpp @@ -11,8 +11,8 @@ #include "piece.h" //----------------------------------------------------------------------------- -KSField::KSField(TQWidget *tqparent) - : Field(tqparent) +KSField::KSField(TQWidget *parent) + : Field(parent) { const Board *b = static_cast<Board *>(board); TQWhatsThis::add(b->giftPool(), i18n("Indicate the number of garbage lines you received from your opponent.")); diff --git a/ksirtet/ksirtet/field.h b/ksirtet/ksirtet/field.h index adbe31cd..55a4152a 100644 --- a/ksirtet/ksirtet/field.h +++ b/ksirtet/ksirtet/field.h @@ -10,7 +10,7 @@ class KSField : public Field Q_OBJECT TQ_OBJECT public: - KSField(TQWidget *tqparent); + KSField(TQWidget *parent); private slots: virtual void removedUpdated(); diff --git a/ksirtet/ksirtet/main.cpp b/ksirtet/ksirtet/main.cpp index 09d02461..4c66c22f 100644 --- a/ksirtet/ksirtet/main.cpp +++ b/ksirtet/ksirtet/main.cpp @@ -64,9 +64,9 @@ KSFactory::KSFactory() : CommonFactory(MAIN_DATA, BASE_BOARD_INFO, COMMON_BOARD_INFO) {} -BaseInterface *KSFactory::createInterface(TQWidget *tqparent) +BaseInterface *KSFactory::createInterface(TQWidget *parent) { - return new Interface(MP_GAME_INFO, tqparent); + return new Interface(MP_GAME_INFO, parent); } //----------------------------------------------------------------------------- diff --git a/ksirtet/ksirtet/main.h b/ksirtet/ksirtet/main.h index c01bcfae..bb22e259 100644 --- a/ksirtet/ksirtet/main.h +++ b/ksirtet/ksirtet/main.h @@ -16,11 +16,11 @@ class KSFactory : public CommonFactory KSFactory(); protected: - virtual BaseBoard *createBoard(bool graphic, TQWidget *tqparent) - { return new KSBoard(graphic, tqparent); } - virtual BaseField *createField(TQWidget *tqparent) - { return new KSField(tqparent); } - virtual BaseInterface *createInterface(TQWidget *tqparent); + virtual BaseBoard *createBoard(bool graphic, TQWidget *parent) + { return new KSBoard(graphic, parent); } + virtual BaseField *createField(TQWidget *parent) + { return new KSField(parent); } + virtual BaseInterface *createInterface(TQWidget *parent); virtual AI *createAI() { return new KSAI; } virtual TQWidget *createGameConfig() { return new KSGameConfig; } }; diff --git a/ksmiletris/gamewidget.cpp b/ksmiletris/gamewidget.cpp index bf1e78ef..04d5e543 100644 --- a/ksmiletris/gamewidget.cpp +++ b/ksmiletris/gamewidget.cpp @@ -43,8 +43,8 @@ this software. #include <kmessagebox.h> #include <klocale.h> -GameWidget::GameWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +GameWidget::GameWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { in_game = false; in_pause = false; @@ -153,7 +153,7 @@ void GameWidget::loadSprites() loadSprite(Sprite_Bg14, "bg14.bmp"); loadSprite(Sprite_Bg15, "bg15.bmp"); loadSprite(Sprite_Bg16, "bg16.bmp"); - loadMaskedSprite(Sprite_Broken, "broken.bmp", "broken-tqmask.bmp"); + loadMaskedSprite(Sprite_Broken, "broken.bmp", "broken-mask.bmp"); } void GameWidget::loadSprite(Sprite spr, const TQString & path) diff --git a/ksmiletris/gamewidget.h b/ksmiletris/gamewidget.h index 4b4371b2..ca41093e 100644 --- a/ksmiletris/gamewidget.h +++ b/ksmiletris/gamewidget.h @@ -48,7 +48,7 @@ public: int num_level; int num_points; - GameWidget(TQWidget *tqparent=0, const char *name=0); + GameWidget(TQWidget *parent=0, const char *name=0); ~GameWidget(); void setPieces(PiecesType type); diff --git a/ksmiletris/gamewindow.h b/ksmiletris/gamewindow.h index bdfaabf7..fdd0d96b 100644 --- a/ksmiletris/gamewindow.h +++ b/ksmiletris/gamewindow.h @@ -38,7 +38,7 @@ class GameWindow : public KMainWindow { TQ_OBJECT public: - GameWindow(TQWidget *tqparent=0, const char *name=0); + GameWindow(TQWidget *parent=0, const char *name=0); public slots: void menu_newGame(); diff --git a/ksmiletris/mirrorwidget.cpp b/ksmiletris/mirrorwidget.cpp index 7a31a166..8a7447eb 100644 --- a/ksmiletris/mirrorwidget.cpp +++ b/ksmiletris/mirrorwidget.cpp @@ -31,8 +31,8 @@ this software. #include "mirrorwidget.h" MirrorWidget::MirrorWidget(TQPixmap *s, bool *game, bool *pause, - TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name) + TQWidget *parent, const char *name) + : TQFrame(parent, name) { in_game = game; in_pause = pause; diff --git a/ksmiletris/mirrorwidget.h b/ksmiletris/mirrorwidget.h index 9d3f0a5d..80676a8a 100644 --- a/ksmiletris/mirrorwidget.h +++ b/ksmiletris/mirrorwidget.h @@ -31,7 +31,7 @@ this software. class MirrorWidget : public TQFrame { public: MirrorWidget(TQPixmap *s, bool *game, bool *pause, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); void setBackgroundSprite(Sprite s) { bg_sprite = s; } void setMirrorSprites(Sprite *s) { mirror_sprites = s; } diff --git a/ksmiletris/npiecewidget.cpp b/ksmiletris/npiecewidget.cpp index 4218df92..9e87a9a0 100644 --- a/ksmiletris/npiecewidget.cpp +++ b/ksmiletris/npiecewidget.cpp @@ -31,8 +31,8 @@ this software. #include "npiecewidget.h" NextPieceWidget::NextPieceWidget(TQPixmap *s, bool *game, bool *pause, - TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name) + TQWidget *parent, const char *name) + : TQFrame(parent, name) { in_game = game; in_pause = pause; diff --git a/ksmiletris/npiecewidget.h b/ksmiletris/npiecewidget.h index 961366f6..f2d7ac1f 100644 --- a/ksmiletris/npiecewidget.h +++ b/ksmiletris/npiecewidget.h @@ -31,7 +31,7 @@ this software. class NextPieceWidget : public TQFrame { public: NextPieceWidget(TQPixmap *s, bool *game, bool *pause, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); void setBackgroundSprite(Sprite s) { bg_sprite = s; } void setNextPieceSprites(Sprite *s) { next_piece_sprites = s; } diff --git a/ksmiletris/screenwidget.cpp b/ksmiletris/screenwidget.cpp index a8f53c73..d8e87f4c 100644 --- a/ksmiletris/screenwidget.cpp +++ b/ksmiletris/screenwidget.cpp @@ -33,8 +33,8 @@ this software. #include "screenwidget.h" ScreenWidget::ScreenWidget(TQPixmap *s, bool *game, bool *pause, - TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name) + TQWidget *parent, const char *name) + : TQFrame(parent, name) { in_game = game; in_pause = pause; diff --git a/ksmiletris/screenwidget.h b/ksmiletris/screenwidget.h index f15a1e23..a27b3b31 100644 --- a/ksmiletris/screenwidget.h +++ b/ksmiletris/screenwidget.h @@ -31,7 +31,7 @@ this software. class ScreenWidget : public TQFrame { public: ScreenWidget(TQPixmap *s, bool *game, bool *pause, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); void setBackgroundSprite(Sprite s) { bg_sprite = s; } void setScreenSprites(Sprite *s) { screen_sprites = s; } diff --git a/ksnake/board.cpp b/ksnake/board.cpp index e9e44cd0..0959dee1 100644 --- a/ksnake/board.cpp +++ b/ksnake/board.cpp @@ -48,7 +48,7 @@ int Pos::price() const { void Pos::setParent(Pos *p) { _parent = p; } -Pos *Pos::tqparent() const { +Pos *Pos::parent() const { return(_parent); } Pos *Pos::listNext() { @@ -241,7 +241,7 @@ int Board::getNextCloseTo(int s, int d, bool diag, int lastIndex) if(list->index() == d) { // Find first movement after root. for(; ; list = p) { - p = list->tqparent(); + p = list->parent(); if(p == root) { // This is our move. int nextSq = list->index(); @@ -265,7 +265,7 @@ int Board::getNextCloseTo(int s, int d, bool diag, int lastIndex) continue; } - int pi = list->tqparent() ? list->tqparent()->index() : lastIndex; + int pi = list->parent() ? list->parent()->index() : lastIndex; if(pi != -1 && direction(pi, list->index()) != direction(list->index(), i)) { pri += 10; @@ -277,7 +277,7 @@ int Board::getNextCloseTo(int s, int d, bool diag, int lastIndex) // Check price of found position with current one. if(p->price() > pri) { // We found a cheapear way to reach the same - // place, so let's change the tqparent and price of p. + // place, so let's change the parent and price of p. p->setPrice(list->price() + 1); p->setParent(list); list->addList(p); diff --git a/ksnake/board.h b/ksnake/board.h index c7514d75..0eece38d 100644 --- a/ksnake/board.h +++ b/ksnake/board.h @@ -47,7 +47,7 @@ public: void setPrice(int p); int price() const; void setParent(Pos *p); - Pos *tqparent() const; + Pos *parent() const; Pos *listNext(); void addBTree(Pos *np); Pos *searchBTree(int i); diff --git a/ksnake/game.cpp b/ksnake/game.cpp index 600bbd55..29e8b5df 100644 --- a/ksnake/game.cpp +++ b/ksnake/game.cpp @@ -54,7 +54,7 @@ #define SCORE 1 #define LIVES 2 -Game::Game(TQWidget *tqparent, const char *name) : KMainWindow(tqparent,name) +Game::Game(TQWidget *parent, const char *name) : KMainWindow(parent,name) { // create statusbar statusBar()->insertItem(i18n("Score: 0"), SCORE); diff --git a/ksnake/game.h b/ksnake/game.h index 509856e7..f3595bb3 100644 --- a/ksnake/game.h +++ b/ksnake/game.h @@ -39,7 +39,7 @@ Q_OBJECT TQ_OBJECT public: - Game(TQWidget *tqparent=0, const char *name=0); + Game(TQWidget *parent=0, const char *name=0); ~Game(); private slots: diff --git a/ksnake/progress.cpp b/ksnake/progress.cpp index 1e2c0f72..547ddbab 100644 --- a/ksnake/progress.cpp +++ b/ksnake/progress.cpp @@ -25,8 +25,8 @@ #include "progress.h" -Progress::Progress(TQWidget *tqparent, const char *name) - : KGameProgress(0, 300, 300, Qt::Horizontal, tqparent, name) +Progress::Progress(TQWidget *parent, const char *name) + : KGameProgress(0, 300, 300, Qt::Horizontal, parent, name) { setBarColor("green1"); setTextEnabled(false); diff --git a/ksnake/progress.h b/ksnake/progress.h index ae78aa47..b395de65 100644 --- a/ksnake/progress.h +++ b/ksnake/progress.h @@ -33,7 +33,7 @@ class Progress : public KGameProgress Q_OBJECT TQ_OBJECT public: - Progress( TQWidget *tqparent=0, const char *name=0 ); + Progress( TQWidget *parent=0, const char *name=0 ); public slots: void advance(); diff --git a/ksnake/rattler.cpp b/ksnake/rattler.cpp index 8fc0999f..4c68f316 100644 --- a/ksnake/rattler.cpp +++ b/ksnake/rattler.cpp @@ -43,8 +43,8 @@ TQBitArray gameState(5); TQLabel *label = 0; int speed[4] = { 130, 95, 55, 40 }; -Rattler::Rattler( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +Rattler::Rattler( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { setFocusPolicy(TQ_StrongFocus); diff --git a/ksnake/rattler.h b/ksnake/rattler.h index 4c9b72ee..9aff9fa6 100644 --- a/ksnake/rattler.h +++ b/ksnake/rattler.h @@ -46,7 +46,7 @@ class Rattler : public TQWidget TQ_OBJECT public: - Rattler ( TQWidget *tqparent=0, const char *name=0 ); + Rattler ( TQWidget *parent=0, const char *name=0 ); ~Rattler(); void setActionCollection(KActionCollection *a){ actionCollection = a;} diff --git a/ksnake/startroom.cpp b/ksnake/startroom.cpp index a50536e0..9792ee4b 100644 --- a/ksnake/startroom.cpp +++ b/ksnake/startroom.cpp @@ -33,8 +33,8 @@ #include "levels.h" -StartRoom::StartRoom( TQWidget *tqparent, const char *name) - : TQWidget( tqparent, name ) +StartRoom::StartRoom( TQWidget *parent, const char *name) + : TQWidget( parent, name ) { TQGridLayout *Form1Layout = new TQGridLayout( this, 1, 1, 11, 6, "Form1Layout"); TQSpacerItem* spacer = new TQSpacerItem( 20, 61, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); diff --git a/ksnake/startroom.h b/ksnake/startroom.h index 222bd50f..7ddba17e 100644 --- a/ksnake/startroom.h +++ b/ksnake/startroom.h @@ -36,7 +36,7 @@ class StartRoom : public TQWidget Q_OBJECT TQ_OBJECT public: - StartRoom( TQWidget *tqparent=0, const char *name=0 ); + StartRoom( TQWidget *parent=0, const char *name=0 ); private slots: void loadLevel(int level); diff --git a/ksnake/view.cpp b/ksnake/view.cpp index dec662ea..add5cf16 100644 --- a/ksnake/view.cpp +++ b/ksnake/view.cpp @@ -32,8 +32,8 @@ int MAPWIDTH = BRICKSIZE * 35; int MAPHEIGHT = MAPWIDTH; #define BAR_HEIGHT 12 -View::View( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +View::View( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { progress = new Progress(this); rattler = new Rattler( this); diff --git a/ksnake/view.h b/ksnake/view.h index 2ab132d7..9e05da9f 100644 --- a/ksnake/view.h +++ b/ksnake/view.h @@ -35,7 +35,7 @@ class View : public TQWidget Q_OBJECT TQ_OBJECT public: - View ( TQWidget *tqparent=0, const char *name=0 ); + View ( TQWidget *parent=0, const char *name=0 ); Progress *progress; Rattler *rattler; diff --git a/ksokoban/ModalLabel.cpp b/ksokoban/ModalLabel.cpp index 47d4c49b..560c4b9d 100644 --- a/ksokoban/ModalLabel.cpp +++ b/ksokoban/ModalLabel.cpp @@ -28,9 +28,9 @@ #include "ModalLabel.moc" -ModalLabel::ModalLabel(const TQString &text, TQWidget *tqparent, +ModalLabel::ModalLabel(const TQString &text, TQWidget *parent, const char *name, WFlags f) - : TQLabel(text, tqparent, name, f) { + : TQLabel(text, parent, name, f) { TQFont font(KGlobalSettings::generalFont().family(), 24, TQFont::Bold); TQFontMetrics fontMet(font); @@ -61,7 +61,7 @@ ModalLabel::ModalLabel(const TQString &text, TQWidget *tqparent, setFrameStyle (TQFrame::Panel | TQFrame::Raised); setLineWidth (4); setFont (font); - move (tqparent->width ()/2 - width/2, tqparent->height ()/2 - height/2); + move (parent->width ()/2 - width/2, parent->height ()/2 - height/2); resize (width, height); show (); @@ -107,9 +107,9 @@ ModalLabel::eventFilter (TQObject *, TQEvent *e) { } void -ModalLabel::message (const TQString &text, TQWidget *tqparent) { +ModalLabel::message (const TQString &text, TQWidget *parent) { KApplication *app = KApplication::kApplication (); - ModalLabel cl (text, tqparent); + ModalLabel cl (text, parent); while (!cl.completed_) app->processOneEvent (); } diff --git a/ksokoban/ModalLabel.h b/ksokoban/ModalLabel.h index cb4420cc..687df563 100644 --- a/ksokoban/ModalLabel.h +++ b/ksokoban/ModalLabel.h @@ -26,14 +26,14 @@ class ModalLabel : public TQLabel { Q_OBJECT TQ_OBJECT public: - static void message (const TQString &text, TQWidget *tqparent); + static void message (const TQString &text, TQWidget *parent); void timerEvent (TQTimerEvent *); bool eventFilter (TQObject *, TQEvent *); bool completed_; protected: - ModalLabel (const TQString &text, TQWidget *tqparent, const char *name=0, WFlags f=0); + ModalLabel (const TQString &text, TQWidget *parent, const char *name=0, WFlags f=0); }; diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp index 68b97f76..c3fe57fe 100644 --- a/ksokoban/PlayField.cpp +++ b/ksokoban/PlayField.cpp @@ -45,8 +45,8 @@ #include "PlayField.moc" -PlayField::PlayField(TQWidget *tqparent, const char *name, WFlags f) - : TQWidget(tqparent, name, f|WResizeNoErase), imageData_(0), lastLevel_(-1), +PlayField::PlayField(TQWidget *parent, const char *name, WFlags f) + : TQWidget(parent, name, f|WResizeNoErase), imageData_(0), lastLevel_(-1), moveSequence_(0), moveInProgress_(false), dragInProgress_(false), xOffs_(0), yOffs_(0), wheelDelta_(0), diff --git a/ksokoban/PlayField.h b/ksokoban/PlayField.h index 161c49d0..b4380033 100644 --- a/ksokoban/PlayField.h +++ b/ksokoban/PlayField.h @@ -45,7 +45,7 @@ class PlayField : public TQWidget { Q_OBJECT TQ_OBJECT public: - PlayField(TQWidget *tqparent, const char *name=0, WFlags f=0); + PlayField(TQWidget *parent, const char *name=0, WFlags f=0); ~PlayField (); bool canMoveNow(); diff --git a/kspaceduel/dialogs.cpp b/kspaceduel/dialogs.cpp index 843e93ee..34194ad0 100644 --- a/kspaceduel/dialogs.cpp +++ b/kspaceduel/dialogs.cpp @@ -113,8 +113,8 @@ int ConfigSetup::Position[EditNum]= const int LCDLen=6; -ConfigSetup::ConfigSetup(SConfig *custom,TQWidget *tqparent,const char *name) - :TQWidget( tqparent, name ) +ConfigSetup::ConfigSetup(SConfig *custom,TQWidget *parent,const char *name) + :TQWidget( parent, name ) { TQLabel *label[EditNum]; TQGridLayout *stacklayout[TabNum]; @@ -388,8 +388,8 @@ void ConfigSetup::sliderChanged(int val) } -SettingsDialog::SettingsDialog(SConfig *customConfig, TQWidget *tqparent, const char *name) - : KConfigDialog( tqparent, name, Options::self()) +SettingsDialog::SettingsDialog(SConfig *customConfig, TQWidget *parent, const char *name) + : KConfigDialog( parent, name, Options::self()) { General *general = new General(); addPage(general, i18n("General"), "package_settings", i18n("General Settings")); diff --git a/kspaceduel/dialogs.h b/kspaceduel/dialogs.h index 1f769a40..897ef65f 100644 --- a/kspaceduel/dialogs.h +++ b/kspaceduel/dialogs.h @@ -20,7 +20,7 @@ class ConfigSetup:public TQWidget Q_OBJECT TQ_OBJECT public: - ConfigSetup(SConfig *custom,TQWidget *tqparent=0,const char* name=0); + ConfigSetup(SConfig *custom,TQWidget *parent=0,const char* name=0); bool hasChanged(); bool isDefault(); @@ -82,7 +82,7 @@ class SettingsDialog : public KConfigDialog Q_OBJECT TQ_OBJECT public: - SettingsDialog(SConfig *customConfig, TQWidget *tqparent=0, const char *name=0); + SettingsDialog(SConfig *customConfig, TQWidget *parent=0, const char *name=0); ~SettingsDialog(); signals: diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp index 39ab33b9..3f17605a 100644 --- a/kspaceduel/mainview.cpp +++ b/kspaceduel/mainview.cpp @@ -18,8 +18,8 @@ KToggleAction *MyMainView::pauseAction = 0; -MyMainView::MyMainView(TQWidget *tqparent) - :TQWidget(tqparent), +MyMainView::MyMainView(TQWidget *parent) + :TQWidget(parent), field(DEF_WIDTH,DEF_HEIGHT), view(&field,this) { diff --git a/kspaceduel/mainview.h b/kspaceduel/mainview.h index ec182408..d7ed1bdc 100644 --- a/kspaceduel/mainview.h +++ b/kspaceduel/mainview.h @@ -21,7 +21,7 @@ class MyMainView:public TQWidget Q_OBJECT TQ_OBJECT public: - MyMainView(TQWidget *tqparent=0); + MyMainView(TQWidget *parent=0); ~MyMainView(); static KToggleAction *pauseAction; diff --git a/kspaceduel/playerinfo.cpp b/kspaceduel/playerinfo.cpp index 07020fb3..dbb5728d 100644 --- a/kspaceduel/playerinfo.cpp +++ b/kspaceduel/playerinfo.cpp @@ -5,8 +5,8 @@ #include <kstandarddirs.h> -PlayerInfo::PlayerInfo(int pnr,TQWidget *tqparent,const char *name) - :TQFrame(tqparent,name), +PlayerInfo::PlayerInfo(int pnr,TQWidget *parent,const char *name) + :TQFrame(parent,name), lplayer(this),lenergy(this),lwins(this), hitpoints(2,this),energy(2,this),wins(2,this) { diff --git a/kspaceduel/playerinfo.h b/kspaceduel/playerinfo.h index 0963b405..a0f570db 100644 --- a/kspaceduel/playerinfo.h +++ b/kspaceduel/playerinfo.h @@ -12,7 +12,7 @@ class PlayerInfo:public TQFrame Q_OBJECT TQ_OBJECT public: - PlayerInfo(int pnr,TQWidget *tqparent=0,const char *name=0); + PlayerInfo(int pnr,TQWidget *parent=0,const char *name=0); public slots: void setHitpoints(int h); void setEnergy(int e); diff --git a/ktron/ktron.cpp b/ktron/ktron.cpp index 16628fd9..9057f7c0 100644 --- a/ktron/ktron.cpp +++ b/ktron/ktron.cpp @@ -42,7 +42,7 @@ /** * Constuctor */ -KTron::KTron(TQWidget *tqparent, const char *name) : KMainWindow(tqparent, name) { +KTron::KTron(TQWidget *parent, const char *name) : KMainWindow(parent, name) { playerPoints[0]=playerPoints[1]=0; tron=new Tron(this, "Tron"); diff --git a/ktron/ktron.h b/ktron/ktron.h index e4b9b218..a46c008c 100644 --- a/ktron/ktron.h +++ b/ktron/ktron.h @@ -42,7 +42,7 @@ Q_OBJECT TQ_OBJECT public: - KTron(TQWidget *tqparent=0, const char *name=0); + KTron(TQWidget *parent=0, const char *name=0); private: KAccel *accel; diff --git a/ktron/tron.cpp b/ktron/tron.cpp index c168070d..9ed00d8c 100644 --- a/ktron/tron.cpp +++ b/ktron/tron.cpp @@ -41,8 +41,8 @@ * init-functions **/ -Tron::Tron(TQWidget *tqparent,const char *name) - : TQWidget(tqparent,name) +Tron::Tron(TQWidget *parent,const char *name) + : TQWidget(parent,name) { pixmap=0; playfield=0; diff --git a/ktron/tron.h b/ktron/tron.h index 16e8722b..db0533f5 100644 --- a/ktron/tron.h +++ b/ktron/tron.h @@ -49,7 +49,7 @@ class Tron : public TQWidget TQ_OBJECT public: - Tron(TQWidget *tqparent=0, const char *name=0); + Tron(TQWidget *parent=0, const char *name=0); ~Tron(); void setActionCollection(KActionCollection*); void updatePixmap(); diff --git a/ktuberling/pics/layout.xml b/ktuberling/pics/layout.xml index 9e87dae7..e96beb07 100644 --- a/ktuberling/pics/layout.xml +++ b/ktuberling/pics/layout.xml @@ -11,7 +11,7 @@ <ktuberling> - <playground gameboard="potato-game.png" masks="potato-tqmask.png"> + <playground gameboard="potato-game.png" masks="potato-mask.png"> <menuitem action="playground_potato_guy"> <label>Potato &Guy</label> @@ -269,7 +269,7 @@ </playground> - <playground gameboard="penguin-game.png" masks="penguin-tqmask.png"> + <playground gameboard="penguin-game.png" masks="penguin-mask.png"> <menuitem action="playground_penguin"> <label>&Penguin</label> @@ -422,7 +422,7 @@ </playground> - <playground gameboard="aquarium-game.png" masks="aquarium-tqmask.png"> + <playground gameboard="aquarium-game.png" masks="aquarium-mask.png"> <menuitem action="playground_aquarium"> <label>&Aquarium</label> diff --git a/ktuberling/playground.cpp b/ktuberling/playground.cpp index c84f9d38..586f143f 100644 --- a/ktuberling/playground.cpp +++ b/ktuberling/playground.cpp @@ -24,10 +24,10 @@ #define YMARGIN 5 // Constructor -PlayGround::PlayGround(TopLevel *tqparent, const char *name, uint selectedGameboard) - : TQWidget(tqparent, name) +PlayGround::PlayGround(TopLevel *parent, const char *name, uint selectedGameboard) + : TQWidget(parent, name) { - topLevel = tqparent; + topLevel = parent; textsLayout = objectsLayout = 0; textsList = soundsList = 0; diff --git a/ktuberling/playground.h b/ktuberling/playground.h index 65fbaff0..4bd8c210 100644 --- a/ktuberling/playground.h +++ b/ktuberling/playground.h @@ -27,7 +27,7 @@ class PlayGround : public TQWidget public: - PlayGround(TopLevel *tqparent, const char *name, uint selectedGameboard); + PlayGround(TopLevel *parent, const char *name, uint selectedGameboard); ~PlayGround(); void reset(); diff --git a/ktuberling/soundfactory.cpp b/ktuberling/soundfactory.cpp index f10d0a8c..857c26d5 100644 --- a/ktuberling/soundfactory.cpp +++ b/ktuberling/soundfactory.cpp @@ -18,10 +18,10 @@ #include "toplevel.h" // Constructor -SoundFactory::SoundFactory(TopLevel *tqparent, const char *name, uint selectedLanguage) - : TQObject(tqparent, name) +SoundFactory::SoundFactory(TopLevel *parent, const char *name, uint selectedLanguage) + : TQObject(parent, name) { - topLevel = tqparent; + topLevel = parent; namesList = filesList = 0; diff --git a/ktuberling/soundfactory.h b/ktuberling/soundfactory.h index 76272e0a..2b9e954f 100644 --- a/ktuberling/soundfactory.h +++ b/ktuberling/soundfactory.h @@ -20,7 +20,7 @@ class SoundFactory : public TQObject public: - SoundFactory(TopLevel *tqparent, const char *name, uint selectedLanguage); + SoundFactory(TopLevel *parent, const char *name, uint selectedLanguage); ~SoundFactory(); void change(uint selectedLanguage); diff --git a/kwin4/kwin4/kspritecache.cpp b/kwin4/kwin4/kspritecache.cpp index c49332f7..bd55c418 100644 --- a/kwin4/kwin4/kspritecache.cpp +++ b/kwin4/kwin4/kspritecache.cpp @@ -27,8 +27,8 @@ // KSprite #include <math.h> -KSpriteCache::KSpriteCache(TQString grafixdir, TQObject* tqparent,const char * name) - : TQObject(tqparent,name) +KSpriteCache::KSpriteCache(TQString grafixdir, TQObject* parent,const char * name) + : TQObject(parent,name) { kdDebug(11002) << "KSpriteCache:: grafixdir=" << grafixdir << endl; mConfig=0; @@ -155,7 +155,7 @@ TQCanvasItem *KSpriteCache::getItem(TQString name,int no) return item; } -TQPixmap * KSpriteCache::loadPixmap(TQString file,TQString tqmask,TQString dir) +TQPixmap * KSpriteCache::loadPixmap(TQString file,TQString mask,TQString dir) { TQPixmap *newP=new TQPixmap; bool result1=false; @@ -165,21 +165,21 @@ TQPixmap * KSpriteCache::loadPixmap(TQString file,TQString tqmask,TQString dir) { result1=newP->load(dir+file); } - if (result1 && !tqmask.isNull()) + if (result1 && !mask.isNull()) { - TQBitmap bittqmask; - if (tqmask==TQString("auto")) // self tqmask..slow but quick to create + TQBitmap bitmask; + if (mask==TQString("auto")) // self mask..slow but quick to create { newP->setMask( newP->createHeuristicMask() ); result2=true; } else { - result2=bittqmask.load(dir+tqmask); - if (result2) newP->setMask(bittqmask); + result2=bitmask.load(dir+mask); + if (result2) newP->setMask(bitmask); } } - //kdDebug(11002) << "KSpriteCache::loadPixmap: file="<<file<<" tqmask="<<tqmask<<" result1="<<result1<<" result2="<<result2<<endl; + //kdDebug(11002) << "KSpriteCache::loadPixmap: file="<<file<<" mask="<<mask<<" result1="<<result1<<" result2="<<result2<<endl; return newP; } @@ -221,7 +221,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na //kdDebug(11002) << " Reading " << number << " frames " << endl; TQString pixfile=config->readPathEntry(name+"file"); - TQString maskfile=config->readPathEntry(name+"tqmask"); + TQString maskfile=config->readPathEntry(name+"mask"); // Load a given set of images or replace a %d by a sequence if there are // less image names than number given @@ -230,12 +230,12 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na // Read images for (unsigned int i=0;i<number;i++) { - TQString tmpfile,tmptqmask; + TQString tmpfile,tmpmask; tmpfile.sprintf(pixfile.latin1(),i); - tmptqmask.sprintf(maskfile.latin1(),i); + tmpmask.sprintf(maskfile.latin1(),i); - pixmap=loadPixmap(tmpfile,tmptqmask); - if (!pixmap) kdError() << "Could not create pixmap="<<tmpfile << " with tqmask " << tmptqmask << endl; + pixmap=loadPixmap(tmpfile,tmpmask); + if (!pixmap) kdError() << "Could not create pixmap="<<tmpfile << " with mask " << tmpmask << endl; else { applyFilter(pixmap,config,name); @@ -255,7 +255,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na double step; if (number>1) step=(100.0-finalscale)/100.0/(double)(number-1); else step=1.0; - //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " tqmask="<<maskfile<<endl; + //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " mask="<<maskfile<<endl; pixmap=loadPixmap(pixfile,maskfile); for (unsigned int j=0;j<(unsigned int)number;j++) diff --git a/kwin4/kwin4/kspritecache.h b/kwin4/kwin4/kspritecache.h index 94cb83d9..5a17a8ba 100644 --- a/kwin4/kwin4/kspritecache.h +++ b/kwin4/kwin4/kspritecache.h @@ -37,7 +37,7 @@ class KSprite; public: KSpriteNotify() :TQObject(0,0) {mRefCnt=0;} - void emitSignal(TQCanvasItem *tqparent,int mode) {emit signalNotify(tqparent,mode);} + void emitSignal(TQCanvasItem *parent,int mode) {emit signalNotify(parent,mode);} void incRefCnt() {mRefCnt++;} void decRefCnt() {mRefCnt--;} int refCnt() {return mRefCnt;} @@ -147,7 +147,7 @@ class KSprite : public TQCanvasSprite /** * Creates a notification object. You can connect to it and it will emit - * the signal signalNotify(TQCanvasItem *tqparent, intmode) when a move or + * the signal signalNotify(TQCanvasItem *parent, intmode) when a move or * animation is finished. * Example: * <pre> @@ -244,17 +244,17 @@ class KSprite : public TQCanvasSprite * * Example: * <pre> - * # Sprite with three frames and a common tqmask for them + * # Sprite with three frames and a common mask for them * # z position given but x,y set manually in the program * [arrow] * file=arrow%d.png - * tqmask=arrow_tqmask.png + * mask=arrow_mask.png * number=3 * offset=19,5 * rtti=32 * z=9.0 * - * # Simple sprite which is already positioned correcly. No tqmask just one file + * # Simple sprite which is already positioned correcly. No mask just one file * [board] * file=board.png * rtti=32 @@ -267,7 +267,7 @@ class KSprite : public TQCanvasSprite * [star] * anim0=0,4,2,8 * file=star%d.png - * tqmask=star%d_tqmask.png + * mask=star%d_mask.png * number=5 * offset=19,20 * rtti=32 @@ -293,7 +293,7 @@ class KSpriteCache : public TQObject * * @param grafixdir - the directory where the configuration file and the graphics reside **/ - KSpriteCache(TQString grafixdir, TQObject* tqparent=0,const char * name=0); + KSpriteCache(TQString grafixdir, TQObject* parent=0,const char * name=0); /** * Delete the sprite cache @@ -369,10 +369,10 @@ class KSpriteCache : public TQObject /** * This function loads a pixmap from the given file. Optional you can also - * provide a tqmask file. Also optinal you can provide the directory. Default + * provide a mask file. Also optinal you can provide the directory. Default * is the directory which is set with this @ref KSpriteCache **/ - TQPixmap * loadPixmap(TQString file,TQString tqmask=TQString(),TQString dir=TQString()); + TQPixmap * loadPixmap(TQString file,TQString mask=TQString(),TQString dir=TQString()); /** * Deletes a item form the sprite cache given as a pointer to it @@ -438,7 +438,7 @@ class KSpriteCache : public TQObject * number=(int) : how many frames to generate * file=(Qstring) : the filename to load (can contain printf format args * as %d which are replaced, e.g. file=hello_%d.png - * tqmask=(TQString) : Same for the tqmask of the pixmaps + * mask=(TQString) : Same for the mask of the pixmaps * axis=(int) : (scale only): scale axis (1=x,2=y,3=x+y) * final=(double) : final scale in percent (default 0.0, i.e. complete scaling) * colorfilter=1,h,s,v: make a HSV transform of all sprite images diff --git a/kwin4/kwin4/kwin4.cpp b/kwin4/kwin4/kwin4.cpp index 84056254..dc4e85c0 100644 --- a/kwin4/kwin4/kwin4.cpp +++ b/kwin4/kwin4/kwin4.cpp @@ -63,8 +63,8 @@ * Constructor for the chat widget. This widget * is derived from the libkdegames chat widget */ -ChatDlg::ChatDlg(KGame *game,TQWidget *tqparent) - : KDialogBase(Plain,i18n("Chat Dlg"),Ok,Ok,tqparent,0,false,true),mChat(0), mChatDlg(0) +ChatDlg::ChatDlg(KGame *game,TQWidget *parent) + : KDialogBase(Plain,i18n("Chat Dlg"),Ok,Ok,parent,0,false,true),mChat(0), mChatDlg(0) { setMinimumSize(TQSize(200,200)); @@ -107,7 +107,7 @@ void ChatDlg::setPlayer(Kwin4Player *p) /** * Construct the main application window */ -Kwin4App::Kwin4App(TQWidget *tqparent, const char *name) : KMainWindow(tqparent,name), view(0), doc(0), mChat(0), mMyChatDlg(0) +Kwin4App::Kwin4App(TQWidget *parent, const char *name) : KMainWindow(parent,name), view(0), doc(0), mChat(0), mMyChatDlg(0) { initGUI(); initStatusBar(); diff --git a/kwin4/kwin4/kwin4.h b/kwin4/kwin4/kwin4.h index e3ab0ebc..d5a132ad 100644 --- a/kwin4/kwin4/kwin4.h +++ b/kwin4/kwin4/kwin4.h @@ -40,7 +40,7 @@ class KDE_EXPORT ChatDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - ChatDlg(KGame *game,TQWidget* tqparent=0); + ChatDlg(KGame *game,TQWidget* parent=0); public slots: void setPlayer(Kwin4Player *p); @@ -60,7 +60,7 @@ Q_OBJECT TQ_OBJECT public: - Kwin4App(TQWidget *tqparent=0, const char *name=0); + Kwin4App(TQWidget *parent=0, const char *name=0); protected: void EndGame(TABLE mode); diff --git a/kwin4/kwin4/kwin4doc.cpp b/kwin4/kwin4/kwin4doc.cpp index 8c52985b..3cce2df6 100644 --- a/kwin4/kwin4/kwin4doc.cpp +++ b/kwin4/kwin4/kwin4doc.cpp @@ -36,7 +36,7 @@ #include "prefs.h" #include "statuswidget.h" -Kwin4Doc::Kwin4Doc(TQWidget *tqparent, const char *) : KGame(1234,TQT_TQOBJECT(tqparent)), pView(0), mHintProcess(0) +Kwin4Doc::Kwin4Doc(TQWidget *parent, const char *) : KGame(1234,TQT_TQOBJECT(parent)), pView(0), mHintProcess(0) { connect(this,TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *,KGame *)), this,TQT_SLOT(slotPropertyChanged(KGamePropertyBase *,KGame *))); diff --git a/kwin4/kwin4/kwin4doc.h b/kwin4/kwin4/kwin4doc.h index 0084b854..d501918f 100644 --- a/kwin4/kwin4/kwin4doc.h +++ b/kwin4/kwin4/kwin4doc.h @@ -51,7 +51,7 @@ Q_OBJECT TQ_OBJECT public: - Kwin4Doc(TQWidget *tqparent, const char *name=0); + Kwin4Doc(TQWidget *parent, const char *name=0); ~Kwin4Doc(); /** adds a view to the document which represents the document contents. Usually this is your main view. */ diff --git a/kwin4/kwin4/kwin4view.cpp b/kwin4/kwin4/kwin4view.cpp index 6877860b..e526539e 100644 --- a/kwin4/kwin4/kwin4view.cpp +++ b/kwin4/kwin4/kwin4view.cpp @@ -101,8 +101,8 @@ private: }; -Kwin4View::Kwin4View(Kwin4Doc *theDoc, TQWidget *tqparent, const char *name) - : TQCanvasView(0,tqparent, name), doc(theDoc) +Kwin4View::Kwin4View(Kwin4Doc *theDoc, TQWidget *parent, const char *name) + : TQCanvasView(0,parent, name), doc(theDoc) { mLastArrow=-1; @@ -129,8 +129,8 @@ Kwin4View::Kwin4View(Kwin4Doc *theDoc, TQWidget *tqparent, const char *name) //setBackgroundMode(PaletteBase); setBackgroundColor(TQColor(0,0,128)); - mCanvas=new TQCanvas(TQT_TQOBJECT(tqparent)); - mCanvas->resize(tqparent->width(),tqparent->height()); + mCanvas=new TQCanvas(TQT_TQOBJECT(parent)); + mCanvas->resize(parent->width(),parent->height()); mCanvas->setDoubleBuffering(true); mCanvas->setBackgroundColor(TQColor(0,0,128)); setCanvas(mCanvas); diff --git a/kwin4/kwin4/kwin4view.h b/kwin4/kwin4/kwin4view.h index 30bcfce6..f35ed154 100644 --- a/kwin4/kwin4/kwin4view.h +++ b/kwin4/kwin4/kwin4view.h @@ -35,7 +35,7 @@ Q_OBJECT TQ_OBJECT public: - Kwin4View(Kwin4Doc *theDoc, TQWidget *tqparent = 0, const char *name=0); + Kwin4View(Kwin4Doc *theDoc, TQWidget *parent = 0, const char *name=0); void initView(bool deleteall=true); void drawBoard(bool remove=false); diff --git a/kwin4/kwin4/scorewidget.cpp b/kwin4/kwin4/scorewidget.cpp index ad53f49e..d9c99225 100644 --- a/kwin4/kwin4/scorewidget.cpp +++ b/kwin4/kwin4/scorewidget.cpp @@ -31,8 +31,8 @@ #define COL_STATUSDARK TQColor(0,0,65) #define COL_STATUSLIGHT TQColor(210,210,255) -ScoreWidget::ScoreWidget( TQWidget* tqparent, const char* name, WFlags fl ) - : TQFrame( tqparent, name, fl ) +ScoreWidget::ScoreWidget( TQWidget* parent, const char* name, WFlags fl ) + : TQFrame( parent, name, fl ) { setFrameStyle( TQFrame::Box | TQFrame::Raised ); setLineWidth( 2 ); diff --git a/kwin4/kwin4/scorewidget.h b/kwin4/kwin4/scorewidget.h index d6476061..7d157812 100644 --- a/kwin4/kwin4/scorewidget.h +++ b/kwin4/kwin4/scorewidget.h @@ -14,7 +14,7 @@ class ScoreWidget : public TQFrame TQ_OBJECT public: - ScoreWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + ScoreWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); void setMove(int i); void setLevel(int i); void setChance(int i); 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 <b_mann@gmx.de> **/ @@ -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 <b_mann@gmx.de> **/ @@ -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 ); }; 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 <kexthighscore.h> -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<ClientPlayData> _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 <klocale.h> -void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *tqparent) +void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *parent) { TQString str; if ( msg2.isNull() ) str = msg1; else str = i18n("%1:\n%2").tqarg(msg1).tqarg(msg2); - KMessageBox::error(tqparent, str); + KMessageBox::error(parent, str); } TQString socketError(const KExtendedSocket *socket) @@ -16,9 +16,9 @@ TQString socketError(const KExtendedSocket *socket) } bool checkSocket(int res, const KExtendedSocket *socket, - const TQString &msg, TQWidget *tqparent) + const TQString &msg, TQWidget *parent) { if ( res==0 ) return false; - errorBox(msg, socketError(socket), tqparent); + errorBox(msg, socketError(socket), parent); return true; } diff --git a/libksirtet/lib/defines.h b/libksirtet/lib/defines.h index db936b10..a6728a38 100644 --- a/libksirtet/lib/defines.h +++ b/libksirtet/lib/defines.h @@ -16,10 +16,10 @@ #define MP_SERVER_ADDRESS "Server address" #define MP_PORT "Port" -void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *tqparent); +void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *parent); TQString socketError(const KExtendedSocket *socket); bool checkSocket(int res, const KExtendedSocket *, - const TQString &msg, TQWidget *tqparent); + const TQString &msg, TQWidget *parent); #define R_ERROR_BOX(msg1, msg2) { \ errorBox(msg1, msg2, this); \ diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp index 48dbb025..599f7372 100644 --- a/libksirtet/lib/keys.cpp +++ b/libksirtet/lib/keys.cpp @@ -7,8 +7,8 @@ KeyData::KeyData(uint maxNb, uint nbActions, const ActionData *data, - TQObject *tqparent) - : TQObject(tqparent), _maxNb(maxNb) + TQObject *parent) + : TQObject(parent), _maxNb(maxNb) { _data.duplicate(data, nbActions); diff --git a/libksirtet/lib/keys.h b/libksirtet/lib/keys.h index 16e25118..a5227a9b 100644 --- a/libksirtet/lib/keys.h +++ b/libksirtet/lib/keys.h @@ -13,7 +13,7 @@ class KeyData : public TQObject TQ_OBJECT public: KeyData(uint maxNb, uint nbActions, const ActionData *, - TQObject *tqparent); + TQObject *parent); void setKeycodes(uint nb, uint i, const int *keycodes); void setCurrentNb(uint nb); diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp index d9b3028a..5e0e679f 100644 --- a/libksirtet/lib/meeting.cpp +++ b/libksirtet/lib/meeting.cpp @@ -14,10 +14,10 @@ NetMeeting::NetMeeting(const cId &_id, Socket *socket, MPOptionWidget *option, - bool _server, TQWidget *tqparent, const char * name) + bool _server, TQWidget *parent, const char * name) : KDialogBase(Plain, i18n("Network Meeting"), (_server ? Ok|Cancel|Help : Cancel|Help), - (_server ? Ok : Cancel), tqparent, name), + (_server ? Ok : Cancel), parent, name), server(_server), ow(option), id(_id), socketRemoved(FALSE) { sm.append(socket, SocketManager::ReadWrite); @@ -213,8 +213,8 @@ void NetMeeting::message(const TQString &str) /** ServerNetMeeting *********************************************************/ ServerNetMeeting::ServerNetMeeting(const cId &id, const RemoteHostData &r, MPOptionWidget *option, - TQPtrList<RemoteHostData> &arhd, TQWidget *tqparent, const char * name) -: NetMeeting(id, r.socket, option, TRUE, tqparent, name), rhd(arhd) + TQPtrList<RemoteHostData> &arhd, TQWidget *parent, const char * name) +: NetMeeting(id, r.socket, option, TRUE, parent, name), rhd(arhd) { connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)), TQT_SLOT(newHost(int))); players.append(Accepted); // server @@ -448,8 +448,8 @@ void ServerNetMeeting::optionsChanged() /** ClientNetMeeting *********************************************************/ ClientNetMeeting::ClientNetMeeting(const cId &id, const RemoteHostData &rhd, MPOptionWidget *option, - TQWidget *tqparent, const char * name) -: NetMeeting(id, rhd.socket, option, FALSE, tqparent, name), bds(rhd.bds) + TQWidget *parent, const char * name) +: NetMeeting(id, rhd.socket, option, FALSE, parent, name), bds(rhd.bds) { connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)), TQT_SLOT(readNotifier(int))); diff --git a/libksirtet/lib/meeting.h b/libksirtet/lib/meeting.h index cc8356fc..a1cdc8e0 100644 --- a/libksirtet/lib/meeting.h +++ b/libksirtet/lib/meeting.h @@ -19,7 +19,7 @@ class NetMeeting : public KDialogBase // "gameName" and "gameId" are TQByteArray because they are // used for ID comparing between games. NetMeeting(const cId &id, Socket *, MPOptionWidget *option, bool server, - TQWidget *tqparent = 0, const char * name = 0); + TQWidget *parent = 0, const char * name = 0); virtual ~NetMeeting(); protected slots: @@ -84,7 +84,7 @@ class ServerNetMeeting : public NetMeeting ServerNetMeeting(const cId &id, const RemoteHostData &rhd, MPOptionWidget *options, TQPtrList<RemoteHostData> &arhd, - TQWidget *tqparent = 0, const char * name = 0); + TQWidget *parent = 0, const char * name = 0); private slots: void newHost(int); @@ -115,7 +115,7 @@ class ClientNetMeeting : public NetMeeting public: ClientNetMeeting(const cId &id, const RemoteHostData &rhd, MPOptionWidget *options, - TQWidget *tqparent = 0, const char * name = 0); + TQWidget *parent = 0, const char * name = 0); private slots: void textChanged(const TQString &text); diff --git a/libksirtet/lib/miscui.cpp b/libksirtet/lib/miscui.cpp index 7bc8e48b..dde70adb 100644 --- a/libksirtet/lib/miscui.cpp +++ b/libksirtet/lib/miscui.cpp @@ -8,8 +8,8 @@ //----------------------------------------------------------------------------- MeetingCheckBox::MeetingCheckBox(Type type, bool owner, bool server, - TQWidget *tqparent) - : TQWidget(tqparent, "meeting_check_box") + TQWidget *parent) + : TQWidget(parent, "meeting_check_box") { TQVBoxLayout *vbox = new TQVBoxLayout(this); @@ -46,8 +46,8 @@ void MeetingCheckBox::changedSlot() //----------------------------------------------------------------------------- PlayerComboBox::PlayerComboBox(Type type, bool canBeEmpty, bool acceptAI, - TQWidget *tqparent) - : TQComboBox(tqparent, "player_combo_box") + TQWidget *parent) + : TQComboBox(parent, "player_combo_box") { insertItem(i18n("Human")); if (acceptAI) insertItem(i18n("AI")); diff --git a/libksirtet/lib/miscui.h b/libksirtet/lib/miscui.h index 3bc7fd32..d8d67002 100644 --- a/libksirtet/lib/miscui.h +++ b/libksirtet/lib/miscui.h @@ -12,7 +12,7 @@ class MeetingCheckBox : public TQWidget TQ_OBJECT public: enum Type { Ready, NotReady, Excluded }; - MeetingCheckBox(Type, bool owner, bool server, TQWidget *tqparent); + MeetingCheckBox(Type, bool owner, bool server, TQWidget *parent); void setType(Type); Type type() const; @@ -34,7 +34,7 @@ class PlayerComboBox : public TQComboBox TQ_OBJECT public: enum Type { Human = 0, AI, None }; - PlayerComboBox(Type, bool canBeNone, bool acceptAI, TQWidget *tqparent); + PlayerComboBox(Type, bool canBeNone, bool acceptAI, TQWidget *parent); Type type() const { return (Type)currentItem(); } diff --git a/libksirtet/lib/mp_board.h b/libksirtet/lib/mp_board.h index 2578e927..3f7e7212 100644 --- a/libksirtet/lib/mp_board.h +++ b/libksirtet/lib/mp_board.h @@ -13,8 +13,8 @@ class MPBoard : public TQWidget TQ_OBJECT public: - MPBoard(TQWidget *tqparent, const char *name=0) - : TQWidget(tqparent, name) {} + MPBoard(TQWidget *parent, const char *name=0) + : TQWidget(parent, name) {} virtual ~MPBoard() {} /** diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp index 6683ba00..e28ebdf8 100644 --- a/libksirtet/lib/mp_interface.cpp +++ b/libksirtet/lib/mp_interface.cpp @@ -21,8 +21,8 @@ /*****************************************************************************/ MPInterface::MPInterface(const MPGameInfo &_gameInfo, uint nbActions, const ActionData *data, - TQWidget *tqparent, const char *name) -: TQWidget(tqparent, name), internal(0), gameInfo(_gameInfo), nbLocalHumans(0) + TQWidget *parent, const char *name) +: TQWidget(parent, name), internal(0), gameInfo(_gameInfo), nbLocalHumans(0) { Q_ASSERT( gameInfo.maxNbLocalPlayers>=1 ); diff --git a/libksirtet/lib/mp_interface.h b/libksirtet/lib/mp_interface.h index ea70736f..1beaa442 100644 --- a/libksirtet/lib/mp_interface.h +++ b/libksirtet/lib/mp_interface.h @@ -83,7 +83,7 @@ class MPInterface : public TQWidget */ MPInterface(const MPGameInfo &gameInfo, uint nbActions, const ActionData *data, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); virtual ~MPInterface(); public slots: diff --git a/libksirtet/lib/mp_option.h b/libksirtet/lib/mp_option.h index 3d7468b5..bca42bfa 100644 --- a/libksirtet/lib/mp_option.h +++ b/libksirtet/lib/mp_option.h @@ -38,8 +38,8 @@ class MPOptionWidget : public TQWidget TQ_OBJECT public: - MPOptionWidget(bool Server, TQWidget *tqparent = 0, const char *name = 0) - : TQWidget(tqparent, name), server(Server) {} + MPOptionWidget(bool Server, TQWidget *parent = 0, const char *name = 0) + : TQWidget(parent, name), server(Server) {} virtual ~MPOptionWidget() {} bool isServer() const { return server; } diff --git a/libksirtet/lib/mp_simple_board.h b/libksirtet/lib/mp_simple_board.h index 24a7654f..f01291f0 100644 --- a/libksirtet/lib/mp_simple_board.h +++ b/libksirtet/lib/mp_simple_board.h @@ -12,8 +12,8 @@ class KDE_EXPORT MPSimpleBoard : public MPBoard TQ_OBJECT public: - MPSimpleBoard(TQWidget *tqparent = 0, const char *name = 0) - : MPBoard(tqparent, name) {} + MPSimpleBoard(TQWidget *parent = 0, const char *name = 0) + : MPBoard(parent, name) {} virtual ~MPSimpleBoard() {} void init(bool AI, bool multiplayers, bool server, bool first, diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp index e863b069..17515fb0 100644 --- a/libksirtet/lib/mp_simple_interface.cpp +++ b/libksirtet/lib/mp_simple_interface.cpp @@ -13,8 +13,8 @@ MPSimpleInterface::MPSimpleInterface(const MPGameInfo &gi, uint nbActions, const ActionData *data, - TQWidget *tqparent, const char *name) -: MPInterface(gi, nbActions, data, tqparent, name), state(SS_Standby) + TQWidget *parent, const char *name) +: MPInterface(gi, nbActions, data, parent, name), state(SS_Standby) {} void MPSimpleInterface::init() diff --git a/libksirtet/lib/mp_simple_interface.h b/libksirtet/lib/mp_simple_interface.h index 04cb014c..fbe4ba1d 100644 --- a/libksirtet/lib/mp_simple_interface.h +++ b/libksirtet/lib/mp_simple_interface.h @@ -12,7 +12,7 @@ class MPSimpleInterface : public MPInterface public: MPSimpleInterface(const MPGameInfo &gi, uint nbActions, const ActionData *data, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); bool isPaused() const { return state==SS_Pause; } diff --git a/libksirtet/lib/pline.cpp b/libksirtet/lib/pline.cpp index 94e9c50e..3a63a0b0 100644 --- a/libksirtet/lib/pline.cpp +++ b/libksirtet/lib/pline.cpp @@ -9,8 +9,8 @@ #define THIN_BORDER 4 MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, - TQWidget *tqparent, const char *name) -: TQFrame(tqparent, name) + TQWidget *parent, const char *name) +: TQFrame(parent, name) { setFrameStyle(Panel | (serverLine ? Raised : Plain)); @@ -84,8 +84,8 @@ void MeetingLine::data(ExtData &ed) const PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt, bool humanSetting, bool AISetting, bool canBeEmpty, bool acceptAI, - TQWidget *tqparent, const char *name) -: TQFrame(tqparent, name), hs(humanSetting), as(AISetting) + TQWidget *parent, const char *name) +: TQFrame(parent, name), hs(humanSetting), as(AISetting) { setFrameStyle(Panel | Raised); @@ -128,8 +128,8 @@ void PlayerLine::setSlot() } /*****************************************************************************/ -GWidgetList::GWidgetList(uint interval, TQWidget *tqparent, const char * name) - : TQWidget(tqparent, name), vbl(this, interval) +GWidgetList::GWidgetList(uint interval, TQWidget *parent, const char * name) + : TQWidget(parent, name), vbl(this, interval) { widgets.setAutoDelete(TRUE); } diff --git a/libksirtet/lib/pline.h b/libksirtet/lib/pline.h index 9cef8d29..5bba6c4b 100644 --- a/libksirtet/lib/pline.h +++ b/libksirtet/lib/pline.h @@ -20,7 +20,7 @@ class MeetingLine : public TQFrame public: MeetingLine(bool isOwner, bool readerIsServer, bool serverLine, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); MeetingCheckBox::Type type() const { return tcb->type(); } void setType(MeetingCheckBox::Type type) { tcb->setType(type); } @@ -58,7 +58,7 @@ class PlayerLine : public TQFrame PlayerLine(PlayerComboBox::Type type, const TQString &txt, bool humanSetting, bool AISetting, bool canBeEmpty, bool acceptAI, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); PlayerComboBox::Type type() const { return pcb->type(); } TQString name() const { return edit->text(); } @@ -86,13 +86,13 @@ class GWidgetList : public TQWidget TQ_OBJECT public: - GWidgetList(uint interval, TQWidget *tqparent = 0, const char * name = 0); + GWidgetList(uint interval, TQWidget *parent = 0, const char * name = 0); void remove(uint i); uint size() const { return widgets.count(); } protected: - /** The widget must be created with this widget as tqparent. */ + /** The widget must be created with this widget as parent. */ void append(TQWidget *); TQWidget *widget(uint i) { return widgets.at(i); } @@ -105,8 +105,8 @@ template <class Type> class WidgetList : public GWidgetList { public: - WidgetList(uint interval, TQWidget *tqparent=0, const char *name=0) - : GWidgetList(interval, tqparent, name) {} + WidgetList(uint interval, TQWidget *parent=0, const char *name=0) + : GWidgetList(interval, parent, name) {} void append(Type *w) { GWidgetList::append(w); } Type *widget(uint i) { return (Type *)GWidgetList::widget(i); } diff --git a/libksirtet/lib/socket.cpp b/libksirtet/lib/socket.cpp index 7dd74f74..6defc94b 100644 --- a/libksirtet/lib/socket.cpp +++ b/libksirtet/lib/socket.cpp @@ -21,13 +21,13 @@ #endif Socket::Socket(KExtendedSocket *s, bool createNotifier, - TQObject *tqparent, const char *name) + TQObject *parent, const char *name) : _socket(s), _notifier(0) { Q_ASSERT(s); if (createNotifier) { _notifier = new TQSocketNotifier(s->fd(), TQSocketNotifier::Read, - tqparent, name); + parent, name); _notifier->setEnabled(FALSE); } } diff --git a/libksirtet/lib/socket.h b/libksirtet/lib/socket.h index 75538670..01dac726 100644 --- a/libksirtet/lib/socket.h +++ b/libksirtet/lib/socket.h @@ -12,7 +12,7 @@ class Socket { public: Socket(KExtendedSocket *, bool createNotifier = FALSE, - TQObject *tqparent = 0, const char *name = 0); + TQObject *parent = 0, const char *name = 0); /** close the socket */ ~Socket(); diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp index a059cfa2..29508e26 100644 --- a/libksirtet/lib/wizard.cpp +++ b/libksirtet/lib/wizard.cpp @@ -32,8 +32,8 @@ #define MAX_USER_PORT 65535 MPWizard::MPWizard(const MPGameInfo &gi, ConnectionData &_cd, - TQWidget *tqparent, const char *name) -: KWizard(tqparent, name, TRUE), cd(_cd) + TQWidget *parent, const char *name) +: KWizard(parent, name, TRUE), cd(_cd) { // setupTypePage(); // #### REMOVE NETWORK GAMES UNTIL FIXED type = Local; diff --git a/libksirtet/lib/wizard.h b/libksirtet/lib/wizard.h index 42623ec7..3de9f1b7 100644 --- a/libksirtet/lib/wizard.h +++ b/libksirtet/lib/wizard.h @@ -23,7 +23,7 @@ class MPWizard : public KWizard public: MPWizard(const MPGameInfo &gi, ConnectionData &cd, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); void showPage(TQWidget *page); diff --git a/lskat/lskat/KChildConnect.cpp b/lskat/lskat/KChildConnect.cpp index 679b3f65..b3ecfb18 100644 --- a/lskat/lskat/KChildConnect.cpp +++ b/lskat/lskat/KChildConnect.cpp @@ -57,7 +57,7 @@ bool KChildConnect::SendMsg(KEMessage *msg) return Send(sendstring); } -// Send string to tqparent +// Send string to parent bool KChildConnect::Send(TQString str) { if (!str || str.length()<1) return true; // no need to send crap diff --git a/lskat/lskat/KEInput.cpp b/lskat/lskat/KEInput.cpp index ea2def79..b2f53f65 100644 --- a/lskat/lskat/KEInput.cpp +++ b/lskat/lskat/KEInput.cpp @@ -22,8 +22,8 @@ #include "KEInput.moc" -KEInput::KEInput(TQObject * tqparent) - : TQObject(tqparent,0) +KEInput::KEInput(TQObject * parent) + : TQObject(parent,0) { number_of_inputs=0; locked=FALSE; diff --git a/lskat/lskat/KEInput.h b/lskat/lskat/KEInput.h index 0a599e9a..4a97e864 100644 --- a/lskat/lskat/KEInput.h +++ b/lskat/lskat/KEInput.h @@ -47,7 +47,7 @@ class KEInput : public TQObject TQMemArray<KConnectEntry> playerArray; public: - KEInput(TQObject * tqparent=0); + KEInput(TQObject * parent=0); ~KEInput(); int QueryNumberOfInputs(); int QueryNext(); diff --git a/lskat/lskat/lskatdoc.cpp b/lskat/lskat/lskatdoc.cpp index f8b955e5..cdb51054 100644 --- a/lskat/lskat/lskatdoc.cpp +++ b/lskat/lskat/lskatdoc.cpp @@ -36,7 +36,7 @@ TQPtrList<LSkatView> *LSkatDoc::pViewList = 0L; -LSkatDoc::LSkatDoc(TQWidget *tqparent, const char *name) : TQObject(tqparent, name) +LSkatDoc::LSkatDoc(TQWidget *parent, const char *name) : TQObject(parent, name) { int i; if(!pViewList) diff --git a/lskat/lskat/lskatdoc.h b/lskat/lskat/lskatdoc.h index a556f3de..e4b52c17 100644 --- a/lskat/lskat/lskatdoc.h +++ b/lskat/lskat/lskatdoc.h @@ -50,7 +50,7 @@ class LSkatDoc : public TQObject TQ_OBJECT public: /** Constructor for the fileclass of the application */ - LSkatDoc(TQWidget *tqparent, const char *name=0); + LSkatDoc(TQWidget *parent, const char *name=0); /** Destructor for the fileclass of the application */ ~LSkatDoc(); diff --git a/lskat/lskat/lskatview.cpp b/lskat/lskat/lskatview.cpp index a71f1b24..1905ad48 100644 --- a/lskat/lskat/lskatview.cpp +++ b/lskat/lskat/lskatview.cpp @@ -104,7 +104,7 @@ #define MOVECOUNTER 20 // so many moves when playing card #define MOVE_TIMER_DELAY 7 // timer in milllisec default 7 -LSkatView::LSkatView(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +LSkatView::LSkatView(TQWidget *parent, const char *name) : TQWidget(parent, name) { setBackgroundMode(PaletteBase); // setBackgroundMode(NoBackground); diff --git a/lskat/lskat/lskatview.h b/lskat/lskat/lskatview.h index 8fd86025..20fe80a7 100644 --- a/lskat/lskat/lskatview.h +++ b/lskat/lskat/lskatview.h @@ -42,9 +42,9 @@ class LSkatView : public TQWidget TQ_OBJECT public: /** Constructor for the main view */ - LSkatView(TQWidget *tqparent = 0, const char *name=0); + LSkatView(TQWidget *parent = 0, const char *name=0); - /** returns a pointer to the document connected to the view instance. Mind that this method requires a LSkatApp instance as a tqparent + /** returns a pointer to the document connected to the view instance. Mind that this method requires a LSkatApp instance as a parent * widget to get to the window document pointer by calling the LSkatApp::getDocument() method. * * @see LSkatApp#getDocument diff --git a/lskat/lskat/msgdlg.cpp b/lskat/lskat/msgdlg.cpp index e1a6923a..cb3e6334 100644 --- a/lskat/lskat/msgdlg.cpp +++ b/lskat/lskat/msgdlg.cpp @@ -37,8 +37,8 @@ // Create the dialog for changing the player names -MsgDlg::MsgDlg( TQWidget *tqparent, const char *name,const char * /*sufi */ ) - : TQDialog( tqparent, name,TRUE ) +MsgDlg::MsgDlg( TQWidget *parent, const char *name,const char * /*sufi */ ) + : TQDialog( parent, name,TRUE ) { setCaption(i18n("Send Message to Remote Player")); setMinimumSize(400,160); diff --git a/lskat/lskat/msgdlg.h b/lskat/lskat/msgdlg.h index b2b0bfe0..52c36817 100644 --- a/lskat/lskat/msgdlg.h +++ b/lskat/lskat/msgdlg.h @@ -26,7 +26,7 @@ class MsgDlg : public TQDialog TQ_OBJECT public: - MsgDlg (TQWidget* tqparent = NULL,const char* name = NULL,const char *sufi=NULL); + MsgDlg (TQWidget* parent = NULL,const char* name = NULL,const char *sufi=NULL); TQString GetMsg(); protected slots: diff --git a/lskat/lskat/namedlg.cpp b/lskat/lskat/namedlg.cpp index 66296195..8267d4ea 100644 --- a/lskat/lskat/namedlg.cpp +++ b/lskat/lskat/namedlg.cpp @@ -19,15 +19,15 @@ #define NAME_MAX_LEN 12 /* - * Constructs a NameDlg which is a child of 'tqparent', with the + * Constructs a NameDlg which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -NameDlg::NameDlg( TQWidget *tqparent, const char *name,bool /* modal */, WFlags /* fl */ ) +NameDlg::NameDlg( TQWidget *parent, const char *name,bool /* modal */, WFlags /* fl */ ) : KDialogBase( Plain, i18n("Configure Names"), Ok|Cancel, Ok, - tqparent, name, true,true ) + parent, name, true,true ) { TQWidget *page = plainPage(); diff --git a/lskat/lskat/namedlg.h b/lskat/lskat/namedlg.h index f8f26881..dbf369d3 100644 --- a/lskat/lskat/namedlg.h +++ b/lskat/lskat/namedlg.h @@ -24,7 +24,7 @@ class NameDlg : public KDialogBase TQ_OBJECT public: - NameDlg( TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + NameDlg( TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); ~NameDlg(); void SetNames(TQString n1,TQString n2); void GetNames(TQString &n1,TQString &n2); diff --git a/lskat/lskat/networkdlg.cpp b/lskat/lskat/networkdlg.cpp index 1bf3f18f..9fe30baf 100644 --- a/lskat/lskat/networkdlg.cpp +++ b/lskat/lskat/networkdlg.cpp @@ -25,8 +25,8 @@ extern const char* LSKAT_SERVICE; // Create the dialog -NetworkDlg::NetworkDlg( TQWidget *tqparent, const char *name ) - : NetworkDlgBase( tqparent, name, TRUE ) +NetworkDlg::NetworkDlg( TQWidget *parent, const char *name ) + : NetworkDlgBase( parent, name, TRUE ) { browser = new DNSSD::ServiceBrowser(TQString::tqfromLatin1(LSKAT_SERVICE)); connect(browser,TQT_SIGNAL(finished()),TQT_SLOT(gamesFound())); diff --git a/lskat/lskat/networkdlg.h b/lskat/lskat/networkdlg.h index 9657280d..9dea97c2 100644 --- a/lskat/lskat/networkdlg.h +++ b/lskat/lskat/networkdlg.h @@ -28,7 +28,7 @@ class NetworkDlg : public NetworkDlgBase TQ_OBJECT public: - NetworkDlg(TQWidget* tqparent=NULL, const char* name=NULL); + NetworkDlg(TQWidget* parent=NULL, const char* name=NULL); ~NetworkDlg(); void SetName(const TQString& name); void SetHost(const TQString& host); diff --git a/lskat/lskatproc/KChildConnect.cpp b/lskat/lskatproc/KChildConnect.cpp index 448eb206..838847be 100644 --- a/lskat/lskatproc/KChildConnect.cpp +++ b/lskat/lskatproc/KChildConnect.cpp @@ -57,7 +57,7 @@ bool KChildConnect::SendMsg(KEMessage *msg) return Send(sendstring); } -// Send string to tqparent +// Send string to parent bool KChildConnect::Send(TQString str) { if (!str || str.length()<1) return true; // no need to send crap |