Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Graphics
KImageMap Editor
Commits
c4c15fdb
Commit
c4c15fdb
authored
Oct 08, 2022
by
Kai Uwe Broulik
🍇
Browse files
Turn AreaTag into a std::list
QLinkedList is gone in Qt 6.
parent
27acbe1d
Pipeline
#244050
passed with stage
in 38 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
kimagemapeditor.cpp
View file @
c4c15fdb
...
...
@@ -1921,7 +1921,7 @@ bool KImageMapEditor::openHTMLFile(const QUrl & url)
}
else
if
(
readMap
)
{
if
(
tagName
==
"area"
)
{
map
->
p
repend
(
*
attr
);
map
->
p
ush_front
(
*
attr
);
}
}
else
{
_htmlContent
.
append
(
new
HtmlElement
(
origcode
));
...
...
@@ -2184,7 +2184,7 @@ void KImageMapEditor::saveAreasToMapTag(MapTag* map) {
dict
.
insert
(
"coords"
,
a
->
coordsToString
());
map
->
append
(
dict
);
map
->
push_back
(
dict
);
}
...
...
@@ -2199,7 +2199,7 @@ void KImageMapEditor::saveAreasToMapTag(MapTag* map) {
dict
.
insert
(
it
.
key
(),
it
.
value
());
}
map
->
append
(
dict
);
map
->
push_back
(
dict
);
}
}
...
...
@@ -2227,9 +2227,7 @@ void KImageMapEditor::setMap(HtmlMapElement* mapElement) {
_mapName
=
map
->
name
;
AreaTag
tag
;
QLinkedListIterator
<
AreaTag
>
it
(
*
map
);
while
(
it
.
hasNext
())
{
tag
=
it
.
next
();
for
(
const
AreaTag
&
tag
:
*
map
)
{
QString
shape
=
"rect"
;
if
(
tag
.
contains
(
"shape"
))
shape
=
tag
.
value
(
"shape"
);
...
...
kimagemapeditor.h
View file @
c4c15fdb
...
...
@@ -30,6 +30,8 @@
#include
<KConfig>
#include
<KParts/ReadWritePart>
#include
<list>
#include
"kimearea.h"
#include
"kimagemapeditorinterface.h"
...
...
@@ -63,7 +65,7 @@ typedef QHash<QString,QString> ImageTag;
/**
* Only a small class to give a list of AreaTags a name
*/
class
MapTag
:
public
QLinkedL
ist
<
AreaTag
>
{
class
MapTag
:
public
std
::
l
ist
<
AreaTag
>
{
public:
MapTag
();
QString
name
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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