From c20f4d8f2cf03c69fcecc80d63fe3cbb80f51610 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 13 Jan 2024 12:28:49 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- atlantik/libatlantikui/auction_widget.cpp | 10 +++---- atlantik/libatlantikui/board.cpp | 32 +++++++++++----------- atlantik/libatlantikui/estatedetails.cpp | 4 +-- atlantik/libatlantikui/estateview.cpp | 4 +-- atlantik/libatlantikui/kwrappedlistviewitem.cpp | 2 +- atlantik/libatlantikui/portfolioview.cpp | 6 ++--- atlantik/libatlantikui/token.cpp | 2 +- atlantik/libatlantikui/trade_widget.cpp | 36 ++++++++++++------------- 8 files changed, 48 insertions(+), 48 deletions(-) (limited to 'atlantik/libatlantikui') diff --git a/atlantik/libatlantikui/auction_widget.cpp b/atlantik/libatlantikui/auction_widget.cpp index 0950b1a0..5dbf09bd 100644 --- a/atlantik/libatlantikui/auction_widget.cpp +++ b/atlantik/libatlantikui/auction_widget.cpp @@ -38,9 +38,9 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid m_atlanticCore = atlanticCore; m_auction = auction; - connect(m_auction, TQT_SIGNAL(changed()), this, TQT_SLOT(auctionChanged())); - connect(m_auction, TQT_SIGNAL(updateBid(Player *, int)), this, TQT_SLOT(updateBid(Player *, int))); - connect(this, TQT_SIGNAL(bid(Auction *, int)), m_auction, TQT_SIGNAL(bid(Auction *, int))); + connect(m_auction, TQ_SIGNAL(changed()), this, TQ_SLOT(auctionChanged())); + connect(m_auction, TQ_SIGNAL(updateBid(Player *, int)), this, TQ_SLOT(updateBid(Player *, int))); + connect(this, TQ_SIGNAL(bid(Auction *, int)), m_auction, TQ_SIGNAL(bid(Auction *, int))); m_mainLayout = new TQVBoxLayout(this, KDialog::marginHint()); TQ_CHECK_PTR(m_mainLayout); @@ -67,7 +67,7 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid item->setPixmap(0, TQPixmap(SmallIcon("preferences-desktop-personal"))); m_playerItems[player] = item; - connect(player, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged(Player *))); + connect(player, TQ_SIGNAL(changed(Player *)), this, TQ_SLOT(playerChanged(Player *))); } } @@ -78,7 +78,7 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid m_bidSpinBox = new TQSpinBox(1, 10000, 1, bidBox); KPushButton *bidButton = new KPushButton(i18n("Make Bid"), bidBox, "bidButton"); - connect(bidButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBidButtonClicked())); + connect(bidButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBidButtonClicked())); // Status label m_statusLabel = new TQLabel(this, "statusLabel"); diff --git a/atlantik/libatlantikui/board.cpp b/atlantik/libatlantikui/board.cpp index bc7402a1..0177f6be 100644 --- a/atlantik/libatlantikui/board.cpp +++ b/atlantik/libatlantikui/board.cpp @@ -50,7 +50,7 @@ AtlantikBoard::AtlantikBoard(AtlanticCore *atlanticCore, int maxEstates, Display // Animated token movement m_movingToken = 0; m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotMoveToken())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotMoveToken())); m_resumeTimer = false; m_gridLayout = new TQGridLayout(this, sideLen+1, sideLen+1); @@ -142,16 +142,16 @@ void AtlantikBoard::addEstateView(Estate *estate, bool indicateUnowned, bool hig EstateView *estateView = new EstateView(estate, orientation, icon, indicateUnowned, highliteUnowned, darkenMortgaged, quartzEffects, this, "estateview"); m_estateViews.append(estateView); - connect(estate, TQT_SIGNAL(changed()), estateView, TQT_SLOT(estateChanged())); - connect(estateView, TQT_SIGNAL(estateToggleMortgage(Estate *)), estate, TQT_SIGNAL(estateToggleMortgage(Estate *))); - connect(estateView, TQT_SIGNAL(LMBClicked(Estate *)), estate, TQT_SIGNAL(LMBClicked(Estate *))); - connect(estateView, TQT_SIGNAL(estateHouseBuy(Estate *)), estate, TQT_SIGNAL(estateHouseBuy(Estate *))); - connect(estateView, TQT_SIGNAL(estateHouseSell(Estate *)), estate, TQT_SIGNAL(estateHouseSell(Estate *))); - connect(estateView, TQT_SIGNAL(newTrade(Player *)), estate, TQT_SIGNAL(newTrade(Player *))); + connect(estate, TQ_SIGNAL(changed()), estateView, TQ_SLOT(estateChanged())); + connect(estateView, TQ_SIGNAL(estateToggleMortgage(Estate *)), estate, TQ_SIGNAL(estateToggleMortgage(Estate *))); + connect(estateView, TQ_SIGNAL(LMBClicked(Estate *)), estate, TQ_SIGNAL(LMBClicked(Estate *))); + connect(estateView, TQ_SIGNAL(estateHouseBuy(Estate *)), estate, TQ_SIGNAL(estateHouseBuy(Estate *))); + connect(estateView, TQ_SIGNAL(estateHouseSell(Estate *)), estate, TQ_SIGNAL(estateHouseSell(Estate *))); + connect(estateView, TQ_SIGNAL(newTrade(Player *)), estate, TQ_SIGNAL(newTrade(Player *))); // Designer has its own LMBClicked slot if (m_mode == Play) - connect(estateView, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(prependEstateDetails(Estate *))); + connect(estateView, TQ_SIGNAL(LMBClicked(Estate *)), this, TQ_SLOT(prependEstateDetails(Estate *))); if (estateIdaddWidget(estateView, sideLen, sideLen-estateId); @@ -181,7 +181,7 @@ void AtlantikBoard::addAuctionWidget(Auction *auction) m_displayQueue.prepend(auctionW); updateCenter(); - connect(auction, TQT_SIGNAL(completed()), this, TQT_SLOT(displayDefault())); + connect(auction, TQ_SIGNAL(completed()), this, TQ_SLOT(displayDefault())); } Token *AtlantikBoard::findToken(Player *player) @@ -215,12 +215,12 @@ void AtlantikBoard::addToken(Player *player) Token *token = new Token(player, this, "token"); m_tokens.append(token); - connect(player, TQT_SIGNAL(changed(Player *)), token, TQT_SLOT(playerChanged())); + connect(player, TQ_SIGNAL(changed(Player *)), token, TQ_SLOT(playerChanged())); jumpToken(token); // Timer to reinit the gameboard _after_ event loop - TQTimer::singleShot(100, this, TQT_SLOT(slotResizeAftermath())); + TQTimer::singleShot(100, this, TQ_SLOT(slotResizeAftermath())); } void AtlantikBoard::playerChanged(Player *player) @@ -466,7 +466,7 @@ void AtlantikBoard::resizeEvent(TQResizeEvent *) } */ // Timer to reinit the gameboard _after_ resizeEvent - TQTimer::singleShot(0, this, TQT_SLOT(slotResizeAftermath())); + TQTimer::singleShot(0, this, TQ_SLOT(slotResizeAftermath())); } void AtlantikBoard::slotResizeAftermath() @@ -544,8 +544,8 @@ void AtlantikBoard::insertDetails(TQString text, bool clearText, bool clearButto eDetails = new EstateDetails(estate, text, this); m_lastServerDisplay = eDetails; - connect(eDetails, TQT_SIGNAL(buttonCommand(TQString)), this, TQT_SIGNAL(buttonCommand(TQString))); - connect(eDetails, TQT_SIGNAL(buttonClose()), this, TQT_SLOT(displayDefault())); + connect(eDetails, TQ_SIGNAL(buttonCommand(TQString)), this, TQ_SIGNAL(buttonCommand(TQString))); + connect(eDetails, TQ_SIGNAL(buttonClose()), this, TQ_SLOT(displayDefault())); m_displayQueue.insert(0, eDetails); updateCenter(); @@ -563,8 +563,8 @@ void AtlantikBoard::prependEstateDetails(Estate *estate) eDetails = new EstateDetails(estate, TQString(), this); m_displayQueue.prepend(eDetails); - connect(eDetails, TQT_SIGNAL(buttonCommand(TQString)), this, TQT_SIGNAL(buttonCommand(TQString))); - connect(eDetails, TQT_SIGNAL(buttonClose()), this, TQT_SLOT(displayDefault())); + connect(eDetails, TQ_SIGNAL(buttonCommand(TQString)), this, TQ_SIGNAL(buttonCommand(TQString))); + connect(eDetails, TQ_SIGNAL(buttonClose()), this, TQ_SLOT(displayDefault())); } else { diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp index cc271752..8a43d6a3 100644 --- a/atlantik/libatlantikui/estatedetails.cpp +++ b/atlantik/libatlantikui/estatedetails.cpp @@ -258,7 +258,7 @@ void EstateDetails::addButton(TQString command, TQString caption, bool enabled) button->setEnabled(enabled); button->show(); - connect(button, TQT_SIGNAL(pressed()), this, TQT_SLOT(buttonPressed())); + connect(button, TQ_SIGNAL(pressed()), this, TQ_SLOT(buttonPressed())); } void EstateDetails::addCloseButton() @@ -268,7 +268,7 @@ void EstateDetails::addCloseButton() m_closeButton = new KPushButton(KStdGuiItem::close(), this); m_buttonBox->addWidget(m_closeButton); m_closeButton->show(); - connect(m_closeButton, TQT_SIGNAL(pressed()), this, TQT_SIGNAL(buttonClose())); + connect(m_closeButton, TQ_SIGNAL(pressed()), this, TQ_SIGNAL(buttonClose())); } } diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp index 193ace17..4d7ba21e 100644 --- a/atlantik/libatlantikui/estateview.cpp +++ b/atlantik/libatlantikui/estateview.cpp @@ -427,7 +427,7 @@ void EstateView::resizeEvent(TQResizeEvent *) m_recreateQuartz = true; b_recreate = true; - TQTimer::singleShot(0, this, TQT_SLOT(slotResizeAftermath())); + TQTimer::singleShot(0, this, TQ_SLOT(slotResizeAftermath())); } void EstateView::mousePressEvent(TQMouseEvent *e) @@ -482,7 +482,7 @@ void EstateView::mousePressEvent(TQMouseEvent *e) TDEPopupMenu *pm = dynamic_cast(rmbMenu); if (pm) { - connect(pm, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuAction(int))); + connect(pm, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuAction(int))); } TQPoint g = TQCursor::pos(); rmbMenu->exec(g); diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.cpp b/atlantik/libatlantikui/kwrappedlistviewitem.cpp index 94143bca..ea5c3618 100644 --- a/atlantik/libatlantikui/kwrappedlistviewitem.cpp +++ b/atlantik/libatlantikui/kwrappedlistviewitem.cpp @@ -110,7 +110,7 @@ void KWrappedListViewItem::init( TQListView *parent, TQString text, TQString t2 wrapColumn( m_wrapColumn ); - connect( parent->header(), TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(wrapColumn(int))); + connect( parent->header(), TQ_SIGNAL(sizeChange(int, int, int)), this, TQ_SLOT(wrapColumn(int))); } #include "kwrappedlistviewitem.moc" diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp index 7ff1a4c0..9ac9bc49 100644 --- a/atlantik/libatlantikui/portfolioview.cpp +++ b/atlantik/libatlantikui/portfolioview.cpp @@ -104,7 +104,7 @@ void PortfolioView::buildPortfolio() PortfolioEstate *portfolioEstate = new PortfolioEstate(estate, m_player, false, this, "portfolioestate"); m_portfolioEstates.append(portfolioEstate); - connect(portfolioEstate, TQT_SIGNAL(estateClicked(Estate *)), this, TQT_SIGNAL(estateClicked(Estate *))); + connect(portfolioEstate, TQ_SIGNAL(estateClicked(Estate *)), this, TQ_SIGNAL(estateClicked(Estate *))); if (lastPE) { x = lastPE->x() + 2; @@ -130,7 +130,7 @@ void PortfolioView::buildPortfolio() portfolioEstate->setGeometry(x, y, portfolioEstate->width(), portfolioEstate->height()); portfolioEstate->show(); - connect(estate, TQT_SIGNAL(changed()), portfolioEstate, TQT_SLOT(estateChanged())); + connect(estate, TQ_SIGNAL(changed()), portfolioEstate, TQ_SLOT(estateChanged())); lastPE = portfolioEstate; } @@ -269,7 +269,7 @@ void PortfolioView::mousePressEvent(TQMouseEvent *e) rmbMenu->setItemEnabled( 0, m_atlanticCore->selfIsMaster() ); } - connect(rmbMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuAction(int))); + connect(rmbMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuAction(int))); TQPoint g = TQCursor::pos(); rmbMenu->exec(g); } diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp index c89d3f49..5cf1937f 100644 --- a/atlantik/libatlantikui/token.cpp +++ b/atlantik/libatlantikui/token.cpp @@ -40,7 +40,7 @@ Token::Token(Player *player, AtlantikBoard *parent, const char *name) : TQWidget m_parentBoard = parent; m_player = player; - connect(m_player, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged())); + connect(m_player, TQ_SIGNAL(changed(Player *)), this, TQ_SLOT(playerChanged())); m_inJail = m_player->inJail(); m_location = m_player->location(); diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp index 39ad6c34..4d11bc05 100644 --- a/atlantik/libatlantikui/trade_widget.cpp +++ b/atlantik/libatlantikui/trade_widget.cpp @@ -63,7 +63,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p m_editTypeCombo->insertItem(i18n("Estate")); m_editTypeCombo->insertItem(i18n("Money")); - connect(m_editTypeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setTypeCombo(int))); + connect(m_editTypeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setTypeCombo(int))); m_estateCombo = new KComboBox(m_updateComponentBox); TQPtrList estateList = m_atlanticCore->estates(); @@ -78,7 +78,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p } } - connect(m_estateCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEstateCombo(int))); + connect(m_estateCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEstateCombo(int))); m_moneyBox = new TQSpinBox(0, 10000, 1, m_updateComponentBox); @@ -105,14 +105,14 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p m_playerTargetMap[m_playerTargetCombo->count() - 1] = player; m_playerTargetRevMap[player] = m_playerTargetCombo->count() - 1; - connect(player, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged(Player *))); + connect(player, TQ_SIGNAL(changed(Player *)), this, TQ_SLOT(playerChanged(Player *))); } } m_updateButton = new KPushButton(i18n("Update"), m_updateComponentBox); m_updateButton->setEnabled(false); - connect(m_updateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateComponent())); + connect(m_updateButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateComponent())); m_componentList = new TDEListView(this, "componentList"); listCompBox->addWidget(m_componentList); @@ -122,8 +122,8 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p m_componentList->addColumn(i18n("Player")); m_componentList->addColumn(i18n("Item")); - connect(m_componentList, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem *, const TQPoint&)), TQT_SLOT(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&))); - connect(m_componentList, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(setCombos(TQListViewItem *))); + connect(m_componentList, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem *, const TQPoint&)), TQ_SLOT(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&))); + connect(m_componentList, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(setCombos(TQListViewItem *))); TQHBoxLayout *actionBox = new TQHBoxLayout(this, 0, KDialog::spacingHint()); listCompBox->addItem(actionBox); @@ -133,13 +133,13 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p m_rejectButton = new KPushButton(BarIcon("cancel", TDEIcon::SizeSmall), i18n("Reject"), this); actionBox->addWidget(m_rejectButton); - connect(m_rejectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(m_rejectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); m_acceptButton = new KPushButton(BarIcon("ok", TDEIcon::SizeSmall), i18n("Accept"), this); // m_acceptButton->setEnabled(false); actionBox->addWidget(m_acceptButton); - connect(m_acceptButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(m_acceptButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); m_status = new TQLabel(this); listCompBox->addWidget(m_status); @@ -149,14 +149,14 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p // mPlayerList->setRootIsDecorated(true); // mPlayerList->setResizeMode(TDEListView::AllColumns); - connect(m_trade, TQT_SIGNAL(itemAdded(TradeItem *)), this, TQT_SLOT(tradeItemAdded(TradeItem *))); - connect(m_trade, TQT_SIGNAL(itemRemoved(TradeItem *)), this, TQT_SLOT(tradeItemRemoved(TradeItem *))); - connect(m_trade, TQT_SIGNAL(changed(Trade *)), this, TQT_SLOT(tradeChanged())); - connect(m_trade, TQT_SIGNAL(rejected(Player *)), this, TQT_SLOT(tradeRejected(Player *))); - connect(this, TQT_SIGNAL(updateEstate(Trade *, Estate *, Player *)), m_trade, TQT_SIGNAL(updateEstate(Trade *, Estate *, Player *))); - connect(this, TQT_SIGNAL(updateMoney(Trade *, unsigned int, Player *, Player *)), m_trade, TQT_SIGNAL(updateMoney(Trade *, unsigned int, Player *, Player *))); - connect(this, TQT_SIGNAL(reject(Trade *)), m_trade, TQT_SIGNAL(reject(Trade *))); - connect(this, TQT_SIGNAL(accept(Trade *)), m_trade, TQT_SIGNAL(accept(Trade *))); + connect(m_trade, TQ_SIGNAL(itemAdded(TradeItem *)), this, TQ_SLOT(tradeItemAdded(TradeItem *))); + connect(m_trade, TQ_SIGNAL(itemRemoved(TradeItem *)), this, TQ_SLOT(tradeItemRemoved(TradeItem *))); + connect(m_trade, TQ_SIGNAL(changed(Trade *)), this, TQ_SLOT(tradeChanged())); + connect(m_trade, TQ_SIGNAL(rejected(Player *)), this, TQ_SLOT(tradeRejected(Player *))); + connect(this, TQ_SIGNAL(updateEstate(Trade *, Estate *, Player *)), m_trade, TQ_SIGNAL(updateEstate(Trade *, Estate *, Player *))); + connect(this, TQ_SIGNAL(updateMoney(Trade *, unsigned int, Player *, Player *)), m_trade, TQ_SIGNAL(updateMoney(Trade *, unsigned int, Player *, Player *))); + connect(this, TQ_SIGNAL(reject(Trade *)), m_trade, TQ_SIGNAL(reject(Trade *))); + connect(this, TQ_SIGNAL(accept(Trade *)), m_trade, TQ_SIGNAL(accept(Trade *))); setTypeCombo(m_editTypeCombo->currentItem()); setEstateCombo(m_estateCombo->currentItem()); @@ -178,7 +178,7 @@ void TradeDisplay::closeEvent(TQCloseEvent *e) void TradeDisplay::tradeItemAdded(TradeItem *tradeItem) { TDEListViewItem *item = new TDEListViewItem(m_componentList, (tradeItem->from() ? tradeItem->from()->name() : TQString("?")), i18n("gives is transitive ;)", "gives"), (tradeItem->to() ? tradeItem->to()->name() : TQString("?")), tradeItem->text()); - connect(tradeItem, TQT_SIGNAL(changed(TradeItem *)), this, TQT_SLOT(tradeItemChanged(TradeItem *))); + connect(tradeItem, TQ_SIGNAL(changed(TradeItem *)), this, TQ_SLOT(tradeItemChanged(TradeItem *))); item->setPixmap(0, TQPixmap(SmallIcon("preferences-desktop-personal"))); item->setPixmap(2, TQPixmap(SmallIcon("preferences-desktop-personal"))); @@ -356,7 +356,7 @@ void TradeDisplay::contextMenu(TDEListView *, TQListViewItem *i, const TQPoint& // rmbMenu->insertTitle( ... ); rmbMenu->insertItem(i18n("Remove From Trade"), 0); - connect(rmbMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(contextMenuClicked(int))); + connect(rmbMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(contextMenuClicked(int))); rmbMenu->exec(p); } -- cgit v1.2.1