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

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

4
common/decklist.cpp
View file

@ -143,10 +143,10 @@ DecklistCardNode::DecklistCardNode(DecklistCardNode *other, InnerDecklistNode *_
{
}
AbstractDecklistNode *InnerDecklistNode::findChild(const QString &name)
AbstractDecklistNode *InnerDecklistNode::findChild(const QString &_name)
{
for (int i = 0; i < size(); i++) {
if (at(i)->getName() == name) {
if (at(i)->getName() == _name) {
return at(i);
}
}

2
common/decklist.h
View file

@ -105,7 +105,7 @@ public:
static QString visibleNameFromName(const QString &_name);
virtual QString getVisibleName() const;
void clearTree();
AbstractDecklistNode *findChild(const QString &name);
AbstractDecklistNode *findChild(const QString &_name);
int height() const override;
int recursiveCount(bool countTotalCards = false) const;
bool compare(AbstractDecklistNode *other) const override;

49
common/featureset.cpp
View file

@ -13,45 +13,45 @@ QMap<QString, bool> FeatureSet::getDefaultFeatureList()
return featureList;
}
void FeatureSet::initalizeFeatureList(QMap<QString, bool> &featureList)
void FeatureSet::initalizeFeatureList(QMap<QString, bool> &_featureList)
{
// default features [name], [is required to connect]
featureList.insert("client_id", false);
featureList.insert("client_ver", false);
featureList.insert("feature_set", false);
featureList.insert("user_ban_history", false);
featureList.insert("room_chat_history", false);
featureList.insert("client_warnings", false);
featureList.insert("mod_log_lookup", false);
featureList.insert("idle_client", false);
featureList.insert("forgot_password", false);
featureList.insert("websocket", false);
_featureList.insert("client_id", false);
_featureList.insert("client_ver", false);
_featureList.insert("feature_set", false);
_featureList.insert("user_ban_history", false);
_featureList.insert("room_chat_history", false);
_featureList.insert("client_warnings", false);
_featureList.insert("mod_log_lookup", false);
_featureList.insert("idle_client", false);
_featureList.insert("forgot_password", false);
_featureList.insert("websocket", false);
// featureList.insert("hashed_password_login", false);
// These are temp to force users onto a newer client
featureList.insert("2.7.0_min_version", false);
featureList.insert("2.8.0_min_version", false);
_featureList.insert("2.7.0_min_version", false);
_featureList.insert("2.8.0_min_version", false);
}
void FeatureSet::enableRequiredFeature(QMap<QString, bool> &featureList, QString featureName)
void FeatureSet::enableRequiredFeature(QMap<QString, bool> &_featureList, const QString &featureName)
{
if (featureList.contains(featureName))
featureList.insert(featureName, true);
if (_featureList.contains(featureName))
_featureList.insert(featureName, true);
}
void FeatureSet::disableRequiredFeature(QMap<QString, bool> &featureList, QString featureName)
void FeatureSet::disableRequiredFeature(QMap<QString, bool> &_featureList, const QString &featureName)
{
if (featureList.contains(featureName))
featureList.insert(featureName, false);
if (_featureList.contains(featureName))
_featureList.insert(featureName, false);
}
QMap<QString, bool>
FeatureSet::addFeature(QMap<QString, bool> &featureList, QString featureName, bool isFeatureRequired)
FeatureSet::addFeature(QMap<QString, bool> &_featureList, const QString &featureName, bool isFeatureRequired)
{
featureList.insert(featureName, isFeatureRequired);
return featureList;
_featureList.insert(featureName, isFeatureRequired);
return _featureList;
}
QMap<QString, bool> FeatureSet::identifyMissingFeatures(QMap<QString, bool> suppliedFeatures,
QMap<QString, bool> FeatureSet::identifyMissingFeatures(const QMap<QString, bool> &suppliedFeatures,
QMap<QString, bool> requiredFeatures)
{
QMap<QString, bool> missingList;
@ -64,7 +64,8 @@ QMap<QString, bool> FeatureSet::identifyMissingFeatures(QMap<QString, bool> supp
return missingList;
}
bool FeatureSet::isRequiredFeaturesMissing(QMap<QString, bool> suppliedFeatures, QMap<QString, bool> requiredFeatures)
bool FeatureSet::isRequiredFeaturesMissing(const QMap<QString, bool> &suppliedFeatures,
QMap<QString, bool> requiredFeatures)
{
QMap<QString, bool>::iterator i;
for (i = requiredFeatures.begin(); i != requiredFeatures.end(); ++i) {

14
common/featureset.h
View file

@ -10,13 +10,15 @@ class FeatureSet
public:
FeatureSet();
QMap<QString, bool> getDefaultFeatureList();
void initalizeFeatureList(QMap<QString, bool> &featureList);
void enableRequiredFeature(QMap<QString, bool> &featureList, QString featureName);
void disableRequiredFeature(QMap<QString, bool> &featureList, QString featureName);
QMap<QString, bool> addFeature(QMap<QString, bool> &featureList, QString featureName, bool isFeatureRequired);
QMap<QString, bool> identifyMissingFeatures(QMap<QString, bool> featureListToCheck,
void initalizeFeatureList(QMap<QString, bool> &_featureList);
void enableRequiredFeature(QMap<QString, bool> &_featureList, const QString &featureName);
void disableRequiredFeature(QMap<QString, bool> &_featureList, const QString &featureName);
QMap<QString, bool>
addFeature(QMap<QString, bool> &_featureList, const QString &featureName, bool isFeatureRequired);
QMap<QString, bool> identifyMissingFeatures(const QMap<QString, bool> &featureListToCheck,
QMap<QString, bool> featureListToCompareTo);
bool isRequiredFeaturesMissing(QMap<QString, bool> featureListToCheck, QMap<QString, bool> featureListToCompareTo);
bool isRequiredFeaturesMissing(const QMap<QString, bool> &featureListToCheck,
QMap<QString, bool> featureListToCompareTo);
private:
QMap<QString, bool> featureList;

8
common/rng_sfmt.cpp
View file

@ -44,11 +44,13 @@ unsigned int RNG_SFMT::rand(int min, int max)
return max;
// This is actually not used in Cockatrice:
// Someone wants rand() % -foo, so we compute -rand(0, +foo)
// This is the only time where min > max is (sort of) legal.
// Someone wants rand() % -foo, so we should compute -rand(0, +foo)
// But this method returns an unsigned int, so it doesn't really make
// a difference.
// This is the only time when min > max is (sort of) legal.
// Not handling this will cause the application to crash.
if (min == 0 && max < 0) {
return -cdf(0, -max);
return cdf(0, -max);
}
// No special cases are left, except !(min > max) which is caught in the cdf itself.

6
common/server.cpp
View file

@ -248,9 +248,9 @@ void Server::removeClient(Server_ProtocolHandler *client)
Event_UserLeft event;
event.set_name(data->name());
SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event);
for (auto &client : clients)
if (client->getAcceptsUserListChanges())
client->sendProtocolItem(*se);
for (auto &_client : clients)
if (_client->getAcceptsUserListChanges())
_client->sendProtocolItem(*se);
sendIsl_SessionEvent(*se);
delete se;

8
common/server_card.cpp
View file

@ -103,15 +103,15 @@ QString Server_Card::setAttribute(CardAttribute attribute, const QString &avalue
return avalue;
}
void Server_Card::setCounter(int id, int value, Event_SetCardCounter *event)
void Server_Card::setCounter(int _id, int value, Event_SetCardCounter *event)
{
if (value)
counters.insert(id, value);
counters.insert(_id, value);
else
counters.remove(id);
counters.remove(_id);
if (event) {
event->set_counter_id(id);
event->set_counter_id(_id);
event->set_counter_value(value);
}
}

8
common/server_card.h
View file

@ -54,7 +54,7 @@ private:
Server_Card *stashedCard;
public:
Server_Card(QString _name, int _id, int _coord_x, int _coord_y, Server_CardZone *_zone = 0);
Server_Card(QString _name, int _id, int _coord_x, int _coord_y, Server_CardZone *_zone = nullptr);
~Server_Card() override;
Server_CardZone *getZone() const
@ -86,9 +86,9 @@ public:
{
return counters;
}
int getCounter(int id) const
int getCounter(int counter_id) const
{
return counters.value(id, 0);
return counters.value(counter_id, 0);
}
bool getTapped() const
{
@ -144,7 +144,7 @@ public:
{
name = _name;
}
void setCounter(int id, int value, Event_SetCardCounter *event = nullptr);
void setCounter(int _id, int value, Event_SetCardCounter *event = nullptr);
void setTapped(bool _tapped)
{
tapped = _tapped;

12
common/server_game.cpp
View file

@ -144,11 +144,11 @@ void Server_Game::storeGameInformation()
replayMatchInfo->set_game_name(gameInfo.description());
const QStringList &allGameTypes = room->getGameTypes();
QStringList gameTypes;
QStringList _gameTypes;
for (int i = gameInfo.game_types_size() - 1; i >= 0; --i)
gameTypes.append(allGameTypes[gameInfo.game_types(i)]);
_gameTypes.append(allGameTypes[gameInfo.game_types(i)]);
for (auto playerName : allPlayersEver) {
for (const auto &playerName : allPlayersEver) {
replayMatchInfo->add_player_names(playerName.toStdString());
}
@ -171,7 +171,7 @@ void Server_Game::storeGameInformation()
delete sessionEvent;
if (server->getStoreReplaysEnabled()) {
server->getDatabaseInterface()->storeGameInformation(room->getName(), gameTypes, gameInfo, allPlayersEver,
server->getDatabaseInterface()->storeGameInformation(room->getName(), _gameTypes, gameInfo, allPlayersEver,
allSpectatorsEver, replayList);
}
}
@ -710,8 +710,8 @@ void Server_Game::createGameJoinedEvent(Server_Player *player, ResponseContainer
event2.set_active_player_id(activePlayer);
event2.set_active_phase(activePhase);
for (Server_Player *player : players.values()) {
player->getInfo(event2.add_player_list(), player, player->getSpectator() && spectatorsSeeEverything, true);
for (auto *_player : players.values()) {
_player->getInfo(event2.add_player_list(), _player, _player->getSpectator() && spectatorsSeeEverything, true);
}
rc.enqueuePostResponseItem(ServerMessage::GAME_EVENT_CONTAINER, prepareGameEvent(event2, -1));

32
common/server_player.cpp
View file

@ -963,7 +963,7 @@ Server_Player::cmdGameSay(const Command_GameSay &cmd, ResponseContainer & /*rc*/
}
}
if (!userInterface->addSaidMessageSize(cmd.message().size())) {
if (!userInterface->addSaidMessageSize(static_cast<int>(cmd.message().size()))) {
return Response::RespChatFlood;
}
Event_GameSay event;
@ -1029,7 +1029,7 @@ Server_Player::cmdMulligan(const Command_Mulligan &cmd, ResponseContainer & /*rc
}
Server_CardZone *hand = zones.value("hand");
Server_CardZone *deck = zones.value("deck");
Server_CardZone *_deck = zones.value("deck");
int number = cmd.number();
if (!hand->getCards().isEmpty()) {
@ -1039,11 +1039,11 @@ Server_Player::cmdMulligan(const Command_Mulligan &cmd, ResponseContainer & /*rc
cardToMove->set_card_id(card->getId());
cardsToMove.append(cardToMove);
}
moveCard(ges, hand, cardsToMove, deck, -1, 0, false);
moveCard(ges, hand, cardsToMove, _deck, -1, 0, false);
qDeleteAll(cardsToMove);
}
deck->shuffle();
_deck->shuffle();
ges.enqueueGameEvent(Event_Shuffle(), playerId);
drawCards(ges, number);
@ -1280,9 +1280,9 @@ Server_Player::cmdAttachCard(const Command_AttachCard &cmd, ResponseContainer &
QMapIterator<int, Server_Player *> playerIterator(game->getPlayers());
while (playerIterator.hasNext()) {
Server_Player *p = playerIterator.next().value();
QList<Server_Arrow *> arrows = p->getArrows().values();
QList<Server_Arrow *> _arrows = p->getArrows().values();
QList<Server_Arrow *> toDelete;
for (auto a : arrows) {
for (auto a : _arrows) {
auto *tCard = qobject_cast<Server_Card *>(a->getTargetItem());
if ((tCard == card) || (a->getStartCard() == card)) {
toDelete.append(a);
@ -1450,12 +1450,12 @@ Server_Player::cmdCreateToken(const Command_CreateToken &cmd, ResponseContainer
while (i.hasNext()) {
i.next();
Event_SetCardCounter event;
event.set_zone_name(card->getZone()->getName().toStdString());
event.set_card_id(card->getId());
Event_SetCardCounter _event;
_event.set_zone_name(card->getZone()->getName().toStdString());
_event.set_card_id(card->getId());
card->setCounter(i.key(), i.value(), &event);
ges.enqueueGameEvent(event, playerId);
card->setCounter(i.key(), i.value(), &_event);
ges.enqueueGameEvent(_event, playerId);
}
// Copy parent card
@ -1495,8 +1495,8 @@ Server_Player::cmdCreateToken(const Command_CreateToken &cmd, ResponseContainer
targetItem = card;
}
if (sendGameEvent) {
Event_CreateArrow event;
ServerInfo_Arrow *arrowInfo = event.mutable_arrow_info();
Event_CreateArrow _event;
ServerInfo_Arrow *arrowInfo = _event.mutable_arrow_info();
arrowInfo->set_id(arrow->getId());
arrowInfo->set_start_player_id(player->getPlayerId());
arrowInfo->set_start_zone(startCard->getZone()->getName().toStdString());
@ -1511,7 +1511,7 @@ Server_Player::cmdCreateToken(const Command_CreateToken &cmd, ResponseContainer
arrowInfo->set_target_card_id(arrowTargetCard->getId());
}
arrowInfo->mutable_arrow_color()->CopyFrom(arrow->getColor());
ges.enqueueGameEvent(event, player->getPlayerId());
ges.enqueueGameEvent(_event, player->getPlayerId());
}
}
}
@ -2077,8 +2077,8 @@ Server_Player::cmdRevealCards(const Command_RevealCards &cmd, ResponseContainer
} else {
if (cmd.grant_write_access()) {
const QList<int> &playerIds = game->getPlayers().keys();
for (int playerId : playerIds) {
zone->addWritePermission(playerId);
for (int _playerId : playerIds) {
zone->addWritePermission(_playerId);
}
}

8
common/server_protocolhandler.cpp
View file

@ -280,8 +280,8 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const
if (!antifloodCommandsWhiteList.contains((GameCommand::GameCommandType)getPbExtension(sc)))
++commandCountOverTime[0];
for (int i = 0; i < commandCountOverTime.size(); ++i) {
totalCount += commandCountOverTime[i];
for (int count : commandCountOverTime) {
totalCount += count;
}
if (maxCommandCountPerInterval > 0 && totalCount > maxCommandCountPerInterval) {
@ -571,7 +571,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdMessage(const Command_Message
if (databaseInterface->isInIgnoreList(receiver, QString::fromStdString(userInfo->name()))) {
return Response::RespInIgnoreList;
}
if (!addSaidMessageSize(cmd.message().size())) {
if (!addSaidMessageSize(static_cast<int>(cmd.message().size()))) {
return Response::RespChatFlood;
}
@ -765,7 +765,7 @@ bool Server_ProtocolHandler::addSaidMessageSize(int size)
Response::ResponseCode
Server_ProtocolHandler::cmdRoomSay(const Command_RoomSay &cmd, Server_Room *room, ResponseContainer & /*rc*/)
{
if (!addSaidMessageSize(cmd.message().size())) {
if (!addSaidMessageSize(static_cast<int>(cmd.message().size()))) {
return Response::RespChatFlood;
}
QString msg = QString::fromStdString(cmd.message());

8
common/server_room.cpp
View file

@ -200,20 +200,20 @@ void Server_Room::addExternalUser(const ServerInfo_User &userInfo)
emit roomInfoChanged(roomInfo);
}
void Server_Room::removeExternalUser(const QString &name)
void Server_Room::removeExternalUser(const QString &_name)
{
// This function is always called from the Server thread with server->roomsMutex locked.
ServerInfo_Room roomInfo;
roomInfo.set_room_id(id);
usersLock.lockForWrite();
if (externalUsers.contains(name))
externalUsers.remove(name);
if (externalUsers.contains(_name))
externalUsers.remove(_name);
roomInfo.set_player_count(users.size() + externalUsers.size());
usersLock.unlock();
Event_LeaveRoom event;
event.set_name(name.toStdString());
event.set_name(_name.toStdString());
sendRoomEvent(prepareRoomEvent(event), false);
emit roomInfoChanged(roomInfo);

2
common/server_room.h
View file

@ -120,7 +120,7 @@ public:
void removeClient(Server_ProtocolHandler *client);
void addExternalUser(const ServerInfo_User &userInfo);
void removeExternalUser(const QString &name);
void removeExternalUser(const QString &_name);
const QMap<QString, ServerInfo_User_Container> &getExternalUsers() const
{
return externalUsers;