Commit c4c15fdb authored by Kai Uwe Broulik's avatar 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
......@@ -1921,7 +1921,7 @@ bool KImageMapEditor::openHTMLFile(const QUrl & url)
} else
if (readMap) {
if (tagName=="area") {
map->prepend(*attr);
map->push_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");
......
......@@ -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 QLinkedList<AreaTag> {
class MapTag : public std::list<AreaTag> {
public:
MapTag();
QString name;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment