[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib/geodata
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2009-04-02 22:49:20
Message-ID: 1238712560.298636.13184.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 948411 by sengels:

use a different function name and use bool return value directly as in solid - thx \
pino for the hint.

 M  +5 -2      handlers/kml/KmlAltitudeModeTagHandler.cpp  
 M  +1 -1      handlers/kml/KmlCoordinatesTagHandler.cpp  
 M  +2 -2      handlers/kml/KmlMultiGeometryTagHandler.cpp  
 M  +2 -3      handlers/kml/KmlPlacemarkTagHandler.cpp  
 M  +2 -2      parser/GeoParser.h  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp \
#948410:948411 @@ -46,10 +46,13 @@
     GeoDataGeometry* geometry;
     bool validParents = false;
 
-    if( parentItem.checkNodeIs<GeoDataPlacemark>() && parentItem.represents( \
kmlTag_Point ) ) { +    if( parentItem.is<GeoDataFeature>() && 
+        parentItem.nodeAs<GeoDataFeature>()->featureId() == GeoDataPlacemarkId && 
+        parentItem.represents( kmlTag_Point ) ) {
         geometry = parentItem.nodeAs<GeoDataPlacemark>()->geometry();
         validParents = true;
-    } else if( parentItem.checkNodeIs<GeoDataGeometry>() && \
parentItem.nodeAs<GeoDataPoint>()->geometryId() == GeoDataPointId ) { +    } else if( \
parentItem.is<GeoDataGeometry>() &&  +               \
parentItem.nodeAs<GeoDataPoint>()->geometryId() == GeoDataPointId ) {  geometry = \
parentItem.nodeAs<GeoDataPoint>();  validParents = true;
     }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp \
#948410:948411 @@ -53,7 +53,7 @@
         QStringList  coordinatesLines = parser.readElementText().trimmed().split( \
QRegExp("\\s"), QString::SkipEmptyParts );  Q_FOREACH( const QString& line, \
coordinatesLines ) {  QStringList coordinates = line.trimmed().split( ',' );
-            if ( parentItem.represents( kmlTag_Point ) && \
parentItem.checkNodeIs<GeoDataPlacemark>() ) { +            if ( \
parentItem.represents( kmlTag_Point ) && parentItem.is<GeoDataPlacemark>() ) {  \
GeoDataPoint coord;  if ( coordinates.size() == 2 ) {
                     coord.set( DEG2RAD * coordinates.at( 0 ).toDouble(), 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlMultiGeometryTagHandler.cpp \
#948410:948411 @@ -43,14 +43,14 @@
     GeoStackItem parentItem = parser.parentElement();
 
     GeoDataMultiGeometry geom;
-    if( parentItem.nodeAs<GeoDataPlacemark>() ) {
+    if( parentItem.represents( kmlTag_Placemark ) ) {
         parentItem.nodeAs<GeoDataPlacemark>()->setGeometry( geom );
 #ifdef DEBUG_TAGS
         qDebug() << "Parsed <" << kmlTag_MultiGeometry << ">"
                  << " parent item name: " << parentItem.qualifiedName().first;
 #endif
         return parentItem.nodeAs<GeoDataPlacemark>()->geometry();
-    } else if( parentItem.nodeAs<GeoDataMultiGeometry>() ) {
+    } else if( parentItem.represents( kmlTag_MultiGeometry ) ) {
         parentItem.nodeAs<GeoDataMultiGeometry>()->append( geom );
 #ifdef DEBUG_TAGS
         qDebug() << "Parsed <" << kmlTag_MultiGeometry << ">"
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp \
#948410:948411 @@ -49,9 +49,8 @@
 #endif
 
     if( parentItem.represents( kmlTag_Folder ) || parentItem.represents( \
                kmlTag_Document ) ) {
-        GeoDataContainer *parentPtr = parentItem.nodeAs<GeoDataContainer>();
-        parentPtr->append( placemark );
-        return static_cast<GeoDataPlacemark*>(&parentPtr->last());
+        parentItem.nodeAs<GeoDataContainer>()->append( placemark );
+        return static_cast<GeoDataPlacemark*>(&parentItem.nodeAs<GeoDataContainer>()->last());
  } else {
         return 0;
     }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/parser/GeoParser.h #948410:948411
@@ -105,9 +105,9 @@
     }
     
     template<class T>
-    T* checkNodeIs()
+    bool is() const
     {
-        return dynamic_cast<T*>(second);
+        return 0 != dynamic_cast<T*>(second);
     }
 
     GeoTagHandler::QualifiedName qualifiedName() const { return first; }


[prev in list] [next in list] [prev in thread] [next in thread]