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

List:       kde-commits
Subject:    [marble] src/plugins/runner/gpx: Merge branch 'master' into
From:       Niko Sams <niko.sams () gmail ! com>
Date:       2011-12-31 15:16:59
Message-ID: 20111231151659.8DD0F580DF () git ! kde ! org
[Download RAW message or body]

Git commit 98d0997cfab046b0510587e76ad5ed1a79c2979a by Niko Sams.
Committed on 31/12/2011 at 15:11.
Pushed by nsams into branch 'master'.

Merge branch 'master' into track-extendeddata

Conflicts:
	src/plugins/runner/gpx/CMakeLists.txt

M  +2    -0    src/plugins/runner/gpx/CMakeLists.txt
M  +2    -0    src/plugins/runner/gpx/handlers/GPXElementDictionary.cpp
M  +2    -0    src/plugins/runner/gpx/handlers/GPXElementDictionary.h

http://commits.kde.org/marble/98d0997cfab046b0510587e76ad5ed1a79c2979a

diff --cc src/plugins/runner/gpx/CMakeLists.txt
index 272b84b,e0d3e07..bee89ac
--- a/src/plugins/runner/gpx/CMakeLists.txt
+++ b/src/plugins/runner/gpx/CMakeLists.txt
@@@ -16,11 -16,8 +16,13 @@@ set( gpx_handlers_SRC
          handlers/GPXtrkptTagHandler.cpp
          handlers/GPXtrksegTagHandler.cpp
          handlers/GPXwptTagHandler.cpp
 +        handlers/GPXtimeTagHandler.cpp
 +        handlers/GPXeleTagHandler.cpp
 +        handlers/GPXextensionsTagHandler.cpp
 +        handlers/GPXTrackPointExtensionTagHandler.cpp
 +        handlers/GPXhrTagHandler.cpp
+         handlers/GPXrteTagHandler.cpp
+         handlers/GPXrteptTagHandler.cpp
     )
  
  set( gpx_SRCS GpxParser.cpp GpxPlugin.cpp GpxRunner.cpp )
diff --cc src/plugins/runner/gpx/handlers/GPXElementDictionary.cpp
index 82cc119,8355a3b..2f9f2d0
--- a/src/plugins/runner/gpx/handlers/GPXElementDictionary.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXElementDictionary.cpp
@@@ -42,10 -39,8 +42,12 @@@ const char* gpxTag_trk = "trk"
  const char* gpxTag_trkpt = "trkpt";
  const char* gpxTag_trkseg = "trkseg";
  const char* gpxTag_wpt = "wpt";
+ const char* gpxTag_rte = "rte";
+ const char* gpxTag_rtept = "rtept";
  
 +const char* gpxTag_nameSpaceGarminTrackPointExt1 = \
"http://www.garmin.com/xmlschemas/TrackPointExtension/v1";  +const char* \
gpxTag_TrackPointExtension = "TrackPointExtension";  +const char* gpxTag_hr = "hr";
 +
  }
  }
diff --cc src/plugins/runner/gpx/handlers/GPXElementDictionary.h
index d0dd0d7,c5c35f7..cce7476
--- a/src/plugins/runner/gpx/handlers/GPXElementDictionary.h
+++ b/src/plugins/runner/gpx/handlers/GPXElementDictionary.h
@@@ -43,11 -40,9 +43,13 @@@ namespace gp
      extern const char* gpxTag_trkpt;
      extern const char* gpxTag_trkseg;
      extern const char* gpxTag_wpt;
+     extern const char* gpxTag_rte;
+     extern const char* gpxTag_rtept;
      // TODO: add all remaining tags!
 +
 +    extern const char* gpxTag_nameSpaceGarminTrackPointExt1;
 +    extern const char* gpxTag_TrackPointExtension;
 +    extern const char* gpxTag_hr;
  }
  
  // Helper macros


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