diff --git a/cockatrice/src/client/settings/shortcuts_settings.cpp b/cockatrice/src/client/settings/shortcuts_settings.cpp index 30be8d70b..7ea15b024 100644 --- a/cockatrice/src/client/settings/shortcuts_settings.cpp +++ b/cockatrice/src/client/settings/shortcuts_settings.cpp @@ -220,7 +220,7 @@ bool ShortcutsSettings::isKeyAllowed(const QString &name, const QString &sequenc const QString checkSequence = sequences.split(sep).last(); const QStringList forbiddenKeys{"Del", "Backspace", "Down", "Up", "Left", "Right", "Return", "Enter", "Menu", "Ctrl+Alt+-", "Ctrl+Alt+=", "Ctrl+Alt+[", - "Ctrl+Alt+]", "Tab", "Space", "Shift+S", "Shift+Left", "Shift+Right"}; + "Ctrl+Alt+]", "Tab", "Space", "Shift+S", "Shift+Left", "Shift+Right"}; return !forbiddenKeys.contains(checkSequence); } diff --git a/cockatrice/src/interface/layouts/flow_layout.cpp b/cockatrice/src/interface/layouts/flow_layout.cpp index cee8ac2b6..644451813 100644 --- a/cockatrice/src/interface/layouts/flow_layout.cpp +++ b/cockatrice/src/interface/layouts/flow_layout.cpp @@ -162,7 +162,7 @@ int FlowLayout::layoutAllRows(const int originX, const int originY, const int av continue; } - QSize itemSize = item->sizeHint(); // The suggested size for the current item + QSize itemSize = item->sizeHint(); // The suggested size for the current item const int itemWidth = itemSize.width() + horizontalSpacing(); // Item width plus spacing // Check if the current item fits in the remaining width of the current row diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index 524f7599f..585bafeed 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -580,7 +580,7 @@ bool DeckEditorDeckDockWidget::swapCard(const QModelIndex ¤tIndex) const QModelIndex newCardIndex = card ? deckModel->addCard(card, otherZoneName) // Third argument (true) says create the card no matter what, even if not in DB - : deckModel->addPreferredPrintingCard(cardName, otherZoneName, true); + : deckModel->addPreferredPrintingCard(cardName, otherZoneName, true); recursiveExpand(proxy->mapToSource(newCardIndex)); return true;