summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--alphabetparameters.cpp6
-rw-r--r--bag.cpp2
-rw-r--r--bag.h2
-rw-r--r--bogowinplayer.cpp2
-rw-r--r--endgame.cpp10
-rw-r--r--fixedstring.h4
-rw-r--r--quacker/dashboard.cpp2
-rw-r--r--quacker/history.cpp2
-rw-r--r--quacker/letterbox.cpp2
-rw-r--r--quacker/quacker.cpp6
-rw-r--r--quacker/settings.cpp2
-rw-r--r--quackleio/dawgfactory.cpp4
-rw-r--r--quackleio/dawgfactory.h2
-rw-r--r--quackleio/gaddagfactory.cpp8
-rw-r--r--quackleio/gaddagfactory.h4
-rw-r--r--reporter.cpp2
16 files changed, 30 insertions, 30 deletions
diff --git a/alphabetparameters.cpp b/alphabetparameters.cpp
index e695f7b..34c4d14 100644
--- a/alphabetparameters.cpp
+++ b/alphabetparameters.cpp
@@ -118,7 +118,7 @@ void AlphabetParameters::setAlphabet(const Alphabet &alphabet)
Alphabet::const_iterator alphabetIt;
for (alphabetIt = m_alphabet.begin(); alphabetIt != alphabetEnd; ++alphabetIt) {
assert(m_letterLookup.find(alphabetIt->text()) == m_letterLookup.end());
- m_letterLookup[alphabetIt->text()] = alphabetIt - m_alphabet.begin();
+ m_letterLookup[alphabetIt->text()] = int(alphabetIt - m_alphabet.begin());
}
}
@@ -138,7 +138,7 @@ void AlphabetParameters::setLetterParameter(Letter letter, const LetterParameter
void AlphabetParameters::updateLength()
{
- m_length = m_alphabet.size() - QUACKLE_FIRST_LETTER;
+ m_length = int(m_alphabet.size() - QUACKLE_FIRST_LETTER);
}
Alphabet AlphabetParameters::emptyAlphabet()
@@ -317,7 +317,7 @@ EnglishAlphabetParameters::EnglishAlphabetParameters()
UVString letterString;
UVString lowerLetterString;
letterString += charIndex;
- lowerLetterString += towlower(charIndex);
+ lowerLetterString += (UVChar)towlower(charIndex);
const bool isVowel = (charIndex == MARK_UV('A')) || (charIndex == MARK_UV('E')) || (charIndex == MARK_UV('I')) || (charIndex == MARK_UV('O')) || (charIndex == MARK_UV('U'));
diff --git a/bag.cpp b/bag.cpp
index 5a08a6f..7aa1622 100644
--- a/bag.cpp
+++ b/bag.cpp
@@ -101,7 +101,7 @@ void Bag::exch(const Move &move, Rack &rack)
Letter Bag::pluck()
{
- return erase(DataManager::self()->randomInteger(0, m_tiles.size() - 1));
+ return erase(DataManager::self()->randomInteger(0, (int)m_tiles.size() - 1));
}
bool Bag::removeLetters(const LetterString &letters)
diff --git a/bag.h b/bag.h
index 394cead..fd44d6e 100644
--- a/bag.h
+++ b/bag.h
@@ -115,7 +115,7 @@ inline bool Bag::empty() const
inline int Bag::size() const
{
- return m_tiles.size();
+ return (int)m_tiles.size();
}
inline const LongLetterString &Bag::tiles() const
diff --git a/bogowinplayer.cpp b/bogowinplayer.cpp
index 8fa5be5..083a94b 100644
--- a/bogowinplayer.cpp
+++ b/bogowinplayer.cpp
@@ -111,7 +111,7 @@ MoveList SmartBogowin::moves(int nmoves)
//
// Make the Simulator able to select racks randomly from the ProbableRackList
if (m_parameters.inferring) {
- int numPlayers = currentPosition().players().size();
+ int numPlayers = (int)currentPosition().players().size();
UVcout << "numPlayers: " << numPlayers << endl;
if (numPlayers == 2) {
bool hasPreviousPosition;
diff --git a/endgame.cpp b/endgame.cpp
index ef4df6e..b41261a 100644
--- a/endgame.cpp
+++ b/endgame.cpp
@@ -185,7 +185,7 @@ double Endgame::disappoint(EndgameMove &hope, double bestPessimistic)
m_endgameGame.commitCandidate(true);
const int startPlayerId = m_endgameGame.currentPosition().currentPlayer().id();
- const int numberOfPlayers = m_originalGame.currentPosition().players().size();
+ const size_t numberOfPlayers = m_originalGame.currentPosition().players().size();
int initialPlayNumber;
unsigned int nestedness = m_originalGame.currentPosition().nestedness();
@@ -283,7 +283,7 @@ Move Endgame::solve(int /* nestedness */)
setIncludedMoves(currentPosition().moves());
const int startPlayerId = m_originalGame.currentPosition().currentPlayer().id();
- const int numberOfPlayers = m_originalGame.currentPosition().players().size();
+ const size_t numberOfPlayers = m_originalGame.currentPosition().players().size();
double bestPessimistic = -1000;
EndgameMove bestPessMove(Move::createNonmove());
@@ -404,7 +404,7 @@ Move Endgame::solve(int /* nestedness */)
void Endgame::reallyPlayOut(Move &chosenMove, int nestedness)
{
const int startPlayerId = m_originalGame.currentPosition().currentPlayer().id();
- const int numberOfPlayers = m_originalGame.currentPosition().players().size();
+ const size_t numberOfPlayers = m_originalGame.currentPosition().players().size();
Game playoutGame = m_originalGame;
@@ -481,14 +481,14 @@ MoveList Endgame::moves(unsigned int nmoves)
MoveList playout;
MoveList ret;
- unsigned int maxPlayedOut = nmoves;
+ size_t maxPlayedOut = nmoves;
if (maxPlayedOut > m_endgameMoves.size())
maxPlayedOut = m_endgameMoves.size();
playout.push_back(best);
- unsigned int i = 0;
+ size_t i = 0;
const EndgameMoveList::const_iterator end = m_endgameMoves.end();
for (EndgameMoveList::const_iterator it = m_endgameMoves.begin(); (it != end) && (i < maxPlayedOut); ++it)
{
diff --git a/fixedstring.h b/fixedstring.h
index bedf669..cda0cf4 100644
--- a/fixedstring.h
+++ b/fixedstring.h
@@ -125,7 +125,7 @@ FixedLengthString::FixedLengthString(size_type n, char c)
inline
FixedLengthString::FixedLengthString(const char* s)
{
- unsigned int sz = strlen(s);
+ size_t sz = strlen(s);
assert(sz < maxSize);
memcpy(m_data, s, sz);
m_end = m_data + sz;
@@ -182,7 +182,7 @@ FixedLengthString::erase(const iterator i)
inline FixedLengthString::size_type
FixedLengthString::length() const
{
- return m_end - m_data;
+ return FixedLengthString::size_type(m_end - m_data);
}
inline FixedLengthString
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);
diff --git a/quackleio/dawgfactory.cpp b/quackleio/dawgfactory.cpp
index 54d753b..60c797d 100644
--- a/quackleio/dawgfactory.cpp
+++ b/quackleio/dawgfactory.cpp
@@ -218,7 +218,7 @@ void DawgFactory::Node::print(vector< Node* > &nodelist)
if (!deleted)
{
//cout << " Setting pointer to " << nodelist.size() << " before I push_back the children." << endl;
- pointer = nodelist.size();
+ pointer = (int)nodelist.size();
}
else
{
@@ -276,7 +276,7 @@ bool DawgFactory::Node::pushWord(const Quackle::LetterString &word, bool inSmall
n.pointer = 0;
n.lastchild = false;
children.push_back(n);
- index = children.size() - 1;
+ index = (int)children.size() - 1;
}
added = children[index].pushWord(rest, inSmaller, pb);
diff --git a/quackleio/dawgfactory.h b/quackleio/dawgfactory.h
index b5751c2..04e7cb3 100644
--- a/quackleio/dawgfactory.h
+++ b/quackleio/dawgfactory.h
@@ -33,7 +33,7 @@ public:
int wordCount() const { return m_encodableWords; };
string letterCountString() const;
- int nodeCount() const { return m_nodelist.size(); };
+ int nodeCount() const { return (int)m_nodelist.size(); };
int encodableWords() const { return m_encodableWords; };
int unencodableWords() const { return m_unencodableWords; };
int duplicateWords() const { return m_duplicateWords; };
diff --git a/quackleio/gaddagfactory.cpp b/quackleio/gaddagfactory.cpp
index bd5d67a..5d20d38 100644
--- a/quackleio/gaddagfactory.cpp
+++ b/quackleio/gaddagfactory.cpp
@@ -120,7 +120,7 @@ void GaddagFactory::writeIndex(const string &fname)
out.put(1); // GADDAG format version 1
out.write(m_hash.charptr, sizeof(m_hash.charptr));
- for (size_t i = 0; i < m_nodelist.size(); i++)
+ for (unsigned int i = 0; i < m_nodelist.size(); i++)
{
unsigned int p = (unsigned int)(m_nodelist[i]->pointer);
if (p != 0)
@@ -152,7 +152,7 @@ void GaddagFactory::Node::print(vector< Node* >& nodelist)
{
if (children.size() > 0)
{
- pointer = nodelist.size();
+ pointer = (int)nodelist.size();
children[children.size() - 1].lastchild = true;
}
@@ -180,7 +180,7 @@ void GaddagFactory::Node::pushWord(const Quackle::LetterString& word)
{
if (children[i].c == first)
{
- index = i;
+ index = (int)i;
i = children.size();
}
}
@@ -193,7 +193,7 @@ void GaddagFactory::Node::pushWord(const Quackle::LetterString& word)
n.pointer = 0;
n.lastchild = false;
children.push_back(n);
- index = children.size() - 1;
+ index = (int)children.size() - 1;
}
children[index].pushWord(rest);
diff --git a/quackleio/gaddagfactory.h b/quackleio/gaddagfactory.h
index 966c561..364e492 100644
--- a/quackleio/gaddagfactory.h
+++ b/quackleio/gaddagfactory.h
@@ -35,8 +35,8 @@ public:
GaddagFactory(const UVString &alphabetFile);
~GaddagFactory();
- int wordCount() const { return m_gaddagizedWords.size(); };
- int nodeCount() const { return m_nodelist.size(); };
+ int wordCount() const { return (int)m_gaddagizedWords.size(); };
+ int nodeCount() const { return (int)m_nodelist.size(); };
int encodableWords() const { return m_encodableWords; };
int unencodableWords() const { return m_unencodableWords; };
diff --git a/reporter.cpp b/reporter.cpp
index 5a2c484..4b13161 100644
--- a/reporter.cpp
+++ b/reporter.cpp
@@ -93,7 +93,7 @@ void Reporter::reportPosition(const GamePosition &position, ComputerPlayer *comp
int highestScore = 0;
double highestEquity = 0;
- unsigned int widestPositionString = 0;
+ size_t widestPositionString = 0;
unsigned int widestMove = 0;
bool hasWinPercentages = false;
const Quackle::MoveList::const_iterator end(moves.end());
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-11 22:04:57 +0000