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

Deal with recent Qt methods deprecation (#3801)

Browse source 
* Deal with recent Qt methods deprecation

 * Use std::sort, std::less instead of qSort/qLess
 * Use QFontMetrics::horizontalAdvance instead of ::width
 * Use qApp->primaryScreen() instead of QDesktopWidget
 * use lambas instead of QSignalMapper
 * Use QTreeWidgetItem::setForeground instead of ::setTextColor
 * Use QDir::setPath instead of operator=(QString)
 * Use QList::swapItemsAt instead of ::swap

* fix error
This commit is contained in:
ctrlaltca 2019-08-28 02:06:54 +02:00 • committed by Zach H
parent f54165025e
commit b6df5a4ac3
17 changed files with 71 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/tab_deck_editor.cpp
View file

@ -35,7 +35,6 @@
#include <QProcessEnvironment>
#include <QPushButton>
#include <QRegularExpression>
#include <QSignalMapper>
#include <QSplitter>
#include <QTextBrowser>
#include <QTextEdit>
@ -471,14 +470,12 @@ void TabDeckEditor::databaseCustomMenu(QPoint point)
if (relatedCards.isEmpty()) {
relatedMenu->setDisabled(true);
} else {
auto *signalMapper = new QSignalMapper(this);
for (const CardRelation *rel : relatedCards) {
QAction *relatedCard;
relatedCard = relatedMenu->addAction(rel->getName());
connect(relatedCard, SIGNAL(triggered()), signalMapper, SLOT(map()));
signalMapper->setMapping(relatedCard, rel->getName());
QString relatedCardName = rel->getName();
QAction *relatedCard = relatedMenu->addAction(relatedCardName);
connect(relatedCard, &QAction::triggered, cardInfo,
[this, relatedCardName] { cardInfo->setCard(relatedCardName); });
}
connect(signalMapper, SIGNAL(mapped(const QString &)), cardInfo, SLOT(setCard(const QString &)));
}
menu.exec(databaseView->mapToGlobal(point));
}
@ -820,7 +817,6 @@ bool TabDeckEditor::actSaveDeckAs()
QFileDialog dialog(this, tr("Save deck"));
dialog.setDirectory(settingsCache->getDeckPath());
dialog.setAcceptMode(QFileDialog::AcceptSave);
dialog.setConfirmOverwrite(true);
dialog.setDefaultSuffix("cod");
dialog.setNameFilters(DeckLoader::fileNameFilters);
dialog.selectFile(deckModel->getDeckList()->getName().trimmed() + ".cod");