mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-26 00:23:55 -07:00
Refactor files in src/game to new Qt Slot/Signal syntax (#5431)
* fix signals in CardDatabaseParser * update remaining signals * cleanup * wait this was always just broken * fix build failure * fix build failure * fix build failure
This commit is contained in:
parent
6e8adddc6d
commit
c3421669d5
25 changed files with 180 additions and 181 deletions
|
|
@ -110,8 +110,7 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
|
|||
|
||||
zone =
|
||||
new ZoneViewZone(player, _origZone, numberCards, _revealZone, _writeableRevealZone, zoneContainer, _isReversed);
|
||||
connect(zone, SIGNAL(wheelEventReceived(QGraphicsSceneWheelEvent *)), scrollBarProxy,
|
||||
SLOT(recieveWheelEvent(QGraphicsSceneWheelEvent *)));
|
||||
connect(zone, &ZoneViewZone::wheelEventReceived, scrollBarProxy, &ScrollableGraphicsProxyWidget::recieveWheelEvent);
|
||||
|
||||
retranslateUi();
|
||||
|
||||
|
|
@ -133,8 +132,8 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
|
|||
|
||||
setLayout(vbox);
|
||||
|
||||
connect(zone, SIGNAL(optimumRectChanged()), this, SLOT(resizeToZoneContents()));
|
||||
connect(zone, SIGNAL(beingDeleted()), this, SLOT(zoneDeleted()));
|
||||
connect(zone, &ZoneViewZone::optimumRectChanged, this, &ZoneViewWidget::resizeToZoneContents);
|
||||
connect(zone, &ZoneViewZone::beingDeleted, this, &ZoneViewWidget::zoneDeleted);
|
||||
zone->initializeCards(cardList);
|
||||
|
||||
// QLabel sizes aren't taken into account until the widget is rendered.
|
||||
|
|
@ -315,7 +314,7 @@ void ZoneViewWidget::handleScrollBarChange(int value)
|
|||
|
||||
void ZoneViewWidget::closeEvent(QCloseEvent *event)
|
||||
{
|
||||
disconnect(zone, SIGNAL(beingDeleted()), this, 0);
|
||||
disconnect(zone, &ZoneViewZone::beingDeleted, this, 0);
|
||||
if (shuffleCheckBox.isChecked())
|
||||
player->sendGameCommand(Command_Shuffle());
|
||||
emit closePressed(this);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue