jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Qt5 compatibility stuff.

Browse source
This commit is contained in:
Lukas Brübach 2025-06-18 23:21:06 +02:00
parent 22f98f28e0
commit ab8ea9deb3
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/dialogs/dlg_select_set_for_cards.cpp
View file

@ -321,7 +321,11 @@ void DlgSelectSetForCards::dropEvent(QDropEvent *event)
{ {
QByteArray itemData = event->mimeData()->data("application/x-setentrywidget"); QByteArray itemData = event->mimeData()->data("application/x-setentrywidget");
QString draggedSetName = QString::fromUtf8(itemData); QString draggedSetName = QString::fromUtf8(itemData);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QPoint adjustedPos = event->position().toPoint() + QPoint(0, scrollArea->verticalScrollBar()->value()); QPoint adjustedPos = event->position().toPoint() + QPoint(0, scrollArea->verticalScrollBar()->value());
#else
QPoint adjustedPos = event->pos() + QPoint(0, scrollArea->verticalScrollBar()->value());
#endif
int dropIndex = -1; int dropIndex = -1;
for (int i = 0; i < listLayout->count(); ++i) { for (int i = 0; i < listLayout->count(); ++i) {
QWidget *widget = listLayout->itemAt(i)->widget(); QWidget *widget = listLayout->itemAt(i)->widget();
@ -433,7 +437,11 @@ SetEntryWidget::SetEntryWidget(DlgSelectSetForCards *_parent, const QString &_se
QHBoxLayout *headerLayout = new QHBoxLayout(); QHBoxLayout *headerLayout = new QHBoxLayout();
CardSetPtr set = CardDatabaseManager::getInstance()->getSet(setName); CardSetPtr set = CardDatabaseManager::getInstance()->getSet(setName);
checkBox = new QCheckBox("(" + set->getShortName() + ") - " + set->getLongName(), this); checkBox = new QCheckBox("(" + set->getShortName() + ") - " + set->getLongName(), this);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
connect(checkBox, &QCheckBox::checkStateChanged, parent, &DlgSelectSetForCards::updateLayoutOrder); connect(checkBox, &QCheckBox::checkStateChanged, parent, &DlgSelectSetForCards::updateLayoutOrder);
#else
connect(checkBox, &QCheckBox::stateChanged, parent, &DlgSelectSetForCards::updateLayoutOrder);
#endif
expandButton = new QPushButton("+", this); expandButton = new QPushButton("+", this);
countLabel = new QLabel(QString::number(count), this); countLabel = new QLabel(QString::number(count), this);
@ -503,7 +511,11 @@ void SetEntryWidget::mousePressEvent(QMouseEvent *event)
} }
} }
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void SetEntryWidget::enterEvent(QEnterEvent *event) void SetEntryWidget::enterEvent(QEnterEvent *event)
#else
void SetEntryWidget::enterEvent(QEvent *event)
#endif
{ {
QWidget::enterEvent(event); // Call the base class handler QWidget::enterEvent(event); // Call the base class handler
// Highlight the widget by changing the background color only for the widget itself // Highlight the widget by changing the background color only for the widget itself

2
cockatrice/src/dialogs/dlg_select_set_for_cards.h
View file

@ -59,7 +59,6 @@ private:
QPushButton *setAllToPreferredButton; QPushButton *setAllToPreferredButton;
QMap<QString, int> getSetsForCards(); QMap<QString, int> getSetsForCards();
void updateCardAvailability();
}; };
class SetEntryWidget : public QWidget class SetEntryWidget : public QWidget
@ -73,7 +72,6 @@ public:
QStringList getAllCardsForSet(); QStringList getAllCardsForSet();
void populateCardList(); void populateCardList();
void updateCardDisplayWidgets(); void updateCardDisplayWidgets();
void updateCardState(bool checked);
bool isChecked() const; bool isChecked() const;
DlgSelectSetForCards *parent; DlgSelectSetForCards *parent;
QString setName; QString setName;