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

List:       kde-commits
Subject:    [marble] src/lib/marble/osm: remove unneeded static attribute
From:       Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date:       2016-10-01 9:50:13
Message-ID: E1bqGvt-0001Mm-Jp () code ! kde ! org
[Download RAW message or body]

Git commit 8bb2d7884e57fed42a03ee639a4ff811c493810b by Bernhard Beschow.
Committed on 01/10/2016 at 09:50.
Pushed by beschow into branch 'master'.

remove unneeded static attribute

M  +1    -2    src/lib/marble/osm/OsmPlacemarkData.cpp
M  +0    -5    src/lib/marble/osm/OsmPlacemarkData.h

http://commits.kde.org/marble/8bb2d7884e57fed42a03ee639a4ff811c493810b

diff --git a/src/lib/marble/osm/OsmPlacemarkData.cpp b/src/lib/marble/osm/OsmPlacemarkData.cpp
index 452f73b..01996ac 100644
--- a/src/lib/marble/osm/OsmPlacemarkData.cpp
+++ b/src/lib/marble/osm/OsmPlacemarkData.cpp
@@ -21,7 +21,6 @@ namespace Marble
 {
 
 const QString OsmPlacemarkData::osmDataKey = "osm_data";
-const char OsmPlacemarkData::osmPlacemarkDataType[] = "OsmPlacemarkDataType";
 
 OsmPlacemarkData::OsmPlacemarkData():
     m_id( 0 )
@@ -312,7 +311,7 @@ OsmPlacemarkData OsmPlacemarkData::fromParserAttributes( const QXmlStreamAttribu
 
 const char *OsmPlacemarkData::nodeType() const
 {
-    return osmPlacemarkDataType;
+    return "OsmPlacemarkDataType";
 }
 
 }
diff --git a/src/lib/marble/osm/OsmPlacemarkData.h b/src/lib/marble/osm/OsmPlacemarkData.h
index 1789e35..8671516 100644
--- a/src/lib/marble/osm/OsmPlacemarkData.h
+++ b/src/lib/marble/osm/OsmPlacemarkData.h
@@ -202,11 +202,6 @@ public:
      */
     static OsmPlacemarkData fromParserAttributes( const QXmlStreamAttributes &attributes );
 
-    /**
-     * @brief osmPlacemarkDataType used for identifying OsmPlacemarkData objects as GeoNodes
-     */
-    static const char osmPlacemarkDataType[];
-
 private:
     qint64 m_id;
     QString m_version;
[prev in list] [next in list] [prev in thread] [next in thread]