diff --git a/CMakeLists.txt b/CMakeLists.txt
index 240cdc32d..4fca72aa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,7 @@ endif()
 # Define proper compilation flags
 if(MSVC)
   # 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
   #set(CMAKE_CXX_FLAGS_DEBUG "/Zi")
 elseif(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp
index 8ed24bb46..5adf8c505 100644
--- a/cockatrice/src/carddatabase.cpp
+++ b/cockatrice/src/carddatabase.cpp
@@ -612,22 +612,22 @@ QStringList CardDatabase::getAllMainCardTypes() const
 
 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
-        int numUnknownSets = sets.getUnknownSetsNum();
-        QStringList unknownSetNames = sets.getUnknownSetsNames();
+        int numUnknownSets = _sets.getUnknownSetsNum();
+        QStringList unknownSetNames = _sets.getUnknownSetsNames();
         if (numUnknownSets > 0) {
             emit cardDatabaseNewSetsFound(numUnknownSets, unknownSetNames);
         } else {
-            sets.markAllAsKnown();
+            _sets.markAllAsKnown();
         }
     } else {
         // No set enabled. Probably this is the first time running trice
-        sets.guessSortKeys();
-        sets.sortByKey();
-        sets.enableAll();
+        _sets.guessSortKeys();
+        _sets.sortByKey();
+        _sets.enableAll();
         notifyEnabledSetsChanged();
 
         emit cardDatabaseAllNewSetsEnabled();
@@ -636,14 +636,14 @@ void CardDatabase::checkUnknownSets()
 
 void CardDatabase::enableAllUnknownSets()
 {
-    SetList sets = getSetList();
-    sets.enableAllUnknown();
+    auto _sets = getSetList();
+    _sets.enableAllUnknown();
 }
 
 void CardDatabase::markAllSetsAsKnown()
 {
-    SetList sets = getSetList();
-    sets.markAllAsKnown();
+    auto _sets = getSetList();
+    _sets.markAllAsKnown();
 }
 
 void CardDatabase::notifyEnabledSetsChanged()
diff --git a/cockatrice/src/carddatabasemodel.cpp b/cockatrice/src/carddatabasemodel.cpp
index 553b87f4a..e9e1de8b8 100644
--- a/cockatrice/src/carddatabasemodel.cpp
+++ b/cockatrice/src/carddatabasemodel.cpp
@@ -326,12 +326,12 @@ void CardDatabaseDisplayModel::clearFilterAll()
     invalidateFilter();
 }
 
-void CardDatabaseDisplayModel::setFilterTree(FilterTree *filterTree)
+void CardDatabaseDisplayModel::setFilterTree(FilterTree *_filterTree)
 {
     if (this->filterTree != nullptr)
         disconnect(this->filterTree, nullptr, this, nullptr);
 
-    this->filterTree = filterTree;
+    this->filterTree = _filterTree;
     connect(this->filterTree, SIGNAL(changed()), this, SLOT(filterTreeChanged()));
     invalidate();
 }
diff --git a/cockatrice/src/carddatabasemodel.h b/cockatrice/src/carddatabasemodel.h
index 9c07711d3..ab890e6b8 100644
--- a/cockatrice/src/carddatabasemodel.h
+++ b/cockatrice/src/carddatabasemodel.h
@@ -82,7 +82,7 @@ private:
 
 public:
     explicit CardDatabaseDisplayModel(QObject *parent = nullptr);
-    void setFilterTree(FilterTree *filterTree);
+    void setFilterTree(FilterTree *_filterTree);
     void setIsToken(FilterBool _isToken)
     {
         isToken = _isToken;
diff --git a/cockatrice/src/carddbparser/cockatricexml3.cpp b/cockatrice/src/carddbparser/cockatricexml3.cpp
index 098a9defd..8646debb1 100644
--- a/cockatrice/src/carddbparser/cockatricexml3.cpp
+++ b/cockatrice/src/carddbparser/cockatricexml3.cpp
@@ -155,7 +155,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
             QVariantHash properties = QVariantHash();
             QString colors = QString("");
             QList<CardRelation *> relatedCards, reverseRelatedCards;
-            CardInfoPerSetMap sets = CardInfoPerSetMap();
+            auto _sets = CardInfoPerSetMap();
             int tableRow = 0;
             bool cipt = false;
             bool isToken = false;
@@ -221,7 +221,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     if (attrs.hasAttribute("rarity")) {
                         setInfo.setProperty("rarity", attrs.value("rarity").toString());
                     }
-                    sets.insert(setName, setInfo);
+                    _sets.insert(setName, setInfo);
                     // related cards
                 } else if (xmlName == "related" || xmlName == "reverse-related") {
                     CardRelation::AttachType attach = CardRelation::DoesNotAttach;
@@ -268,7 +268,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
 
             properties.insert("colors", colors);
             CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards,
-                                                        reverseRelatedCards, sets, cipt, tableRow, upsideDown);
+                                                        reverseRelatedCards, _sets, cipt, tableRow, upsideDown);
             emit addCard(newCard);
         }
     }
@@ -412,7 +412,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     return xml;
 }
 
-bool CockatriceXml3Parser::saveToFile(SetNameMap sets,
+bool CockatriceXml3Parser::saveToFile(SetNameMap _sets,
                                       CardNameMap cards,
                                       const QString &fileName,
                                       const QString &sourceUrl,
@@ -439,9 +439,9 @@ bool CockatriceXml3Parser::saveToFile(SetNameMap sets,
     xml.writeTextElement("sourceVersion", sourceVersion);
     xml.writeEndElement();
 
-    if (sets.count() > 0) {
+    if (_sets.count() > 0) {
         xml.writeStartElement("sets");
-        for (CardSetPtr set : sets) {
+        for (CardSetPtr set : _sets) {
             xml << set;
         }
         xml.writeEndElement();
diff --git a/cockatrice/src/carddbparser/cockatricexml3.h b/cockatrice/src/carddbparser/cockatricexml3.h
index b8330c884..413803ff4 100644
--- a/cockatrice/src/carddbparser/cockatricexml3.h
+++ b/cockatrice/src/carddbparser/cockatricexml3.h
@@ -14,7 +14,7 @@ public:
     ~CockatriceXml3Parser() override = default;
     bool getCanParseFile(const QString &name, QIODevice &device) override;
     void parseFile(QIODevice &device) override;
-    bool saveToFile(SetNameMap sets,
+    bool saveToFile(SetNameMap _sets,
                     CardNameMap cards,
                     const QString &fileName,
                     const QString &sourceUrl = "unknown",
diff --git a/cockatrice/src/carddbparser/cockatricexml4.cpp b/cockatrice/src/carddbparser/cockatricexml4.cpp
index a030ea4d3..d21f8715f 100644
--- a/cockatrice/src/carddbparser/cockatricexml4.cpp
+++ b/cockatrice/src/carddbparser/cockatricexml4.cpp
@@ -134,7 +134,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
             QString text = QString("");
             QVariantHash properties = QVariantHash();
             QList<CardRelation *> relatedCards, reverseRelatedCards;
-            CardInfoPerSetMap sets = CardInfoPerSetMap();
+            auto _sets = CardInfoPerSetMap();
             int tableRow = 0;
             bool cipt = false;
             bool isToken = false;
@@ -178,7 +178,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                                 attrName = "picurl";
                             setInfo.setProperty(attrName, attr.value().toString());
                         }
-                        sets.insert(setName, setInfo);
+                        _sets.insert(setName, setInfo);
                     }
                     // related cards
                 } 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,
-                                                        reverseRelatedCards, sets, cipt, tableRow, upsideDown);
+                                                        reverseRelatedCards, _sets, cipt, tableRow, upsideDown);
             emit addCard(newCard);
         }
     }
@@ -356,7 +356,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     return xml;
 }
 
-bool CockatriceXml4Parser::saveToFile(SetNameMap sets,
+bool CockatriceXml4Parser::saveToFile(SetNameMap _sets,
                                       CardNameMap cards,
                                       const QString &fileName,
                                       const QString &sourceUrl,
@@ -383,9 +383,9 @@ bool CockatriceXml4Parser::saveToFile(SetNameMap sets,
     xml.writeTextElement("sourceVersion", sourceVersion);
     xml.writeEndElement();
 
-    if (sets.count() > 0) {
+    if (_sets.count() > 0) {
         xml.writeStartElement("sets");
-        for (CardSetPtr set : sets) {
+        for (CardSetPtr set : _sets) {
             xml << set;
         }
         xml.writeEndElement();
diff --git a/cockatrice/src/carddbparser/cockatricexml4.h b/cockatrice/src/carddbparser/cockatricexml4.h
index d08ba8720..a2e19f201 100644
--- a/cockatrice/src/carddbparser/cockatricexml4.h
+++ b/cockatrice/src/carddbparser/cockatricexml4.h
@@ -14,7 +14,7 @@ public:
     ~CockatriceXml4Parser() override = default;
     bool getCanParseFile(const QString &name, QIODevice &device) override;
     void parseFile(QIODevice &device) override;
-    bool saveToFile(SetNameMap sets,
+    bool saveToFile(SetNameMap _sets,
                     CardNameMap cards,
                     const QString &fileName,
                     const QString &sourceUrl = "unknown",
diff --git a/cockatrice/src/carditem.cpp b/cockatrice/src/carditem.cpp
index 59bd9febb..d4ddc6fee 100644
--- a/cockatrice/src/carditem.cpp
+++ b/cockatrice/src/carditem.cpp
@@ -97,10 +97,10 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
     QMapIterator<int, int> counterIterator(counters);
     while (counterIterator.hasNext()) {
         counterIterator.next();
-        QColor color;
-        color.setHsv(counterIterator.key() * 60, 150, 255);
+        QColor _color;
+        _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;
     }
 
@@ -233,25 +233,25 @@ void CardItem::resetState()
     update();
 }
 
-void CardItem::processCardInfo(const ServerInfo_Card &info)
+void CardItem::processCardInfo(const ServerInfo_Card &_info)
 {
     counters.clear();
-    const int counterListSize = info.counter_list_size();
+    const int counterListSize = _info.counter_list_size();
     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());
     }
 
-    setId(info.id());
-    setName(QString::fromStdString(info.name()));
-    setAttacking(info.attacking());
-    setFaceDown(info.face_down());
-    setPT(QString::fromStdString(info.pt()));
-    setAnnotation(QString::fromStdString(info.annotation()));
-    setColor(QString::fromStdString(info.color()));
-    setTapped(info.tapped());
-    setDestroyOnZoneChange(info.destroy_on_zone_change());
-    setDoesntUntap(info.doesnt_untap());
+    setId(_info.id());
+    setName(QString::fromStdString(_info.name()));
+    setAttacking(_info.attacking());
+    setFaceDown(_info.face_down());
+    setPT(QString::fromStdString(_info.pt()));
+    setAnnotation(QString::fromStdString(_info.annotation()));
+    setColor(QString::fromStdString(_info.color()));
+    setTapped(_info.tapped());
+    setDestroyOnZoneChange(_info.destroy_on_zone_change());
+    setDoesntUntap(_info.doesnt_untap());
 }
 
 CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown)
diff --git a/cockatrice/src/carditem.h b/cockatrice/src/carditem.h
index 51a187147..bb6dc6463 100644
--- a/cockatrice/src/carditem.h
+++ b/cockatrice/src/carditem.h
@@ -138,7 +138,7 @@ public:
         return attachedCards;
     }
     void resetState();
-    void processCardInfo(const ServerInfo_Card &info);
+    void processCardInfo(const ServerInfo_Card &_info);
 
     QMenu *getCardMenu() const
     {
diff --git a/cockatrice/src/deck_loader.h b/cockatrice/src/deck_loader.h
index 721d1c780..61b695335 100644
--- a/cockatrice/src/deck_loader.h
+++ b/cockatrice/src/deck_loader.h
@@ -57,8 +57,8 @@ protected:
                                     const InnerDecklistNode *zoneNode,
                                     QList<DecklistCardNode *> cards,
                                     bool addComments = true);
-    virtual QString getCardZoneFromName(QString cardName, QString currentZoneName);
-    virtual QString getCompleteCardName(const QString &cardName) const;
+    [[nodiscard]] QString getCardZoneFromName(QString cardName, QString currentZoneName) override;
+    [[nodiscard]] QString getCompleteCardName(const QString &cardName) const override;
 };
 
 #endif
diff --git a/cockatrice/src/dlg_connect.cpp b/cockatrice/src/dlg_connect.cpp
index 508085f13..eff0371a8 100644
--- a/cockatrice/src/dlg_connect.cpp
+++ b/cockatrice/src/dlg_connect.cpp
@@ -245,22 +245,22 @@ void DlgConnect::updateDisplayInfo(const QString &saveName)
     }
 
     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));
-    hostEdit->setText(data.at(1));
-    portEdit->setText(data.at(2));
-    playernameEdit->setText(data.at(3));
+    saveEdit->setText(_data.at(0));
+    hostEdit->setText(_data.at(1));
+    portEdit->setText(_data.at(2));
+    playernameEdit->setText(_data.at(3));
     savePasswordCheckBox->setChecked(savePasswordStatus);
 
     if (savePasswordStatus) {
-        passwordEdit->setText(data.at(4));
+        passwordEdit->setText(_data.at(4));
     }
 
-    if (!data.at(6).isEmpty()) {
-        QString formattedLink = "<a href=\"" + data.at(6) + "\">" + data.at(6) + "</a>";
+    if (!_data.at(6).isEmpty()) {
+        QString formattedLink = "<a href=\"" + _data.at(6) + "\">" + _data.at(6) + "</a>";
         serverContactLabel->setText(tr("Webpage") + ":");
         serverContactLink->setText(formattedLink);
     } else {
diff --git a/cockatrice/src/dlg_creategame.cpp b/cockatrice/src/dlg_creategame.cpp
index 11fc05100..a659a5157 100644
--- a/cockatrice/src/dlg_creategame.cpp
+++ b/cockatrice/src/dlg_creategame.cpp
@@ -235,13 +235,13 @@ void DlgCreateGame::actOK()
     cmd.set_join_as_judge(QApplication::keyboardModifiers() & Qt::ShiftModifier);
     cmd.set_join_as_spectator(createGameAsSpectatorCheckBox->isChecked());
 
-    QString gameTypes = QString();
+    QString _gameTypes = QString();
     QMapIterator<int, QRadioButton *> gameTypeCheckBoxIterator(gameTypeCheckBoxes);
     while (gameTypeCheckBoxIterator.hasNext()) {
         gameTypeCheckBoxIterator.next();
         if (gameTypeCheckBoxIterator.value()->isChecked()) {
             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().setSpectatorsCanSeeEverything(spectatorsSeeEverythingCheckBox->isChecked());
         SettingsCache::instance().setCreateGameAsSpectator(createGameAsSpectatorCheckBox->isChecked());
-        SettingsCache::instance().setGameTypes(gameTypes);
+        SettingsCache::instance().setGameTypes(_gameTypes);
     }
     PendingCommand *pend = room->prepareRoomCommand(cmd);
     connect(pend, SIGNAL(finished(Response, CommandContainer, QVariant)), this, SLOT(checkResponse(Response)));
diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp
index 7985c524d..f560e126c 100644
--- a/cockatrice/src/dlg_settings.cpp
+++ b/cockatrice/src/dlg_settings.cpp
@@ -1154,28 +1154,28 @@ ShortcutSettingsPage::ShortcutSettingsPage()
     btnClearAll->setIcon(QPixmap("theme:icons/clearsearch"));
 
     // layout
-    auto *editLayout = new QGridLayout;
-    editLayout->addWidget(currentActionGroupLabel, 0, 0);
-    editLayout->addWidget(currentActionGroupName, 0, 1);
-    editLayout->addWidget(currentActionLabel, 1, 0);
-    editLayout->addWidget(currentActionName, 1, 1);
-    editLayout->addWidget(currentShortcutLabel, 2, 0);
-    editLayout->addWidget(editTextBox, 2, 1);
+    auto *_editLayout = new QGridLayout;
+    _editLayout->addWidget(currentActionGroupLabel, 0, 0);
+    _editLayout->addWidget(currentActionGroupName, 0, 1);
+    _editLayout->addWidget(currentActionLabel, 1, 0);
+    _editLayout->addWidget(currentActionName, 1, 1);
+    _editLayout->addWidget(currentShortcutLabel, 2, 0);
+    _editLayout->addWidget(editTextBox, 2, 1);
 
     editShortcutGroupBox = new QGroupBox;
-    editShortcutGroupBox->setLayout(editLayout);
+    editShortcutGroupBox->setLayout(_editLayout);
 
-    auto *buttonsLayout = new QHBoxLayout;
-    buttonsLayout->addWidget(faqLabel);
-    buttonsLayout->addWidget(btnResetAll);
-    buttonsLayout->addWidget(btnClearAll);
+    auto *_buttonsLayout = new QHBoxLayout;
+    _buttonsLayout->addWidget(faqLabel);
+    _buttonsLayout->addWidget(btnResetAll);
+    _buttonsLayout->addWidget(btnClearAll);
 
-    auto *mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(shortcutsTable);
-    mainLayout->addWidget(editShortcutGroupBox);
-    mainLayout->addLayout(buttonsLayout);
+    auto *_mainLayout = new QVBoxLayout;
+    _mainLayout->addWidget(shortcutsTable);
+    _mainLayout->addWidget(editShortcutGroupBox);
+    _mainLayout->addLayout(_buttonsLayout);
 
-    setLayout(mainLayout);
+    setLayout(_mainLayout);
 
     connect(btnResetAll, SIGNAL(clicked()), this, SLOT(resetShortcuts()));
     connect(btnClearAll, SIGNAL(clicked()), this, SLOT(clearShortcuts()));
diff --git a/cockatrice/src/pictureloader.cpp b/cockatrice/src/pictureloader.cpp
index 960343cbb..d8519adb8 100644
--- a/cockatrice/src/pictureloader.cpp
+++ b/cockatrice/src/pictureloader.cpp
@@ -212,22 +212,22 @@ bool PictureLoaderWorker::cardImageExistsOnDisk(QString &setName, QString &corre
     // Iterates through the list of paths, searching for images with the desired
     // name with any QImageReader-supported
     // extension
-    for (const auto &picsPath : picsPaths) {
-        imgReader.setFileName(picsPath);
+    for (const auto &_picsPath : picsPaths) {
+        imgReader.setFileName(_picsPath);
         if (imgReader.read(&image)) {
             qDebug().nospace() << "PictureLoader: [card: " << correctedCardname << " set: " << setName
                                << "]: Picture found on disk.";
             imageLoaded(cardBeingLoaded.getCard(), image);
             return true;
         }
-        imgReader.setFileName(picsPath + ".full");
+        imgReader.setFileName(_picsPath + ".full");
         if (imgReader.read(&image)) {
             qDebug().nospace() << "PictureLoader: [card: " << correctedCardname << " set: " << setName
                                << "]: Picture.full found on disk.";
             imageLoaded(cardBeingLoaded.getCard(), image);
             return true;
         }
-        imgReader.setFileName(picsPath + ".xlhq");
+        imgReader.setFileName(_picsPath + ".xlhq");
         if (imgReader.read(&image)) {
             qDebug().nospace() << "PictureLoader: [card: " << correctedCardname << " set: " << setName
                                << "]: Picture.xlhq found on disk.";
diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp
index 04390e602..644acebd2 100644
--- a/cockatrice/src/player.cpp
+++ b/cockatrice/src/player.cpp
@@ -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;
     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,
                            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);
     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());
         libraryMenu->addSeparator();
         libraryMenu->addAction(aOpenDeckInDeckEditor);
-        deck->setMenu(libraryMenu, aDrawCard);
+        _deck->setMenu(libraryMenu, aDrawCard);
 
         topLibraryMenu->addAction(aMoveTopToPlay);
         topLibraryMenu->addAction(aMoveTopToPlayFaceDown);
@@ -2282,27 +2282,27 @@ void Player::eventAttachCard(const Event_AttachCard &event)
 
 void Player::eventDrawCards(const Event_DrawCards &event)
 {
-    CardZone *deck = zones.value("deck");
-    CardZone *hand = zones.value("hand");
+    CardZone *_deck = zones.value("deck");
+    CardZone *_hand = zones.value("hand");
 
     const int listSize = event.cards_size();
     if (listSize) {
         for (int i = 0; i < listSize; ++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()));
-            hand->addCard(card, false, -1);
+            _hand->addCard(card, false, -1);
         }
     } else {
         const int number = event.number();
         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();
-    deck->reorganizeCards();
-    emit logDrawCards(this, event.number(), deck->getCards().size() == 0);
+    _hand->reorganizeCards();
+    _deck->reorganizeCards();
+    emit logDrawCards(this, event.number(), _deck->getCards().size() == 0);
 }
 
 void Player::eventRevealCards(const Event_RevealCards &event)
@@ -3157,16 +3157,16 @@ void Player::actSetPT()
         if (!empty) {
             const auto oldpt = parsePT(card->getPT());
             int ptIter = 0;
-            for (const auto &item : ptList) {
+            for (const auto &_item : ptList) {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-                if (item.typeId() == QMetaType::Type::Int) {
+                if (_item.typeId() == QMetaType::Type::Int) {
 #else
-                if (item.type() == QVariant::Int) {
+                if (_item.type() == QVariant::Int) {
 #endif
                     int oldItem = ptIter < oldpt.size() ? oldpt.at(ptIter).toInt() : 0;
-                    newpt += '/' + QString::number(oldItem + item.toInt());
+                    newpt += '/' + QString::number(oldItem + _item.toInt());
                 } else {
-                    newpt += '/' + item.toString();
+                    newpt += '/' + _item.toString();
                 }
                 ++ptIter;
             }
diff --git a/cockatrice/src/remotereplaylist_treewidget.cpp b/cockatrice/src/remotereplaylist_treewidget.cpp
index 3ae2546bd..c6e5dc19b 100644
--- a/cockatrice/src/remotereplaylist_treewidget.cpp
+++ b/cockatrice/src/remotereplaylist_treewidget.cpp
@@ -218,16 +218,16 @@ ServerInfo_Replay const *RemoteReplayList_TreeModel::getReplay(const QModelIndex
 ServerInfo_ReplayMatch const *RemoteReplayList_TreeModel::getReplayMatch(const QModelIndex &index) const
 {
     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) {
-        ReplayNode *node = dynamic_cast<ReplayNode *>(static_cast<Node *>(index.internalPointer()));
-        if (!node)
-            return 0;
-        return &node->getParent()->getMatchInfo();
-    } else
-        return &node->getMatchInfo();
+        auto *_node = dynamic_cast<ReplayNode *>(static_cast<Node *>(index.internalPointer()));
+        if (!_node)
+            return nullptr;
+        return &_node->getParent()->getMatchInfo();
+    }
+    return &node->getMatchInfo();
 }
 
 void RemoteReplayList_TreeModel::clearTree()
diff --git a/cockatrice/src/sequenceEdit/sequenceedit.cpp b/cockatrice/src/sequenceEdit/sequenceedit.cpp
index f1719214f..ca3d24909 100644
--- a/cockatrice/src/sequenceEdit/sequenceedit.cpp
+++ b/cockatrice/src/sequenceEdit/sequenceedit.cpp
@@ -60,8 +60,8 @@ void SequenceEdit::removeLastShortcut()
     QString sequences = lineEdit->text();
     if (!sequences.isEmpty()) {
         if (sequences.lastIndexOf(";") > 0) {
-            QString valid = sequences.left(sequences.lastIndexOf(";"));
-            lineEdit->setText(valid);
+            QString validText = sequences.left(sequences.lastIndexOf(";"));
+            lineEdit->setText(validText);
         } else {
             lineEdit->clear();
         }
diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp
index 70fea767c..1755b094b 100644
--- a/cockatrice/src/tab_deck_editor.cpp
+++ b/cockatrice/src/tab_deck_editor.cpp
@@ -1076,8 +1076,8 @@ void TabDeckEditor::actDecrementCardFromSideboard()
 
 void TabDeckEditor::copyDatabaseCellContents()
 {
-    QVariant data = databaseView->selectionModel()->currentIndex().data();
-    QApplication::clipboard()->setText(data.toString());
+    auto _data = databaseView->selectionModel()->currentIndex().data();
+    QApplication::clipboard()->setText(_data.toString());
 }
 
 void TabDeckEditor::actIncrement()
diff --git a/cockatrice/src/tab_game.cpp b/cockatrice/src/tab_game.cpp
index b57d0028e..29bd1b1c7 100644
--- a/cockatrice/src/tab_game.cpp
+++ b/cockatrice/src/tab_game.cpp
@@ -986,7 +986,7 @@ PendingCommand *TabGame::prepareGameCommand(const QList<const ::google::protobuf
     return new PendingCommand(cont);
 }
 
-void TabGame::startGame(bool resuming)
+void TabGame::startGame(bool _resuming)
 {
     currentPhase = -1;
 
@@ -999,7 +999,7 @@ void TabGame::startGame(bool resuming)
 
     mainWidget->setCurrentWidget(gamePlayAreaWidget);
 
-    if (!resuming) {
+    if (!_resuming) {
         QMapIterator<int, Player *> playerIterator(players);
         while (playerIterator.hasNext())
             playerIterator.next().value()->setGameStarted();
diff --git a/cockatrice/src/tab_logs.cpp b/cockatrice/src/tab_logs.cpp
index 02a8e86f6..da0589efd 100644
--- a/cockatrice/src/tab_logs.cpp
+++ b/cockatrice/src/tab_logs.cpp
@@ -89,7 +89,7 @@ void TabLog::getClicked()
     if (maximumResults->value() == 0)
         maximumResults->setValue(1000);
 
-    int dateRange;
+    int dateRange = 0;
     if (lastHour->isChecked())
         dateRange = 1;
 
diff --git a/cockatrice/src/tab_replays.cpp b/cockatrice/src/tab_replays.cpp
index c8347f765..fc70cd4a8 100644
--- a/cockatrice/src/tab_replays.cpp
+++ b/cockatrice/src/tab_replays.cpp
@@ -134,11 +134,11 @@ void TabReplays::actOpenLocalReplay()
     QFile f(filePath);
     if (!f.open(QIODevice::ReadOnly))
         return;
-    QByteArray data = f.readAll();
+    QByteArray _data = f.readAll();
     f.close();
 
     GameReplay *replay = new GameReplay;
-    replay->ParseFromArray(data.data(), data.size());
+    replay->ParseFromArray(_data.data(), _data.size());
 
     emit openReplay(replay);
 }
@@ -223,10 +223,10 @@ void TabReplays::downloadFinished(const Response &r,
     const Response_ReplayDownload &resp = r.GetExtension(Response_ReplayDownload::ext);
     QString filePath = extraData.toString();
 
-    const std::string &data = resp.replay_data();
+    const std::string &_data = resp.replay_data();
     QFile f(filePath);
     f.open(QIODevice::WriteOnly);
-    f.write((const char *)data.data(), data.size());
+    f.write((const char *)_data.data(), _data.size());
     f.close();
 }
 
diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp
index ed7339b2e..5649b046c 100644
--- a/cockatrice/src/tab_supervisor.cpp
+++ b/cockatrice/src/tab_supervisor.cpp
@@ -729,8 +729,8 @@ const ServerInfo_User *TabSupervisor::getOnlineUser(const QString &userName) con
 
     for (i = userList.begin(); i != userList.end(); ++i)
         if (i.key().toLower() == userNameToMatchLower) {
-            const ServerInfo_User &userInfo = i.value()->getUserInfo();
-            return &userInfo;
+            const ServerInfo_User &_userInfo = i.value()->getUserInfo();
+            return &_userInfo;
         }
 
     return nullptr;
diff --git a/cockatrice/src/user_context_menu.cpp b/cockatrice/src/user_context_menu.cpp
index 4d89f7b3b..902ec8c01 100644
--- a/cockatrice/src/user_context_menu.cpp
+++ b/cockatrice/src/user_context_menu.cpp
@@ -306,10 +306,10 @@ void UserContextMenu::showContextMenu(const QPoint &pos,
                                       const QString &deckHash,
                                       ChatView *chatView)
 {
-    QAction *aCopyToClipBoard, *aRemoveMessages;
+    QAction *aCopyToClipBoard = nullptr, *aRemoveMessages = nullptr;
     aUserName->setText(userName);
 
-    QMenu *menu = new QMenu(static_cast<QWidget *>(parent()));
+    auto *menu = new QMenu(static_cast<QWidget *>(parent()));
     menu->addAction(aUserName);
     menu->addSeparator();
     if (!deckHash.isEmpty()) {
diff --git a/cockatrice/src/userconnection_information.cpp b/cockatrice/src/userconnection_information.cpp
index ad10e32f0..bebe25b40 100644
--- a/cockatrice/src/userconnection_information.cpp
+++ b/cockatrice/src/userconnection_information.cpp
@@ -28,16 +28,16 @@ QMap<QString, std::pair<QString, UserConnection_Information>> UserConnection_Inf
     int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1;
 
     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 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 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();
-        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);
-        serverList.insert(saveName, std::make_pair(serverName, userInfo));
+        UserConnection_Information userInfo(_saveName, serverName, portNum, userName, pass, savePass, _site);
+        serverList.insert(_saveName, std::make_pair(serverName, userInfo));
     }
 
     return serverList;
@@ -45,15 +45,15 @@ QMap<QString, std::pair<QString, UserConnection_Information>> UserConnection_Inf
 
 QStringList UserConnection_Information::getServerInfo(const QString &find)
 {
-    QStringList server;
+    QStringList _server;
 
     ServersSettings &servers = SettingsCache::instance().servers();
 
     int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1;
     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;
 
         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 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();
-        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(serverName);
-        server.append(portNum);
-        server.append(userName);
-        server.append(pass);
-        server.append(savePass ? "1" : "0");
-        server.append(site);
+        _server.append(_saveName);
+        _server.append(serverName);
+        _server.append(portNum);
+        _server.append(userName);
+        _server.append(pass);
+        _server.append(savePass ? "1" : "0");
+        _server.append(_site);
         break;
     }
 
-    if (server.empty())
+    if (_server.empty())
         qDebug() << "There was a problem!";
 
-    return server;
+    return _server;
 }
diff --git a/common/decklist.cpp b/common/decklist.cpp
index ee18f5cbb..1e118d22c 100644
--- a/common/decklist.cpp
+++ b/common/decklist.cpp
@@ -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);
         }
     }
diff --git a/common/decklist.h b/common/decklist.h
index 4fe2d34a8..bacba0ce6 100644
--- a/common/decklist.h
+++ b/common/decklist.h
@@ -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;
diff --git a/common/featureset.cpp b/common/featureset.cpp
index 1fdafacb3..d9f253ab9 100644
--- a/common/featureset.cpp
+++ b/common/featureset.cpp
@@ -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) {
diff --git a/common/featureset.h b/common/featureset.h
index eb73471b5..da495c4b7 100644
--- a/common/featureset.h
+++ b/common/featureset.h
@@ -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;
diff --git a/common/rng_sfmt.cpp b/common/rng_sfmt.cpp
index 30d0ab638..5a6d8c862 100644
--- a/common/rng_sfmt.cpp
+++ b/common/rng_sfmt.cpp
@@ -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.
diff --git a/common/server.cpp b/common/server.cpp
index 1a9bf6bfa..a8223c599 100644
--- a/common/server.cpp
+++ b/common/server.cpp
@@ -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;
 
diff --git a/common/server_card.cpp b/common/server_card.cpp
index 5bf8ee78d..3bab40132 100644
--- a/common/server_card.cpp
+++ b/common/server_card.cpp
@@ -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);
     }
 }
diff --git a/common/server_card.h b/common/server_card.h
index 0e1052d9f..58ef20255 100644
--- a/common/server_card.h
+++ b/common/server_card.h
@@ -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;
diff --git a/common/server_game.cpp b/common/server_game.cpp
index 840cbee17..6f8cd63c4 100644
--- a/common/server_game.cpp
+++ b/common/server_game.cpp
@@ -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));
diff --git a/common/server_player.cpp b/common/server_player.cpp
index 9c21d7f81..69087826d 100644
--- a/common/server_player.cpp
+++ b/common/server_player.cpp
@@ -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);
             }
         }
 
diff --git a/common/server_protocolhandler.cpp b/common/server_protocolhandler.cpp
index 978dad571..8e4d58f48 100644
--- a/common/server_protocolhandler.cpp
+++ b/common/server_protocolhandler.cpp
@@ -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());
diff --git a/common/server_room.cpp b/common/server_room.cpp
index e9f5c20f0..4cd5f3a01 100644
--- a/common/server_room.cpp
+++ b/common/server_room.cpp
@@ -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);
diff --git a/common/server_room.h b/common/server_room.h
index fafc6a184..76988f012 100644
--- a/common/server_room.h
+++ b/common/server_room.h
@@ -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;
diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index ae7c35aab..cfb035425 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -349,8 +349,8 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet,
 
         // split cards are considered a single card, enqueue for later merging
         if (layout == "split" || layout == "aftermath" || layout == "adventure") {
-            auto faceName = getStringPropertyFromMap(card, "faceName");
-            SplitCardPart split(faceName, text, properties, setInfo);
+            auto _faceName = getStringPropertyFromMap(card, "faceName");
+            SplitCardPart split(_faceName, text, properties, setInfo);
             auto found_iter = splitCards.find(name);
             if (found_iter == splitCards.end()) {
                 splitCards.insert(name, {split});
diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp
index e13412ca7..a85f1b775 100644
--- a/oracle/src/oraclewizard.cpp
+++ b/oracle/src/oraclewizard.cpp
@@ -438,7 +438,7 @@ void LoadSetsPage::actDownloadFinishedSetsFile()
     reply->deleteLater();
 }
 
-void LoadSetsPage::readSetsFromByteArray(QByteArray data)
+void LoadSetsPage::readSetsFromByteArray(QByteArray _data)
 {
     // show an infinite progressbar
     progressBar->setMaximum(0);
@@ -450,16 +450,16 @@ void LoadSetsPage::readSetsFromByteArray(QByteArray data)
 
     wizard()->downloadedPlainXml = false;
     wizard()->xmlData.clear();
-    readSetsFromByteArrayRef(data);
+    readSetsFromByteArrayRef(_data);
 }
 
-void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
+void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &_data)
 {
     // unzip the file if needed
-    if (data.startsWith(XZ_SIGNATURE)) {
+    if (_data.startsWith(XZ_SIGNATURE)) {
 #ifdef HAS_LZMA
         // zipped file
-        auto *inBuffer = new QBuffer(&data);
+        auto *inBuffer = new QBuffer(&_data);
         auto newData = QByteArray();
         auto *outBuffer = new QBuffer(&newData);
         inBuffer->open(QBuffer::ReadOnly);
@@ -469,7 +469,7 @@ void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
             zipDownloadFailed(tr("Xz extraction failed."));
             return;
         }
-        data.clear();
+        _data.clear();
         readSetsFromByteArrayRef(newData);
         return;
 #else
@@ -481,10 +481,10 @@ void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
         progressBar->hide();
         return;
 #endif
-    } else if (data.startsWith(ZIP_SIGNATURE)) {
+    } else if (_data.startsWith(ZIP_SIGNATURE)) {
 #ifdef HAS_ZLIB
         // zipped file
-        auto *inBuffer = new QBuffer(&data);
+        auto *inBuffer = new QBuffer(&_data);
         auto newData = QByteArray();
         auto *outBuffer = new QBuffer(&newData);
         QString fileName;
@@ -510,7 +510,7 @@ void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
             uz.closeArchive();
             return;
         }
-        data.clear();
+        _data.clear();
         readSetsFromByteArrayRef(newData);
         return;
 #else
@@ -522,15 +522,15 @@ void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
         progressBar->hide();
         return;
 #endif
-    } else if (data.startsWith("{")) {
+    } else if (_data.startsWith("{")) {
         // Start the computation.
-        jsonData = std::move(data);
+        jsonData = std::move(_data);
         future = QtConcurrent::run([this] { return wizard()->importer->readSetsFromByteArray(std::move(jsonData)); });
         watcher.setFuture(future);
-    } else if (data.startsWith("<")) {
+    } else if (_data.startsWith("<")) {
         // save xml file and don't do any processing
         wizard()->downloadedPlainXml = true;
-        wizard()->xmlData = std::move(data);
+        wizard()->xmlData = std::move(_data);
         importFinished();
     } else {
         wizard()->enableButtons();
diff --git a/oracle/src/oraclewizard.h b/oracle/src/oraclewizard.h
index b813fcea2..35f1a233e 100644
--- a/oracle/src/oraclewizard.h
+++ b/oracle/src/oraclewizard.h
@@ -114,8 +114,8 @@ public:
 protected:
     void initializePage() override;
     bool validatePage() override;
-    void readSetsFromByteArray(QByteArray data);
-    void readSetsFromByteArrayRef(QByteArray &data);
+    void readSetsFromByteArray(QByteArray _data);
+    void readSetsFromByteArrayRef(QByteArray &_data);
     void downloadSetsFile(const QUrl &url);
 
 private:
diff --git a/oracle/src/zip/unzip.cpp b/oracle/src/zip/unzip.cpp
index 6d8830476..1e5910051 100755
--- a/oracle/src/zip/unzip.cpp
+++ b/oracle/src/zip/unzip.cpp
@@ -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
  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);
 
     // read encryption keys
diff --git a/oracle/src/zip/unzip_p.h b/oracle/src/zip/unzip_p.h
index c389fcd6b..fca2b071d 100755
--- a/oracle/src/zip/unzip_p.h
+++ b/oracle/src/zip/unzip_p.h
@@ -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, 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 createDirectory(const QString& path);
diff --git a/oracle/src/zip/zipglobal.cpp b/oracle/src/zip/zipglobal.cpp
index 4a855ed81..d09a1b677 100644
--- a/oracle/src/zip/zipglobal.cpp
+++ b/oracle/src/zip/zipglobal.cpp
@@ -95,8 +95,6 @@ int OSDAB_ZIP_MANGLE(currentUtcOffset)()
     const int utcOffset = -qRound(difftime(global_time_t, local_time_t));
     return tm_struct->tm_isdst > 0 ? utcOffset + 3600 : utcOffset;
 #endif // No UTC
-
-    return 0;
 }
 
 QDateTime OSDAB_ZIP_MANGLE(fromFileTimestamp)(const QDateTime &dateTime)
diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index 9ab7cc4ef..351c608c5 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -273,9 +273,9 @@ void IslInterface::transmitMessage(const IslMessage &item)
 {
     QByteArray buf;
 #if GOOGLE_PROTOBUF_VERSION > 3001000
-    unsigned int size = item.ByteSizeLong();
+    unsigned int size = static_cast<unsigned int>(item.ByteSizeLong());
 #else
-    unsigned int size = item.ByteSize();
+    unsigned int size = static_cast<unsigned int>(item.ByteSize());
 #endif
     buf.resize(size + 4);
     item.SerializeToArray(buf.data() + 4, size);
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index fff5a4a0a..80f60e3d4 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -722,16 +722,16 @@ void Servatrice::shutdownTimeout()
     shutdownMinutes--;
 }
 
-bool Servatrice::islConnectionExists(int serverId) const
+bool Servatrice::islConnectionExists(int _serverId) const
 {
     // 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
-    islInterfaces.insert(serverId, interface);
+    islInterfaces.insert(_serverId, interface);
     connect(interface, SIGNAL(externalUserJoined(ServerInfo_User)), this, SLOT(externalUserJoined(ServerInfo_User)));
     connect(interface, SIGNAL(externalUserLeft(QString)), this, SLOT(externalUserLeft(QString)));
     connect(interface, SIGNAL(externalRoomUserJoined(int, ServerInfo_User)), this,
@@ -753,24 +753,24 @@ void Servatrice::addIslInterface(int serverId, IslInterface *interface)
             SLOT(externalGameEventContainerReceived(GameEventContainer, qint64)));
 }
 
-void Servatrice::removeIslInterface(int serverId)
+void Servatrice::removeIslInterface(int _serverId)
 {
     // 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
     // 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);
 
-    if (serverId == -1) {
+    if (_serverId == -1) {
         QMapIterator<int, IslInterface *> islIterator(islInterfaces);
         while (islIterator.hasNext())
             islIterator.next().value()->transmitMessage(msg);
     } else {
-        IslInterface *interface = islInterfaces.value(serverId);
+        IslInterface *interface = islInterfaces.value(_serverId);
         if (interface)
             interface->transmitMessage(msg);
     }
@@ -811,7 +811,7 @@ bool Servatrice::getRegOnlyServerEnabled() const
 QString Servatrice::getAuthenticationMethodString() const
 {
     if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
-        return QString("sql");
+        return {"sql"};
     }
     return settingsCache->value("authentication/method").toString();
 }
@@ -854,7 +854,7 @@ QString Servatrice::getRequiredFeatures() const
 QString Servatrice::getDBTypeString() const
 {
     if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
-        return QString("mysql");
+        return {"mysql"};
     }
     return settingsCache->value("database/type").toString();
 }
@@ -862,7 +862,7 @@ QString Servatrice::getDBTypeString() const
 QString Servatrice::getDBPrefixString() const
 {
     if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
-        return QString("cockatrice");
+        return {"cockatrice"};
     }
     return settingsCache->value("database/prefix").toString();
 }
@@ -903,7 +903,7 @@ QString Servatrice::getDBPasswordString() const
 QString Servatrice::getRoomsMethodString() const
 {
     if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
-        return QString("sql");
+        return {"sql"};
     }
     return settingsCache->value("rooms/method").toString();
 }
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index d21410560..8dbaf492f 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -143,7 +143,7 @@ private slots:
     void shutdownTimeout();
 
 protected:
-    void doSendIslMessage(const IslMessage &msg, int islServerId) override;
+    void doSendIslMessage(const IslMessage &msg, int _serverId) override;
 
 private:
     enum DatabaseType
@@ -276,9 +276,9 @@ public:
     void incRxBytes(quint64 num);
     void addDatabaseInterface(QThread *thread, Servatrice_DatabaseInterface *databaseInterface);
 
-    bool islConnectionExists(int islServerId) const;
-    void addIslInterface(int islServerId, IslInterface *interface);
-    void removeIslInterface(int islServerId);
+    bool islConnectionExists(int _serverId) const;
+    void addIslInterface(int _serverId, IslInterface *interface);
+    void removeIslInterface(int _serverId);
     QReadWriteLock islLock;
 
     QList<ServerProperties> getServerList() const;
diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp
index 4291c75ee..ab90eb97e 100644
--- a/servatrice/src/servatrice_database_interface.cpp
+++ b/servatrice/src/servatrice_database_interface.cpp
@@ -834,9 +834,9 @@ void Servatrice_DatabaseInterface::storeGameInformation(const QString &roomName,
     for (int i = 0; i < replayList.size(); ++i) {
         QByteArray blob;
 #if GOOGLE_PROTOBUF_VERSION > 3001000
-        const unsigned int size = replayList[i]->ByteSizeLong();
+        const unsigned int size = static_cast<unsigned int>(replayList[i]->ByteSizeLong());
 #else
-        const unsigned int size = replayList[i]->ByteSize();
+        const unsigned int size = static_cast<unsigned int>(replayList[i]->ByteSize());
 #endif
         blob.resize(size);
         replayList[i]->SerializeToArray(blob.data(), size);
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index 40d4820c2..363c25904 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -1306,16 +1306,16 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountEdit(const Comma
     QString queryText = QString("update {prefix}_users set %1 where name=:userName").arg(queryList.join(", "));
     QSqlQuery *query = sqlInterface->prepareQuery(queryText);
     if (cmd.has_real_name()) {
-        QString realName = nameFromStdString(cmd.real_name());
-        query->bindValue(":realName", realName);
+        auto _realName = nameFromStdString(cmd.real_name());
+        query->bindValue(":realName", _realName);
     }
     if (cmd.has_email()) {
-        QString emailAddress = nameFromStdString(cmd.email());
-        query->bindValue(":email", emailAddress);
+        auto _emailAddress = nameFromStdString(cmd.email());
+        query->bindValue(":email", _emailAddress);
     }
     if (cmd.has_country()) {
-        QString country = nameFromStdString(cmd.country());
-        query->bindValue(":country", country);
+        auto _country = nameFromStdString(cmd.country());
+        query->bindValue(":country", _country);
     }
     query->bindValue(":userName", userName);
 
@@ -1752,9 +1752,9 @@ void TcpServerSocketInterface::flushOutputQueue()
 
         QByteArray buf;
 #if GOOGLE_PROTOBUF_VERSION > 3001000
-        unsigned int size = item.ByteSizeLong();
+        unsigned int size = static_cast<unsigned int>(item.ByteSizeLong());
 #else
-        unsigned int size = item.ByteSize();
+        unsigned int size = static_cast<unsigned int>(item.ByteSize());
 #endif
         buf.resize(size + 4);
         item.SerializeToArray(buf.data() + 4, size);
@@ -1955,9 +1955,9 @@ void WebsocketServerSocketInterface::flushOutputQueue()
 
         QByteArray buf;
 #if GOOGLE_PROTOBUF_VERSION > 3001000
-        unsigned int size = item.ByteSizeLong();
+        unsigned int size = static_cast<unsigned int>(item.ByteSizeLong());
 #else
-        unsigned int size = item.ByteSize();
+        unsigned int size = static_cast<unsigned int>(item.ByteSize());
 #endif
         buf.resize(size);
         item.SerializeToArray(buf.data(), size);
diff --git a/servatrice/src/signalhandler.cpp b/servatrice/src/signalhandler.cpp
index 0592c6325..f7cb207a9 100644
--- a/servatrice/src/signalhandler.cpp
+++ b/servatrice/src/signalhandler.cpp
@@ -73,9 +73,9 @@ void SignalHandler::internalSigHupHandler()
     snHup->setEnabled(true);
 }
 
+#ifdef Q_OS_UNIX
 void SignalHandler::sigSegvHandler(int sig)
 {
-#ifdef Q_OS_UNIX
     void *array[SIGSEGV_TRACE_LINES];
     size_t size;
 
@@ -96,5 +96,9 @@ void SignalHandler::sigSegvHandler(int sig)
     delete loggerThread;
 
     raise(sig);
-#endif
 }
+#else
+void SignalHandler::sigSegvHandler(int /* sig */)
+{
+}
+#endif