[Marble-commits] KDE/kdeedu/marble/src/lib/geodata

[Bastian Holst]

SVN commit 1015532 by bholst:

Marble geodata: Added tag handlers for Lod and Region.


 M  +1 -1      data/GeoDataFeature.cpp  
 M  +1 -1      data/GeoDataFeature.h  
 M  +4 -2      data/GeoDataRegion.cpp  
 M  +2 -2      data/GeoDataRegion.h  
 AM            handlers/kml/KmlLatLonAltBoxTagHandler.cpp   [License: LGPL]
 AM            handlers/kml/KmlLatLonAltBoxTagHandler.h   [License: LGPL]
 AM            handlers/kml/KmlLodTagHandler.cpp   [License: LGPL]
 AM            handlers/kml/KmlLodTagHandler.h   [License: LGPL]
 AM            handlers/kml/KmlMaxFadeExtentTagHandler.cpp   [License: LGPL]
 AM            handlers/kml/KmlMaxFadeExtentTagHandler.h   [License: LGPL]
 AM            handlers/kml/KmlMaxLodPixelsTagHandler.cpp   [License: LGPL]
 AM            handlers/kml/KmlMaxLodPixelsTagHandler.h   [License: LGPL]
 AM            handlers/kml/KmlMinFadeExtentTagHandler.cpp   [License: LGPL]
 AM            handlers/kml/KmlMinFadeExtentTagHandler.h   [License: LGPL]
 AM            handlers/kml/KmlMinLodPixelsTagHandler.cpp   [License: LGPL]
 AM            handlers/kml/KmlMinLodPixelsTagHandler.h   [License: LGPL]
 AM            handlers/kml/KmlRegionTagHandler.cpp   [License: LGPL]
 AM            handlers/kml/KmlRegionTagHandler.h   [License: LGPL]


--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFeature.cpp #1015531:1015532
@@ -471,7 +471,7 @@
     d->m_style = style;
 }
 
-GeoDataRegion GeoDataFeature::region() const
+GeoDataRegion& GeoDataFeature::region() const
 {
     return d->m_region;
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFeature.h #1015531:1015532
@@ -222,7 +222,7 @@
     /**
      * Return the region assigned to the placemark.
      */
-    GeoDataRegion region() const;
+    GeoDataRegion& region() const;
     /**
      * @brief Sets the region of the placemark.
      * @param region new value for the region
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataRegion.cpp #1015531:1015532
@@ -60,8 +60,10 @@
 }
 
 
-GeoDataLatLonAltBox GeoDataRegion::latLonAltBox() const
+GeoDataLatLonAltBox& GeoDataRegion::latLonAltBox() const
 {
+    // FIXME: This isn't exactly what a 'const' function should do, is it?
+
     // If the latLonAltBox hasn't been set try to determine it automatically
     if ( !d->m_latLonAltBox ) {
         // If there is a parent try to 
@@ -102,7 +104,7 @@
 }
 
 
-GeoDataLod GeoDataRegion::lod() const
+GeoDataLod& GeoDataRegion::lod() const
 {
     // If the lod hasn't been set then return a shared one
     if ( !d->m_lod ) {
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataRegion.h #1015531:1015532
@@ -101,7 +101,7 @@
     there is no geometry assigned to the feature or if the parent object of the
     region is a GeoDataLink).
 */
-    GeoDataLatLonAltBox latLonAltBox() const;
+    GeoDataLatLonAltBox& latLonAltBox() const;
 
     
 /*!
@@ -118,7 +118,7 @@
     If no \a lod has been set then a GeoDataLod object with default values
     is being returned.
 */
-    GeoDataLod lod() const;
+    GeoDataLod& lod() const;
 
     
 /*!
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlLatLonAltBoxTagHandler.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlLatLonAltBoxTagHandler.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlLodTagHandler.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlLodTagHandler.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlMaxFadeExtentTagHandler.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlMaxFadeExtentTagHandler.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlMaxLodPixelsTagHandler.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlMaxLodPixelsTagHandler.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlMinFadeExtentTagHandler.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlMinFadeExtentTagHandler.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlMinLodPixelsTagHandler.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlMinLodPixelsTagHandler.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlRegionTagHandler.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlRegionTagHandler.h #property svn:eol-style
   + native