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

List:       kde-commits
Subject:    [marble/KDE/4.10] src/lib/geodata/data: Fix const logic
From:       Dennis_Nienhüser <earthwings () gentoo ! org>
Date:       2012-12-22 9:41:49
Message-ID: 20121222094149.7F3B3A6091 () git ! kde ! org
[Download RAW message or body]

Git commit 54c244a98286db753b6db82acfe789c02b2a0ea1 by Dennis Nienhüser.
Committed on 22/12/2012 at 10:35.
Pushed by nienhueser into branch 'KDE/4.10'.

Fix const logic

M  +12   -2    src/lib/geodata/data/GeoDataPolygon.cpp
M  +15   -2    src/lib/geodata/data/GeoDataPolygon.h

http://commits.kde.org/marble/54c244a98286db753b6db82acfe789c02b2a0ea1

diff --git a/src/lib/geodata/data/GeoDataPolygon.cpp b/src/lib/geodata/data/GeoDataPolygon.cpp
index 11fc4e9..5007ab9 100644
--- a/src/lib/geodata/data/GeoDataPolygon.cpp
+++ b/src/lib/geodata/data/GeoDataPolygon.cpp
@@ -82,7 +82,12 @@ const GeoDataLatLonAltBox& GeoDataPolygon::latLonAltBox() const
     return p()->outer.latLonAltBox();
 }
 
-GeoDataLinearRing& GeoDataPolygon::outerBoundary() const
+GeoDataLinearRing &GeoDataPolygon::outerBoundary()
+{
+    return (p()->outer);
+}
+
+const GeoDataLinearRing &GeoDataPolygon::outerBoundary() const
 {
     return (p()->outer);
 }
@@ -93,7 +98,12 @@ void GeoDataPolygon::setOuterBoundary( const GeoDataLinearRing& boundary )
     p()->outer = boundary;
 }
 
-QVector<GeoDataLinearRing>& GeoDataPolygon::innerBoundaries() const
+QVector<GeoDataLinearRing>& GeoDataPolygon::innerBoundaries()
+{
+    return p()->inner;
+}
+
+const QVector<GeoDataLinearRing>& GeoDataPolygon::innerBoundaries() const
 {
     return p()->inner;
 }
diff --git a/src/lib/geodata/data/GeoDataPolygon.h b/src/lib/geodata/data/GeoDataPolygon.h
index 05695a1..788f19e 100644
--- a/src/lib/geodata/data/GeoDataPolygon.h
+++ b/src/lib/geodata/data/GeoDataPolygon.h
@@ -151,7 +151,14 @@ class GEODATA_EXPORT GeoDataPolygon : public GeoDataGeometry
 
     \see GeoDataLinearRing
 */
-    GeoDataLinearRing& outerBoundary() const;
+    GeoDataLinearRing &outerBoundary();
+
+/*!
+    \brief Returns the outer boundary that is represented as a LinearRing.
+
+    \see GeoDataLinearRing
+*/
+    const GeoDataLinearRing &outerBoundary() const;
 
 /*!
     \brief Sets the given LinearRing as an outer boundary of the Polygon.
@@ -165,8 +172,14 @@ class GEODATA_EXPORT GeoDataPolygon : public GeoDataGeometry
 
     \see GeoDataLinearRing
 */
-    QVector<GeoDataLinearRing>& innerBoundaries() const;
+    QVector<GeoDataLinearRing>& innerBoundaries();
 
+/*!
+    \brief Returns a set of inner boundaries which are represented as LinearRings.
+
+    \see GeoDataLinearRing
+*/
+    const QVector<GeoDataLinearRing>& innerBoundaries() const;
 
 /*!
     \brief Appends a given LinearRing as an inner boundary of the Polygon.

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