Fix integer size compiler warnings.

10 files changed, 23 insertions, 24 deletions

diff --git a/game.cpp b/game.cpp
index 0f2963a..2319fc0 100644
--- a/game.cpp
+++ b/game.cpp
@@ -189,7 +189,7 @@ GamePosition::GamePosition(const PlayerList &players)
 	setEmptyBoard();
 	resetMoveMade();
 	resetBag();
-	m_tilesInBag = m_bag.fullBagTileCount() - (QUACKLE_PARAMETERS->rackSize() * m_players.size()); 
+	m_tilesInBag = m_bag.fullBagTileCount() - (QUACKLE_PARAMETERS->rackSize() * int(m_players.size())); 
 }
 
 GamePosition::GamePosition(const GamePosition &position)
diff --git a/quacker/history.cpp b/quacker/history.cpp
index c391d61..917ae54 100644
--- a/quacker/history.cpp
+++ b/quacker/history.cpp
@@ -56,8 +56,8 @@ void History::historyChanged(const Quackle::History &history)
 	if (gameOver)
 		rowLabels.push_back(tr("Final"));
 
-	m_tableWidget->setRowCount(rowLabels.size());
-	m_tableWidget->setColumnCount((int)players.size());
+	m_tableWidget->setRowCount(int(rowLabels.size()));
+	m_tableWidget->setColumnCount(int(players.size()));
 
 	Quackle::PlayerList currentScores(lastPosition.endgameAdjustedScores());
 
@@ -92,7 +92,7 @@ void History::historyChanged(const Quackle::History &history)
 			QString scoreString(QString::number((*currentScoresIt).score()));
 
 			QTableWidgetItem *item = createPlainItem(scoreString);
-			m_tableWidget->setItem(rowLabels.size() - 1, playerCountFromZero, item);
+			m_tableWidget->setItem(int(rowLabels.size()) - 1, playerCountFromZero, item);
 
 			if (history.currentPosition().gameOver())
 				currentItem = item;
diff --git a/quacker/letterbox.cpp b/quacker/letterbox.cpp
index 6921dca..91c2ad9 100644
--- a/quacker/letterbox.cpp
+++ b/quacker/letterbox.cpp
@@ -255,7 +255,7 @@ void Letterbox::loadFile()
 		QString letters = line;
 		QString comment;
 
-		int quoteMarkIndex = line.indexOf("\"");
+		int quoteMarkIndex = int(line.indexOf("\""));
 		if (quoteMarkIndex >= 0)
 		{
 			letters = line.left(quoteMarkIndex).trimmed();
@@ -306,7 +306,7 @@ void Letterbox::jumpTo()
 	pause(true);
 
 	bool ok;
-	int index = QInputDialog::getInt(this, tr("Jump to word - Quackle Letterbox"), tr("Index to which to jump:"), m_numberIterator + 1, 1, m_clueResults.count(), 1, &ok);
+	int index = QInputDialog::getInt(this, tr("Jump to word - Quackle Letterbox"), tr("Index to which to jump:"), m_numberIterator + 1, 1, int(m_clueResults.count()), 1, &ok);
 	if (ok)
 	{
 		jumpTo(index);
@@ -454,7 +454,7 @@ void Letterbox::skip()
 	for (auto& it : m_clueResultsIterator->words)
 	{
 		it.missed = false;
-		it.keystrokes = it.word.length();
+		it.keystrokes = int(it.word.length());
 		it.time = timerLength();
 	}
 
@@ -496,7 +496,7 @@ int Letterbox::timerLength()
 	if (!isInQuiz())
 		return 0;
 
-	return LetterboxSettings::self()->msecWaitBase + LetterboxSettings::self()->msecWaitExtraPerSolution * (*m_answersIterator).count();
+	return LetterboxSettings::self()->msecWaitBase + LetterboxSettings::self()->msecWaitExtraPerSolution * int(m_answersIterator->count());
 }
 
 void Letterbox::listFinished()
@@ -916,7 +916,7 @@ void Letterbox::print()
 	bool wasModified = m_modified;
 	int previousNumber = m_numberIterator;
 	statusBar()->showMessage(tr("Generating HTML..."));
-	jumpTo(m_clueResults.size() - 1);
+	jumpTo(int(m_clueResults.size() - 1));
 
 	printer.setWords(m_answers.begin(), m_answers.end());
 
@@ -952,7 +952,7 @@ void Letterbox::printStudy()
 	bool wasModified = m_modified;
 	int previousNumber = m_numberIterator;
 	statusBar()->showMessage(tr("Generating study sheet..."));
-	jumpTo(m_clueResults.size() - 1);
+	jumpTo(int(m_clueResults.size() - 1));
 
 	QTextStream stream(&file);
 	SET_QTEXTSTREAM_TO_UTF8(stream);
@@ -975,7 +975,7 @@ QString Letterbox::generateStudySheet(Dict::WordListList::ConstIterator start, D
 
 	for (Dict::WordListList::ConstIterator it = start; it != end; ++it) 
 	{
-		int length = (*it).front().word.length();
+		int length = int((*it).front().word.length());
 		QString pad = "  ";
 		for (int i = 0; i < length; ++i)
 			pad += " ";
@@ -1393,8 +1393,7 @@ QString HTMLRepresentation::prettyExtensionList(const Dict::ExtensionList &list,
 		{
 			if (extensionChars >= LetterboxSettings::self()->numExtensionChars)
 			{
-				int numExtensions = 0;
-				numExtensions = list.size();
+				int numExtensions = int(list.size());
 				
 				ret += QString("...%1(%2)").arg(space).arg(numExtensions);
 				return ret;
diff --git a/quacker/letterbox.h b/quacker/letterbox.h
index c340f1d..703b1be 100644
--- a/quacker/letterbox.h
+++ b/quacker/letterbox.h
@@ -41,7 +41,7 @@ public:
 	WordResult(QString w);
 	void resetStats();
 	QString word;
-	int time;
+	qint64 time;
 	bool missed;
 	int keystrokes;
 };
diff --git a/quacker/lexicondialog.cpp b/quacker/lexicondialog.cpp
index 04092f1..a99e84b 100644
--- a/quacker/lexicondialog.cpp
+++ b/quacker/lexicondialog.cpp
@@ -230,7 +230,7 @@ void LexiconDialog::addWordsFromTextFile(const QString &textFile)
 		if (firstChar < 'A')
 			continue; // allows the usage of most punctuation characters as comments
 		int playability = 0;
-		for (int i = word.size() - 1; i > 0; i--)
+		for (int i = int(word.size()) - 1; i > 0; i--)
 		{
 			if (word[i].isDigit())
 				playability = playability * 10 + word[i].digitValue();
diff --git a/quacker/lister.cpp b/quacker/lister.cpp
index 4cfc03e..ea39ca9 100644
--- a/quacker/lister.cpp
+++ b/quacker/lister.cpp
@@ -241,7 +241,7 @@ void ListerDialog::openFile()
 		{
 			line = stream.readLine();
 
-			int quoteMarkIndex = line.indexOf("\"");
+			qsizetype quoteMarkIndex = line.indexOf("\"");
 			if (quoteMarkIndex >= 0)
 				line = line.left(quoteMarkIndex).trimmed();
 
diff --git a/quacker/quacker.cpp b/quacker/quacker.cpp
index 9e133c4..ba3ad6a 100644
--- a/quacker/quacker.cpp
+++ b/quacker/quacker.cpp
@@ -2176,11 +2176,11 @@ void TopLevel::about()
 		QString line = strm.readLine();
 		while (!line.isNull())
 		{
-			int startPos = line.indexOf(':');
+			qsizetype startPos = line.indexOf(':');
 			if (startPos != -1 && startPos + 1 < line.size())
 			{
 				line = line.mid(startPos + 1);
-				int endPos = line.indexOf(':');
+				qsizetype endPos = line.indexOf(':');
 				line = line.mid(0, endPos);
 				// Only include lines with a copyright (the word or the symbol) in them
 				if (line.indexOf("copyright", 0, Qt::CaseInsensitive) != -1 || line.indexOf(QChar(0xA9)) != -1)
diff --git a/quacker/settings.cpp b/quacker/settings.cpp
index 6ce139a..5b31192 100644
--- a/quacker/settings.cpp
+++ b/quacker/settings.cpp
@@ -561,7 +561,7 @@ void Settings::editBoard()
 
 		QByteArray boardParameterBytes = qCompress(
 							(const char *)boardParameterStream.str().data(),
-							boardParameterStream.str().size());
+							int(boardParameterStream.str().size()));
 		settings.setValue(newBoardName, QVariant(boardParameterBytes));
 		boardChanged(newBoardName);
 	}
@@ -669,7 +669,7 @@ void Settings::populateComboFromFilenames(QComboBox* combo, const QString &path,
 	QStringList::iterator i;
 	QString fileName;
 	QStringList list;
-	int periodPos;
+	qsizetype periodPos;
 
 	for (i = fileList.begin(); i != fileList.end(); ++i)
 	{
diff --git a/quackleio/froggetopt.cpp b/quackleio/froggetopt.cpp
index 43f1d6b..8678c96 100644
--- a/quackleio/froggetopt.cpp
+++ b/quackleio/froggetopt.cpp
@@ -263,7 +263,7 @@ bool GetOpt::parse( bool untilFirstSwitchOnly )
 				}
 				t = LongOpt;
 				// split key=value style arguments
-				int equal = a.indexOf( '=' );
+				qsizetype equal = a.indexOf( '=' );
 				if ( equal >= 0 ) {
 					stack.push( a.mid( equal + 1 ) );
 					currArg--;
diff --git a/sim.cpp b/sim.cpp
index eb8461b..baede1f 100644
--- a/sim.cpp
+++ b/sim.cpp
@@ -283,7 +283,7 @@ void Simulator::simulate(int plies)
 	SimmedMoveConstants constants;
 	constants.game = m_originalGame;
 	constants.startPlayerId = m_originalGame.currentPosition().currentPlayer().id();
-	constants.playerCount = m_originalGame.currentPosition().players().size();
+	constants.playerCount = int(m_originalGame.currentPosition().players().size());
 	// level one's first move is the zeroth ply (the candidate)
 	constants.decimalTurns = (plies % constants.playerCount);
 	// also one-indexed
@@ -580,14 +580,14 @@ int Simulator::numLevels() const
 {
 	if (m_simmedMoves.empty())
 		return 0;
-	return m_simmedMoves.front().levels.size();
+	return int(m_simmedMoves.front().levels.size());
 }
 
 int Simulator::numPlayersAtLevel(int levelIndex) const
 {
 	if (m_simmedMoves.empty())
 		return 0;
-	return m_simmedMoves.front().levels[levelIndex].statistics.size();
+	return int(m_simmedMoves.front().levels[levelIndex].statistics.size());
 }
 
 ////////////