Commit by wildfox :: r792861 marble/trunk/KDE/kdeedu/marble/src/lib/ (3 files in 3 dirs):

Resolve ambigious linkage. geodatatest linked against marblewidget and compiled in geodata_SRCS. marblewidget
also compiled in geodata_SRCS, resulting in problems with the static initialization of the tag handlers.
Reenable assertion, to cover duplicated registrations (at least on linux)

Commit by wildfox :: r784518 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataContainer.cpp:

Use qDeleteAll for speed.

Commit by wildfox :: r784517 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataObject.cpp:

Remove a similar approach to leak tracking from GeoDataObject, which has been generalized in GeoNode.

Commit by wildfox :: r784516 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/parser/ (GeoDocument.h GeoParser.cpp):

Add simple GeoNode object leak protection. Wold have spotted problems like those we've faced in GeoSceneSettings::property.
Set DUMP_GEONODE_LEAKS to 1, to get a leak count report when deleting the document.
Set to 2, to see when which objects are constructed/destructed. Setting to 1 is the default for now.

Result: no leaks on simple test files :-)

Commit by wildfox :: r784515 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/GeoDataTest.cpp:

• Test access to nonexistant property (we do want to create unit tests for such things!) Force deleting document, preparing for GeoNode-leak-checker.

Commit by wildfox :: r784514 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/scene/ (GeoSceneSettings.cpp GeoSceneSettings.h):

Don't crash on non-existant property (calling property->setName on null pointer!)
Also cleanup code & style, and add an assertion.

Commit by wildfox :: r784509 marble/trunk/KDE/kdeedu/marble/src/lib/ (CMakeLists.txt geodata/CMakeLists.txt):

Demystify build. Build all files from geodata/ into marblewidget.
Build all files from geodata/ again to build the GeoDataTest.cpp application. (Could be changed, to just link against marblewidget... open for discussion)

Commit by wildfox :: r783953 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/ (3 files in 2 dirs):

• Save superflous static_cast in DGMLIconTagHandler
• Add helper function GeoParser::attribute(), to avoid code duplication ("parser.attributes().value(dgmlAttr_..).toString()")

Commit by wildfox :: r783952 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/parser/GeoTagHandler.cpp:

silence

Commit by wildfox :: r783951 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/scene/ (GeoSceneIcon.cpp GeoSceneIcon.h):

Cleanup GeoSceneIcon

Commit by wildfox :: r783942 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/ (4 files in 2 dirs):

Add raiseWarning(), which just feeds parsing warnings to the console. We may want to add
a strict parsing mode, which just stops parsing on ie. integer conversion failures etc..

Commit by wildfox :: r783936 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/parser/GeoParser.cpp:

Optimize, if debug output is turned off. Don't needlessly push/pop a GeoStackItem, if the current element doesn't have non-textual children.

Commit by wildfox :: r783934 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/ (9 files):

Cleanup code & style of all tag handlers except minimum/maximum

Commit by wildfox :: r783635 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/parser/GeoParser.cpp:

Readd assertion, fix parsing problem, when tag handlers called readElementText().

Commit by wildfox :: r783634 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/ (3 files):

Some cleanups, and fix DGMLDescriptionTagHandler which called GeoSceneHeads setName() method instead of setDescription()

Commit by wildfox :: r783556 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/ (7 files in 3 dirs):

• Clarify GeoSceneHead memory managment
• Add missing DGMLDescriptionTagHandler

Commit by wildfox :: r780856 marble/trunk/KDE/ (32 files in 8 dirs):

Extend the parser to maintain a "node stack" so that we always know all parents and their associated Geo* objects
when parsing a new element (the parent chain is always known). Allows us to build hierachies of ie. <Folder> items.

Discussed and explained to tackat, who should know how it works now :-)

Commit by wildfox :: r780237 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/ (6 files in 3 dirs):

Add two helper functinos geoDataDoc() and geoSceneDoc() that take a GeoParser& parameter and return the contained active document, that we're parsing.
This makes it easy for the tag handlers to retrieve the current GeoDataDocument/GeoSceneDocument, avoids casting from GeoDocument -> GeoDataDocument/GeoSceneDocument everywhere.

Also add a file I forgot: GeoSceneParser.h

Commit by wildfox :: r780227 marble/trunk/KDE/kdeedu/marble/src/lib/geodata/ (6 files in 4 dirs):

Register element handlers with a tagname & a namespace. This avoids clashes between gpx/kml/dgml.
Also this allows a fine-grained implementation of quirks depending on different namespaces.

By default all tag handlers are registered in all namespaces of a certain language (ie. KML 2.0 & KML 2.1)
Though you can use ie. KML_DEFINE_TAG_HANDLER_20 instead of KML_DEFINE_TAG_HANDLER to just register this
element in KML 2.0 namespace. Hope this addresses all issues.

Commit by wildfox :: r714883 marble/trunk/KDE/kdeedu/marble/src/ (26 files in 8 dirs):

Add the prototype of 'GeoData' - a subproject or Marble intended to handle popular geo files like kml (Google Earth), gpx, georss et al.
Build system is still qt-only, Tobias wants to take care of it soon.