diff options
author | John Fultz <jfultz@wolfram.com> | 2019-07-21 02:06:00 -0500 |
---|---|---|
committer | John Fultz <jfultz@wolfram.com> | 2019-07-21 02:06:00 -0500 |
commit | b67605814738d17484e508d037b8b1f09c27cab6 (patch) | |
tree | 9584efaa02ac17a1e0dd91b9b36797441c3cf593 /quacker | |
parent | 592be355923ea0fae3630af6fe3ba8f11523d9e4 (diff) |
Visual C++ compiler warning fixes.
Mostly signed/unsigned/size_t mismatches, except for one
case treating a bool as an integer.
Diffstat (limited to 'quacker')
-rw-r--r-- | quacker/dashboard.cpp | 2 | ||||
-rw-r--r-- | quacker/history.cpp | 2 | ||||
-rw-r--r-- | quacker/letterbox.cpp | 2 | ||||
-rw-r--r-- | quacker/quacker.cpp | 6 | ||||
-rw-r--r-- | quacker/settings.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/quacker/dashboard.cpp b/quacker/dashboard.cpp index 2b361ce..d1ba089 100644 --- a/quacker/dashboard.cpp +++ b/quacker/dashboard.cpp @@ -81,7 +81,7 @@ Dashboard::~Dashboard() void Dashboard::historyChanged(const Quackle::History &history) { const Quackle::PlayerList players(history.currentPosition().endgameAdjustedScores()); - const int numberOfPlayers = players.size(); + const size_t numberOfPlayers = players.size(); const bool gameOver = history.currentPosition().gameOver(); while (m_briefs.size() > numberOfPlayers) diff --git a/quacker/history.cpp b/quacker/history.cpp index c00ca9f..30a5361 100644 --- a/quacker/history.cpp +++ b/quacker/history.cpp @@ -57,7 +57,7 @@ void History::historyChanged(const Quackle::History &history) rowLabels.push_back(tr("Final")); m_tableWidget->setRowCount(rowLabels.size()); - m_tableWidget->setColumnCount(players.size()); + m_tableWidget->setColumnCount((int)players.size()); Quackle::PlayerList currentScores(lastPosition.endgameAdjustedScores()); diff --git a/quacker/letterbox.cpp b/quacker/letterbox.cpp index faa646d..8edcaa5 100644 --- a/quacker/letterbox.cpp +++ b/quacker/letterbox.cpp @@ -733,7 +733,7 @@ void Letterbox::processAnswer(const QString &answer) QString upperAnswer(answer.toUpper()); - if (m_submittedAnswers.contains(upperAnswer) > 0) + if (m_submittedAnswers.contains(upperAnswer)) { statusBar()->showMessage(tr("You already submitted %1.").arg(upperAnswer)); m_lineEdit->clear(); diff --git a/quacker/quacker.cpp b/quacker/quacker.cpp index 2049f42..3e3df93 100644 --- a/quacker/quacker.cpp +++ b/quacker/quacker.cpp @@ -897,8 +897,8 @@ void TopLevel::kibitz() if (confuseUser) { - const int currentlyKibitzed = m_game->currentPosition().moves().size(); - kibitz(currentlyKibitzed < kExtraPlaysToKibitz? kExtraPlaysToKibitz : currentlyKibitzed + kExtraPlaysToKibitz); + const size_t currentlyKibitzed = m_game->currentPosition().moves().size(); + kibitz(currentlyKibitzed < kExtraPlaysToKibitz? kExtraPlaysToKibitz : (int)currentlyKibitzed + kExtraPlaysToKibitz); } else { @@ -2025,7 +2025,7 @@ QString TopLevel::playerString() const bool begin = true; int i = 0; - const int maximumIndex = players.size() - 1; + const size_t maximumIndex = players.size() - 1; const Quackle::PlayerList::const_iterator end(players.end()); for (Quackle::PlayerList::const_iterator it = players.begin(); it != end; ++it, ++i) { diff --git a/quacker/settings.cpp b/quacker/settings.cpp index b487bb0..8b08c76 100644 --- a/quacker/settings.cpp +++ b/quacker/settings.cpp @@ -516,7 +516,7 @@ void Settings::addBoard() QByteArray boardParameterBytes = qCompress( (const uchar *)boardParameterStream.str().data(), - boardParameterStream.str().size()); + (int)boardParameterStream.str().size()); settings.setValue(boardName, QVariant(boardParameterBytes)); m_boardNameCombo->setCurrentIndex(-1); boardChanged(boardName); |