jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-04 12:33:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor files in src/utility and src/deck to new Qt Slot/Signal syntax (#5432)

Browse source 
* refactor in src/utility

* refactor in src/deck

* fix build failure
This commit is contained in:
RickyRister 2025-01-09 03:33:20 -08:00 • committed by GitHub
parent c3421669d5
commit 1f11015a2f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/deck/deck_list_model.cpp
View file

@ -18,8 +18,8 @@ DeckListModel::DeckListModel(QObject *parent)
: QAbstractItemModel(parent), lastKnownColumn(1), lastKnownOrder(Qt::AscendingOrder) : QAbstractItemModel(parent), lastKnownColumn(1), lastKnownOrder(Qt::AscendingOrder)
{ {
deckList = new DeckLoader; deckList = new DeckLoader;
connect(deckList, SIGNAL(deckLoaded()), this, SLOT(rebuildTree())); connect(deckList, &DeckLoader::deckLoaded, this, &DeckListModel::rebuildTree);
connect(deckList, SIGNAL(deckHashChanged()), this, SIGNAL(deckHashChanged())); connect(deckList, &DeckLoader::deckHashChanged, this, &DeckListModel::deckHashChanged);
root = new InnerDecklistNode; root = new InnerDecklistNode;
} }
@ -474,8 +474,8 @@ void DeckListModel::setDeckList(DeckLoader *_deck)
{ {
delete deckList; delete deckList;
deckList = _deck; deckList = _deck;
connect(deckList, SIGNAL(deckLoaded()), this, SLOT(rebuildTree())); connect(deckList, &DeckLoader::deckLoaded, this, &DeckListModel::rebuildTree);
connect(deckList, SIGNAL(deckHashChanged()), this, SIGNAL(deckHashChanged())); connect(deckList, &DeckLoader::deckHashChanged, this, &DeckListModel::deckHashChanged);
rebuildTree(); rebuildTree();
} }

2
cockatrice/src/deck/deck_stats_interface.cpp
View file

@ -14,7 +14,7 @@ DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *par
: QObject(parent), cardDatabase(_cardDatabase) : QObject(parent), cardDatabase(_cardDatabase)
{ {
manager = new QNetworkAccessManager(this); manager = new QNetworkAccessManager(this);
connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(queryFinished(QNetworkReply *))); connect(manager, &QNetworkAccessManager::finished, this, &DeckStatsInterface::queryFinished);
} }
void DeckStatsInterface::queryFinished(QNetworkReply *reply) void DeckStatsInterface::queryFinished(QNetworkReply *reply)

6
cockatrice/src/deck/deck_view.cpp
View file

@ -496,9 +496,9 @@ DeckView::DeckView(QWidget *parent) : QGraphicsView(parent)
setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing /* | QPainter::SmoothPixmapTransform*/); setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing /* | QPainter::SmoothPixmapTransform*/);
setScene(deckViewScene); setScene(deckViewScene);
connect(deckViewScene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(updateSceneRect(const QRectF &))); connect(deckViewScene, &DeckViewScene::sceneRectChanged, this, &DeckView::updateSceneRect);
connect(deckViewScene, SIGNAL(newCardAdded(AbstractCardItem *)), this, SIGNAL(newCardAdded(AbstractCardItem *))); connect(deckViewScene, &DeckViewScene::newCardAdded, this, &DeckView::newCardAdded);
connect(deckViewScene, SIGNAL(sideboardPlanChanged()), this, SIGNAL(sideboardPlanChanged())); connect(deckViewScene, &DeckViewScene::sideboardPlanChanged, this, &DeckView::sideboardPlanChanged);
} }
void DeckView::resizeEvent(QResizeEvent *event) void DeckView::resizeEvent(QResizeEvent *event)

4
cockatrice/src/utility/sequence_edit.cpp
View file

@ -24,8 +24,8 @@ SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWid
layout->addWidget(clearButton); layout->addWidget(clearButton);
layout->addWidget(defaultButton); layout->addWidget(defaultButton);
connect(clearButton, SIGNAL(clicked()), this, SLOT(removeLastShortcut())); connect(clearButton, &QPushButton::clicked, this, &SequenceEdit::removeLastShortcut);
connect(defaultButton, SIGNAL(clicked()), this, SLOT(restoreDefault())); connect(defaultButton, &QPushButton::clicked, this, &SequenceEdit::restoreDefault);
lineEdit->installEventFilter(this); lineEdit->installEventFilter(this);
setShortcutName(_shortcutName); setShortcutName(_shortcutName);