From 96ec49936ed2d1c78847dabdb15ec8e303c8abc5 Mon Sep 17 00:00:00 2001 From: Matt Kelly Date: Tue, 11 Feb 2014 01:52:06 -0500 Subject: [PATCH] Resolve all compiler warnings --- cockatrice/src/abstractclient.cpp | 1 + cockatrice/src/cardzone.cpp | 1 + cockatrice/src/player.cpp | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/abstractclient.cpp b/cockatrice/src/abstractclient.cpp index de823716..0ffb7179 100644 --- a/cockatrice/src/abstractclient.cpp +++ b/cockatrice/src/abstractclient.cpp @@ -82,6 +82,7 @@ void AbstractClient::processProtocolItem(const ServerMessage &item) case SessionEvent::USER_LEFT: emit userLeftEventReceived(event.GetExtension(Event_UserLeft::ext)); break; case SessionEvent::GAME_JOINED: emit gameJoinedEventReceived(event.GetExtension(Event_GameJoined::ext)); break; case SessionEvent::REPLAY_ADDED: emit replayAddedEventReceived(event.GetExtension(Event_ReplayAdded::ext)); break; + default: break; } break; } diff --git a/cockatrice/src/cardzone.cpp b/cockatrice/src/cardzone.cpp index a5fa3e18..6ad653a6 100644 --- a/cockatrice/src/cardzone.cpp +++ b/cockatrice/src/cardzone.cpp @@ -143,6 +143,7 @@ QString CardZone::getTranslatedName(bool hisOwn, GrammaticalCase gc) const ? tr("his sideboard", "nominative, male owner") : tr("%1's sideboard", "nominative, male owner").arg(ownerName) ); + default: break; } return QString(); } diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index 7a31a08c..6d5720a6 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -1514,8 +1514,8 @@ void Player::playCard(CardItem *c, bool faceDown, bool tapped) CardInfo *ci = c->getInfo(); if ((!settingsCache->getPlayToStack() && ci->getTableRow() == 3) || - (settingsCache->getPlayToStack() && ci->getTableRow() != 0) && - c->getZone()->getName().toStdString() != "stack") { + ((settingsCache->getPlayToStack() && ci->getTableRow() != 0) && + c->getZone()->getName().toStdString() != "stack")) { cmd.set_target_zone("stack"); cmd.set_x(0); cmd.set_y(0); @@ -1784,6 +1784,7 @@ void Player::cardMenuAction() commandList.append(cmd); break; } + default: break; } } else {