summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-16 13:51:03 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-16 13:51:03 (GMT)
commit76bc83e65ae395f26a0ae5b6950787d58a6198c6 (patch)
tree621b0df77b2f3231be6f7f61b916f8f085de1d04
parent9ea3604dd4dd952d1f1d9d8256073a0911894220 (diff)
Use QLatin1String with assert on tag in GeoTagHandler::parse() reimplementations
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlAvailableTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlBlendingTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlDescriptionTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlDiscreteTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlDocumentTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlFilterTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlGeodataTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlGroupTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlHeadTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlHeadingTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlIconTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlInstallMapTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlItemTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlLayerTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlLegendTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlLicenseTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlMapTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlMaximumTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlMinimumTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlNameTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlPaletteTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlPenTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlProjectionTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlPropertyTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlRenderOrderTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlSectionTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlSettingsTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlSourceDirTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlSourceFileTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlStorageLayoutTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlTargetTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlTextTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlTextureTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlThemeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlTileSizeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlValueTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlVectortileTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlVisibleTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlZoomTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlAliasTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlAltitudeTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlAnimatedUpdateTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlAreaTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlBalloonStyleTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlBalloonVisibilityTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlBeginTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlBgColorTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlBottomFovTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlColorTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlCookieTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp18
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlCountryNameCodeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlCountrycodeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlCreateTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlDataTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlDeleteTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlDescriptionTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlDisplayModeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlDisplayNameTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlDurationTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlEastTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlEndTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlExpiresTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlExtendedDataTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlExtrudeTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlFillTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlFlyToModeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlFlyToTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlFlyToViewTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlFolderTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlGridOriginTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlGroundOverlayTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlGxTimeSpanTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlGxTimeStampTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlHeadingTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlHotSpotTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlHrefTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlHttpQueryTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlIconStyleTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlIconTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlImagePyramidTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlInnerBoundaryIsTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlKeyTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLabelStyleTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLatLonAltBoxTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLatLonBoxTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLatLonQuadTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLatitudeTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLeftFovTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLineStringTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLineStyleTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLinkDescriptionTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLinkNameTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLinkSnippetTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlListStyleTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLocationTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLodTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLongitudeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMaxAltitudeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMaxFadeExtentTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMaxHeightTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMaxLodPixelsTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMaxSessionLengthTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMaxWidthTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMessageTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMinAltitudeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMinFadeExtentTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMinLodPixelsTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMinRefreshPeriodTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMultiGeometryTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMultiTrackTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlNameTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlNearTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlNetworkLinkControlTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlNorthTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlOpenTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlOrientationTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlOuterBoundaryIsTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlOutlineTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlOverlayXYTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlPairTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlPhotoOverlayTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlPlaylistTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlPolyStyleTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlPopTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlRefreshIntervalTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlRefreshModeTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlRefreshVisibilityTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlRegionTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlRightFovTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlRoleTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlRollTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlRotationTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlRotationXYTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlScaleTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSchemaDataTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSchemaTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlScreenOverlayTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlScreenXYTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSimpleArrayDataTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSimpleFieldTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSizeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSoundCueTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSourceHrefTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSouthTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlStateTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlStyleMapTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlStyleTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTargetHrefTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTextColorTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTextTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTileSizeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTiltTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTimeSpanTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTimeStampTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTopFovTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTourControlTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTourTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlUpdateTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlValueTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlViewFormatTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlViewRefreshModeTagHandler.cpp3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlViewVolumeTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlVisibilityTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlWaitTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlWestTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlWhenTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlWidthTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlXTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlYTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlZTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/Kml_scaleTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmldelayedStartTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmldrawOrderTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlplayModeTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.cpp3
-rw-r--r--src/plugins/runner/gpx/handlers/GPXcmtTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXdescTagHandler.cpp3
-rw-r--r--src/plugins/runner/gpx/handlers/GPXeleTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.cpp3
-rw-r--r--src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp3
-rw-r--r--src/plugins/runner/gpx/handlers/GPXlinkTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXnameTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXrteptTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXtimeTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXtrkTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXtrkptTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXtypeTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXurlTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXwptTagHandler.cpp2
-rw-r--r--tools/add_kml/add_kml_tag.py2
222 files changed, 242 insertions, 236 deletions
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlAvailableTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlAvailableTagHandler.cpp
index 61c4338..7bc57bb 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlAvailableTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlAvailableTagHandler.cpp
@@ -37,7 +37,7 @@ DGML_DEFINE_TAG_HANDLER(Available)
GeoNode* DgmlAvailableTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Available));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Available)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlBlendingTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlBlendingTagHandler.cpp
index f4203a4..d8decdd 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlBlendingTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlBlendingTagHandler.cpp
@@ -32,7 +32,7 @@ static GeoTagHandlerRegistrar registrar( GeoParser::QualifiedName( dgmlTag_Blend
GeoNode* DgmlBlendingTagHandler::parse( GeoParser& parser ) const
{
// Check whether the tag is valid
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( dgmlTag_Blending ));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Blending)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp
index bef5c1b..460c06e 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp
@@ -40,7 +40,7 @@ DGML_DEFINE_TAG_HANDLER(Brush)
GeoNode* DgmlBrushTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Brush));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Brush)));
QString color = parser.attribute(dgmlAttr_color).trimmed();
QString colorMap = parser.attribute(dgmlAttr_colorMap).trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlDescriptionTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlDescriptionTagHandler.cpp
index fa9ccae..ff74bbd 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlDescriptionTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlDescriptionTagHandler.cpp
@@ -34,7 +34,7 @@ DGML_DEFINE_TAG_HANDLER(Description)
GeoNode* DgmlDescriptionTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Description));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Description)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlDiscreteTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlDiscreteTagHandler.cpp
index 97ca8e2..770be36 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlDiscreteTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlDiscreteTagHandler.cpp
@@ -35,7 +35,7 @@ DGML_DEFINE_TAG_HANDLER(Discrete)
GeoNode* DgmlDiscreteTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Discrete));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Discrete)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlDocumentTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlDocumentTagHandler.cpp
index 964740e..e10967f 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlDocumentTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlDocumentTagHandler.cpp
@@ -35,7 +35,7 @@ DGML_DEFINE_TAG_HANDLER(Document)
GeoNode* DgmlDocumentTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Document));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Document)));
return geoSceneDoc(parser);
}
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.cpp
index 1bedb32..425b858 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.cpp
@@ -40,7 +40,7 @@ static GeoTagHandlerRegistrar handler( GeoParser::QualifiedName( dgmlTag_Downloa
GeoNode* DgmlDownloadPolicyTagHandler::parse( GeoParser& parser ) const
{
// Check whether the tag is valid
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( dgmlTag_DownloadPolicy ));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_DownloadPolicy)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp
index 9cf97ef..408c4ca 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp
@@ -41,7 +41,7 @@ DGML_DEFINE_TAG_HANDLER(DownloadUrl)
GeoNode* DgmlDownloadUrlTagHandler::parse( GeoParser& parser ) const
{
// Check whether the tag is valid
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( dgmlTag_DownloadUrl ));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_DownloadUrl)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlFilterTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlFilterTagHandler.cpp
index eb80b2f..ab92306 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlFilterTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlFilterTagHandler.cpp
@@ -42,7 +42,7 @@ DGML_DEFINE_TAG_HANDLER(Filter)
GeoNode* DgmlFilterTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Filter));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Filter)));
QString name = parser.attribute(dgmlAttr_name).trimmed();
QString type = parser.attribute(dgmlAttr_type).toLower().trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlGeodataTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlGeodataTagHandler.cpp
index e8125e8..bee85a9 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlGeodataTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlGeodataTagHandler.cpp
@@ -44,7 +44,7 @@ DGML_DEFINE_TAG_HANDLER(Geodata)
GeoNode* DgmlGeodataTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Geodata));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Geodata)));
const QString name = parser.attribute(dgmlAttr_name).trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlGroupTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlGroupTagHandler.cpp
index 2aed828..075e4ec 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlGroupTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlGroupTagHandler.cpp
@@ -39,7 +39,7 @@ DGML_DEFINE_TAG_HANDLER(Group)
GeoNode* DgmlGroupTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Group));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Group)));
QString name = parser.attribute(dgmlAttr_name);
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlHeadTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlHeadTagHandler.cpp
index 2ddbf63..7e04cac 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlHeadTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlHeadTagHandler.cpp
@@ -36,7 +36,7 @@ DGML_DEFINE_TAG_HANDLER(Head)
GeoNode* DgmlHeadTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Head));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Head)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlHeadingTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlHeadingTagHandler.cpp
index 0832878..8a577e6 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlHeadingTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlHeadingTagHandler.cpp
@@ -35,7 +35,7 @@ DGML_DEFINE_TAG_HANDLER(Heading)
GeoNode* DgmlHeadingTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Heading));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Heading)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlIconTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlIconTagHandler.cpp
index 7d8f774..62d1944 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlIconTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlIconTagHandler.cpp
@@ -42,7 +42,7 @@ DGML_DEFINE_TAG_HANDLER(Icon)
GeoNode* DgmlIconTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Icon));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Icon)));
QString pixmapRelativePath = parser.attribute(dgmlAttr_pixmap).trimmed();
QColor color = QColor( parser.attribute(dgmlAttr_color).trimmed() );
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlInstallMapTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlInstallMapTagHandler.cpp
index a605b41..737214e 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlInstallMapTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlInstallMapTagHandler.cpp
@@ -34,7 +34,7 @@ DGML_DEFINE_TAG_HANDLER(InstallMap)
GeoNode* DgmlInstallMapTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_InstallMap));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_InstallMap)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlItemTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlItemTagHandler.cpp
index 11c3754..5a55955 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlItemTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlItemTagHandler.cpp
@@ -39,7 +39,7 @@ DGML_DEFINE_TAG_HANDLER(Item)
GeoNode* DgmlItemTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Item));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Item)));
QString name = parser.attribute(dgmlAttr_name).trimmed();
QString checkable = parser.attribute(dgmlAttr_checkable).toLower().trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlLayerTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlLayerTagHandler.cpp
index 2ee6acc..a17d32e 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlLayerTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlLayerTagHandler.cpp
@@ -40,7 +40,7 @@ DGML_DEFINE_TAG_HANDLER(Layer)
GeoNode* DgmlLayerTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Layer));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Layer)));
QString name = parser.attribute(dgmlAttr_name).trimmed();
QString backend = parser.attribute(dgmlAttr_backend).toLower().trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlLegendTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlLegendTagHandler.cpp
index f2c6f7b..88ae100 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlLegendTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlLegendTagHandler.cpp
@@ -37,7 +37,7 @@ DGML_DEFINE_TAG_HANDLER(Legend)
GeoNode* DgmlLegendTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Legend));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Legend)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlLicenseTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlLicenseTagHandler.cpp
index f9582d5..551d23f 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlLicenseTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlLicenseTagHandler.cpp
@@ -26,7 +26,7 @@ DGML_DEFINE_TAG_HANDLER(License)
GeoNode* DgmlLicenseTagHandler::parse( GeoParser& parser ) const
{
// Check whether the tag is valid
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( dgmlTag_License ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_License)));
GeoStackItem parentItem = parser.parentElement();
if( parentItem.represents( dgmlTag_Head ) ) {
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlMapTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlMapTagHandler.cpp
index 808684a..2e4d874 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlMapTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlMapTagHandler.cpp
@@ -38,7 +38,7 @@ DGML_DEFINE_TAG_HANDLER(Map)
GeoNode* DgmlMapTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Map));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Map)));
QColor labelColor = parser.attribute(dgmlAttr_labelColor).trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlMaximumTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlMaximumTagHandler.cpp
index 91c9013..aae3490 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlMaximumTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlMaximumTagHandler.cpp
@@ -34,7 +34,7 @@ DGML_DEFINE_TAG_HANDLER(Maximum)
GeoNode* DgmlMaximumTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Maximum));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Maximum)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlMinimumTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlMinimumTagHandler.cpp
index b25bb0d..274a2bf 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlMinimumTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlMinimumTagHandler.cpp
@@ -34,7 +34,7 @@ DGML_DEFINE_TAG_HANDLER(Minimum)
GeoNode* DgmlMinimumTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Minimum));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Minimum)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlNameTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlNameTagHandler.cpp
index 8b53c54..945ae76 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlNameTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlNameTagHandler.cpp
@@ -34,7 +34,7 @@ DGML_DEFINE_TAG_HANDLER(Name)
GeoNode* DgmlNameTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Name));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Name)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlPaletteTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlPaletteTagHandler.cpp
index 5c54483..33103af 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlPaletteTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlPaletteTagHandler.cpp
@@ -41,7 +41,7 @@ DGML_DEFINE_TAG_HANDLER(Palette)
GeoNode* DgmlPaletteTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Palette));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Palette)));
QString type = parser.attribute(dgmlAttr_type).toLower().trimmed();
QString file = parser.readElementText().trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlPenTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlPenTagHandler.cpp
index 7628dc7..f071e61 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlPenTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlPenTagHandler.cpp
@@ -39,7 +39,7 @@ DGML_DEFINE_TAG_HANDLER(Pen)
GeoNode* DgmlPenTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Pen));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Pen)));
QString color = parser.attribute(dgmlAttr_color).trimmed();
QString style = parser.attribute(dgmlAttr_style).toLower().trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlProjectionTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlProjectionTagHandler.cpp
index 21c3efb..5da657f 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlProjectionTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlProjectionTagHandler.cpp
@@ -37,7 +37,7 @@ DGML_DEFINE_TAG_HANDLER(Projection)
GeoNode* DgmlProjectionTagHandler::parse( GeoParser& parser ) const
{
// Check whether the tag is valid
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( dgmlTag_Projection ));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Projection)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlPropertyTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlPropertyTagHandler.cpp
index c9f8af6..b67b93d 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlPropertyTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlPropertyTagHandler.cpp
@@ -39,7 +39,7 @@ DGML_DEFINE_TAG_HANDLER(Property)
GeoNode* DgmlPropertyTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Property));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Property)));
QString name = parser.attribute(dgmlAttr_name).trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlRenderOrderTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlRenderOrderTagHandler.cpp
index f76bf5e..75b00a6 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlRenderOrderTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlRenderOrderTagHandler.cpp
@@ -24,7 +24,7 @@ DGML_DEFINE_TAG_HANDLER(RenderOrder)
GeoNode* DgmlRenderOrderTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_RenderOrder));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_RenderOrder)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlSectionTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlSectionTagHandler.cpp
index 66ee562..32bda7f 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlSectionTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlSectionTagHandler.cpp
@@ -40,7 +40,7 @@ DGML_DEFINE_TAG_HANDLER(Section)
GeoNode* DgmlSectionTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Section));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Section)));
QString name = parser.attribute(dgmlAttr_name);
QString checkable = parser.attribute(dgmlAttr_checkable).toLower().trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlSettingsTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlSettingsTagHandler.cpp
index ef3b74f..f99d9c2 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlSettingsTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlSettingsTagHandler.cpp
@@ -36,7 +36,7 @@ DGML_DEFINE_TAG_HANDLER(Settings)
GeoNode* DgmlSettingsTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Settings));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Settings)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlSourceDirTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlSourceDirTagHandler.cpp
index 02f8d99..fbf06fc 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlSourceDirTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlSourceDirTagHandler.cpp
@@ -35,7 +35,7 @@ DGML_DEFINE_TAG_HANDLER(SourceDir)
GeoNode* DgmlSourceDirTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_SourceDir));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_SourceDir)));
QString format = parser.attribute(dgmlAttr_format).trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlSourceFileTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlSourceFileTagHandler.cpp
index a6d71f6..cfd5636 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlSourceFileTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlSourceFileTagHandler.cpp
@@ -35,7 +35,7 @@ DGML_DEFINE_TAG_HANDLER(SourceFile)
GeoNode* DgmlSourceFileTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_SourceFile));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_SourceFile)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlStorageLayoutTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlStorageLayoutTagHandler.cpp
index 69bcc35..4b2a69e 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlStorageLayoutTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlStorageLayoutTagHandler.cpp
@@ -38,7 +38,7 @@ DGML_DEFINE_TAG_HANDLER(StorageLayout)
GeoNode* DgmlStorageLayoutTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_StorageLayout));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_StorageLayout)));
// Attribute levelZeroColumns, default to value of the oldest tile themes
int levelZeroColumns = 2;
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlTargetTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlTargetTagHandler.cpp
index 2527a8e..eaee478 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlTargetTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlTargetTagHandler.cpp
@@ -37,7 +37,7 @@ DGML_DEFINE_TAG_HANDLER(Target)
GeoNode* DgmlTargetTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Target));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Target)));
QString const targetRadius = parser.attribute( dgmlAttr_radius ).trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlTextTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlTextTagHandler.cpp
index b401a9f..89f2865 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlTextTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlTextTagHandler.cpp
@@ -34,7 +34,7 @@ DGML_DEFINE_TAG_HANDLER(Text)
GeoNode* DgmlTextTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Text));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Text)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlTextureTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlTextureTagHandler.cpp
index 739fa9a..3da8c25 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlTextureTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlTextureTagHandler.cpp
@@ -41,7 +41,7 @@ DGML_DEFINE_TAG_HANDLER(Texture)
GeoNode* DgmlTextureTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Texture));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Texture)));
const QString name = parser.attribute(dgmlAttr_name).trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlThemeTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlThemeTagHandler.cpp
index b491813..fd6d6f8 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlThemeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlThemeTagHandler.cpp
@@ -34,7 +34,7 @@ DGML_DEFINE_TAG_HANDLER(Theme)
GeoNode* DgmlThemeTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Theme));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Theme)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlTileSizeTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlTileSizeTagHandler.cpp
index 76de782..532cc6e 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlTileSizeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlTileSizeTagHandler.cpp
@@ -23,7 +23,7 @@ DGML_DEFINE_TAG_HANDLER(TileSize)
GeoNode* DgmlTileSizeTagHandler::parse( GeoParser& parser ) const
{
// Check whether the tag is valid
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( dgmlTag_TileSize ));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_TileSize)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlValueTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlValueTagHandler.cpp
index 2ba1ca4..c9e23fa 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlValueTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlValueTagHandler.cpp
@@ -37,7 +37,7 @@ DGML_DEFINE_TAG_HANDLER(Value)
GeoNode* DgmlValueTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Value));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Value)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.cpp
index a27576c..4937886 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.cpp
@@ -39,7 +39,7 @@ DGML_DEFINE_TAG_HANDLER(Vector)
GeoNode* DgmlVectorTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Vector));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Vector)));
QString name = parser.attribute(dgmlAttr_name).trimmed();
QString feature = parser.attribute(dgmlAttr_feature).trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlVectortileTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlVectortileTagHandler.cpp
index a8c0cf3..15495b4 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlVectortileTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlVectortileTagHandler.cpp
@@ -32,7 +32,7 @@ DGML_DEFINE_TAG_HANDLER(Vectortile)
GeoNode* DgmlVectortileTagHandler::parse( GeoParser& parser ) const
{
// Check whether the tag is valid
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( dgmlTag_Vectortile ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Vectortile)));
const QString name = parser.attribute( dgmlAttr_name ).trimmed();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlVisibleTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlVisibleTagHandler.cpp
index 1fac082..18c3b1e 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlVisibleTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlVisibleTagHandler.cpp
@@ -35,7 +35,7 @@ DGML_DEFINE_TAG_HANDLER(Visible)
GeoNode* DgmlVisibleTagHandler::parse(GeoParser& parser) const
{
// Check whether the tag is valid
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( dgmlTag_Visible ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Visible)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlZoomTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlZoomTagHandler.cpp
index 3688f7c..bc6fe32 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlZoomTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlZoomTagHandler.cpp
@@ -36,7 +36,7 @@ DGML_DEFINE_TAG_HANDLER(Zoom)
GeoNode* DgmlZoomTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Zoom));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(dgmlTag_Zoom)));
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlAliasTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlAliasTagHandler.cpp
index 30bc72d..155bce4 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlAliasTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlAliasTagHandler.cpp
@@ -23,7 +23,7 @@ KML_DEFINE_TAG_HANDLER( Alias )
GeoNode* KmlAliasTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Alias ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Alias)));
GeoDataAlias alias;
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp
index 3f05c69..c31a06d 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp
@@ -44,7 +44,7 @@ KML_DEFINE_TAG_HANDLER( altitudeMode )
GeoNode* KmlaltitudeModeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_altitudeMode ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_altitudeMode)));
QString content = parser.readElementText().trimmed();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlAltitudeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlAltitudeTagHandler.cpp
index 12fc41a..a1e86f1 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlAltitudeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlAltitudeTagHandler.cpp
@@ -30,8 +30,7 @@ namespace kml
KML_DEFINE_TAG_HANDLER( altitude )
GeoNode *KmlaltitudeTagHandler::parse(GeoParser & parser) const
{
- Q_ASSERT ( parser.isStartElement()
- && parser.isValidElement( kmlTag_altitude ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_altitude)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlAnimatedUpdateTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlAnimatedUpdateTagHandler.cpp
index fc9f8b6..dc20a43 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlAnimatedUpdateTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlAnimatedUpdateTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER_GX22( AnimatedUpdate )
GeoNode* KmlAnimatedUpdateTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_AnimatedUpdate ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_AnimatedUpdate)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlAreaTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlAreaTagHandler.cpp
index 4631647..d340919 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlAreaTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlAreaTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( area )
GeoNode* KmlareaTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_area ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_area)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlBalloonStyleTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlBalloonStyleTagHandler.cpp
index 54266dc..8866142 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlBalloonStyleTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlBalloonStyleTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( BalloonStyle )
GeoNode* KmlBalloonStyleTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_BalloonStyle ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_BalloonStyle)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlBalloonVisibilityTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlBalloonVisibilityTagHandler.cpp
index 30d7e5a..e73015c 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlBalloonVisibilityTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlBalloonVisibilityTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER_GX22( balloonVisibility )
GeoNode* KmlballoonVisibilityTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_balloonVisibility ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_balloonVisibility)));
QString content = parser.readElementText().trimmed();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlBeginTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlBeginTagHandler.cpp
index 4a71aa1..2e1acb9 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlBeginTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlBeginTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER( begin )
GeoNode* KmlbeginTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_begin ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_begin)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlBgColorTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlBgColorTagHandler.cpp
index 88fd3a3..8afbbbe 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlBgColorTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlBgColorTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( bgColor )
GeoNode* KmlbgColorTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_bgColor ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_bgColor)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlBottomFovTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlBottomFovTagHandler.cpp
index 70f7c57..12ce2ef 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlBottomFovTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlBottomFovTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( bottomFov )
GeoNode* KmlbottomFovTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_bottomFov ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_bottomFov)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.cpp
index 89b12ae..46fbcfd 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.cpp
@@ -29,8 +29,7 @@ KML_DEFINE_TAG_HANDLER( Camera )
GeoNode *KmlCameraTagHandler::parse( GeoParser & parser ) const
{
- Q_ASSERT (parser.isStartElement()
- && parser.isValidElement( kmlTag_Camera ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Camera)));
GeoDataCamera* camera = 0;
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.cpp
index 41afb24..bdb51b3 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( Change )
GeoNode* KmlChangeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Change ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Change)));
GeoDataChange *change = new GeoDataChange;
KmlObjectTagHandler::parseIdentifiers( parser, change );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.cpp
index 95bbd5f..c16f4d8 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.cpp
@@ -35,7 +35,7 @@ KML_DEFINE_TAG_HANDLER( colorMode )
GeoNode* KmlcolorModeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_colorMode ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_colorMode)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlColorTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlColorTagHandler.cpp
index 7aaf0f1..32bc8e6 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlColorTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlColorTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( color )
GeoNode* KmlcolorTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_color ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_color)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlCookieTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlCookieTagHandler.cpp
index 0bf6ed0..e1e0ff9 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlCookieTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlCookieTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( cookie )
GeoNode* KmlcookieTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_cookie ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_cookie)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp
index fdcad86..4115afe 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp
@@ -48,14 +48,14 @@ static const bool kmlStrictSpecs = false;
// We can't use KML_DEFINE_TAG_HANDLER_GX22 because the name of the tag ("coord")
// and the TagHandler ("KmlcoordinatesTagHandler") don't match
-static GeoTagHandlerRegistrar s_handlercoordkmlTag_nameSpaceGx22(GeoParser::QualifiedName(kmlTag_coord, kmlTag_nameSpaceGx22 ),
+static GeoTagHandlerRegistrar s_handlercoordkmlTag_nameSpaceGx22(GeoParser::QualifiedName(QLatin1String(kmlTag_coord), QLatin1String(kmlTag_nameSpaceGx22)),
new KmlcoordinatesTagHandler());
GeoNode* KmlcoordinatesTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement()
- && ( parser.isValidElement( kmlTag_coordinates )
- || parser.isValidElement( kmlTag_coord ) ) );
+ Q_ASSERT(parser.isStartElement()
+ && (parser.isValidElement(QLatin1String(kmlTag_coordinates))
+ || parser.isValidElement(QLatin1String(kmlTag_coord))));
GeoStackItem parentItem = parser.parentElement();
@@ -71,7 +71,7 @@ GeoNode* KmlcoordinatesTagHandler::parse( GeoParser& parser ) const
if ( !kmlStrictSpecs ) {
// Removing spaces before and after commas
for ( int i = 1; i < text.size() - 1; ++i ) {
- if ( text[i] == ',' ) {
+ if (text[i] == QLatin1Char(',')) {
// Before
int l = i - 1;
while ( l > 0 && text[l].isSpace() ) {
@@ -84,7 +84,7 @@ GeoNode* KmlcoordinatesTagHandler::parse( GeoParser& parser ) const
++r;
}
- text.remove( l + 1, r - l - 1 ).insert( l + 1, ',' );
+ text.remove(l + 1, r - l - 1).insert(l + 1, QLatin1Char(','));
}
}
}
@@ -106,7 +106,7 @@ GeoNode* KmlcoordinatesTagHandler::parse( GeoParser& parser ) const
coordinatesLines.append( text.mid( index ) );
int coordinatesIndex = 0;
Q_FOREACH( const QString& line, coordinatesLines ) {
- QStringList coordinates = line.trimmed().split( ',' );
+ const QStringList coordinates = line.trimmed().split(QLatin1Char(','));
if ( parentItem.represents( kmlTag_Point ) && parentItem.is<GeoDataFeature>() ) {
GeoDataCoordinates coord;
if ( coordinates.size() == 2 ) {
@@ -175,9 +175,9 @@ GeoNode* KmlcoordinatesTagHandler::parse( GeoParser& parser ) const
if( parentItem.represents( kmlTag_Track ) ) {
QString input = parser.readElementText().trimmed();
if ( !kmlStrictSpecs ) {
- input = input.replace( QRegExp( "\\s*,\\s*" ), "," );
+ input = input.replace(QRegExp(QStringLiteral("\\s*,\\s*")), QStringLiteral(","));
}
- QStringList coordinates = input.split( ' ' );
+ const QStringList coordinates = input.split(QLatin1Char(' '));
GeoDataCoordinates coord;
if ( coordinates.size() == 2 ) {
diff --git a/src/lib/marble/geodata/handlers/kml/KmlCountryNameCodeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlCountryNameCodeTagHandler.cpp
index 7f486b7..bcedbe3 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlCountryNameCodeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlCountryNameCodeTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( CountryNameCode )
GeoNode* KmlCountryNameCodeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_CountryNameCode ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_CountryNameCode)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlCountrycodeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlCountrycodeTagHandler.cpp
index 695168d..92ba57c 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlCountrycodeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlCountrycodeTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( countrycode )
GeoNode* KmlcountrycodeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_countrycode ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_countrycode)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlCreateTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlCreateTagHandler.cpp
index 9244130..c399099 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlCreateTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlCreateTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( Create )
GeoNode* KmlCreateTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Create ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Create)));
GeoDataCreate *create = new GeoDataCreate;
KmlObjectTagHandler::parseIdentifiers( parser, create );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlDataTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlDataTagHandler.cpp
index 15a2d34..a7442d6 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlDataTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlDataTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( Data )
GeoNode* KmlDataTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Data ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Data)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlDeleteTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlDeleteTagHandler.cpp
index 954b2d0..bed8913 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlDeleteTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlDeleteTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( Delete )
GeoNode* KmlDeleteTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Delete ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Delete)));
GeoDataDelete *dataDelete = new GeoDataDelete;
KmlObjectTagHandler::parseIdentifiers( parser, dataDelete );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlDescriptionTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlDescriptionTagHandler.cpp
index 6b54238..6d3cbfc 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlDescriptionTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlDescriptionTagHandler.cpp
@@ -36,7 +36,7 @@ KML_DEFINE_TAG_HANDLER( description )
GeoNode* KmldescriptionTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_description ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_description)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlDisplayModeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlDisplayModeTagHandler.cpp
index fd5354b..852c8cd 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlDisplayModeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlDisplayModeTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( displayMode )
GeoNode* KmldisplayModeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_displayMode ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_displayMode)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlDisplayNameTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlDisplayNameTagHandler.cpp
index 1da21a3..2db7a67 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlDisplayNameTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlDisplayNameTagHandler.cpp
@@ -23,7 +23,7 @@ KML_DEFINE_TAG_HANDLER( displayName )
GeoNode* KmldisplayNameTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_displayName ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_displayName)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.cpp
index 6772f7b..f5f4964 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER(Document)
GeoNode* KmlDocumentTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(kmlTag_Document));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Document)));
GeoStackItem parentItem = parser.parentElement();
if( !(parentItem.qualifiedName().first.isNull() && parentItem.qualifiedName().second.isNull()) ) {
diff --git a/src/lib/marble/geodata/handlers/kml/KmlDurationTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlDurationTagHandler.cpp
index c17ef54..d8b30b6 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlDurationTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlDurationTagHandler.cpp
@@ -29,8 +29,7 @@ KML_DEFINE_TAG_HANDLER_GX22( duration )
GeoNode *KmldurationTagHandler::parse(GeoParser & parser) const
{
- Q_ASSERT ( parser.isStartElement()
- && parser.isValidElement( kmlTag_duration ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_duration)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlEastTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlEastTagHandler.cpp
index 39ef498..cdc584a 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlEastTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlEastTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( east )
GeoNode* KmleastTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_east ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_east)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlEndTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlEndTagHandler.cpp
index 17bad1d..3dfc10f 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlEndTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlEndTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER( end )
GeoNode* KmlendTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_end ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_end)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlExpiresTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlExpiresTagHandler.cpp
index c00d2ca..9fc6ee9 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlExpiresTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlExpiresTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( expires )
GeoNode* KmlexpiresTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_expires ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_expires)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlExtendedDataTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlExtendedDataTagHandler.cpp
index 3aa572a..d8effef 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlExtendedDataTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlExtendedDataTagHandler.cpp
@@ -27,7 +27,7 @@ KML_DEFINE_TAG_HANDLER( ExtendedData )
GeoNode* KmlExtendedDataTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_ExtendedData ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_ExtendedData)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlExtrudeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlExtrudeTagHandler.cpp
index e923434..941b88b 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlExtrudeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlExtrudeTagHandler.cpp
@@ -41,7 +41,8 @@ KML_DEFINE_TAG_HANDLER( extrude )
GeoNode* KmlextrudeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_extrude ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_extrude)));
+
GeoStackItem parentItem = parser.parentElement();
GeoDataGeometry* geometry;
diff --git a/src/lib/marble/geodata/handlers/kml/KmlFillTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlFillTagHandler.cpp
index c070a4a..2f935eb 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlFillTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlFillTagHandler.cpp
@@ -35,7 +35,7 @@ KML_DEFINE_TAG_HANDLER( fill )
GeoNode* KmlfillTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_fill ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_fill)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlFlyToModeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlFlyToModeTagHandler.cpp
index 27070f1..ea321aa 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlFlyToModeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlFlyToModeTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER_GX22( flyToMode )
GeoNode* KmlflyToModeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_flyToMode ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_flyToMode)));
QString content = parser.readElementText().trimmed();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlFlyToTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlFlyToTagHandler.cpp
index 263d862..36ebcec 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlFlyToTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlFlyToTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER_GX22( FlyTo )
GeoNode* KmlFlyToTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_FlyTo ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_FlyTo)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlFlyToViewTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlFlyToViewTagHandler.cpp
index 9b37e42..4741dfd 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlFlyToViewTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlFlyToViewTagHandler.cpp
@@ -22,7 +22,8 @@ KML_DEFINE_TAG_HANDLER( flyToView )
GeoNode* KmlflyToViewTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_flyToView ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_flyToView)));
+
GeoStackItem parentItem = parser.parentElement();
if( parentItem.is<GeoDataNetworkLink>() ) {
QString content = parser.readElementText().trimmed();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlFolderTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlFolderTagHandler.cpp
index af7b39c..c55af2c 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlFolderTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlFolderTagHandler.cpp
@@ -38,7 +38,7 @@ KML_DEFINE_TAG_HANDLER(Folder)
GeoNode* KmlFolderTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(kmlTag_Folder));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Folder)));
GeoStackItem parentItem = parser.parentElement();
GeoDataFolder *folder = new GeoDataFolder;
diff --git a/src/lib/marble/geodata/handlers/kml/KmlGridOriginTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlGridOriginTagHandler.cpp
index 86ed547..4191d1a 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlGridOriginTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlGridOriginTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( gridOrigin )
GeoNode* KmlgridOriginTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_gridOrigin ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_gridOrigin)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlGroundOverlayTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlGroundOverlayTagHandler.cpp
index 88874f4..fef4f74 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlGroundOverlayTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlGroundOverlayTagHandler.cpp
@@ -27,7 +27,7 @@ KML_DEFINE_TAG_HANDLER( GroundOverlay )
GeoNode* KmlGroundOverlayTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_GroundOverlay ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_GroundOverlay)));
GeoDataGroundOverlay *overlay = new GeoDataGroundOverlay;
KmlObjectTagHandler::parseIdentifiers( parser, overlay );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp
index b3ac8ae..93229d5 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp
@@ -36,7 +36,7 @@ KML_DEFINE_TAG_HANDLER_GX22( altitudeMode )
GeoNode* KmlaltitudeModeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_altitudeMode ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_altitudeMode)));
QString content = parser.readElementText().trimmed();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlGxTimeSpanTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlGxTimeSpanTagHandler.cpp
index e952fa9..dc3000b 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlGxTimeSpanTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlGxTimeSpanTagHandler.cpp
@@ -30,7 +30,7 @@ KML_DEFINE_TAG_HANDLER_GX22( TimeSpan )
GeoNode* KmlTimeSpanTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_TimeSpan ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_TimeSpan)));
GeoStackItem parentItem = parser.parentElement();
if ( parentItem.is<GeoDataFeature>() ) {
diff --git a/src/lib/marble/geodata/handlers/kml/KmlGxTimeStampTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlGxTimeStampTagHandler.cpp
index 864b7de..b8e3314 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlGxTimeStampTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlGxTimeStampTagHandler.cpp
@@ -30,7 +30,7 @@ KML_DEFINE_TAG_HANDLER_GX22( TimeStamp )
GeoNode* KmlTimeStampTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_TimeStamp ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_TimeStamp)));
GeoStackItem parentItem = parser.parentElement();
GeoDataTimeStamp timestamp;
KmlObjectTagHandler::parseIdentifiers( parser, &timestamp );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlHeadingTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlHeadingTagHandler.cpp
index 6a9c1c9..dbe3c36 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlHeadingTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlHeadingTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( heading )
GeoNode* KmlheadingTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_heading ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_heading)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlHotSpotTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlHotSpotTagHandler.cpp
index d6d5739..034f152 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlHotSpotTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlHotSpotTagHandler.cpp
@@ -36,7 +36,7 @@ KML_DEFINE_TAG_HANDLER( hotSpot )
GeoNode* KmlhotSpotTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_hotSpot ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_hotSpot)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlHrefTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlHrefTagHandler.cpp
index a5cb636..a3ba9c7 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlHrefTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlHrefTagHandler.cpp
@@ -40,7 +40,7 @@ KML_DEFINE_TAG_HANDLER( href )
GeoNode* KmlhrefTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_href ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_href)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlHttpQueryTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlHttpQueryTagHandler.cpp
index d123926..940efda 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlHttpQueryTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlHttpQueryTagHandler.cpp
@@ -23,7 +23,7 @@ KML_DEFINE_TAG_HANDLER( httpQuery )
GeoNode* KmlhttpQueryTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_httpQuery ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_httpQuery)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(kmlTag_Link))
{
diff --git a/src/lib/marble/geodata/handlers/kml/KmlIconStyleTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlIconStyleTagHandler.cpp
index e06eb04..2e51bef 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlIconStyleTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlIconStyleTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( IconStyle )
GeoNode* KmlIconStyleTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_IconStyle ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_IconStyle)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlIconTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlIconTagHandler.cpp
index 7b25821..69f7a9d 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlIconTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlIconTagHandler.cpp
@@ -38,7 +38,7 @@ KML_DEFINE_TAG_HANDLER( Icon )
GeoNode* KmlIconTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Icon ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Icon)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlImagePyramidTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlImagePyramidTagHandler.cpp
index 24812a3..738038f 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlImagePyramidTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlImagePyramidTagHandler.cpp
@@ -23,7 +23,7 @@ KML_DEFINE_TAG_HANDLER( ImagePyramid )
GeoNode* KmlImagePyramidTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_ImagePyramid ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_ImagePyramid)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlInnerBoundaryIsTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlInnerBoundaryIsTagHandler.cpp
index a872a22..97b0ca3 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlInnerBoundaryIsTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlInnerBoundaryIsTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( innerBoundaryIs )
GeoNode* KmlinnerBoundaryIsTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_innerBoundaryIs ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_innerBoundaryIs)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.cpp
index debfb1a..c1ed854 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( ItemIcon )
GeoNode* KmlItemIconTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_ItemIcon ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_ItemIcon)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlKeyTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlKeyTagHandler.cpp
index 3abdf54..ff775da 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlKeyTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlKeyTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( key )
GeoNode* KmlkeyTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_key ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_key)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLabelStyleTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLabelStyleTagHandler.cpp
index d4769d1..fd89946 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLabelStyleTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLabelStyleTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( LabelStyle )
GeoNode* KmlLabelStyleTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_LabelStyle ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_LabelStyle)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLatLonAltBoxTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLatLonAltBoxTagHandler.cpp
index 3d18723..41d5aa1 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLatLonAltBoxTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLatLonAltBoxTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( LatLonAltBox )
GeoNode* KmlLatLonAltBoxTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_LatLonAltBox ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_LatLonAltBox)));
GeoDataLatLonAltBox box;
KmlObjectTagHandler::parseIdentifiers( parser, &box );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLatLonBoxTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLatLonBoxTagHandler.cpp
index da2b101..ad0b88d 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLatLonBoxTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLatLonBoxTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( LatLonBox )
GeoNode* KmlLatLonBoxTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_LatLonBox ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_LatLonBox)));
GeoDataLatLonBox box;
KmlObjectTagHandler::parseIdentifiers( parser, &box );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLatLonQuadTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLatLonQuadTagHandler.cpp
index d22f0f9..b24cef7 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLatLonQuadTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLatLonQuadTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER_GX22( LatLonQuad )
GeoNode* KmlLatLonQuadTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_LatLonQuad ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_LatLonQuad)));
GeoStackItem parentItem = parser.parentElement();
if( parentItem.represents( kmlTag_GroundOverlay ) )
{
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLatitudeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLatitudeTagHandler.cpp
index d7d01d6..b8736b7 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLatitudeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLatitudeTagHandler.cpp
@@ -29,8 +29,7 @@ namespace kml
KML_DEFINE_TAG_HANDLER( latitude )
GeoNode *KmllatitudeTagHandler::parse( GeoParser & parser ) const
{
- Q_ASSERT( parser.isStartElement()
- && parser.isValidElement( kmlTag_latitude ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_latitude)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLeftFovTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLeftFovTagHandler.cpp
index ef29cac..3066085 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLeftFovTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLeftFovTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( leftFov )
GeoNode* KmlleftFovTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_leftFov ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_leftFov)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLineStringTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLineStringTagHandler.cpp
index adc2c68..6cb0671 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLineStringTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLineStringTagHandler.cpp
@@ -39,7 +39,7 @@ KML_DEFINE_TAG_HANDLER( LineString )
GeoNode* KmlLineStringTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_LineString ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_LineString)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLineStyleTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLineStyleTagHandler.cpp
index 1c4b6f0..eddfbbc 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLineStyleTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLineStyleTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( LineStyle )
GeoNode* KmlLineStyleTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_LineStyle ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_LineStyle)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.cpp
index 7c60aee..005452a 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.cpp
@@ -39,7 +39,7 @@ KML_DEFINE_TAG_HANDLER( LinearRing )
GeoNode* KmlLinearRingTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_LinearRing ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_LinearRing)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLinkDescriptionTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLinkDescriptionTagHandler.cpp
index 19407d4..ade087e 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLinkDescriptionTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLinkDescriptionTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( linkDescription )
GeoNode* KmllinkDescriptionTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_linkDescription ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_linkDescription)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLinkNameTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLinkNameTagHandler.cpp
index 13ec6b4..1ff27d9 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLinkNameTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLinkNameTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( linkName )
GeoNode* KmllinkNameTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_linkName ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_linkName)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLinkSnippetTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLinkSnippetTagHandler.cpp
index fd90e37..5b99481 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLinkSnippetTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLinkSnippetTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( linkSnippet )
GeoNode* KmllinkSnippetTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_linkSnippet ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_linkSnippet)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.cpp
index c5d692d..f64ead8 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.cpp
@@ -28,7 +28,7 @@ KML_DEFINE_TAG_HANDLER( Link )
GeoNode* KmlLinkTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Link ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Link)));
GeoDataLink link;
KmlObjectTagHandler::parseIdentifiers( parser, &link );
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.cpp
index cec4963..f8ce519 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( listItemType )
GeoNode* KmllistItemTypeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_listItemType ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_listItemType)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlListStyleTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlListStyleTagHandler.cpp
index d550cb6..2759ab3 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlListStyleTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlListStyleTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( ListStyle )
GeoNode* KmlListStyleTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_ListStyle ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_ListStyle)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLocationTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLocationTagHandler.cpp
index cc254ff..ee09991 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLocationTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLocationTagHandler.cpp
@@ -28,7 +28,7 @@ KML_DEFINE_TAG_HANDLER( Location )
GeoNode* KmlLocationTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Location ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Location)));
GeoDataLocation location;
KmlObjectTagHandler::parseIdentifiers( parser, &location );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLodTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLodTagHandler.cpp
index f20e02a..400e762 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLodTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLodTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( Lod )
GeoNode* KmlLodTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Lod ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Lod)));
GeoDataLod lod;
KmlObjectTagHandler::parseIdentifiers( parser, &lod );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLongitudeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLongitudeTagHandler.cpp
index 6b93011..a560b5c 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLongitudeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLongitudeTagHandler.cpp
@@ -30,7 +30,7 @@ namespace kml
GeoNode *KmllongitudeTagHandler::parse( GeoParser & parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_longitude ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_longitude)));
GeoStackItem parentItem = parser.parentElement();
if ( parentItem.is<GeoDataLookAt>() ) {
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.cpp
index 6e3064c..ab01a92 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.cpp
@@ -27,8 +27,7 @@ KML_DEFINE_TAG_HANDLER( LookAt )
GeoNode *KmlLookAtTagHandler::parse( GeoParser & parser ) const
{
- Q_ASSERT (parser.isStartElement()
- && parser.isValidElement( kmlTag_LookAt ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_LookAt)));
GeoDataLookAt *lookAt = new GeoDataLookAt();
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.cpp
index d65d0a9..a4d2a22 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.cpp
@@ -39,7 +39,7 @@ KML_DEFINE_TAG_HANDLER( MarblePlacemark )
GeoNode* KmlMarblePlacemarkTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_MarblePlacemark ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_MarblePlacemark)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMaxAltitudeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMaxAltitudeTagHandler.cpp
index ae5d3e7..60cc95c 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMaxAltitudeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMaxAltitudeTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( maxAltitude )
GeoNode* KmlmaxAltitudeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_maxAltitude ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_maxAltitude)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMaxFadeExtentTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMaxFadeExtentTagHandler.cpp
index 17d8a24..cba403a 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMaxFadeExtentTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMaxFadeExtentTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( maxFadeExtent )
GeoNode* KmlmaxFadeExtentTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_maxFadeExtent ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_maxFadeExtent)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMaxHeightTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMaxHeightTagHandler.cpp
index 37a48d6..8b237e7 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMaxHeightTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMaxHeightTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( maxHeight )
GeoNode* KmlmaxHeightTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_maxHeight ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_maxHeight)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMaxLodPixelsTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMaxLodPixelsTagHandler.cpp
index 2ab81b9..498fd6b 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMaxLodPixelsTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMaxLodPixelsTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( maxLodPixels )
GeoNode* KmlmaxLodPixelsTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_maxLodPixels ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_maxLodPixels)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMaxSessionLengthTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMaxSessionLengthTagHandler.cpp
index be4683a..f8a46c6 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMaxSessionLengthTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMaxSessionLengthTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( maxSessionLength )
GeoNode* KmlmaxSessionLengthTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_maxSessionLength ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_maxSessionLength)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMaxWidthTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMaxWidthTagHandler.cpp
index ac30714..b197439 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMaxWidthTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMaxWidthTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( maxWidth )
GeoNode* KmlmaxWidthTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_maxWidth ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_maxWidth)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMessageTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMessageTagHandler.cpp
index 0fcffaa..68b2e52 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMessageTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMessageTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( message )
GeoNode* KmlmessageTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_message ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_message)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMinAltitudeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMinAltitudeTagHandler.cpp
index 5f8fb3b..a1864c4 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMinAltitudeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMinAltitudeTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( minAltitude )
GeoNode* KmlminAltitudeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_minAltitude ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_minAltitude)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMinFadeExtentTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMinFadeExtentTagHandler.cpp
index 02e90a1..3ed2019 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMinFadeExtentTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMinFadeExtentTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( minFadeExtent )
GeoNode* KmlminFadeExtentTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_minFadeExtent ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_minFadeExtent)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMinLodPixelsTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMinLodPixelsTagHandler.cpp
index 75518ce..061ff1b 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMinLodPixelsTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMinLodPixelsTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( minLodPixels )
GeoNode* KmlminLodPixelsTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_minLodPixels ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_minLodPixels)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMinRefreshPeriodTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMinRefreshPeriodTagHandler.cpp
index 2bfc97b..71dd87b 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMinRefreshPeriodTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMinRefreshPeriodTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( minRefreshPeriod )
GeoNode* KmlminRefreshPeriodTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_minRefreshPeriod ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_minRefreshPeriod)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.cpp
index 041fe27..641468b 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( Model )
GeoNode* KmlModelTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Model ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Model)));
GeoDataModel *model = new GeoDataModel;
KmlObjectTagHandler::parseIdentifiers( parser, model );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMultiGeometryTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMultiGeometryTagHandler.cpp
index aaa298b..e4e3920 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMultiGeometryTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMultiGeometryTagHandler.cpp
@@ -38,7 +38,7 @@ KML_DEFINE_TAG_HANDLER( MultiGeometry )
GeoNode* KmlMultiGeometryTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_MultiGeometry ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_MultiGeometry)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMultiTrackTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMultiTrackTagHandler.cpp
index 05fae78..bad5fad 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMultiTrackTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMultiTrackTagHandler.cpp
@@ -28,7 +28,7 @@ KML_DEFINE_TAG_HANDLER_GX22( MultiTrack )
GeoNode* KmlMultiTrackTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_MultiTrack ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_MultiTrack)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlNameTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlNameTagHandler.cpp
index 5e73458..c14d3b3 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlNameTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlNameTagHandler.cpp
@@ -35,7 +35,7 @@ KML_DEFINE_TAG_HANDLER( name )
GeoNode* KmlnameTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_name ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_name)));
GeoStackItem parentItem = parser.parentElement();
if( parentItem.is<GeoDataFeature>() ) {
diff --git a/src/lib/marble/geodata/handlers/kml/KmlNearTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlNearTagHandler.cpp
index 84f2897..8d66fcd 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlNearTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlNearTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( near )
GeoNode* KmlnearTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_near ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_near)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkControlTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkControlTagHandler.cpp
index 907c844..5b7ea75 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkControlTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkControlTagHandler.cpp
@@ -23,7 +23,7 @@ KML_DEFINE_TAG_HANDLER( NetworkLinkControl )
GeoNode* KmlNetworkLinkControlTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_NetworkLinkControl ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_NetworkLinkControl)));
GeoStackItem parentItem = parser.parentElement();
GeoDataNetworkLinkControl *networkLinkControl = new GeoDataNetworkLinkControl;
diff --git a/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.cpp
index ffc0d0e..a3f0073 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.cpp
@@ -25,7 +25,8 @@ KML_DEFINE_TAG_HANDLER( NetworkLink )
GeoNode* KmlNetworkLinkTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_NetworkLink ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_NetworkLink)));
+
GeoDataNetworkLink *networkLink = new GeoDataNetworkLink;
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlNorthTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlNorthTagHandler.cpp
index c0fa239..7e70ae5 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlNorthTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlNorthTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( north )
GeoNode* KmlnorthTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_north ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_north)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlOpenTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlOpenTagHandler.cpp
index b7d53d2..e46bd31 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlOpenTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlOpenTagHandler.cpp
@@ -36,7 +36,7 @@ KML_DEFINE_TAG_HANDLER( open )
GeoNode* KmlopenTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_open ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_open)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlOrientationTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlOrientationTagHandler.cpp
index 8d7ec00..2d7b20c 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlOrientationTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlOrientationTagHandler.cpp
@@ -27,7 +27,7 @@ KML_DEFINE_TAG_HANDLER( Orientation )
GeoNode* KmlOrientationTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Orientation ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Orientation)));
GeoDataOrientation orientation;
KmlObjectTagHandler::parseIdentifiers( parser, &orientation );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlOuterBoundaryIsTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlOuterBoundaryIsTagHandler.cpp
index 6114f2a..b7cc731 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlOuterBoundaryIsTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlOuterBoundaryIsTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( outerBoundaryIs )
GeoNode* KmlouterBoundaryIsTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_outerBoundaryIs ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_outerBoundaryIs)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlOutlineTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlOutlineTagHandler.cpp
index 5f8a5e7..2a60aa0 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlOutlineTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlOutlineTagHandler.cpp
@@ -35,7 +35,7 @@ KML_DEFINE_TAG_HANDLER( outline )
GeoNode* KmloutlineTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_outline ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_outline)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlOverlayXYTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlOverlayXYTagHandler.cpp
index 2faa0c4..ac12487 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlOverlayXYTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlOverlayXYTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER( overlayXY )
GeoNode* KmloverlayXYTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_overlayXY ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_overlayXY)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlPairTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlPairTagHandler.cpp
index 23843cc..1996243 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlPairTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlPairTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( Pair )
GeoNode* KmlPairTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Pair ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Pair)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlPhotoOverlayTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlPhotoOverlayTagHandler.cpp
index 699d84b..8de843a 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlPhotoOverlayTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlPhotoOverlayTagHandler.cpp
@@ -27,7 +27,7 @@ KML_DEFINE_TAG_HANDLER( PhotoOverlay )
GeoNode* KmlPhotoOverlayTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_PhotoOverlay ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_PhotoOverlay)));
GeoDataPhotoOverlay *overlay = new GeoDataPhotoOverlay;
KmlObjectTagHandler::parseIdentifiers( parser, overlay );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp
index da007cd..35b3017 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp
@@ -39,7 +39,7 @@ KML_DEFINE_TAG_HANDLER( Placemark )
GeoNode* KmlPlacemarkTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Placemark ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Placemark)));
GeoDataPlacemark *placemark = new GeoDataPlacemark;
KmlObjectTagHandler::parseIdentifiers( parser, placemark );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlPlaylistTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlPlaylistTagHandler.cpp
index 9bf4b69..1f42ec9 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlPlaylistTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlPlaylistTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER_GX22( Playlist )
GeoNode* KmlPlaylistTagHandler::parse(GeoParser &parser) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Playlist ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Playlist)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.cpp
index 1b1c09c..8203608 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.cpp
@@ -38,7 +38,7 @@ KML_DEFINE_TAG_HANDLER( Point )
GeoNode* KmlPointTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Point ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Point)));
// FIXME: there needs to be a check that a coordinates subtag is contained
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlPolyStyleTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlPolyStyleTagHandler.cpp
index 62fab88..9068e93 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlPolyStyleTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlPolyStyleTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( PolyStyle )
GeoNode* KmlPolyStyleTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_PolyStyle ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_PolyStyle)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.cpp
index e64d401..396ff8a 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.cpp
@@ -38,7 +38,7 @@ KML_DEFINE_TAG_HANDLER( Polygon )
GeoNode* KmlPolygonTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Polygon ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Polygon)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlPopTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlPopTagHandler.cpp
index 84c629b..617c09b 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlPopTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlPopTagHandler.cpp
@@ -37,7 +37,7 @@ KML_DEFINE_TAG_HANDLER( pop )
GeoNode* KmlpopTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_pop ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_pop)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlRefreshIntervalTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlRefreshIntervalTagHandler.cpp
index 9a1715f..ec475b8 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlRefreshIntervalTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlRefreshIntervalTagHandler.cpp
@@ -21,7 +21,8 @@ namespace kml
KML_DEFINE_TAG_HANDLER( refreshInterval )
GeoNode *KmlrefreshIntervalTagHandler::parse(GeoParser & parser) const
{
- Q_ASSERT ( parser.isStartElement() && parser.isValidElement( kmlTag_refreshInterval ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_refreshInterval)));
+
GeoStackItem parentItem = parser.parentElement();
if ( parentItem.is<GeoDataLink>() ) {
qreal const refreshInterval = parser.readElementText().trimmed().toDouble();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlRefreshModeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlRefreshModeTagHandler.cpp
index fcbee2e..67a8d01 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlRefreshModeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlRefreshModeTagHandler.cpp
@@ -12,7 +12,8 @@ KML_DEFINE_TAG_HANDLER( refreshMode )
GeoNode* KmlrefreshModeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_refreshMode ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_refreshMode)));
+
GeoStackItem parentItem = parser.parentElement();
QString content = parser.readElementText().trimmed();
GeoDataLink::RefreshMode mode;
diff --git a/src/lib/marble/geodata/handlers/kml/KmlRefreshVisibilityTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlRefreshVisibilityTagHandler.cpp
index 03b73cd..8b6ec79 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlRefreshVisibilityTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlRefreshVisibilityTagHandler.cpp
@@ -24,8 +24,7 @@ KML_DEFINE_TAG_HANDLER( refreshVisibility )
GeoNode *KmlrefreshVisibilityTagHandler::parse(GeoParser & parser) const
{
- Q_ASSERT ( parser.isStartElement()
- && parser.isValidElement( kmlTag_refreshVisibility ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_refreshVisibility)));
GeoStackItem parentItem = parser.parentElement();
if( parentItem.is<GeoDataNetworkLink>() ) {
diff --git a/src/lib/marble/geodata/handlers/kml/KmlRegionTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlRegionTagHandler.cpp
index 0e7ae05..81d283a 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlRegionTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlRegionTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( Region )
GeoNode* KmlRegionTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Region ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Region)));
GeoDataRegion region;
KmlObjectTagHandler::parseIdentifiers( parser, &region );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.cpp
index 786d7cc..bbcb6c9 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( ResourceMap )
GeoNode* KmlResourceMapTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_ResourceMap ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_ResourceMap)));
GeoDataResourceMap map;
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlRightFovTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlRightFovTagHandler.cpp
index afc7a54..de5ec23 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlRightFovTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlRightFovTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( rightFov )
GeoNode* KmlrightFovTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_rightFov ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_rightFov)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlRoleTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlRoleTagHandler.cpp
index 59132a9..8667198 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlRoleTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlRoleTagHandler.cpp
@@ -38,7 +38,7 @@ KML_DEFINE_TAG_HANDLER( role )
GeoNode* KmlroleTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_role ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_role)));
GeoStackItem parentItem = parser.parentElement();
if( parentItem.is<GeoDataPlacemark>() ) {
diff --git a/src/lib/marble/geodata/handlers/kml/KmlRollTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlRollTagHandler.cpp
index 8ba3050..4f209ac 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlRollTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlRollTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( roll )
GeoNode* KmlrollTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_roll ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_roll)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlRotationTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlRotationTagHandler.cpp
index d765865..12ea756 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlRotationTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlRotationTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( rotation )
GeoNode* KmlrotationTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_rotation ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_rotation)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlRotationXYTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlRotationXYTagHandler.cpp
index 3dabdf4..4b2270b 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlRotationXYTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlRotationXYTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( rotationXY )
GeoNode* KmlrotationXYTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_rotationXY ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_rotationXY)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlScaleTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlScaleTagHandler.cpp
index be00bb0..cc31168 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlScaleTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlScaleTagHandler.cpp
@@ -27,7 +27,7 @@ KML_DEFINE_TAG_HANDLER( Scale )
GeoNode* KmlScaleTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Scale ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Scale)));
GeoDataScale scale;
KmlObjectTagHandler::parseIdentifiers( parser, &scale );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSchemaDataTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlSchemaDataTagHandler.cpp
index 58e6d25..0253262 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSchemaDataTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlSchemaDataTagHandler.cpp
@@ -27,7 +27,7 @@ KML_DEFINE_TAG_HANDLER( SchemaData )
GeoNode* KmlSchemaDataTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_SchemaData ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_SchemaData)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSchemaTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlSchemaTagHandler.cpp
index 325d6d8..07fe483 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSchemaTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlSchemaTagHandler.cpp
@@ -38,7 +38,7 @@ KML_DEFINE_TAG_HANDLER( Schema )
GeoNode* KmlSchemaTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Schema ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Schema)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlScreenOverlayTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlScreenOverlayTagHandler.cpp
index 2a25ead..88b6eba 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlScreenOverlayTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlScreenOverlayTagHandler.cpp
@@ -27,7 +27,7 @@ KML_DEFINE_TAG_HANDLER( ScreenOverlay )
GeoNode* KmlScreenOverlayTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_ScreenOverlay ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_ScreenOverlay)));
GeoDataScreenOverlay *overlay = new GeoDataScreenOverlay();
KmlObjectTagHandler::parseIdentifiers( parser, overlay );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlScreenXYTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlScreenXYTagHandler.cpp
index f602df7..68285fa 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlScreenXYTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlScreenXYTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( screenXY )
GeoNode* KmlscreenXYTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_screenXY ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_screenXY)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.cpp
index 1578180..05ed008 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( shape )
GeoNode* KmlshapeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_shape ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_shape)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSimpleArrayDataTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlSimpleArrayDataTagHandler.cpp
index dc861d7..072e6d0 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSimpleArrayDataTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlSimpleArrayDataTagHandler.cpp
@@ -30,7 +30,7 @@ KML_DEFINE_TAG_HANDLER_GX22( SimpleArrayData )
GeoNode* KmlSimpleArrayDataTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_SimpleArrayData ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_SimpleArrayData)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.cpp
index 8144891..e947ecf 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( SimpleData )
GeoNode* KmlSimpleDataTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_SimpleData ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_SimpleData)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSimpleFieldTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlSimpleFieldTagHandler.cpp
index 3c30dd6..71aedf0 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSimpleFieldTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlSimpleFieldTagHandler.cpp
@@ -36,7 +36,7 @@ KML_DEFINE_TAG_HANDLER( SimpleField )
GeoNode* KmlSimpleFieldTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_SimpleField ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_SimpleField)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSizeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlSizeTagHandler.cpp
index bbee5cc..e5611ab 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSizeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlSizeTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( size )
GeoNode* KmlsizeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_size ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_size)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.cpp
index 890a4a1..c0bc256 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.cpp
@@ -23,7 +23,7 @@ KML_DEFINE_TAG_HANDLER( Snippet )
GeoNode* KmlSnippetTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Snippet ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Snippet)));
GeoStackItem parentItem = parser.parentElement();
if( parentItem.is<GeoDataFeature>() ) {
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSoundCueTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlSoundCueTagHandler.cpp
index 7652ef9..013cd13 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSoundCueTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlSoundCueTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER_GX22( SoundCue )
GeoNode* KmlSoundCueTagHandler::parse(GeoParser &parser) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_SoundCue ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_SoundCue)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSourceHrefTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlSourceHrefTagHandler.cpp
index 0894b84..bcde45b 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSourceHrefTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlSourceHrefTagHandler.cpp
@@ -23,7 +23,7 @@ KML_DEFINE_TAG_HANDLER( sourceHref )
GeoNode* KmlsourceHrefTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_sourceHref ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_sourceHref)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSouthTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlSouthTagHandler.cpp
index e1f4523..78c1863 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSouthTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlSouthTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( south )
GeoNode* KmlsouthTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_south ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_south)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlStateTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlStateTagHandler.cpp
index e03719e..278c700 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlStateTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlStateTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( state )
GeoNode* KmlstateTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_state ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_state)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlStyleMapTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlStyleMapTagHandler.cpp
index 06f0365..ed3845c 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlStyleMapTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlStyleMapTagHandler.cpp
@@ -39,7 +39,7 @@ KML_DEFINE_TAG_HANDLER( StyleMap )
GeoNode* KmlStyleMapTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_StyleMap ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_StyleMap)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlStyleTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlStyleTagHandler.cpp
index 10215b3..4da5926 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlStyleTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlStyleTagHandler.cpp
@@ -38,7 +38,7 @@ KML_DEFINE_TAG_HANDLER( Style )
GeoNode* KmlStyleTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Style ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Style)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp
index 38fee3e..935fc31 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp
@@ -38,7 +38,7 @@ KML_DEFINE_TAG_HANDLER( styleUrl )
GeoNode* KmlstyleUrlTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_styleUrl ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_styleUrl)));
GeoStackItem parentItem = parser.parentElement();
GeoStackItem grandParentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTargetHrefTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTargetHrefTagHandler.cpp
index 151bb0a..af20709 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTargetHrefTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTargetHrefTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( targetHref )
GeoNode* KmltargetHrefTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_targetHref ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_targetHref)));
GeoStackItem parentItem = parser.parentElement();
QString content = parser.readElementText().trimmed();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.cpp
index b97fce9..cca53bf 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.cpp
@@ -39,7 +39,7 @@ KML_DEFINE_TAG_HANDLER( tessellate )
GeoNode* KmltessellateTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_tessellate ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_tessellate)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTextColorTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTextColorTagHandler.cpp
index cfaebd9..64082e1 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTextColorTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTextColorTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER( textColor )
GeoNode* KmltextColorTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_textColor ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_textColor)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTextTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTextTagHandler.cpp
index ba29593..b7d2b3a 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTextTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTextTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( text )
GeoNode* KmltextTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_text ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_text)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTileSizeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTileSizeTagHandler.cpp
index 7da721e..c41dea1 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTileSizeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTileSizeTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( tileSize )
GeoNode* KmltileSizeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_tileSize ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_tileSize)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTiltTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTiltTagHandler.cpp
index 85d04a4..2832b20 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTiltTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTiltTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( tilt )
GeoNode* KmltiltTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_tilt ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_tilt)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTimeSpanTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTimeSpanTagHandler.cpp
index 6d826ac..7a8d8ad 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTimeSpanTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTimeSpanTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( TimeSpan )
GeoNode* KmlTimeSpanTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_TimeSpan ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_TimeSpan)));
GeoStackItem parentItem = parser.parentElement();
if ( parentItem.is<GeoDataFeature>() ) {
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTimeStampTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTimeStampTagHandler.cpp
index d3bda25..16367dd 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTimeStampTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTimeStampTagHandler.cpp
@@ -26,7 +26,8 @@ KML_DEFINE_TAG_HANDLER( TimeStamp )
GeoNode* KmlTimeStampTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_TimeStamp ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_TimeStamp)));
+
GeoStackItem parentItem = parser.parentElement();
if ( parentItem.is<GeoDataFeature>() ) {
GeoDataTimeStamp timestamp;
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTopFovTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTopFovTagHandler.cpp
index 13a62f8..991d4d2 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTopFovTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTopFovTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( topFov )
GeoNode* KmltopFovTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_topFov ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_topFov)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTourControlTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTourControlTagHandler.cpp
index ad9ab11..39a5416 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTourControlTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTourControlTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER_GX22( TourControl )
GeoNode* KmlTourControlTagHandler::parse(GeoParser &parser) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_TourControl ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_TourControl)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTourTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTourTagHandler.cpp
index 4f907d2..851054f 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTourTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTourTagHandler.cpp
@@ -23,7 +23,7 @@ KML_DEFINE_TAG_HANDLER_GX22( Tour )
GeoNode* KmlTourTagHandler::parse(GeoParser &parser) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Tour ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Tour)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.cpp
index 3f0d092..4013152 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER_GX22( Track )
GeoNode *KmlTrackTagHandler::parse( GeoParser &parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Track ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Track)));
GeoStackItem parentItem = parser.parentElement();
GeoDataTrack *track = new GeoDataTrack();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlUpdateTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlUpdateTagHandler.cpp
index 6a88996..6cba7a4 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlUpdateTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlUpdateTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER( Update )
GeoNode* KmlUpdateTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Update ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Update)));
GeoDataUpdate *update = new GeoDataUpdate;
KmlObjectTagHandler::parseIdentifiers( parser, update );
diff --git a/src/lib/marble/geodata/handlers/kml/KmlValueTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlValueTagHandler.cpp
index 56edb97..fed2b4d 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlValueTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlValueTagHandler.cpp
@@ -28,7 +28,7 @@ KML_DEFINE_TAG_HANDLER_GX22( value )
GeoNode* KmlvalueTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_value ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_value)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlViewFormatTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlViewFormatTagHandler.cpp
index d790e4d..2a33dd0 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlViewFormatTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlViewFormatTagHandler.cpp
@@ -23,7 +23,8 @@ KML_DEFINE_TAG_HANDLER( viewFormat )
GeoNode* KmlviewFormatTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_viewFormat ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_viewFormat)));
+
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(kmlTag_Link)) {
QString content = parser.readElementText().trimmed();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlViewRefreshModeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlViewRefreshModeTagHandler.cpp
index 205b74d..6782bc8 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlViewRefreshModeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlViewRefreshModeTagHandler.cpp
@@ -23,7 +23,8 @@ KML_DEFINE_TAG_HANDLER( viewRefreshMode )
GeoNode* KmlviewRefreshModeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_viewRefreshMode ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_viewRefreshMode)));
+
GeoStackItem parentItem = parser.parentElement();
if ( parentItem.is<GeoDataLink>() ) {
QString content = parser.readElementText().trimmed();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlViewVolumeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlViewVolumeTagHandler.cpp
index 43926e2..0f3c03f 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlViewVolumeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlViewVolumeTagHandler.cpp
@@ -23,7 +23,7 @@ KML_DEFINE_TAG_HANDLER( ViewVolume )
GeoNode* KmlViewVolumeTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_ViewVolume ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_ViewVolume)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlVisibilityTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlVisibilityTagHandler.cpp
index fb6c4a1..06bf078 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlVisibilityTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlVisibilityTagHandler.cpp
@@ -35,7 +35,7 @@ KML_DEFINE_TAG_HANDLER( visibility )
GeoNode* KmlvisibilityTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_visibility ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_visibility)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlWaitTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlWaitTagHandler.cpp
index 58e5336..7e7aa96 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlWaitTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlWaitTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER_GX22( Wait )
GeoNode* KmlWaitTagHandler::parse(GeoParser &parser) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_Wait ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_Wait)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlWestTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlWestTagHandler.cpp
index 0e1760d..e84a4d1 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlWestTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlWestTagHandler.cpp
@@ -24,7 +24,7 @@ KML_DEFINE_TAG_HANDLER( west )
GeoNode* KmlwestTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_west ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_west)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlWhenTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlWhenTagHandler.cpp
index de0d064..2918d96 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlWhenTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlWhenTagHandler.cpp
@@ -26,7 +26,7 @@ KML_DEFINE_TAG_HANDLER( when )
GeoNode* KmlwhenTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_when ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_when)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlWidthTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlWidthTagHandler.cpp
index 68f65eb..6e10a7a 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlWidthTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlWidthTagHandler.cpp
@@ -35,7 +35,7 @@ KML_DEFINE_TAG_HANDLER( width )
GeoNode* KmlwidthTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_width ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_width)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlXTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlXTagHandler.cpp
index 78491d0..65644ab 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlXTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlXTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER( x )
GeoNode* KmlxTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_x ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_x)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlYTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlYTagHandler.cpp
index 8d31bf2..7c4d4c0 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlYTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlYTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER( y )
GeoNode* KmlyTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_y ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_y)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmlZTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlZTagHandler.cpp
index a1132c4..16f0acb 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlZTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlZTagHandler.cpp
@@ -25,7 +25,7 @@ KML_DEFINE_TAG_HANDLER( z )
GeoNode* KmlzTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_z ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_z)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/Kml_scaleTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/Kml_scaleTagHandler.cpp
index 39c8176..b05344c 100644
--- a/src/lib/marble/geodata/handlers/kml/Kml_scaleTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/Kml_scaleTagHandler.cpp
@@ -40,7 +40,7 @@ KML_DEFINE_TAG_HANDLER( scale )
GeoNode* KmlscaleTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_scale ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_scale)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmldelayedStartTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmldelayedStartTagHandler.cpp
index 46eed31..56e4261 100644
--- a/src/lib/marble/geodata/handlers/kml/KmldelayedStartTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmldelayedStartTagHandler.cpp
@@ -23,7 +23,7 @@ KML_DEFINE_TAG_HANDLER_GX22( delayedStart )
GeoNode* KmldelayedStartTagHandler::parse(GeoParser &parser) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_delayedStart ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_delayedStart)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/lib/marble/geodata/handlers/kml/KmldrawOrderTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmldrawOrderTagHandler.cpp
index d81611f..c44fb6c 100644
--- a/src/lib/marble/geodata/handlers/kml/KmldrawOrderTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmldrawOrderTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER( drawOrder )
GeoNode* KmldrawOrderTagHandler::parse(GeoParser &parser) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_drawOrder ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_drawOrder)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.is<GeoDataOverlay>()) {
diff --git a/src/lib/marble/geodata/handlers/kml/KmlplayModeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlplayModeTagHandler.cpp
index e06edc5..bc5832d 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlplayModeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlplayModeTagHandler.cpp
@@ -22,7 +22,7 @@ KML_DEFINE_TAG_HANDLER_GX22( playMode )
GeoNode* KmlplayModeTagHandler::parse(GeoParser &parser) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_playMode ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_playMode)));
GeoStackItem parentItem = parser.parentElement();
diff --git a/src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.cpp
index d0365e9..b53e05f 100644
--- a/src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.cpp
@@ -28,7 +28,8 @@ GPX_DEFINE_TAG_HANDLER_GARMIN_TRACKPOINTEXT1(TrackPointExtension)
GeoNode* GPXTrackPointExtensionTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( gpxTag_TrackPointExtension ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_TrackPointExtension)));
+
GeoStackItem parentItem = parser.parentElement();
if ( parentItem.is<GeoDataTrack>() )
diff --git a/src/plugins/runner/gpx/handlers/GPXcmtTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXcmtTagHandler.cpp
index 9628877..06cdd36 100644
--- a/src/plugins/runner/gpx/handlers/GPXcmtTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXcmtTagHandler.cpp
@@ -29,7 +29,7 @@ GPX_DEFINE_TAG_HANDLER(cmt)
GeoNode* GPXcmtTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_cmt));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_cmt)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_wpt))
diff --git a/src/plugins/runner/gpx/handlers/GPXdescTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXdescTagHandler.cpp
index beeead3..39fefed 100644
--- a/src/plugins/runner/gpx/handlers/GPXdescTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXdescTagHandler.cpp
@@ -28,7 +28,8 @@ GPX_DEFINE_TAG_HANDLER(desc)
GeoNode* GPXdescTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_desc));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_desc)));
+
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_wpt)
|| parentItem.represents(gpxTag_trk)
diff --git a/src/plugins/runner/gpx/handlers/GPXeleTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXeleTagHandler.cpp
index 500df47..8ba3a3e 100644
--- a/src/plugins/runner/gpx/handlers/GPXeleTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXeleTagHandler.cpp
@@ -27,7 +27,7 @@ GPX_DEFINE_TAG_HANDLER(ele)
GeoNode* GPXeleTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_ele));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_ele)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_trkpt))
diff --git a/src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.cpp
index e0677be..8e1f8f3 100644
--- a/src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.cpp
@@ -28,7 +28,8 @@ GPX_DEFINE_TAG_HANDLER(extensions)
GeoNode* GPXextensionsTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( gpxTag_extensions ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_extensions)));
+
GeoStackItem parentItem = parser.parentElement();
if ( parentItem.represents( gpxTag_trkpt ) )
diff --git a/src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp
index 44a5ef1..27ab530 100644
--- a/src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp
@@ -27,7 +27,8 @@ GPX_DEFINE_TAG_HANDLER_GARMIN_TRACKPOINTEXT1(hr)
GeoNode* GPXhrTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( gpxTag_hr ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_hr)));
+
GeoStackItem parentItem = parser.parentElement();
if ( parentItem.is<GeoDataTrack>() )
diff --git a/src/plugins/runner/gpx/handlers/GPXlinkTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXlinkTagHandler.cpp
index 0f954f5..0b47d2b 100644
--- a/src/plugins/runner/gpx/handlers/GPXlinkTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXlinkTagHandler.cpp
@@ -32,7 +32,7 @@ GPX_DEFINE_TAG_HANDLER_11(link)
// there are text and type properties, type being ignored for now.
GeoNode* GPXlinkTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_link));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_link)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_wpt))
diff --git a/src/plugins/runner/gpx/handlers/GPXnameTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXnameTagHandler.cpp
index bc827bd..15566fc 100644
--- a/src/plugins/runner/gpx/handlers/GPXnameTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXnameTagHandler.cpp
@@ -36,7 +36,7 @@ GPX_DEFINE_TAG_HANDLER(name)
GeoNode* GPXnameTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_name));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_name)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_wpt)
diff --git a/src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp
index 4e09cd0..0e326a2 100644
--- a/src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp
@@ -36,7 +36,7 @@ GPX_DEFINE_TAG_HANDLER(rte)
GeoNode* GPXrteTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_rte));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_rte)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_gpx))
diff --git a/src/plugins/runner/gpx/handlers/GPXrteptTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXrteptTagHandler.cpp
index c2306b2..41731ce 100644
--- a/src/plugins/runner/gpx/handlers/GPXrteptTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXrteptTagHandler.cpp
@@ -37,7 +37,7 @@ GPX_DEFINE_TAG_HANDLER(rtept)
GeoNode* GPXrteptTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_rtept));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_rtept)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_rte))
diff --git a/src/plugins/runner/gpx/handlers/GPXtimeTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXtimeTagHandler.cpp
index 7a5b806..8069a98 100644
--- a/src/plugins/runner/gpx/handlers/GPXtimeTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXtimeTagHandler.cpp
@@ -27,7 +27,7 @@ GPX_DEFINE_TAG_HANDLER(time)
GeoNode* GPXtimeTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_time));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_time)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_trkpt))
diff --git a/src/plugins/runner/gpx/handlers/GPXtrkTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXtrkTagHandler.cpp
index b098667..a771e8d 100644
--- a/src/plugins/runner/gpx/handlers/GPXtrkTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXtrkTagHandler.cpp
@@ -35,7 +35,7 @@ GPX_DEFINE_TAG_HANDLER(trk)
GeoNode* GPXtrkTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_trk));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_trk)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_gpx))
diff --git a/src/plugins/runner/gpx/handlers/GPXtrkptTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXtrkptTagHandler.cpp
index 56fea1e..dd25220 100644
--- a/src/plugins/runner/gpx/handlers/GPXtrkptTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXtrkptTagHandler.cpp
@@ -35,7 +35,7 @@ GPX_DEFINE_TAG_HANDLER(trkpt)
GeoNode* GPXtrkptTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_trkpt));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_trkpt)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_trkseg))
diff --git a/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp
index 1a4d2fd..1e33d97 100644
--- a/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp
@@ -36,7 +36,7 @@ GPX_DEFINE_TAG_HANDLER(trkseg)
GeoNode* GPXtrksegTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_trkseg));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_trkseg)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_trk))
diff --git a/src/plugins/runner/gpx/handlers/GPXtypeTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXtypeTagHandler.cpp
index 41df20f..a26d1c1 100644
--- a/src/plugins/runner/gpx/handlers/GPXtypeTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXtypeTagHandler.cpp
@@ -30,7 +30,7 @@ GPX_DEFINE_TAG_HANDLER(type)
GeoNode* GPXtypeTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_type));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_type)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_wpt)
diff --git a/src/plugins/runner/gpx/handlers/GPXurlTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXurlTagHandler.cpp
index 7da202d..d60d31c 100644
--- a/src/plugins/runner/gpx/handlers/GPXurlTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXurlTagHandler.cpp
@@ -32,7 +32,7 @@ GPX_DEFINE_TAG_HANDLER_10(url)
// The insertion is done in the urlname element, which is the link text.
GeoNode* GPXurlTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_url));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_url)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_wpt))
diff --git a/src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.cpp
index a1ebd9c..590e63f 100644
--- a/src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.cpp
@@ -28,7 +28,7 @@ GPX_DEFINE_TAG_HANDLER_10(urlname)
// completes gpx 1.0 url element
GeoNode* GPXurlnameTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_urlname));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_urlname)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_wpt))
diff --git a/src/plugins/runner/gpx/handlers/GPXwptTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXwptTagHandler.cpp
index 270c2b9..19cebab 100644
--- a/src/plugins/runner/gpx/handlers/GPXwptTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXwptTagHandler.cpp
@@ -35,7 +35,7 @@ GPX_DEFINE_TAG_HANDLER(wpt)
GeoNode* GPXwptTagHandler::parse(GeoParser& parser) const
{
- Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_wpt));
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(gpxTag_wpt)));
GeoStackItem parentItem = parser.parentElement();
if (parentItem.represents(gpxTag_gpx))
diff --git a/tools/add_kml/add_kml_tag.py b/tools/add_kml/add_kml_tag.py
index b786ff1..66a9561 100644
--- a/tools/add_kml/add_kml_tag.py
+++ b/tools/add_kml/add_kml_tag.py
@@ -233,7 +233,7 @@ KML_DEFINE_TAG_HANDLER( template )
GeoNode* KmltemplateTagHandler::parse( GeoParser& parser ) const
{
- Q_ASSERT( parser.isStartElement() && parser.isValidElement( kmlTag_template ) );
+ Q_ASSERT(parser.isStartElement() && parser.isValidElement(QLatin1String(kmlTag_template)));
GeoStackItem parentItem = parser.parentElement();