[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/marble/src/lib/geodata/handlers/kml
From: Thibaut Gridel <tgridel () free ! fr>
Date: 2010-09-07 21:52:40
Message-ID: 20100907215240.B875BAC857 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1172705 by tgridel:
geodata: folder can be a root item
and this should be the same for every feature!
M +7 -1 KmlFolderTagHandler.cpp
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlFolderTagHandler.cpp #1172704:1172705
@@ -27,6 +27,7 @@
#include "GeoDataContainer.h"
#include "GeoDataFolder.h"
#include "GeoDataParser.h"
+#include "GeoDataDocument.h"
namespace Marble
{
@@ -39,8 +40,8 @@
Q_ASSERT(parser.isStartElement() && parser.isValidElement(kmlTag_Folder));
GeoStackItem parentItem = parser.parentElement();
+ GeoDataFolder *folder = new GeoDataFolder;
if ( parentItem.represents( kmlTag_Folder ) || parentItem.represents( kmlTag_Document ) ) {
- GeoDataFolder *folder = new GeoDataFolder;
GeoDataContainer *parentPtr = parentItem.nodeAs<GeoDataContainer>();
parentPtr->append( folder );
@@ -49,7 +50,12 @@
<< " parent item name: " << parentItem.qualifiedName().first;
#endif // DEBUG_TAGS
return folder;
+ } else if ( parentItem.first.first == kmlTag_kml) {
+ GeoDataDocument* doc = geoDataDoc( parser );
+ doc->append( folder );
+ return folder;
} else {
+ delete folder;
return 0;
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic