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

List:       kde-commits
Subject:    [marble] src/lib/geodata/data: ExtendedData takes ownership of
From:       Niko Sams <niko.sams () gmail ! com>
Date:       2011-12-31 15:16:59
Message-ID: 20111231151659.84BDD580D9 () git ! kde ! org
[Download RAW message or body]

Git commit 784c52bc09ea91e780724c39af57bb77b06dbc39 by Niko Sams.
Committed on 31/12/2011 at 14:29.
Pushed by nsams into branch 'master'.

ExtendedData takes ownership of SimpleArrayData

M  +3    -2    src/lib/geodata/data/GeoDataExtendedData.cpp
M  +2    -0    src/lib/geodata/data/GeoDataExtendedData.h

http://commits.kde.org/marble/784c52bc09ea91e780724c39af57bb77b06dbc39

diff --git a/src/lib/geodata/data/GeoDataExtendedData.cpp b/src/lib/geodata=
/data/GeoDataExtendedData.cpp
index 4437216..fa8e49c 100644
--- a/src/lib/geodata/data/GeoDataExtendedData.cpp
+++ b/src/lib/geodata/data/GeoDataExtendedData.cpp
@@ -30,6 +30,7 @@ GeoDataExtendedData::GeoDataExtendedData( const GeoDataEx=
tendedData& other )
 =

 GeoDataExtendedData::~GeoDataExtendedData()
 {
+    qDeleteAll( d->arrayHash );
     delete d;
 }
 =

@@ -62,12 +63,12 @@ void GeoDataExtendedData::addValue( const GeoDataData& =
data )
 =

 QHash< QString, GeoDataData >::const_iterator GeoDataExtendedData::constBe=
gin( ) const
 {
-	return d->hash.constBegin();
+    return d->hash.constBegin();
 }
 =

 QHash< QString, GeoDataData >::const_iterator GeoDataExtendedData::constEn=
d( ) const
 {
-	return d->hash.constEnd();
+    return d->hash.constEnd();
 }
 =

 int GeoDataExtendedData::size() const
diff --git a/src/lib/geodata/data/GeoDataExtendedData.h b/src/lib/geodata/d=
ata/GeoDataExtendedData.h
index 96d7ad5..6984170 100644
--- a/src/lib/geodata/data/GeoDataExtendedData.h
+++ b/src/lib/geodata/data/GeoDataExtendedData.h
@@ -91,6 +91,8 @@ class GEODATA_EXPORT GeoDataExtendedData : public GeoData=
Object
 =

     /**
      * @brief set SimpleArrayData for given @p key
+     *
+     * ExtendedData takes ownership of SimpleArrayData
      */
     void setSimpleArrayData( const QString& key, GeoDataSimpleArrayData* v=
alues );
 =


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