Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Games
Palapeli
Commits
3cce7018
Commit
3cce7018
authored
Dec 14, 2009
by
David Faure
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avoid detaching (fix compilation with strict iterators)
svn path=/trunk/KDE/kdegames/palapeli/; revision=1062502
parent
0f3e4cb7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
src/engine/scene.cpp
src/engine/scene.cpp
+4
-4
src/file-io/puzzle.cpp
src/file-io/puzzle.cpp
+2
-2
No files found.
src/engine/scene.cpp
View file @
3cce7018
...
...
@@ -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
.
b
egin
();
const
QMap
<
int
,
Palapeli
::
Piece
*>::
const_iterator
iterPiecesEnd
=
m_pieces
.
e
nd
();
QMap
<
int
,
Palapeli
::
Piece
*>::
const_iterator
iterPieces
=
m_pieces
.
constB
egin
();
const
QMap
<
int
,
Palapeli
::
Piece
*>::
const_iterator
iterPiecesEnd
=
m_pieces
.
constE
nd
();
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
.
b
egin
();
const
QMap
<
int
,
Palapeli
::
Piece
*>::
const_iterator
iterPiecesEnd
=
m_pieces
.
e
nd
();
QMap
<
int
,
Palapeli
::
Piece
*>::
const_iterator
iterPieces
=
m_pieces
.
constB
egin
();
const
QMap
<
int
,
Palapeli
::
Piece
*>::
const_iterator
iterPiecesEnd
=
m_pieces
.
constE
nd
();
for
(
int
pieceID
=
iterPieces
.
key
();
iterPieces
!=
iterPiecesEnd
;
pieceID
=
(
++
iterPieces
).
key
())
saveGroup
.
writeEntry
(
QString
::
number
(
pieceID
),
iterPieces
.
value
()
->
part
()
->
pos
());
}
...
...
src/file-io/puzzle.cpp
View file @
3cce7018
...
...
@@ -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
.
b
egin
();
const
QMap
<
int
,
QPoint
>::
const_iterator
iterOffsetsEnd
=
m_contents
->
pieceOffsets
.
e
nd
();
QMap
<
int
,
QPoint
>::
const_iterator
iterOffsets
=
m_contents
->
pieceOffsets
.
constB
egin
();
const
QMap
<
int
,
QPoint
>::
const_iterator
iterOffsetsEnd
=
m_contents
->
pieceOffsets
.
constE
nd
();
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment