aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -141,7 +141,7 @@ endif()
# Define proper compilation flags # Define proper compilation flags
if(MSVC) if(MSVC)
# Visual Studio: Maximum optimization, disable warning C4251, establish C++17 compatibility # Visual Studio: Maximum optimization, disable warning C4251, establish C++17 compatibility
set(CMAKE_CXX_FLAGS_RELEASE "/Ox /MD /wd4251 /Zc:__cplusplus /std:c++17 /permissive-") set(CMAKE_CXX_FLAGS_RELEASE "/Ox /MD /wd4251 /Zc:__cplusplus /std:c++17 /permissive- /W4")
# Generate complete debugging information # Generate complete debugging information
#set(CMAKE_CXX_FLAGS_DEBUG "/Zi") #set(CMAKE_CXX_FLAGS_DEBUG "/Zi")
elseif(CMAKE_COMPILER_IS_GNUCXX) elseif(CMAKE_COMPILER_IS_GNUCXX)

24
cockatrice/src/carddatabase.cpp
View file

@ -612,22 +612,22 @@ QStringList CardDatabase::getAllMainCardTypes() const
void CardDatabase::checkUnknownSets() void CardDatabase::checkUnknownSets()
{ {
SetList sets = getSetList(); auto _sets = getSetList();
if (sets.getEnabledSetsNum()) { if (_sets.getEnabledSetsNum()) {
// if some sets are first found on this run, ask the user // if some sets are first found on this run, ask the user
int numUnknownSets = sets.getUnknownSetsNum(); int numUnknownSets = _sets.getUnknownSetsNum();
QStringList unknownSetNames = sets.getUnknownSetsNames(); QStringList unknownSetNames = _sets.getUnknownSetsNames();
if (numUnknownSets > 0) { if (numUnknownSets > 0) {
emit cardDatabaseNewSetsFound(numUnknownSets, unknownSetNames); emit cardDatabaseNewSetsFound(numUnknownSets, unknownSetNames);
} else { } else {
sets.markAllAsKnown(); _sets.markAllAsKnown();
} }
} else { } else {
// No set enabled. Probably this is the first time running trice // No set enabled. Probably this is the first time running trice
sets.guessSortKeys(); _sets.guessSortKeys();
sets.sortByKey(); _sets.sortByKey();
sets.enableAll(); _sets.enableAll();
notifyEnabledSetsChanged(); notifyEnabledSetsChanged();
emit cardDatabaseAllNewSetsEnabled(); emit cardDatabaseAllNewSetsEnabled();
@ -636,14 +636,14 @@ void CardDatabase::checkUnknownSets()
void CardDatabase::enableAllUnknownSets() void CardDatabase::enableAllUnknownSets()
{ {
SetList sets = getSetList(); auto _sets = getSetList();
sets.enableAllUnknown(); _sets.enableAllUnknown();
} }
void CardDatabase::markAllSetsAsKnown() void CardDatabase::markAllSetsAsKnown()
{ {
SetList sets = getSetList(); auto _sets = getSetList();
sets.markAllAsKnown(); _sets.markAllAsKnown();
} }
void CardDatabase::notifyEnabledSetsChanged() void CardDatabase::notifyEnabledSetsChanged()

4
cockatrice/src/carddatabasemodel.cpp
View file

@ -326,12 +326,12 @@ void CardDatabaseDisplayModel::clearFilterAll()
invalidateFilter(); invalidateFilter();
} }
void CardDatabaseDisplayModel::setFilterTree(FilterTree *filterTree) void CardDatabaseDisplayModel::setFilterTree(FilterTree *_filterTree)
{ {
if (this->filterTree != nullptr) if (this->filterTree != nullptr)
disconnect(this->filterTree, nullptr, this, nullptr); disconnect(this->filterTree, nullptr, this, nullptr);
this->filterTree = filterTree; this->filterTree = _filterTree;
connect(this->filterTree, SIGNAL(changed()), this, SLOT(filterTreeChanged())); connect(this->filterTree, SIGNAL(changed()), this, SLOT(filterTreeChanged()));
invalidate(); invalidate();
} }

2
cockatrice/src/carddatabasemodel.h
View file

@ -82,7 +82,7 @@ private:
public: public:
explicit CardDatabaseDisplayModel(QObject *parent = nullptr); explicit CardDatabaseDisplayModel(QObject *parent = nullptr);
void setFilterTree(FilterTree *filterTree); void setFilterTree(FilterTree *_filterTree);
void setIsToken(FilterBool _isToken) void setIsToken(FilterBool _isToken)
{ {
isToken = _isToken; isToken = _isToken;

12
cockatrice/src/carddbparser/cockatricexml3.cpp
View file

@ -155,7 +155,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
QVariantHash properties = QVariantHash(); QVariantHash properties = QVariantHash();
QString colors = QString(""); QString colors = QString("");
QList<CardRelation *> relatedCards, reverseRelatedCards; QList<CardRelation *> relatedCards, reverseRelatedCards;
CardInfoPerSetMap sets = CardInfoPerSetMap(); auto _sets = CardInfoPerSetMap();
int tableRow = 0; int tableRow = 0;
bool cipt = false; bool cipt = false;
bool isToken = false; bool isToken = false;
@ -221,7 +221,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
if (attrs.hasAttribute("rarity")) { if (attrs.hasAttribute("rarity")) {
setInfo.setProperty("rarity", attrs.value("rarity").toString()); setInfo.setProperty("rarity", attrs.value("rarity").toString());
} }
sets.insert(setName, setInfo); _sets.insert(setName, setInfo);
// related cards // related cards
} else if (xmlName == "related" || xmlName == "reverse-related") { } else if (xmlName == "related" || xmlName == "reverse-related") {
CardRelation::AttachType attach = CardRelation::DoesNotAttach; CardRelation::AttachType attach = CardRelation::DoesNotAttach;
@ -268,7 +268,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
properties.insert("colors", colors); properties.insert("colors", colors);
CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards, CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards,
reverseRelatedCards, sets, cipt, tableRow, upsideDown); reverseRelatedCards, _sets, cipt, tableRow, upsideDown);
emit addCard(newCard); emit addCard(newCard);
} }
} }
@ -412,7 +412,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
return xml; return xml;
} }
bool CockatriceXml3Parser::saveToFile(SetNameMap sets, bool CockatriceXml3Parser::saveToFile(SetNameMap _sets,
CardNameMap cards, CardNameMap cards,
const QString &fileName, const QString &fileName,
const QString &sourceUrl, const QString &sourceUrl,
@ -439,9 +439,9 @@ bool CockatriceXml3Parser::saveToFile(SetNameMap sets,
xml.writeTextElement("sourceVersion", sourceVersion); xml.writeTextElement("sourceVersion", sourceVersion);
xml.writeEndElement(); xml.writeEndElement();
if (sets.count() > 0) { if (_sets.count() > 0) {
xml.writeStartElement("sets"); xml.writeStartElement("sets");
for (CardSetPtr set : sets) { for (CardSetPtr set : _sets) {
xml << set; xml << set;
} }
xml.writeEndElement(); xml.writeEndElement();

2
cockatrice/src/carddbparser/cockatricexml3.h
View file

@ -14,7 +14,7 @@ public:
~CockatriceXml3Parser() override = default; ~CockatriceXml3Parser() override = default;
bool getCanParseFile(const QString &name, QIODevice &device) override; bool getCanParseFile(const QString &name, QIODevice &device) override;
void parseFile(QIODevice &device) override; void parseFile(QIODevice &device) override;
bool saveToFile(SetNameMap sets, bool saveToFile(SetNameMap _sets,
CardNameMap cards, CardNameMap cards,
const QString &fileName, const QString &fileName,
const QString &sourceUrl = "unknown", const QString &sourceUrl = "unknown",

12
cockatrice/src/carddbparser/cockatricexml4.cpp
View file

@ -134,7 +134,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
QString text = QString(""); QString text = QString("");
QVariantHash properties = QVariantHash(); QVariantHash properties = QVariantHash();
QList<CardRelation *> relatedCards, reverseRelatedCards; QList<CardRelation *> relatedCards, reverseRelatedCards;
CardInfoPerSetMap sets = CardInfoPerSetMap(); auto _sets = CardInfoPerSetMap();
int tableRow = 0; int tableRow = 0;
bool cipt = false; bool cipt = false;
bool isToken = false; bool isToken = false;
@ -178,7 +178,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
attrName = "picurl"; attrName = "picurl";
setInfo.setProperty(attrName, attr.value().toString()); setInfo.setProperty(attrName, attr.value().toString());
} }
sets.insert(setName, setInfo); _sets.insert(setName, setInfo);
} }
// related cards // related cards
} else if (xmlName == "related" || xmlName == "reverse-related") { } else if (xmlName == "related" || xmlName == "reverse-related") {
@ -231,7 +231,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
} }
CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards, CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards,
reverseRelatedCards, sets, cipt, tableRow, upsideDown); reverseRelatedCards, _sets, cipt, tableRow, upsideDown);
emit addCard(newCard); emit addCard(newCard);
} }
} }
@ -356,7 +356,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
return xml; return xml;
} }
bool CockatriceXml4Parser::saveToFile(SetNameMap sets, bool CockatriceXml4Parser::saveToFile(SetNameMap _sets,
CardNameMap cards, CardNameMap cards,
const QString &fileName, const QString &fileName,
const QString &sourceUrl, const QString &sourceUrl,
@ -383,9 +383,9 @@ bool CockatriceXml4Parser::saveToFile(SetNameMap sets,
xml.writeTextElement("sourceVersion", sourceVersion); xml.writeTextElement("sourceVersion", sourceVersion);
xml.writeEndElement(); xml.writeEndElement();
if (sets.count() > 0) { if (_sets.count() > 0) {
xml.writeStartElement("sets"); xml.writeStartElement("sets");
for (CardSetPtr set : sets) { for (CardSetPtr set : _sets) {
xml << set; xml << set;
} }
xml.writeEndElement(); xml.writeEndElement();

2
cockatrice/src/carddbparser/cockatricexml4.h
View file

@ -14,7 +14,7 @@ public:
~CockatriceXml4Parser() override = default; ~CockatriceXml4Parser() override = default;
bool getCanParseFile(const QString &name, QIODevice &device) override; bool getCanParseFile(const QString &name, QIODevice &device) override;
void parseFile(QIODevice &device) override; void parseFile(QIODevice &device) override;
bool saveToFile(SetNameMap sets, bool saveToFile(SetNameMap _sets,
CardNameMap cards, CardNameMap cards,
const QString &fileName, const QString &fileName,
const QString &sourceUrl = "unknown", const QString &sourceUrl = "unknown",

32
cockatrice/src/carditem.cpp
View file

@ -97,10 +97,10 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QMapIterator<int, int> counterIterator(counters); QMapIterator<int, int> counterIterator(counters);
while (counterIterator.hasNext()) { while (counterIterator.hasNext()) {
counterIterator.next(); counterIterator.next();
QColor color; QColor _color;
color.setHsv(counterIterator.key() * 60, 150, 255); _color.setHsv(counterIterator.key() * 60, 150, 255);
paintNumberEllipse(counterIterator.value(), 14, color, i, counters.size(), painter); paintNumberEllipse(counterIterator.value(), 14, _color, i, counters.size(), painter);
++i; ++i;
} }
@ -233,25 +233,25 @@ void CardItem::resetState()
update(); update();
} }
void CardItem::processCardInfo(const ServerInfo_Card &info) void CardItem::processCardInfo(const ServerInfo_Card &_info)
{ {
counters.clear(); counters.clear();
const int counterListSize = info.counter_list_size(); const int counterListSize = _info.counter_list_size();
for (int i = 0; i < counterListSize; ++i) { for (int i = 0; i < counterListSize; ++i) {
const ServerInfo_CardCounter &counterInfo = info.counter_list(i); const ServerInfo_CardCounter &counterInfo = _info.counter_list(i);
counters.insert(counterInfo.id(), counterInfo.value()); counters.insert(counterInfo.id(), counterInfo.value());
} }
setId(info.id()); setId(_info.id());
setName(QString::fromStdString(info.name())); setName(QString::fromStdString(_info.name()));
setAttacking(info.attacking()); setAttacking(_info.attacking());
setFaceDown(info.face_down()); setFaceDown(_info.face_down());
setPT(QString::fromStdString(info.pt())); setPT(QString::fromStdString(_info.pt()));
setAnnotation(QString::fromStdString(info.annotation())); setAnnotation(QString::fromStdString(_info.annotation()));
setColor(QString::fromStdString(info.color())); setColor(QString::fromStdString(_info.color()));
setTapped(info.tapped()); setTapped(_info.tapped());
setDestroyOnZoneChange(info.destroy_on_zone_change()); setDestroyOnZoneChange(_info.destroy_on_zone_change());
setDoesntUntap(info.doesnt_untap()); setDoesntUntap(_info.doesnt_untap());
} }
CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown) CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown)

2
cockatrice/src/carditem.h
View file

@ -138,7 +138,7 @@ public:
return attachedCards; return attachedCards;
} }
void resetState(); void resetState();
void processCardInfo(const ServerInfo_Card &info); void processCardInfo(const ServerInfo_Card &_info);
QMenu *getCardMenu() const QMenu *getCardMenu() const
{ {

4
cockatrice/src/deck_loader.h
View file

@ -57,8 +57,8 @@ protected:
const InnerDecklistNode *zoneNode, const InnerDecklistNode *zoneNode,
QList<DecklistCardNode *> cards, QList<DecklistCardNode *> cards,
bool addComments = true); bool addComments = true);
virtual QString getCardZoneFromName(QString cardName, QString currentZoneName); [[nodiscard]] QString getCardZoneFromName(QString cardName, QString currentZoneName) override;
virtual QString getCompleteCardName(const QString &cardName) const; [[nodiscard]] QString getCompleteCardName(const QString &cardName) const override;
}; };
#endif #endif

18
cockatrice/src/dlg_connect.cpp
View file

@ -245,22 +245,22 @@ void DlgConnect::updateDisplayInfo(const QString &saveName)
} }
UserConnection_Information uci; UserConnection_Information uci;
QStringList data = uci.getServerInfo(saveName); QStringList _data = uci.getServerInfo(saveName);
bool savePasswordStatus = (data.at(5) == "1"); bool savePasswordStatus = (_data.at(5) == "1");
saveEdit->setText(data.at(0)); saveEdit->setText(_data.at(0));
hostEdit->setText(data.at(1)); hostEdit->setText(_data.at(1));
portEdit->setText(data.at(2)); portEdit->setText(_data.at(2));
playernameEdit->setText(data.at(3)); playernameEdit->setText(_data.at(3));
savePasswordCheckBox->setChecked(savePasswordStatus); savePasswordCheckBox->setChecked(savePasswordStatus);
if (savePasswordStatus) { if (savePasswordStatus) {
passwordEdit->setText(data.at(4)); passwordEdit->setText(_data.at(4));
} }
if (!data.at(6).isEmpty()) { if (!_data.at(6).isEmpty()) {
QString formattedLink = "<a href=\"" + data.at(6) + "\">" + data.at(6) + "</a>"; QString formattedLink = "<a href=\"" + _data.at(6) + "\">" + _data.at(6) + "</a>";
serverContactLabel->setText(tr("Webpage") + ":"); serverContactLabel->setText(tr("Webpage") + ":");
serverContactLink->setText(formattedLink); serverContactLink->setText(formattedLink);
} else { } else {

6
cockatrice/src/dlg_creategame.cpp
View file

@ -235,13 +235,13 @@ void DlgCreateGame::actOK()
cmd.set_join_as_judge(QApplication::keyboardModifiers() & Qt::ShiftModifier); cmd.set_join_as_judge(QApplication::keyboardModifiers() & Qt::ShiftModifier);
cmd.set_join_as_spectator(createGameAsSpectatorCheckBox->isChecked()); cmd.set_join_as_spectator(createGameAsSpectatorCheckBox->isChecked());
QString gameTypes = QString(); QString _gameTypes = QString();
QMapIterator<int, QRadioButton *> gameTypeCheckBoxIterator(gameTypeCheckBoxes); QMapIterator<int, QRadioButton *> gameTypeCheckBoxIterator(gameTypeCheckBoxes);
while (gameTypeCheckBoxIterator.hasNext()) { while (gameTypeCheckBoxIterator.hasNext()) {
gameTypeCheckBoxIterator.next(); gameTypeCheckBoxIterator.next();
if (gameTypeCheckBoxIterator.value()->isChecked()) { if (gameTypeCheckBoxIterator.value()->isChecked()) {
cmd.add_game_type_ids(gameTypeCheckBoxIterator.key()); cmd.add_game_type_ids(gameTypeCheckBoxIterator.key());
gameTypes += gameTypeCheckBoxIterator.value()->text() + ", "; _gameTypes += gameTypeCheckBoxIterator.value()->text() + ", ";
} }
} }
@ -256,7 +256,7 @@ void DlgCreateGame::actOK()
SettingsCache::instance().setSpectatorsCanTalk(spectatorsCanTalkCheckBox->isChecked()); SettingsCache::instance().setSpectatorsCanTalk(spectatorsCanTalkCheckBox->isChecked());
SettingsCache::instance().setSpectatorsCanSeeEverything(spectatorsSeeEverythingCheckBox->isChecked()); SettingsCache::instance().setSpectatorsCanSeeEverything(spectatorsSeeEverythingCheckBox->isChecked());
SettingsCache::instance().setCreateGameAsSpectator(createGameAsSpectatorCheckBox->isChecked()); SettingsCache::instance().setCreateGameAsSpectator(createGameAsSpectatorCheckBox->isChecked());
SettingsCache::instance().setGameTypes(gameTypes); SettingsCache::instance().setGameTypes(_gameTypes);
} }
PendingCommand *pend = room->prepareRoomCommand(cmd); PendingCommand *pend = room->prepareRoomCommand(cmd);
connect(pend, SIGNAL(finished(Response, CommandContainer, QVariant)), this, SLOT(checkResponse(Response))); connect(pend, SIGNAL(finished(Response, CommandContainer, QVariant)), this, SLOT(checkResponse(Response)));

34
cockatrice/src/dlg_settings.cpp
View file

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

8
cockatrice/src/pictureloader.cpp
View file

@ -212,22 +212,22 @@ bool PictureLoaderWorker::cardImageExistsOnDisk(QString &setName, QString &corre
// Iterates through the list of paths, searching for images with the desired // Iterates through the list of paths, searching for images with the desired
// name with any QImageReader-supported // name with any QImageReader-supported
// extension // extension
for (const auto &picsPath : picsPaths) { for (const auto &_picsPath : picsPaths) {
imgReader.setFileName(picsPath); imgReader.setFileName(_picsPath);
if (imgReader.read(&image)) { if (imgReader.read(&image)) {
qDebug().nospace() << "PictureLoader: [card: " << correctedCardname << " set: " << setName qDebug().nospace() << "PictureLoader: [card: " << correctedCardname << " set: " << setName
<< "]: Picture found on disk."; << "]: Picture found on disk.";
imageLoaded(cardBeingLoaded.getCard(), image); imageLoaded(cardBeingLoaded.getCard(), image);
return true; return true;
} }
imgReader.setFileName(picsPath + ".full"); imgReader.setFileName(_picsPath + ".full");
if (imgReader.read(&image)) { if (imgReader.read(&image)) {
qDebug().nospace() << "PictureLoader: [card: " << correctedCardname << " set: " << setName qDebug().nospace() << "PictureLoader: [card: " << correctedCardname << " set: " << setName
<< "]: Picture.full found on disk."; << "]: Picture.full found on disk.";
imageLoaded(cardBeingLoaded.getCard(), image); imageLoaded(cardBeingLoaded.getCard(), image);
return true; return true;
} }
imgReader.setFileName(picsPath + ".xlhq"); imgReader.setFileName(_picsPath + ".xlhq");
if (imgReader.read(&image)) { if (imgReader.read(&image)) {
qDebug().nospace() << "PictureLoader: [card: " << correctedCardname << " set: " << setName qDebug().nospace() << "PictureLoader: [card: " << correctedCardname << " set: " << setName
<< "]: Picture.xlhq found on disk."; << "]: Picture.xlhq found on disk.";

34
cockatrice/src/player.cpp
View file

@ -126,12 +126,12 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
qreal avatarMargin = (counterAreaWidth + CARD_HEIGHT + 15 - playerTarget->boundingRect().width()) / 2.0; qreal avatarMargin = (counterAreaWidth + CARD_HEIGHT + 15 - playerTarget->boundingRect().width()) / 2.0;
playerTarget->setPos(QPointF(avatarMargin, avatarMargin)); playerTarget->setPos(QPointF(avatarMargin, avatarMargin));
PileZone *deck = new PileZone(this, "deck", true, false, playerArea); auto *_deck = new PileZone(this, "deck", true, false, playerArea);
QPointF base = QPointF(counterAreaWidth + (CARD_HEIGHT - CARD_WIDTH + 15) / 2.0, QPointF base = QPointF(counterAreaWidth + (CARD_HEIGHT - CARD_WIDTH + 15) / 2.0,
10 + playerTarget->boundingRect().height() + 5 - (CARD_HEIGHT - CARD_WIDTH) / 2.0); 10 + playerTarget->boundingRect().height() + 5 - (CARD_HEIGHT - CARD_WIDTH) / 2.0);
deck->setPos(base); _deck->setPos(base);
qreal h = deck->boundingRect().width() + 5; qreal h = _deck->boundingRect().width() + 5;
auto *handCounter = new HandCounter(playerArea); auto *handCounter = new HandCounter(playerArea);
handCounter->setPos(base + QPointF(0, h + 10)); handCounter->setPos(base + QPointF(0, h + 10));
@ -321,7 +321,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
bottomLibraryMenu = libraryMenu->addTearOffMenu(QString()); bottomLibraryMenu = libraryMenu->addTearOffMenu(QString());
libraryMenu->addSeparator(); libraryMenu->addSeparator();
libraryMenu->addAction(aOpenDeckInDeckEditor); libraryMenu->addAction(aOpenDeckInDeckEditor);
deck->setMenu(libraryMenu, aDrawCard); _deck->setMenu(libraryMenu, aDrawCard);
topLibraryMenu->addAction(aMoveTopToPlay); topLibraryMenu->addAction(aMoveTopToPlay);
topLibraryMenu->addAction(aMoveTopToPlayFaceDown); topLibraryMenu->addAction(aMoveTopToPlayFaceDown);
@ -2282,27 +2282,27 @@ void Player::eventAttachCard(const Event_AttachCard &event)
void Player::eventDrawCards(const Event_DrawCards &event) void Player::eventDrawCards(const Event_DrawCards &event)
{ {
CardZone *deck = zones.value("deck"); CardZone *_deck = zones.value("deck");
CardZone *hand = zones.value("hand"); CardZone *_hand = zones.value("hand");
const int listSize = event.cards_size(); const int listSize = event.cards_size();
if (listSize) { if (listSize) {
for (int i = 0; i < listSize; ++i) { for (int i = 0; i < listSize; ++i) {
const ServerInfo_Card &cardInfo = event.cards(i); const ServerInfo_Card &cardInfo = event.cards(i);
CardItem *card = deck->takeCard(0, cardInfo.id()); CardItem *card = _deck->takeCard(0, cardInfo.id());
card->setName(QString::fromStdString(cardInfo.name())); card->setName(QString::fromStdString(cardInfo.name()));
hand->addCard(card, false, -1); _hand->addCard(card, false, -1);
} }
} else { } else {
const int number = event.number(); const int number = event.number();
for (int i = 0; i < number; ++i) { for (int i = 0; i < number; ++i) {
hand->addCard(deck->takeCard(0, -1), false, -1); _hand->addCard(_deck->takeCard(0, -1), false, -1);
} }
} }
hand->reorganizeCards(); _hand->reorganizeCards();
deck->reorganizeCards(); _deck->reorganizeCards();
emit logDrawCards(this, event.number(), deck->getCards().size() == 0); emit logDrawCards(this, event.number(), _deck->getCards().size() == 0);
} }
void Player::eventRevealCards(const Event_RevealCards &event) void Player::eventRevealCards(const Event_RevealCards &event)
@ -3157,16 +3157,16 @@ void Player::actSetPT()
if (!empty) { if (!empty) {
const auto oldpt = parsePT(card->getPT()); const auto oldpt = parsePT(card->getPT());
int ptIter = 0; int ptIter = 0;
for (const auto &item : ptList) { for (const auto &_item : ptList) {
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
if (item.typeId() == QMetaType::Type::Int) { if (_item.typeId() == QMetaType::Type::Int) {
#else #else
if (item.type() == QVariant::Int) { if (_item.type() == QVariant::Int) {
#endif #endif
int oldItem = ptIter < oldpt.size() ? oldpt.at(ptIter).toInt() : 0; int oldItem = ptIter < oldpt.size() ? oldpt.at(ptIter).toInt() : 0;
newpt += '/' + QString::number(oldItem + item.toInt()); newpt += '/' + QString::number(oldItem + _item.toInt());
} else { } else {
newpt += '/' + item.toString(); newpt += '/' + _item.toString();
} }
++ptIter; ++ptIter;
} }

16
cockatrice/src/remotereplaylist_treewidget.cpp
View file

@ -218,16 +218,16 @@ ServerInfo_Replay const *RemoteReplayList_TreeModel::getReplay(const QModelIndex
ServerInfo_ReplayMatch const *RemoteReplayList_TreeModel::getReplayMatch(const QModelIndex &index) const ServerInfo_ReplayMatch const *RemoteReplayList_TreeModel::getReplayMatch(const QModelIndex &index) const
{ {
if (!index.isValid()) if (!index.isValid())
return 0; return nullptr;
MatchNode *node = dynamic_cast<MatchNode *>(static_cast<Node *>(index.internalPointer())); auto *node = dynamic_cast<MatchNode *>(static_cast<Node *>(index.internalPointer()));
if (!node) { if (!node) {
ReplayNode *node = dynamic_cast<ReplayNode *>(static_cast<Node *>(index.internalPointer())); auto *_node = dynamic_cast<ReplayNode *>(static_cast<Node *>(index.internalPointer()));
if (!node) if (!_node)
return 0; return nullptr;
return &node->getParent()->getMatchInfo(); return &_node->getParent()->getMatchInfo();
} else }
return &node->getMatchInfo(); return &node->getMatchInfo();
} }
void RemoteReplayList_TreeModel::clearTree() void RemoteReplayList_TreeModel::clearTree()

4
cockatrice/src/sequenceEdit/sequenceedit.cpp
View file

@ -60,8 +60,8 @@ void SequenceEdit::removeLastShortcut()
QString sequences = lineEdit->text(); QString sequences = lineEdit->text();
if (!sequences.isEmpty()) { if (!sequences.isEmpty()) {
if (sequences.lastIndexOf(";") > 0) { if (sequences.lastIndexOf(";") > 0) {
QString valid = sequences.left(sequences.lastIndexOf(";")); QString validText = sequences.left(sequences.lastIndexOf(";"));
lineEdit->setText(valid); lineEdit->setText(validText);
} else { } else {
lineEdit->clear(); lineEdit->clear();
} }

4
cockatrice/src/tab_deck_editor.cpp
View file

@ -1076,8 +1076,8 @@ void TabDeckEditor::actDecrementCardFromSideboard()
void TabDeckEditor::copyDatabaseCellContents() void TabDeckEditor::copyDatabaseCellContents()
{ {
QVariant data = databaseView->selectionModel()->currentIndex().data(); auto _data = databaseView->selectionModel()->currentIndex().data();
QApplication::clipboard()->setText(data.toString()); QApplication::clipboard()->setText(_data.toString());
} }
void TabDeckEditor::actIncrement() void TabDeckEditor::actIncrement()

4
cockatrice/src/tab_game.cpp
View file

@ -986,7 +986,7 @@ PendingCommand *TabGame::prepareGameCommand(const QList<const ::google::protobuf
return new PendingCommand(cont); return new PendingCommand(cont);
} }
void TabGame::startGame(bool resuming) void TabGame::startGame(bool _resuming)
{ {
currentPhase = -1; currentPhase = -1;
@ -999,7 +999,7 @@ void TabGame::startGame(bool resuming)
mainWidget->setCurrentWidget(gamePlayAreaWidget); mainWidget->setCurrentWidget(gamePlayAreaWidget);
if (!resuming) { if (!_resuming) {
QMapIterator<int, Player *> playerIterator(players); QMapIterator<int, Player *> playerIterator(players);
while (playerIterator.hasNext()) while (playerIterator.hasNext())
playerIterator.next().value()->setGameStarted(); playerIterator.next().value()->setGameStarted();

2
cockatrice/src/tab_logs.cpp
View file

@ -89,7 +89,7 @@ void TabLog::getClicked()
if (maximumResults->value() == 0) if (maximumResults->value() == 0)
maximumResults->setValue(1000); maximumResults->setValue(1000);
int dateRange; int dateRange = 0;
if (lastHour->isChecked()) if (lastHour->isChecked())
dateRange = 1; dateRange = 1;

8
cockatrice/src/tab_replays.cpp
View file

@ -134,11 +134,11 @@ void TabReplays::actOpenLocalReplay()
QFile f(filePath); QFile f(filePath);
if (!f.open(QIODevice::ReadOnly)) if (!f.open(QIODevice::ReadOnly))
return; return;
QByteArray data = f.readAll(); QByteArray _data = f.readAll();
f.close(); f.close();
GameReplay *replay = new GameReplay; GameReplay *replay = new GameReplay;
replay->ParseFromArray(data.data(), data.size()); replay->ParseFromArray(_data.data(), _data.size());
emit openReplay(replay); emit openReplay(replay);
} }
@ -223,10 +223,10 @@ void TabReplays::downloadFinished(const Response &r,
const Response_ReplayDownload &resp = r.GetExtension(Response_ReplayDownload::ext); const Response_ReplayDownload &resp = r.GetExtension(Response_ReplayDownload::ext);
QString filePath = extraData.toString(); QString filePath = extraData.toString();
const std::string &data = resp.replay_data(); const std::string &_data = resp.replay_data();
QFile f(filePath); QFile f(filePath);
f.open(QIODevice::WriteOnly); f.open(QIODevice::WriteOnly);
f.write((const char *)data.data(), data.size()); f.write((const char *)_data.data(), _data.size());
f.close(); f.close();
} }

4
cockatrice/src/tab_supervisor.cpp
View file

@ -729,8 +729,8 @@ const ServerInfo_User *TabSupervisor::getOnlineUser(const QString &userName) con
for (i = userList.begin(); i != userList.end(); ++i) for (i = userList.begin(); i != userList.end(); ++i)
if (i.key().toLower() == userNameToMatchLower) { if (i.key().toLower() == userNameToMatchLower) {
const ServerInfo_User &userInfo = i.value()->getUserInfo(); const ServerInfo_User &_userInfo = i.value()->getUserInfo();
return &userInfo; return &_userInfo;
} }
return nullptr; return nullptr;

4
cockatrice/src/user_context_menu.cpp
View file

@ -306,10 +306,10 @@ void UserContextMenu::showContextMenu(const QPoint &pos,
const QString &deckHash, const QString &deckHash,
ChatView *chatView) ChatView *chatView)
{ {
QAction *aCopyToClipBoard, *aRemoveMessages; QAction *aCopyToClipBoard = nullptr, *aRemoveMessages = nullptr;
aUserName->setText(userName); aUserName->setText(userName);
QMenu *menu = new QMenu(static_cast<QWidget *>(parent())); auto *menu = new QMenu(static_cast<QWidget *>(parent()));
menu->addAction(aUserName); menu->addAction(aUserName);
menu->addSeparator(); menu->addSeparator();
if (!deckHash.isEmpty()) { if (!deckHash.isEmpty()) {

34
cockatrice/src/userconnection_information.cpp
View file

@ -28,16 +28,16 @@ QMap<QString, std::pair<QString, UserConnection_Information>> UserConnection_Inf
int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1; int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
QString saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString(); QString _saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString();
QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString(); QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString();
QString portNum = servers.getValue(QString("port%1").arg(i), "server", "server_details").toString(); QString portNum = servers.getValue(QString("port%1").arg(i), "server", "server_details").toString();
QString userName = servers.getValue(QString("username%1").arg(i), "server", "server_details").toString(); QString userName = servers.getValue(QString("username%1").arg(i), "server", "server_details").toString();
QString pass = servers.getValue(QString("password%1").arg(i), "server", "server_details").toString(); QString pass = servers.getValue(QString("password%1").arg(i), "server", "server_details").toString();
bool savePass = servers.getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool(); bool savePass = servers.getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
QString site = servers.getValue(QString("site%1").arg(i), "server", "server_details").toString(); QString _site = servers.getValue(QString("site%1").arg(i), "server", "server_details").toString();
UserConnection_Information userInfo(saveName, serverName, portNum, userName, pass, savePass, site); UserConnection_Information userInfo(_saveName, serverName, portNum, userName, pass, savePass, _site);
serverList.insert(saveName, std::make_pair(serverName, userInfo)); serverList.insert(_saveName, std::make_pair(serverName, userInfo));
} }
return serverList; return serverList;
@ -45,15 +45,15 @@ QMap<QString, std::pair<QString, UserConnection_Information>> UserConnection_Inf
QStringList UserConnection_Information::getServerInfo(const QString &find) QStringList UserConnection_Information::getServerInfo(const QString &find)
{ {
QStringList server; QStringList _server;
ServersSettings &servers = SettingsCache::instance().servers(); ServersSettings &servers = SettingsCache::instance().servers();
int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1; int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
QString saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString(); QString _saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString();
if (find != saveName) if (find != _saveName)
continue; continue;
QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString(); QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString();
@ -61,20 +61,20 @@ QStringList UserConnection_Information::getServerInfo(const QString &find)
QString userName = servers.getValue(QString("username%1").arg(i), "server", "server_details").toString(); QString userName = servers.getValue(QString("username%1").arg(i), "server", "server_details").toString();
QString pass = servers.getValue(QString("password%1").arg(i), "server", "server_details").toString(); QString pass = servers.getValue(QString("password%1").arg(i), "server", "server_details").toString();
bool savePass = servers.getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool(); bool savePass = servers.getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
QString site = servers.getValue(QString("site%1").arg(i), "server", "server_details").toString(); QString _site = servers.getValue(QString("site%1").arg(i), "server", "server_details").toString();
server.append(saveName); _server.append(_saveName);
server.append(serverName); _server.append(serverName);
server.append(portNum); _server.append(portNum);
server.append(userName); _server.append(userName);
server.append(pass); _server.append(pass);
server.append(savePass ? "1" : "0"); _server.append(savePass ? "1" : "0");
server.append(site); _server.append(_site);
break; break;
} }
if (server.empty()) if (_server.empty())
qDebug() << "There was a problem!"; qDebug() << "There was a problem!";
return server; return _server;
} }

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++) { for (int i = 0; i < size(); i++) {
if (at(i)->getName() == name) { if (at(i)->getName() == _name) {
return at(i); return at(i);
} }
} }

2
common/decklist.h
View file

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

49
common/featureset.cpp
View file

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

14
common/featureset.h
View file

@ -10,13 +10,15 @@ class FeatureSet
public: public:
FeatureSet(); FeatureSet();
QMap<QString, bool> getDefaultFeatureList(); QMap<QString, bool> getDefaultFeatureList();
void initalizeFeatureList(QMap<QString, bool> &featureList); void initalizeFeatureList(QMap<QString, bool> &_featureList);
void enableRequiredFeature(QMap<QString, bool> &featureList, QString featureName); void enableRequiredFeature(QMap<QString, bool> &_featureList, const QString &featureName);
void disableRequiredFeature(QMap<QString, bool> &featureList, QString featureName); void disableRequiredFeature(QMap<QString, bool> &_featureList, const QString &featureName);
QMap<QString, bool> addFeature(QMap<QString, bool> &featureList, QString featureName, bool isFeatureRequired); QMap<QString, bool>
QMap<QString, bool> identifyMissingFeatures(QMap<QString, bool> featureListToCheck, addFeature(QMap<QString, bool> &_featureList, const QString &featureName, bool isFeatureRequired);
QMap<QString, bool> identifyMissingFeatures(const QMap<QString, bool> &featureListToCheck,
QMap<QString, bool> featureListToCompareTo); 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: private:
QMap<QString, bool> featureList; 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; return max;
// This is actually not used in Cockatrice: // This is actually not used in Cockatrice:
// Someone wants rand() % -foo, so we compute -rand(0, +foo) // Someone wants rand() % -foo, so we should compute -rand(0, +foo)
// This is the only time where min > max is (sort of) legal. // 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. // Not handling this will cause the application to crash.
if (min == 0 && max < 0) { 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. // 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_UserLeft event;
event.set_name(data->name()); event.set_name(data->name());
SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event); SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event);
for (auto &client : clients) for (auto &_client : clients)
if (client->getAcceptsUserListChanges()) if (_client->getAcceptsUserListChanges())
client->sendProtocolItem(*se); _client->sendProtocolItem(*se);
sendIsl_SessionEvent(*se); sendIsl_SessionEvent(*se);
delete 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; 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) if (value)
counters.insert(id, value); counters.insert(_id, value);
else else
counters.remove(id); counters.remove(_id);
if (event) { if (event) {
event->set_counter_id(id); event->set_counter_id(_id);
event->set_counter_value(value); event->set_counter_value(value);
} }
} }

8
common/server_card.h
View file

@ -54,7 +54,7 @@ private:
Server_Card *stashedCard; Server_Card *stashedCard;
public: 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_Card() override;
Server_CardZone *getZone() const Server_CardZone *getZone() const
@ -86,9 +86,9 @@ public:
{ {
return counters; 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 bool getTapped() const
{ {
@ -144,7 +144,7 @@ public:
{ {
name = _name; 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) void setTapped(bool _tapped)
{ {
tapped = _tapped; tapped = _tapped;

12
common/server_game.cpp
View file

@ -144,11 +144,11 @@ void Server_Game::storeGameInformation()
replayMatchInfo->set_game_name(gameInfo.description()); replayMatchInfo->set_game_name(gameInfo.description());
const QStringList &allGameTypes = room->getGameTypes(); const QStringList &allGameTypes = room->getGameTypes();
QStringList gameTypes; QStringList _gameTypes;
for (int i = gameInfo.game_types_size() - 1; i >= 0; --i) 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()); replayMatchInfo->add_player_names(playerName.toStdString());
} }
@ -171,7 +171,7 @@ void Server_Game::storeGameInformation()
delete sessionEvent; delete sessionEvent;
if (server->getStoreReplaysEnabled()) { if (server->getStoreReplaysEnabled()) {
server->getDatabaseInterface()->storeGameInformation(room->getName(), gameTypes, gameInfo, allPlayersEver, server->getDatabaseInterface()->storeGameInformation(room->getName(), _gameTypes, gameInfo, allPlayersEver,
allSpectatorsEver, replayList); allSpectatorsEver, replayList);
} }
} }
@ -710,8 +710,8 @@ void Server_Game::createGameJoinedEvent(Server_Player *player, ResponseContainer
event2.set_active_player_id(activePlayer); event2.set_active_player_id(activePlayer);
event2.set_active_phase(activePhase); event2.set_active_phase(activePhase);
for (Server_Player *player : players.values()) { for (auto *_player : players.values()) {
player->getInfo(event2.add_player_list(), player, player->getSpectator() && spectatorsSeeEverything, true); _player->getInfo(event2.add_player_list(), _player, _player->getSpectator() && spectatorsSeeEverything, true);
} }
rc.enqueuePostResponseItem(ServerMessage::GAME_EVENT_CONTAINER, prepareGameEvent(event2, -1)); 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; return Response::RespChatFlood;
} }
Event_GameSay event; Event_GameSay event;
@ -1029,7 +1029,7 @@ Server_Player::cmdMulligan(const Command_Mulligan &cmd, ResponseContainer & /*rc
} }
Server_CardZone *hand = zones.value("hand"); Server_CardZone *hand = zones.value("hand");
Server_CardZone *deck = zones.value("deck"); Server_CardZone *_deck = zones.value("deck");
int number = cmd.number(); int number = cmd.number();
if (!hand->getCards().isEmpty()) { if (!hand->getCards().isEmpty()) {
@ -1039,11 +1039,11 @@ Server_Player::cmdMulligan(const Command_Mulligan &cmd, ResponseContainer & /*rc
cardToMove->set_card_id(card->getId()); cardToMove->set_card_id(card->getId());
cardsToMove.append(cardToMove); cardsToMove.append(cardToMove);
} }
moveCard(ges, hand, cardsToMove, deck, -1, 0, false); moveCard(ges, hand, cardsToMove, _deck, -1, 0, false);
qDeleteAll(cardsToMove); qDeleteAll(cardsToMove);
} }
deck->shuffle(); _deck->shuffle();
ges.enqueueGameEvent(Event_Shuffle(), playerId); ges.enqueueGameEvent(Event_Shuffle(), playerId);
drawCards(ges, number); drawCards(ges, number);
@ -1280,9 +1280,9 @@ Server_Player::cmdAttachCard(const Command_AttachCard &cmd, ResponseContainer &
QMapIterator<int, Server_Player *> playerIterator(game->getPlayers()); QMapIterator<int, Server_Player *> playerIterator(game->getPlayers());
while (playerIterator.hasNext()) { while (playerIterator.hasNext()) {
Server_Player *p = playerIterator.next().value(); Server_Player *p = playerIterator.next().value();
QList<Server_Arrow *> arrows = p->getArrows().values(); QList<Server_Arrow *> _arrows = p->getArrows().values();
QList<Server_Arrow *> toDelete; QList<Server_Arrow *> toDelete;
for (auto a : arrows) { for (auto a : _arrows) {
auto *tCard = qobject_cast<Server_Card *>(a->getTargetItem()); auto *tCard = qobject_cast<Server_Card *>(a->getTargetItem());
if ((tCard == card) || (a->getStartCard() == card)) { if ((tCard == card) || (a->getStartCard() == card)) {
toDelete.append(a); toDelete.append(a);
@ -1450,12 +1450,12 @@ Server_Player::cmdCreateToken(const Command_CreateToken &cmd, ResponseContainer
while (i.hasNext()) { while (i.hasNext()) {
i.next(); i.next();
Event_SetCardCounter event; Event_SetCardCounter _event;
event.set_zone_name(card->getZone()->getName().toStdString()); _event.set_zone_name(card->getZone()->getName().toStdString());
event.set_card_id(card->getId()); _event.set_card_id(card->getId());
card->setCounter(i.key(), i.value(), &event); card->setCounter(i.key(), i.value(), &_event);
ges.enqueueGameEvent(event, playerId); ges.enqueueGameEvent(_event, playerId);
} }
// Copy parent card // Copy parent card
@ -1495,8 +1495,8 @@ Server_Player::cmdCreateToken(const Command_CreateToken &cmd, ResponseContainer
targetItem = card; targetItem = card;
} }
if (sendGameEvent) { if (sendGameEvent) {
Event_CreateArrow event; Event_CreateArrow _event;
ServerInfo_Arrow *arrowInfo = event.mutable_arrow_info(); ServerInfo_Arrow *arrowInfo = _event.mutable_arrow_info();
arrowInfo->set_id(arrow->getId()); arrowInfo->set_id(arrow->getId());
arrowInfo->set_start_player_id(player->getPlayerId()); arrowInfo->set_start_player_id(player->getPlayerId());
arrowInfo->set_start_zone(startCard->getZone()->getName().toStdString()); 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->set_target_card_id(arrowTargetCard->getId());
} }
arrowInfo->mutable_arrow_color()->CopyFrom(arrow->getColor()); 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 { } else {
if (cmd.grant_write_access()) { if (cmd.grant_write_access()) {
const QList<int> &playerIds = game->getPlayers().keys(); const QList<int> &playerIds = game->getPlayers().keys();
for (int playerId : playerIds) { for (int _playerId : playerIds) {
zone->addWritePermission(playerId); 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))) if (!antifloodCommandsWhiteList.contains((GameCommand::GameCommandType)getPbExtension(sc)))
++commandCountOverTime[0]; ++commandCountOverTime[0];
for (int i = 0; i < commandCountOverTime.size(); ++i) { for (int count : commandCountOverTime) {
totalCount += commandCountOverTime[i]; totalCount += count;
} }
if (maxCommandCountPerInterval > 0 && totalCount > maxCommandCountPerInterval) { 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()))) { if (databaseInterface->isInIgnoreList(receiver, QString::fromStdString(userInfo->name()))) {
return Response::RespInIgnoreList; return Response::RespInIgnoreList;
} }
if (!addSaidMessageSize(cmd.message().size())) { if (!addSaidMessageSize(static_cast<int>(cmd.message().size()))) {
return Response::RespChatFlood; return Response::RespChatFlood;
} }
@ -765,7 +765,7 @@ bool Server_ProtocolHandler::addSaidMessageSize(int size)
Response::ResponseCode Response::ResponseCode
Server_ProtocolHandler::cmdRoomSay(const Command_RoomSay &cmd, Server_Room *room, ResponseContainer & /*rc*/) 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; return Response::RespChatFlood;
} }
QString msg = QString::fromStdString(cmd.message()); 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); 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. // This function is always called from the Server thread with server->roomsMutex locked.
ServerInfo_Room roomInfo; ServerInfo_Room roomInfo;
roomInfo.set_room_id(id); roomInfo.set_room_id(id);
usersLock.lockForWrite(); usersLock.lockForWrite();
if (externalUsers.contains(name)) if (externalUsers.contains(_name))
externalUsers.remove(name); externalUsers.remove(_name);
roomInfo.set_player_count(users.size() + externalUsers.size()); roomInfo.set_player_count(users.size() + externalUsers.size());
usersLock.unlock(); usersLock.unlock();
Event_LeaveRoom event; Event_LeaveRoom event;
event.set_name(name.toStdString()); event.set_name(_name.toStdString());
sendRoomEvent(prepareRoomEvent(event), false); sendRoomEvent(prepareRoomEvent(event), false);
emit roomInfoChanged(roomInfo); emit roomInfoChanged(roomInfo);

2
common/server_room.h
View file

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

4
oracle/src/oracleimporter.cpp
View file

@ -349,8 +349,8 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet,
// split cards are considered a single card, enqueue for later merging // split cards are considered a single card, enqueue for later merging
if (layout == "split" || layout == "aftermath" || layout == "adventure") { if (layout == "split" || layout == "aftermath" || layout == "adventure") {
auto faceName = getStringPropertyFromMap(card, "faceName"); auto _faceName = getStringPropertyFromMap(card, "faceName");
SplitCardPart split(faceName, text, properties, setInfo); SplitCardPart split(_faceName, text, properties, setInfo);
auto found_iter = splitCards.find(name); auto found_iter = splitCards.find(name);
if (found_iter == splitCards.end()) { if (found_iter == splitCards.end()) {
splitCards.insert(name, {split}); splitCards.insert(name, {split});

26
oracle/src/oraclewizard.cpp
View file

@ -438,7 +438,7 @@ void LoadSetsPage::actDownloadFinishedSetsFile()
reply->deleteLater(); reply->deleteLater();
} }
void LoadSetsPage::readSetsFromByteArray(QByteArray data) void LoadSetsPage::readSetsFromByteArray(QByteArray _data)
{ {
// show an infinite progressbar // show an infinite progressbar
progressBar->setMaximum(0); progressBar->setMaximum(0);
@ -450,16 +450,16 @@ void LoadSetsPage::readSetsFromByteArray(QByteArray data)
wizard()->downloadedPlainXml = false; wizard()->downloadedPlainXml = false;
wizard()->xmlData.clear(); wizard()->xmlData.clear();
readSetsFromByteArrayRef(data); readSetsFromByteArrayRef(_data);
} }
void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data) void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &_data)
{ {
// unzip the file if needed // unzip the file if needed
if (data.startsWith(XZ_SIGNATURE)) { if (_data.startsWith(XZ_SIGNATURE)) {
#ifdef HAS_LZMA #ifdef HAS_LZMA
// zipped file // zipped file
auto *inBuffer = new QBuffer(&data); auto *inBuffer = new QBuffer(&_data);
auto newData = QByteArray(); auto newData = QByteArray();
auto *outBuffer = new QBuffer(&newData); auto *outBuffer = new QBuffer(&newData);
inBuffer->open(QBuffer::ReadOnly); inBuffer->open(QBuffer::ReadOnly);
@ -469,7 +469,7 @@ void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
zipDownloadFailed(tr("Xz extraction failed.")); zipDownloadFailed(tr("Xz extraction failed."));
return; return;
} }
data.clear(); _data.clear();
readSetsFromByteArrayRef(newData); readSetsFromByteArrayRef(newData);
return; return;
#else #else
@ -481,10 +481,10 @@ void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
progressBar->hide(); progressBar->hide();
return; return;
#endif #endif
} else if (data.startsWith(ZIP_SIGNATURE)) { } else if (_data.startsWith(ZIP_SIGNATURE)) {
#ifdef HAS_ZLIB #ifdef HAS_ZLIB
// zipped file // zipped file
auto *inBuffer = new QBuffer(&data); auto *inBuffer = new QBuffer(&_data);
auto newData = QByteArray(); auto newData = QByteArray();
auto *outBuffer = new QBuffer(&newData); auto *outBuffer = new QBuffer(&newData);
QString fileName; QString fileName;
@ -510,7 +510,7 @@ void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
uz.closeArchive(); uz.closeArchive();
return; return;
} }
data.clear(); _data.clear();
readSetsFromByteArrayRef(newData); readSetsFromByteArrayRef(newData);
return; return;
#else #else
@ -522,15 +522,15 @@ void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
progressBar->hide(); progressBar->hide();
return; return;
#endif #endif
} else if (data.startsWith("{")) { } else if (_data.startsWith("{")) {
// Start the computation. // Start the computation.
jsonData = std::move(data); jsonData = std::move(_data);
future = QtConcurrent::run([this] { return wizard()->importer->readSetsFromByteArray(std::move(jsonData)); }); future = QtConcurrent::run([this] { return wizard()->importer->readSetsFromByteArray(std::move(jsonData)); });
watcher.setFuture(future); watcher.setFuture(future);
} else if (data.startsWith("<")) { } else if (_data.startsWith("<")) {
// save xml file and don't do any processing // save xml file and don't do any processing
wizard()->downloadedPlainXml = true; wizard()->downloadedPlainXml = true;
wizard()->xmlData = std::move(data); wizard()->xmlData = std::move(_data);
importFinished(); importFinished();
} else { } else {
wizard()->enableButtons(); wizard()->enableButtons();

4
oracle/src/oraclewizard.h
View file

@ -114,8 +114,8 @@ public:
protected: protected:
void initializePage() override; void initializePage() override;
bool validatePage() override; bool validatePage() override;
void readSetsFromByteArray(QByteArray data); void readSetsFromByteArray(QByteArray _data);
void readSetsFromByteArrayRef(QByteArray &data); void readSetsFromByteArrayRef(QByteArray &_data);
void downloadSetsFile(const QUrl &url); void downloadSetsFile(const QUrl &url);
private: private:

4
oracle/src/zip/unzip.cpp
View file

@ -1012,9 +1012,9 @@ void UnzipPrivate::initKeys(const QString& pwd, quint32* keys) const
The \p file parameter can be used in the user interface or for debugging purposes The \p file parameter can be used in the user interface or for debugging purposes
as it is the name of the encrypted file for wich the password is being tested. as it is the name of the encrypted file for wich the password is being tested.
*/ */
UnZip::ErrorCode UnzipPrivate::testPassword(quint32* keys, const QString& file, const ZipEntryP& header) UnZip::ErrorCode UnzipPrivate::testPassword(quint32* keys, const QString&_file, const ZipEntryP& header)
{ {
Q_UNUSED(file); Q_UNUSED(_file);
Q_ASSERT(device); Q_ASSERT(device);
// read encryption keys // read encryption keys

2
oracle/src/zip/unzip_p.h
View file

@ -98,7 +98,7 @@ public:
UnZip::ErrorCode extractFile(const QString& path, const ZipEntryP& entry, const QDir& dir, UnZip::ExtractionOptions options); UnZip::ErrorCode extractFile(const QString& path, const ZipEntryP& entry, const QDir& dir, UnZip::ExtractionOptions options);
UnZip::ErrorCode extractFile(const QString& path, const ZipEntryP& entry, QIODevice* device, UnZip::ExtractionOptions options); UnZip::ErrorCode extractFile(const QString& path, const ZipEntryP& entry, QIODevice* device, UnZip::ExtractionOptions options);
UnZip::ErrorCode testPassword(quint32* keys, const QString& file, const ZipEntryP& header); UnZip::ErrorCode testPassword(quint32* keys, const QString&_file, const ZipEntryP& header);
bool testKeys(const ZipEntryP& header, quint32* keys); bool testKeys(const ZipEntryP& header, quint32* keys);
bool createDirectory(const QString& path); bool createDirectory(const QString& path);

2
oracle/src/zip/zipglobal.cpp
View file

@ -95,8 +95,6 @@ int OSDAB_ZIP_MANGLE(currentUtcOffset)()
const int utcOffset = -qRound(difftime(global_time_t, local_time_t)); const int utcOffset = -qRound(difftime(global_time_t, local_time_t));
return tm_struct->tm_isdst > 0 ? utcOffset + 3600 : utcOffset; return tm_struct->tm_isdst > 0 ? utcOffset + 3600 : utcOffset;
#endif // No UTC #endif // No UTC
return 0;
} }
QDateTime OSDAB_ZIP_MANGLE(fromFileTimestamp)(const QDateTime &dateTime) QDateTime OSDAB_ZIP_MANGLE(fromFileTimestamp)(const QDateTime &dateTime)

4
servatrice/src/isl_interface.cpp
View file

@ -273,9 +273,9 @@ void IslInterface::transmitMessage(const IslMessage &item)
{ {
QByteArray buf; QByteArray buf;
#if GOOGLE_PROTOBUF_VERSION > 3001000 #if GOOGLE_PROTOBUF_VERSION > 3001000
unsigned int size = item.ByteSizeLong(); unsigned int size = static_cast<unsigned int>(item.ByteSizeLong());
#else #else
unsigned int size = item.ByteSize(); unsigned int size = static_cast<unsigned int>(item.ByteSize());
#endif #endif
buf.resize(size + 4); buf.resize(size + 4);
item.SerializeToArray(buf.data() + 4, size); item.SerializeToArray(buf.data() + 4, size);

26
servatrice/src/servatrice.cpp
View file

@ -722,16 +722,16 @@ void Servatrice::shutdownTimeout()
shutdownMinutes--; shutdownMinutes--;
} }
bool Servatrice::islConnectionExists(int serverId) const bool Servatrice::islConnectionExists(int _serverId) const
{ {
// Only call with islLock locked at least for reading // Only call with islLock locked at least for reading
return islInterfaces.contains(serverId); return islInterfaces.contains(_serverId);
} }
void Servatrice::addIslInterface(int serverId, IslInterface *interface) void Servatrice::addIslInterface(int _serverId, IslInterface *interface)
{ {
// Only call with islLock locked for writing // Only call with islLock locked for writing
islInterfaces.insert(serverId, interface); islInterfaces.insert(_serverId, interface);
connect(interface, SIGNAL(externalUserJoined(ServerInfo_User)), this, SLOT(externalUserJoined(ServerInfo_User))); connect(interface, SIGNAL(externalUserJoined(ServerInfo_User)), this, SLOT(externalUserJoined(ServerInfo_User)));
connect(interface, SIGNAL(externalUserLeft(QString)), this, SLOT(externalUserLeft(QString))); connect(interface, SIGNAL(externalUserLeft(QString)), this, SLOT(externalUserLeft(QString)));
connect(interface, SIGNAL(externalRoomUserJoined(int, ServerInfo_User)), this, connect(interface, SIGNAL(externalRoomUserJoined(int, ServerInfo_User)), this,
@ -753,24 +753,24 @@ void Servatrice::addIslInterface(int serverId, IslInterface *interface)
SLOT(externalGameEventContainerReceived(GameEventContainer, qint64))); SLOT(externalGameEventContainerReceived(GameEventContainer, qint64)));
} }
void Servatrice::removeIslInterface(int serverId) void Servatrice::removeIslInterface(int _serverId)
{ {
// Only call with islLock locked for writing // Only call with islLock locked for writing
// XXX we probably need to delete everything that belonged to it... <-- THIS SHOULD BE FIXED FOR ISL FUNCTIONALITY // XXX we probably need to delete everything that belonged to it... <-- THIS SHOULD BE FIXED FOR ISL FUNCTIONALITY
// TO WORK COMPLETLY! // TO WORK COMPLETLY!
islInterfaces.remove(serverId); islInterfaces.remove(_serverId);
} }
void Servatrice::doSendIslMessage(const IslMessage &msg, int serverId) void Servatrice::doSendIslMessage(const IslMessage &msg, int _serverId)
{ {
QReadLocker locker(&islLock); QReadLocker locker(&islLock);
if (serverId == -1) { if (_serverId == -1) {
QMapIterator<int, IslInterface *> islIterator(islInterfaces); QMapIterator<int, IslInterface *> islIterator(islInterfaces);
while (islIterator.hasNext()) while (islIterator.hasNext())
islIterator.next().value()->transmitMessage(msg); islIterator.next().value()->transmitMessage(msg);
} else { } else {
IslInterface *interface = islInterfaces.value(serverId); IslInterface *interface = islInterfaces.value(_serverId);
if (interface) if (interface)
interface->transmitMessage(msg); interface->transmitMessage(msg);
} }
@ -811,7 +811,7 @@ bool Servatrice::getRegOnlyServerEnabled() const
QString Servatrice::getAuthenticationMethodString() const QString Servatrice::getAuthenticationMethodString() const
{ {
if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) { if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
return QString("sql"); return {"sql"};
} }
return settingsCache->value("authentication/method").toString(); return settingsCache->value("authentication/method").toString();
} }
@ -854,7 +854,7 @@ QString Servatrice::getRequiredFeatures() const
QString Servatrice::getDBTypeString() const QString Servatrice::getDBTypeString() const
{ {
if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) { if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
return QString("mysql"); return {"mysql"};
} }
return settingsCache->value("database/type").toString(); return settingsCache->value("database/type").toString();
} }
@ -862,7 +862,7 @@ QString Servatrice::getDBTypeString() const
QString Servatrice::getDBPrefixString() const QString Servatrice::getDBPrefixString() const
{ {
if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) { if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
return QString("cockatrice"); return {"cockatrice"};
} }
return settingsCache->value("database/prefix").toString(); return settingsCache->value("database/prefix").toString();
} }
@ -903,7 +903,7 @@ QString Servatrice::getDBPasswordString() const
QString Servatrice::getRoomsMethodString() const QString Servatrice::getRoomsMethodString() const
{ {
if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) { if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
return QString("sql"); return {"sql"};
} }
return settingsCache->value("rooms/method").toString(); return settingsCache->value("rooms/method").toString();
} }

8
servatrice/src/servatrice.h
View file

@ -143,7 +143,7 @@ private slots:
void shutdownTimeout(); void shutdownTimeout();
protected: protected:
void doSendIslMessage(const IslMessage &msg, int islServerId) override; void doSendIslMessage(const IslMessage &msg, int _serverId) override;
private: private:
enum DatabaseType enum DatabaseType
@ -276,9 +276,9 @@ public:
void incRxBytes(quint64 num); void incRxBytes(quint64 num);
void addDatabaseInterface(QThread *thread, Servatrice_DatabaseInterface *databaseInterface); void addDatabaseInterface(QThread *thread, Servatrice_DatabaseInterface *databaseInterface);
bool islConnectionExists(int islServerId) const; bool islConnectionExists(int _serverId) const;
void addIslInterface(int islServerId, IslInterface *interface); void addIslInterface(int _serverId, IslInterface *interface);
void removeIslInterface(int islServerId); void removeIslInterface(int _serverId);
QReadWriteLock islLock; QReadWriteLock islLock;
QList<ServerProperties> getServerList() const; QList<ServerProperties> getServerList() const;

4
servatrice/src/servatrice_database_interface.cpp
View file

@ -834,9 +834,9 @@ void Servatrice_DatabaseInterface::storeGameInformation(const QString &roomName,
for (int i = 0; i < replayList.size(); ++i) { for (int i = 0; i < replayList.size(); ++i) {
QByteArray blob; QByteArray blob;
#if GOOGLE_PROTOBUF_VERSION > 3001000 #if GOOGLE_PROTOBUF_VERSION > 3001000
const unsigned int size = replayList[i]->ByteSizeLong(); const unsigned int size = static_cast<unsigned int>(replayList[i]->ByteSizeLong());
#else #else
const unsigned int size = replayList[i]->ByteSize(); const unsigned int size = static_cast<unsigned int>(replayList[i]->ByteSize());
#endif #endif
blob.resize(size); blob.resize(size);
replayList[i]->SerializeToArray(blob.data(), size); replayList[i]->SerializeToArray(blob.data(), size);

20
servatrice/src/serversocketinterface.cpp
View file

@ -1306,16 +1306,16 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountEdit(const Comma
QString queryText = QString("update {prefix}_users set %1 where name=:userName").arg(queryList.join(", ")); QString queryText = QString("update {prefix}_users set %1 where name=:userName").arg(queryList.join(", "));
QSqlQuery *query = sqlInterface->prepareQuery(queryText); QSqlQuery *query = sqlInterface->prepareQuery(queryText);
if (cmd.has_real_name()) { if (cmd.has_real_name()) {
QString realName = nameFromStdString(cmd.real_name()); auto _realName = nameFromStdString(cmd.real_name());
query->bindValue(":realName", realName); query->bindValue(":realName", _realName);
} }
if (cmd.has_email()) { if (cmd.has_email()) {
QString emailAddress = nameFromStdString(cmd.email()); auto _emailAddress = nameFromStdString(cmd.email());
query->bindValue(":email", emailAddress); query->bindValue(":email", _emailAddress);
} }
if (cmd.has_country()) { if (cmd.has_country()) {
QString country = nameFromStdString(cmd.country()); auto _country = nameFromStdString(cmd.country());
query->bindValue(":country", country); query->bindValue(":country", _country);
} }
query->bindValue(":userName", userName); query->bindValue(":userName", userName);
@ -1752,9 +1752,9 @@ void TcpServerSocketInterface::flushOutputQueue()
QByteArray buf; QByteArray buf;
#if GOOGLE_PROTOBUF_VERSION > 3001000 #if GOOGLE_PROTOBUF_VERSION > 3001000
unsigned int size = item.ByteSizeLong(); unsigned int size = static_cast<unsigned int>(item.ByteSizeLong());
#else #else
unsigned int size = item.ByteSize(); unsigned int size = static_cast<unsigned int>(item.ByteSize());
#endif #endif
buf.resize(size + 4); buf.resize(size + 4);
item.SerializeToArray(buf.data() + 4, size); item.SerializeToArray(buf.data() + 4, size);
@ -1955,9 +1955,9 @@ void WebsocketServerSocketInterface::flushOutputQueue()
QByteArray buf; QByteArray buf;
#if GOOGLE_PROTOBUF_VERSION > 3001000 #if GOOGLE_PROTOBUF_VERSION > 3001000
unsigned int size = item.ByteSizeLong(); unsigned int size = static_cast<unsigned int>(item.ByteSizeLong());
#else #else
unsigned int size = item.ByteSize(); unsigned int size = static_cast<unsigned int>(item.ByteSize());
#endif #endif
buf.resize(size); buf.resize(size);
item.SerializeToArray(buf.data(), size); item.SerializeToArray(buf.data(), size);

8
servatrice/src/signalhandler.cpp
View file

@ -73,9 +73,9 @@ void SignalHandler::internalSigHupHandler()
snHup->setEnabled(true); snHup->setEnabled(true);
} }
#ifdef Q_OS_UNIX
void SignalHandler::sigSegvHandler(int sig) void SignalHandler::sigSegvHandler(int sig)
{ {
#ifdef Q_OS_UNIX
void *array[SIGSEGV_TRACE_LINES]; void *array[SIGSEGV_TRACE_LINES];
size_t size; size_t size;
@ -96,5 +96,9 @@ void SignalHandler::sigSegvHandler(int sig)
delete loggerThread; delete loggerThread;
raise(sig); raise(sig);
#endif
} }
#else
void SignalHandler::sigSegvHandler(int /* sig */)
{
}
#endif