jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 08:34:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Address /W4 compiler warnings for Windows (#4910)

Browse source
This commit is contained in:
Zach H 2023-10-15 20:31:13 -04:00 • committed by GitHub
parent cb90a8356b
commit 186f4289e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 279 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

34
cockatrice/src/dlg_settings.cpp
View file

@ -1154,28 +1154,28 @@ ShortcutSettingsPage::ShortcutSettingsPage()
btnClearAll->setIcon(QPixmap("theme:icons/clearsearch"));
// layout
auto *editLayout = new QGridLayout;
editLayout->addWidget(currentActionGroupLabel, 0, 0);
editLayout->addWidget(currentActionGroupName, 0, 1);
editLayout->addWidget(currentActionLabel, 1, 0);
editLayout->addWidget(currentActionName, 1, 1);
editLayout->addWidget(currentShortcutLabel, 2, 0);
editLayout->addWidget(editTextBox, 2, 1);
auto *_editLayout = new QGridLayout;
_editLayout->addWidget(currentActionGroupLabel, 0, 0);
_editLayout->addWidget(currentActionGroupName, 0, 1);
_editLayout->addWidget(currentActionLabel, 1, 0);
_editLayout->addWidget(currentActionName, 1, 1);
_editLayout->addWidget(currentShortcutLabel, 2, 0);
_editLayout->addWidget(editTextBox, 2, 1);
editShortcutGroupBox = new QGroupBox;
editShortcutGroupBox->setLayout(editLayout);
editShortcutGroupBox->setLayout(_editLayout);
auto *buttonsLayout = new QHBoxLayout;
buttonsLayout->addWidget(faqLabel);
buttonsLayout->addWidget(btnResetAll);
buttonsLayout->addWidget(btnClearAll);
auto *_buttonsLayout = new QHBoxLayout;
_buttonsLayout->addWidget(faqLabel);
_buttonsLayout->addWidget(btnResetAll);
_buttonsLayout->addWidget(btnClearAll);
auto *mainLayout = new QVBoxLayout;
mainLayout->addWidget(shortcutsTable);
mainLayout->addWidget(editShortcutGroupBox);
mainLayout->addLayout(buttonsLayout);
auto *_mainLayout = new QVBoxLayout;
_mainLayout->addWidget(shortcutsTable);
_mainLayout->addWidget(editShortcutGroupBox);
_mainLayout->addLayout(_buttonsLayout);
setLayout(mainLayout);
setLayout(_mainLayout);
connect(btnResetAll, SIGNAL(clicked()), this, SLOT(resetShortcuts()));
connect(btnClearAll, SIGNAL(clicked()), this, SLOT(clearShortcuts()));