diff --git a/src/engine/scene.cpp b/src/engine/scene.cpp
index ee2f7f178c3ad686ce89cad5b0acfbec2a93c6f2..886852664252e501e63cba10f4fe99d3d9a7a22e 100644
--- a/src/engine/scene.cpp
+++ b/src/engine/scene.cpp
@@ -171,8 +171,8 @@ void Palapeli::Scene::finishLoading()
 	{
 		//read piece positions from savegame
 		KConfigGroup saveGroup(&saveConfig, "SaveGame");
-		QMap<int, Palapeli::Piece*>::const_iterator iterPieces = m_pieces.begin();
-		const QMap<int, Palapeli::Piece*>::const_iterator iterPiecesEnd = m_pieces.end();
+		QMap<int, Palapeli::Piece*>::const_iterator iterPieces = m_pieces.constBegin();
+		const QMap<int, Palapeli::Piece*>::const_iterator iterPiecesEnd = m_pieces.constEnd();
 		for (int pieceID = iterPieces.key(); iterPieces != iterPiecesEnd; pieceID = (++iterPieces).key())
 		{
 			Palapeli::Part* part = iterPieces.value()->part();
@@ -253,8 +253,8 @@ void Palapeli::Scene::partMoved()
 	static const QString pathTemplate = QString::fromLatin1("collection/%1.save");
 	KConfig saveConfig(KStandardDirs::locateLocal("appdata", pathTemplate.arg(m_identifier)));
 	KConfigGroup saveGroup(&saveConfig, "SaveGame");
-	QMap<int, Palapeli::Piece*>::const_iterator iterPieces = m_pieces.begin();
-	const QMap<int, Palapeli::Piece*>::const_iterator iterPiecesEnd = m_pieces.end();
+	QMap<int, Palapeli::Piece*>::const_iterator iterPieces = m_pieces.constBegin();
+	const QMap<int, Palapeli::Piece*>::const_iterator iterPiecesEnd = m_pieces.constEnd();
 	for (int pieceID = iterPieces.key(); iterPieces != iterPiecesEnd; pieceID = (++iterPieces).key())
 		saveGroup.writeEntry(QString::number(pieceID), iterPieces.value()->part()->pos());
 }
diff --git a/src/file-io/puzzle.cpp b/src/file-io/puzzle.cpp
index d1f98133397c1776af374dc565dab6c1f7b96108..2c692377b16ec175fc39f875bd0783461f8ea321 100644
--- a/src/file-io/puzzle.cpp
+++ b/src/file-io/puzzle.cpp
@@ -171,8 +171,8 @@ bool Palapeli::Puzzle::readContents(bool force)
 			m_contents->pieceOffsets[pieceIndex] = offsetGroup.readEntry(offsetGroupIterator.key(), QPoint());
 	}
 	//load pieces
-	QMap<int, QPoint>::const_iterator iterOffsets = m_contents->pieceOffsets.begin();
-	const QMap<int, QPoint>::const_iterator iterOffsetsEnd = m_contents->pieceOffsets.end();
+	QMap<int, QPoint>::const_iterator iterOffsets = m_contents->pieceOffsets.constBegin();
+	const QMap<int, QPoint>::const_iterator iterOffsetsEnd = m_contents->pieceOffsets.constEnd();
 	for (int pieceID = iterOffsets.key(); iterOffsets != iterOffsetsEnd; pieceID = (++iterOffsets).key())
 		m_contents->pieces[pieceID].load(m_cache->name() + QString("%1.png").arg(pieceID));
 	//load relations