← Back to branch summary

~ubuntu-branches/ubuntu/wily/marble/wily-proposed

~ubuntu-branches/ubuntu/wily/marble/wily-proposed

« back to all changes in this revision

Viewing changes to src/lib/marble/routing/instructions/RoutingInstruction.cpp

Committer: Package Import Robot
Author(s): Scarlett Clark, Jonathan Riddell, Scarlett Clark
Date: 2014-07-24 23:38:32 UTC
mfrom: (1.5.2)
Revision ID: package-import@ubuntu.com-20140724233832-7v4421t4khrhw487

Tags: 4:4.13.90-0ubuntu1

[ Jonathan Riddell ]
* Switch to libmarblewidget19 for new soversion

[ Scarlett Clark ]
* New upstream beta release
* Update: do_not_install_private_headers.

files added:
FileAssociation.nsh

data/bitmaps/audio-x-generic.png

data/bitmaps/document-edit.png

data/bitmaps/media-playback-pause.png

data/bitmaps/player-time.png

data/maps/earth/political

data/maps/earth/political/political-preview.png

data/maps/earth/political/political.dgml

data/maps/moon/clementine/tour.kml

data/naturalearth/ne_50m_admin_0_countries.pn2

debian/libmarblewidget19.install

debian/libmarblewidget19.symbols

examples/cpp/marbleQuick2

examples/cpp/marbleQuick2/CMakeLists.txt

examples/cpp/marbleQuick2/CMakeLists.txt.external

examples/cpp/marbleQuick2/Readme.txt

examples/cpp/marbleQuick2/main.cpp

examples/cpp/marbleQuick2/main.qml

examples/cpp/squad-interpolation

examples/cpp/squad-interpolation/CMakeLists.txt

examples/cpp/squad-interpolation/squad-interpolation.cpp

examples/cpp/squad-interpolation/squad-interpolation.h

examples/cpp/tour-preview

examples/cpp/tour-preview/CMakeLists.txt

examples/cpp/tour-preview/CMakeLists.txt.external

examples/cpp/tour-preview/tour-preview.cpp

marble.appdata.xml

src/apps/marble-ui/icons/draw-overlay.png

src/lib/marble/MarbleAbstractPresenter.cpp

src/lib/marble/MarbleAbstractPresenter.h

src/lib/marble/MarbleInputHandler.cpp

src/lib/marble/MarbleInputHandler.h

src/lib/marble/MarbleQuickItem.cpp

src/lib/marble/MarbleQuickItem.h

src/lib/marble/ParallelTrack.cpp

src/lib/marble/ParallelTrack.h

src/lib/marble/PlaybackAnimatedUpdateItem.cpp

src/lib/marble/PlaybackAnimatedUpdateItem.h

src/lib/marble/PlaybackFlyToItem.cpp

src/lib/marble/PlaybackFlyToItem.h

src/lib/marble/PlaybackItem.cpp

src/lib/marble/PlaybackItem.h

src/lib/marble/PlaybackSoundCueItem.cpp

src/lib/marble/PlaybackSoundCueItem.h

src/lib/marble/PlaybackTourControlItem.cpp

src/lib/marble/PlaybackTourControlItem.h

src/lib/marble/PlaybackWaitItem.cpp

src/lib/marble/PlaybackWaitItem.h

src/lib/marble/RenderState.cpp

src/lib/marble/RenderState.h

src/lib/marble/SerialTrack.cpp

src/lib/marble/SerialTrack.h

src/lib/marble/geodata/data/GeoDataChange.cpp

src/lib/marble/geodata/data/GeoDataChange.h

src/lib/marble/geodata/data/GeoDataCreate.cpp

src/lib/marble/geodata/data/GeoDataCreate.h

src/lib/marble/geodata/data/GeoDataDelete.cpp

src/lib/marble/geodata/data/GeoDataDelete.h

src/lib/marble/geodata/data/GeoDataSchema.cpp

src/lib/marble/geodata/data/GeoDataSchema.h

src/lib/marble/geodata/data/GeoDataSimpleField.cpp

src/lib/marble/geodata/data/GeoDataSimpleField.h

src/lib/marble/geodata/handlers/kml/KmlBalloonVisibilityTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlBalloonVisibilityTagHandler.h

src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.h

src/lib/marble/geodata/handlers/kml/KmlCreateTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlCreateTagHandler.h

src/lib/marble/geodata/handlers/kml/KmlDeleteTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlDeleteTagHandler.h

src/lib/marble/geodata/handlers/kml/KmlObjectTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlObjectTagHandler.h

src/lib/marble/geodata/writers/kml/KmlAnimatedUpdateTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlAnimatedUpdateTagWriter.h

src/lib/marble/geodata/writers/kml/KmlNetworkLinkControlTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlNetworkLinkControlTagWriter.h

src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.h

src/lib/marble/geodata/writers/kml/KmlSchemaTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlSchemaTagWriter.h

src/lib/marble/geodata/writers/kml/KmlSimpleFieldTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlSimpleFieldTagWriter.h

src/lib/marble/geodata/writers/kml/KmlUpdateTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlUpdateTagWriter.h

src/plugins/render/annotate/EditGroundOverlayDialog.cpp

src/plugins/render/annotate/EditGroundOverlayDialog.h

src/plugins/render/annotate/EditGroundOverlayDialog.ui

src/plugins/render/annotate/EditPolygonDialog.cpp

src/plugins/render/annotate/EditPolygonDialog.h

src/plugins/render/annotate/EditPolygonDialog.ui

src/plugins/render/annotate/GroundOverlayFrame.cpp

src/plugins/render/annotate/GroundOverlayFrame.h

src/plugins/render/annotate/SceneGraphicsTypes.cpp

src/plugins/render/annotate/SceneGraphicsTypes.h

src/plugins/runner/gpx/marble_thumbnail_gpx.desktop

src/plugins/runner/kml/marble_thumbnail_kml.desktop

src/plugins/runner/kml/marble_thumbnail_kmz.desktop

src/plugins/runner/osm/marble_thumbnail_osm.desktop

src/plugins/runner/shp/marble_thumbnail_shp.desktop

src/thumbnailer

src/thumbnailer/CMakeLists.txt

src/thumbnailer/main.cpp

src/thumbnailer/thumbnailer.cpp

src/thumbnailer/thumbnailer.h

tests/data/CameraLookAt.kml

tests/data/Geometries.kml

tests/data/ListStyleTest1.kml

tests/data/ListStyleTest2.kml

tests/data/ListStyleTest3.kml

tests/data/ListStyleTest4.kml

tests/data/ListStyleTest5.kml

tests/data/LookAtTest.kml

tests/data/NetworkLinkControl.kml

tests/data/PhotoOverlayAsRoot.kml

tests/data/PhotoOverlayInFolder.kml

tests/data/Route.kml

tests/data/Track.kml

tests/data/schema.kml

files removed:
debian/libmarblewidget18.acc

debian/libmarblewidget18.install

debian/libmarblewidget18.symbols

tests/TestPhotoOverlay.cpp

files modified:
.pc/applied-patches

.pc/do_not_install_private_headers/src/lib/marble/CMakeLists.txt

.pc/fix_qmake_fallback.diff/src/CMakeLists.txt

CMakeLists.txt

INSTALL

data/CMakeLists.txt

data/lang/routing-instructions_i18n.bash

data/maps/earth/openstreetmap/openstreetmap.dgml

data/maps/moon/clementine/clementine.dgml

data/mimetypes/geo.xml

data/naturalearth/ne_10m_admin_0_boundary_lines_land.pn2

data/naturalearth/ne_10m_rivers_lake_centerlines.pn2

data/naturalearth/ne_50m_admin_0_boundary_lines_land.pn2

data/naturalearth/ne_50m_admin_0_boundary_lines_maritime_indicator.pn2

data/naturalearth/ne_50m_admin_0_breakaway_disputed_areas.pn2

data/naturalearth/ne_50m_admin_0_pacific_groupings.pn2

data/naturalearth/ne_50m_admin_1_states_provinces_lines.pn2

data/naturalearth/ne_50m_antarctic_ice_shelves_lines.pn2

data/naturalearth/ne_50m_antarctic_ice_shelves_polys.pn2

data/naturalearth/ne_50m_coastline.pn2

data/naturalearth/ne_50m_glaciated_areas.pn2

data/naturalearth/ne_50m_lakes.pn2

data/naturalearth/ne_50m_lakes_historic.pn2

data/naturalearth/ne_50m_land.pn2

data/naturalearth/ne_50m_playas.pn2

data/naturalearth/ne_50m_rivers_lake_centerlines.pn2

data/naturalearth/ne_50m_urban_areas.pn2

data/placemarks/baseplacemarks.kml

data/placemarks/boundaryplacemarks.kml

data/placemarks/cityplacemarks.kml

data/placemarks/elevplacemarks.kml

data/placemarks/moonlandingsites.kml

data/placemarks/moonterrain.kml

data/placemarks/otherplacemarks.kml

debian/changelog

debian/control

debian/marble-data.install

debian/marble-plugins.install.linux

debian/marble.install

debian/patches/do_not_install_private_headers

debian/patches/series

examples/cpp/CMakeLists.txt

examples/cpp/animation-video/CMakeLists.txt

examples/cpp/custom-layers/main.cpp

examples/cpp/overlay-rendering/Readme.txt

examples/kml/Marble writing.kml

examples/kml/NewYorkRegion.kml

examples/kml/Rabet.kml

examples/kml/czech.kml

examples/kml/germany.kml

examples/kml/poland.kml

examples/qml/data-layers/EarthquakesModel.qml

marble.nsi

src/CMakeLists.txt

src/apps/marble-kde/marble.desktop

src/apps/marble-kde/marble_part.cpp

src/apps/marble-kde/marble_part.h

src/apps/marble-mobile/MobileMainWindow.h

src/apps/marble-mobile/marble-mobile.desktop

src/apps/marble-qt/CMakeLists.txt

src/apps/marble-qt/QtMainWindow.cpp

src/apps/marble-qt/QtMainWindow.h

src/apps/marble-qt/marble-qt.desktop

src/apps/marble-touch/marble-touch.desktop

src/apps/marble-ui/CMakeLists.txt

src/apps/marble-ui/ControlView.cpp

src/apps/marble-ui/ControlView.h

src/apps/marble-ui/marble.qrc

src/lib/marble/AbstractDataPlugin.cpp

src/lib/marble/AbstractDataPlugin.h

src/lib/marble/AbstractDataPluginItem.cpp

src/lib/marble/AbstractDataPluginItem.h

src/lib/marble/AbstractFloatItem.cpp

src/lib/marble/AbstractFloatItem.h

src/lib/marble/BookmarkManager.cpp

src/lib/marble/BookmarkManager.h

src/lib/marble/BookmarkManagerDialog.cpp

src/lib/marble/CMakeLists.txt

src/lib/marble/ClipPainter.cpp

src/lib/marble/DiscCache.cpp

src/lib/marble/DiscCache.h

src/lib/marble/EditBookmarkDialog.cpp

src/lib/marble/FileLoader.cpp

src/lib/marble/FileLoader.h

src/lib/marble/FileManager.cpp

src/lib/marble/FileManager.h

src/lib/marble/FileViewWidget.cpp

src/lib/marble/GeoDataTreeModel.cpp

src/lib/marble/GeoPainter_p.h

src/lib/marble/GeoUriParser.cpp

src/lib/marble/GeoUriParser.h

src/lib/marble/LayerInterface.cpp

src/lib/marble/LayerInterface.h

src/lib/marble/LayerManager.cpp

src/lib/marble/LayerManager.h

src/lib/marble/LegendWidget.cpp

src/lib/marble/LegendWidget.h

src/lib/marble/MapThemeDownloadDialog.cpp

src/lib/marble/MapThemeManager.cpp

src/lib/marble/MapThemeSortFilterProxyModel.cpp

src/lib/marble/MapThemeSortFilterProxyModel.h

src/lib/marble/MapViewWidget.cpp

src/lib/marble/MapWizard.cpp

src/lib/marble/MapWizard.h

src/lib/marble/MarbleAboutDialog.cpp

src/lib/marble/MarbleClock.cpp

src/lib/marble/MarbleClock.h

src/lib/marble/MarbleDebug.cpp

src/lib/marble/MarbleGlobal.h

src/lib/marble/MarbleLegendBrowser.cpp

src/lib/marble/MarbleLegendBrowser.h

src/lib/marble/MarbleMap.cpp

src/lib/marble/MarbleMap.h

src/lib/marble/MarbleModel.cpp

src/lib/marble/MarbleModel.h

src/lib/marble/MarblePhysics.cpp

src/lib/marble/MarblePhysics.h

src/lib/marble/MarbleWidget.cpp

src/lib/marble/MarbleWidget.h

src/lib/marble/MarbleWidgetInputHandler.cpp

src/lib/marble/MarbleWidgetInputHandler.h

src/lib/marble/MarbleWidgetPopupMenu.cpp

src/lib/marble/MergedLayerDecorator.cpp

src/lib/marble/MergedLayerDecorator.h

src/lib/marble/NewstuffModel.cpp

src/lib/marble/NewstuffModel.h

src/lib/marble/PlacemarkLayout.cpp

src/lib/marble/PlacemarkLayout.h

src/lib/marble/PluginItemDelegate.cpp

src/lib/marble/PluginItemDelegate.h

src/lib/marble/PopupItem.cpp

src/lib/marble/PopupItem.h

src/lib/marble/PositionTracking.cpp

src/lib/marble/QtMarbleConfigDialog.cpp

src/lib/marble/QtMarbleConfigDialog.h

src/lib/marble/Quaternion.cpp

src/lib/marble/Quaternion.h

src/lib/marble/RenderPlugin.cpp

src/lib/marble/RenderPlugin.h

src/lib/marble/RoutingRunner.cpp

src/lib/marble/RoutingRunner.h

src/lib/marble/RoutingRunnerManager.cpp

src/lib/marble/RunnerTask.cpp

src/lib/marble/RunnerTask.h

src/lib/marble/SearchRunner.h

src/lib/marble/SearchRunnerManager.cpp

src/lib/marble/SearchRunnerManager.h

src/lib/marble/ServerLayout.cpp

src/lib/marble/StackedTileLoader.cpp

src/lib/marble/StackedTileLoader.h

src/lib/marble/TemplateDocument.cpp

src/lib/marble/TextureColorizer.h

src/lib/marble/TileLoader.cpp

src/lib/marble/TileLoader.h

src/lib/marble/TinyWebBrowser.cpp

src/lib/marble/TourPlayback.cpp

src/lib/marble/TourPlayback.h

src/lib/marble/TourWidget.cpp

src/lib/marble/TourWidget.h

src/lib/marble/TourWidget.ui

src/lib/marble/VectorTileModel.h

src/lib/marble/VisiblePlacemark.h

src/lib/marble/cloudsync/BookmarkSyncManager.cpp

src/lib/marble/cloudsync/CloudSyncManager.cpp

src/lib/marble/cloudsync/CloudSyncManager.h

src/lib/marble/cloudsync/OwncloudSyncBackend.cpp

src/lib/marble/cloudsync/OwncloudSyncBackend.h

src/lib/marble/cloudsync/RouteItemDelegate.cpp

src/lib/marble/cloudsync/RouteItemDelegate.h

src/lib/marble/cloudsync/RouteSyncManager.cpp

src/lib/marble/cloudsync/RouteSyncManager.h

src/lib/marble/geodata/CMakeLists.txt

src/lib/marble/geodata/data/GeoDataAbstractView.cpp

src/lib/marble/geodata/data/GeoDataAbstractView.h

src/lib/marble/geodata/data/GeoDataAnimatedUpdate.cpp

src/lib/marble/geodata/data/GeoDataAnimatedUpdate.h

src/lib/marble/geodata/data/GeoDataBalloonStyle.cpp

src/lib/marble/geodata/data/GeoDataBalloonStyle.h

src/lib/marble/geodata/data/GeoDataCamera.cpp

src/lib/marble/geodata/data/GeoDataCamera.h

src/lib/marble/geodata/data/GeoDataCamera_p.h

src/lib/marble/geodata/data/GeoDataColorStyle.cpp

src/lib/marble/geodata/data/GeoDataColorStyle.h

src/lib/marble/geodata/data/GeoDataContainer.cpp

src/lib/marble/geodata/data/GeoDataContainer.h

src/lib/marble/geodata/data/GeoDataCoordinates.cpp

src/lib/marble/geodata/data/GeoDataCoordinates.h

src/lib/marble/geodata/data/GeoDataCoordinates_p.h

src/lib/marble/geodata/data/GeoDataData.cpp

src/lib/marble/geodata/data/GeoDataDocument.cpp

src/lib/marble/geodata/data/GeoDataDocument.h

src/lib/marble/geodata/data/GeoDataDocument_p.h

src/lib/marble/geodata/data/GeoDataExtendedData.cpp

src/lib/marble/geodata/data/GeoDataFeature.cpp

src/lib/marble/geodata/data/GeoDataFeature.h

src/lib/marble/geodata/data/GeoDataFlyTo.cpp

src/lib/marble/geodata/data/GeoDataFlyTo.h

src/lib/marble/geodata/data/GeoDataFolder.cpp

src/lib/marble/geodata/data/GeoDataFolder.h

src/lib/marble/geodata/data/GeoDataGeometry.cpp

src/lib/marble/geodata/data/GeoDataGeometry.h

src/lib/marble/geodata/data/GeoDataGeometry_p.h

src/lib/marble/geodata/data/GeoDataGroundOverlay.cpp

src/lib/marble/geodata/data/GeoDataGroundOverlay.h

src/lib/marble/geodata/data/GeoDataHotSpot.cpp

src/lib/marble/geodata/data/GeoDataHotSpot.h

src/lib/marble/geodata/data/GeoDataIconStyle.cpp

src/lib/marble/geodata/data/GeoDataIconStyle.h

src/lib/marble/geodata/data/GeoDataImagePyramid.cpp

src/lib/marble/geodata/data/GeoDataImagePyramid.h

src/lib/marble/geodata/data/GeoDataItemIcon.cpp

src/lib/marble/geodata/data/GeoDataItemIcon.h

src/lib/marble/geodata/data/GeoDataLabelStyle.cpp

src/lib/marble/geodata/data/GeoDataLabelStyle.h

src/lib/marble/geodata/data/GeoDataLatLonAltBox.cpp

src/lib/marble/geodata/data/GeoDataLatLonBox.cpp

src/lib/marble/geodata/data/GeoDataLatLonBox.h

src/lib/marble/geodata/data/GeoDataLatLonQuad.cpp

src/lib/marble/geodata/data/GeoDataLatLonQuad.h

src/lib/marble/geodata/data/GeoDataLineString.cpp

src/lib/marble/geodata/data/GeoDataLineString.h

src/lib/marble/geodata/data/GeoDataLineString_p.h

src/lib/marble/geodata/data/GeoDataLineStyle.cpp

src/lib/marble/geodata/data/GeoDataLineStyle.h

src/lib/marble/geodata/data/GeoDataLinearRing.cpp

src/lib/marble/geodata/data/GeoDataLinearRing.h

src/lib/marble/geodata/data/GeoDataLink.cpp

src/lib/marble/geodata/data/GeoDataLink.h

src/lib/marble/geodata/data/GeoDataListStyle.cpp

src/lib/marble/geodata/data/GeoDataListStyle.h

src/lib/marble/geodata/data/GeoDataLocation.cpp

src/lib/marble/geodata/data/GeoDataLocation.h

src/lib/marble/geodata/data/GeoDataLod.cpp

src/lib/marble/geodata/data/GeoDataLod.h

src/lib/marble/geodata/data/GeoDataLookAt.cpp

src/lib/marble/geodata/data/GeoDataLookAt.h

src/lib/marble/geodata/data/GeoDataModel.cpp

src/lib/marble/geodata/data/GeoDataModel.h

src/lib/marble/geodata/data/GeoDataMultiGeometry.cpp

src/lib/marble/geodata/data/GeoDataMultiGeometry.h

src/lib/marble/geodata/data/GeoDataMultiTrack.cpp

src/lib/marble/geodata/data/GeoDataMultiTrack.h

src/lib/marble/geodata/data/GeoDataNetworkLink.cpp

src/lib/marble/geodata/data/GeoDataNetworkLink.h

src/lib/marble/geodata/data/GeoDataNetworkLinkControl.cpp

src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h

src/lib/marble/geodata/data/GeoDataObject.cpp

src/lib/marble/geodata/data/GeoDataObject.h

src/lib/marble/geodata/data/GeoDataOrientation.cpp

src/lib/marble/geodata/data/GeoDataOrientation.h

src/lib/marble/geodata/data/GeoDataOverlay.cpp

src/lib/marble/geodata/data/GeoDataOverlay.h

src/lib/marble/geodata/data/GeoDataPhotoOverlay.cpp

src/lib/marble/geodata/data/GeoDataPhotoOverlay.h

src/lib/marble/geodata/data/GeoDataPlacemark.cpp

src/lib/marble/geodata/data/GeoDataPlacemark.h

src/lib/marble/geodata/data/GeoDataPlacemark_p.h

src/lib/marble/geodata/data/GeoDataPlaylist.cpp

src/lib/marble/geodata/data/GeoDataPlaylist.h

src/lib/marble/geodata/data/GeoDataPoint.cpp

src/lib/marble/geodata/data/GeoDataPoint.h

src/lib/marble/geodata/data/GeoDataPolyStyle.cpp

src/lib/marble/geodata/data/GeoDataPolyStyle.h

src/lib/marble/geodata/data/GeoDataPolygon.cpp

src/lib/marble/geodata/data/GeoDataPolygon.h

src/lib/marble/geodata/data/GeoDataRegion.cpp

src/lib/marble/geodata/data/GeoDataRegion.h

src/lib/marble/geodata/data/GeoDataResourceMap.cpp

src/lib/marble/geodata/data/GeoDataResourceMap.h

src/lib/marble/geodata/data/GeoDataScale.cpp

src/lib/marble/geodata/data/GeoDataScale.h

src/lib/marble/geodata/data/GeoDataScreenOverlay.cpp

src/lib/marble/geodata/data/GeoDataScreenOverlay.h

src/lib/marble/geodata/data/GeoDataSimpleArrayData.cpp

src/lib/marble/geodata/data/GeoDataSnippet.cpp

src/lib/marble/geodata/data/GeoDataSnippet.h

src/lib/marble/geodata/data/GeoDataSoundCue.cpp

src/lib/marble/geodata/data/GeoDataSoundCue.h

src/lib/marble/geodata/data/GeoDataStyle.cpp

src/lib/marble/geodata/data/GeoDataStyle.h

src/lib/marble/geodata/data/GeoDataStyleMap.cpp

src/lib/marble/geodata/data/GeoDataStyleMap.h

src/lib/marble/geodata/data/GeoDataStyleSelector.cpp

src/lib/marble/geodata/data/GeoDataStyleSelector.h

src/lib/marble/geodata/data/GeoDataTimeSpan.cpp

src/lib/marble/geodata/data/GeoDataTimeSpan.h

src/lib/marble/geodata/data/GeoDataTimeStamp.cpp

src/lib/marble/geodata/data/GeoDataTimeStamp.h

src/lib/marble/geodata/data/GeoDataTour.cpp

src/lib/marble/geodata/data/GeoDataTour.h

src/lib/marble/geodata/data/GeoDataTourControl.cpp

src/lib/marble/geodata/data/GeoDataTourControl.h

src/lib/marble/geodata/data/GeoDataTrack.cpp

src/lib/marble/geodata/data/GeoDataTrack.h

src/lib/marble/geodata/data/GeoDataUpdate.cpp

src/lib/marble/geodata/data/GeoDataUpdate.h

src/lib/marble/geodata/data/GeoDataVec2.cpp

src/lib/marble/geodata/data/GeoDataVec2.h

src/lib/marble/geodata/data/GeoDataViewVolume.cpp

src/lib/marble/geodata/data/GeoDataViewVolume.h

src/lib/marble/geodata/data/GeoDataWait.cpp

src/lib/marble/geodata/data/GeoDataWait.h

src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.cpp

src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.h

src/lib/marble/geodata/handlers/dgml/DgmlAttributeDictionary.cpp

src/lib/marble/geodata/handlers/dgml/DgmlAttributeDictionary.h

src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlAnimatedUpdateTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlAnimatedUpdateTagHandler.h

src/lib/marble/geodata/handlers/kml/KmlBalloonStyleTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlDataTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlDisplayNameTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlElementDictionary.cpp

src/lib/marble/geodata/handlers/kml/KmlElementDictionary.h

src/lib/marble/geodata/handlers/kml/KmlExtrudeTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlFlyToModeTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlFlyToTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlFolderTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlGroundOverlayTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlGxTimeSpanTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlGxTimeStampTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlIconStyleTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlLabelStyleTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlLatLonAltBoxTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlLatLonBoxTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlLatLonQuadTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlLineStringTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlLineStyleTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlLinkSnippetTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlListStyleTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlLocationTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlLodTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlMultiGeometryTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlMultiTrackTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlNetworkLinkControlTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlOrientationTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlPhotoOverlayTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlPlaylistTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlPolyStyleTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlRegionTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlScaleTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlSchemaTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlScreenOverlayTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlSimpleFieldTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlSimpleFieldTagHandler.h

src/lib/marble/geodata/handlers/kml/KmlSoundCueTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlStyleMapTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlStyleTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlTimeSpanTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlTimeStampTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlTourControlTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlTourTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlUpdateTagHandler.cpp

src/lib/marble/geodata/handlers/kml/KmlWaitTagHandler.cpp

src/lib/marble/geodata/parser/GeoDataTypes.cpp

src/lib/marble/geodata/parser/GeoDataTypes.h

src/lib/marble/geodata/scene/GeoSceneGeodata.cpp

src/lib/marble/geodata/scene/GeoSceneGeodata.h

src/lib/marble/geodata/writer/GeoWriter.cpp

src/lib/marble/geodata/writers/kml/KmlBalloonStyleTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlCameraTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlColorStyleTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlDataTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlDocumentTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlExtendedDataTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlFeatureTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlFlyToTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlFolderTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlGroundOverlayWriter.cpp

src/lib/marble/geodata/writers/kml/KmlIconStyleTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlIconStyleTagWriter.h

src/lib/marble/geodata/writers/kml/KmlLatLonAltBoxWriter.cpp

src/lib/marble/geodata/writers/kml/KmlLatLonBoxWriter.cpp

src/lib/marble/geodata/writers/kml/KmlLatLonQuadWriter.cpp

src/lib/marble/geodata/writers/kml/KmlLineStringTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlLineStyleTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlLinearRingTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlLinkTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlLinkTagWriter.h

src/lib/marble/geodata/writers/kml/KmlListStyleTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlListStyleTagWriter.h

src/lib/marble/geodata/writers/kml/KmlLodTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlLookAtTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlModelTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlMultiGeometryTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlMultiTrackTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlNetworkLinkTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlOverlayTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlPhotoOverlayWriter.cpp

src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.h

src/lib/marble/geodata/writers/kml/KmlPointTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlPolyStyleTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlPolygonTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlRegionTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlScreenOverlayWriter.cpp

src/lib/marble/geodata/writers/kml/KmlScreenOverlayWriter.h

src/lib/marble/geodata/writers/kml/KmlStyleMapTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlStyleTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlTimeSpanWriter.cpp

src/lib/marble/geodata/writers/kml/KmlTimeStampTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlTourTagWriter.cpp

src/lib/marble/geodata/writers/kml/KmlTrackWriter.cpp

src/lib/marble/graphicsview/BillboardGraphicsItem.cpp

src/lib/marble/graphicsview/BillboardGraphicsItem.h

src/lib/marble/graphicsview/GeoGraphicsItem.cpp

src/lib/marble/graphicsview/GeoGraphicsItem.h

src/lib/marble/graphicsview/LabelGraphicsItem.cpp

src/lib/marble/graphicsview/LabelGraphicsItem_p.h

src/lib/marble/graphicsview/MarbleGraphicsItem.cpp

src/lib/marble/graphicsview/MarbleGraphicsItem.h

src/lib/marble/graphicsview/ScreenGraphicsItem.cpp

src/lib/marble/graphicsview/ScreenGraphicsItem.h

src/lib/marble/graphicsview/WidgetGraphicsItem.cpp

src/lib/marble/kdescendantsproxymodel.cpp

src/lib/marble/kdescendantsproxymodel.h

src/lib/marble/layers/FogLayer.cpp

src/lib/marble/layers/FogLayer.h

src/lib/marble/layers/FpsLayer.cpp

src/lib/marble/layers/FpsLayer.h

src/lib/marble/layers/GeometryLayer.cpp

src/lib/marble/layers/GeometryLayer.h

src/lib/marble/layers/GroundLayer.cpp

src/lib/marble/layers/GroundLayer.h

src/lib/marble/layers/MarbleSplashLayer.cpp

src/lib/marble/layers/MarbleSplashLayer.h

src/lib/marble/layers/PlacemarkLayer.cpp

src/lib/marble/layers/PlacemarkLayer.h

src/lib/marble/layers/PopupLayer.cpp

src/lib/marble/layers/PopupLayer.h

src/lib/marble/layers/TextureLayer.cpp

src/lib/marble/layers/TextureLayer.h

src/lib/marble/layers/VectorTileLayer.cpp

src/lib/marble/layers/VectorTileLayer.h

src/lib/marble/libmarble.qrc

src/lib/marble/projections/CylindricalProjection.cpp

src/lib/marble/projections/CylindricalProjection_p.h

src/lib/marble/projections/SphericalProjection.cpp

src/lib/marble/routing/RouteSegment.cpp

src/lib/marble/routing/RouteSegment.h

src/lib/marble/routing/RoutingInputWidget.cpp

src/lib/marble/routing/RoutingLayer.cpp

src/lib/marble/routing/RoutingLayer.h

src/lib/marble/routing/RoutingManager.cpp

src/lib/marble/routing/RoutingManager.h

src/lib/marble/routing/RoutingModel.cpp

src/lib/marble/routing/SpeakersModel.cpp

src/lib/marble/routing/SpeakersModel.h

src/lib/marble/routing/VoiceNavigationModel.cpp

src/lib/marble/routing/instructions/RoutingInstruction.cpp

src/plasmarunner/plasma-runner-marble.desktop

src/plasmoid/plasma-applet-kworldclock.desktop

src/plasmoid/worldclock.cpp

src/plasmoid/worldclock.h

src/plugins/declarative/Bookmarks.cpp

src/plugins/declarative/Bookmarks.h

src/plugins/declarative/CloudSync.cpp

src/plugins/declarative/CloudSync.h

src/plugins/declarative/DeclarativeDataPlugin.cpp

src/plugins/declarative/DeclarativeDataPlugin.h

src/plugins/declarative/DeclarativeDataPluginItem.cpp

src/plugins/declarative/DeclarativeDataPluginItem.h

src/plugins/declarative/OfflineDataModel.cpp

src/plugins/declarative/OfflineDataModel.h

src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.cpp

src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h

src/plugins/render/annotate/AnnotatePlugin.cpp

src/plugins/render/annotate/AnnotatePlugin.h

src/plugins/render/annotate/AreaAnnotation.cpp

src/plugins/render/annotate/AreaAnnotation.h

src/plugins/render/annotate/CMakeLists.txt

src/plugins/render/annotate/GeoWidgetBubble.cpp

src/plugins/render/annotate/GeoWidgetBubble.h

src/plugins/render/annotate/PlacemarkTextAnnotation.cpp

src/plugins/render/annotate/PlacemarkTextAnnotation.h

src/plugins/render/annotate/SceneGraphicsItem.cpp

src/plugins/render/annotate/SceneGraphicsItem.h

src/plugins/render/annotate/TextEditor.cpp

src/plugins/render/annotate/TextEditor.h

src/plugins/render/aprs/AprsGatherer.cpp

src/plugins/render/aprs/AprsGatherer.h

src/plugins/render/aprs/AprsObject.cpp

src/plugins/render/aprs/AprsObject.h

src/plugins/render/compass/CompassFloatItem.cpp

src/plugins/render/compass/CompassFloatItem.h

src/plugins/render/earthquake/EarthquakeItem.cpp

src/plugins/render/earthquake/EarthquakeItem.h

src/plugins/render/eclipses/EclipsesPlugin.cpp

src/plugins/render/eclipses/EclipsesPlugin.h

src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp

src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h

src/plugins/render/foursquare/FoursquareItem.cpp

src/plugins/render/foursquare/FoursquareItem.h

src/plugins/render/graticule/GraticulePlugin.h

src/plugins/render/license/License.cpp

src/plugins/render/mapscale/MapScaleFloatItem.cpp

src/plugins/render/mapscale/MapScaleFloatItem.h

src/plugins/render/measure/MeasureToolPlugin.cpp

src/plugins/render/measure/MeasureToolPlugin.h

src/plugins/render/navigation/ArrowDiscWidget.h

src/plugins/render/navigation/NavigationFloatItem.cpp

src/plugins/render/navigation/NavigationFloatItem.h

src/plugins/render/navigation/NavigationSlider.h

src/plugins/render/opencachingcom/CacheDetailsDialog.ui

src/plugins/render/opencachingcom/OpenCachingComItem.cpp

src/plugins/render/opencachingcom/OpenCachingComItem.h

src/plugins/render/opencachingcom/OpenCachingComModel.cpp

src/plugins/render/opencachingcom/OpenCachingComModel.h

src/plugins/render/opendesktop/OpenDesktopItem.cpp

src/plugins/render/opendesktop/OpenDesktopItem.h

src/plugins/render/overviewmap/OverviewMap.cpp

src/plugins/render/overviewmap/OverviewMap.h

src/plugins/render/panoramio/CMakeLists.txt

src/plugins/render/panoramio/PanoramioModel.cpp

src/plugins/render/panoramio/PanoramioModel.h

src/plugins/render/panoramio/PanoramioPlugin.cpp

src/plugins/render/panoramio/PanoramioPlugin.h

src/plugins/render/panoramio/PanoramioWidget.cpp

src/plugins/render/panoramio/PanoramioWidget.h

src/plugins/render/photo/PhotoPluginItem.cpp

src/plugins/render/photo/PhotoPluginItem.h

src/plugins/render/postalcode/PostalCodeItem.cpp

src/plugins/render/postalcode/PostalCodeItem.h

src/plugins/render/postalcode/PostalCodeModel.h

src/plugins/render/progress/ProgressFloatItem.cpp

src/plugins/render/progress/ProgressFloatItem.h

src/plugins/render/routing/RoutingPlugin.cpp

src/plugins/render/satellites/SatellitesConfigDialog.cpp

src/plugins/render/satellites/SatellitesConfigDialog.h

src/plugins/render/satellites/SatellitesTLEItem.cpp

src/plugins/render/satellites/SatellitesTLEItem.h

src/plugins/render/satellites/TrackerPluginModel.cpp

src/plugins/render/satellites/TrackerPluginModel.h

src/plugins/render/stars/StarsPlugin.cpp

src/plugins/render/stars/StarsPlugin.h

src/plugins/render/weather/GeoNamesWeatherService.h

src/plugins/render/weather/WeatherData.cpp

src/plugins/render/weather/WeatherItem.cpp

src/plugins/render/weather/WeatherItem.h

src/plugins/render/wikipedia/WikipediaItem.cpp

src/plugins/render/wikipedia/WikipediaItem.h

src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp

src/plugins/runner/gpx/CMakeLists.txt

src/plugins/runner/gpx/handlers/GPXgpxTagHandler.cpp

src/plugins/runner/gpx/marble_gpx.desktop

src/plugins/runner/hostip/HostipRunner.cpp

src/plugins/runner/hostip/HostipRunner.h

src/plugins/runner/kml/CMakeLists.txt

src/plugins/runner/kml/marble_kml.desktop

src/plugins/runner/kml/marble_kmz.desktop

src/plugins/runner/latlon/LatLonRunner.cpp

src/plugins/runner/latlon/LatLonRunner.h

src/plugins/runner/local-osm-search/DatabaseQuery.cpp

src/plugins/runner/local-osm-search/DatabaseQuery.h

src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp

src/plugins/runner/local-osm-search/LocalOsmSearchRunner.h

src/plugins/runner/local-osm-search/OsmDatabase.cpp

src/plugins/runner/local-osm-search/OsmDatabase.h

src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp

src/plugins/runner/localdatabase/LocalDatabaseRunner.h

src/plugins/runner/mapquest/MapQuestRunner.cpp

src/plugins/runner/mapquest/MapQuestRunner.h

src/plugins/runner/monav/MonavConfigWidget.cpp

src/plugins/runner/monav/MonavPlugin.cpp

src/plugins/runner/monav/MonavRunner.cpp

src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.h

src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp

src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h

src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp

src/plugins/runner/open-source-routing-machine/OSRMRunner.h

src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp

src/plugins/runner/openrouteservice/OpenRouteServiceRunner.h

src/plugins/runner/osm/CMakeLists.txt

src/plugins/runner/osm/handlers/OsmOsmTagHandler.cpp

src/plugins/runner/osm/handlers/OsmTagTagHandler.cpp

src/plugins/runner/osm/handlers/OsmTagTagHandler.h

src/plugins/runner/osm/marble_osm.desktop

src/plugins/runner/pn2/Pn2Runner.cpp

src/plugins/runner/pn2/Pn2Runner.h

src/plugins/runner/routino/RoutinoRunner.cpp

src/plugins/runner/shp/CMakeLists.txt

src/plugins/runner/shp/ShpRunner.cpp

src/plugins/runner/shp/marble_shp.desktop

src/plugins/runner/yours/YoursRunner.cpp

src/plugins/runner/yours/YoursRunner.h

tests/AbstractDataPluginModelTest.cpp

tests/CMakeLists.txt

tests/MarbleMapTest.cpp

tests/MercatorProjectionTest.cpp

tests/QuaternionTest.cpp

tests/TestEquality.cpp

tests/TestGeoData.cpp

tests/TestGeoDataCoordinates.cpp

tests/TestGeoDataCopy.cpp

tests/TestGeoDataLatLonAltBox.cpp

tests/TestGeoDataPack.cpp

tests/TestGeoDataWriter.cpp

tests/TestLatLonQuad.cpp

tests/TestTour.cpp

tests/TileIdTest.cpp

tests/ViewportParamsTest.cpp

tests/data/AltitudeMode.kml

tests/data/CDATATest.kml

tests/data/MackyModel.kml

tests/data/NetworkLink.kml

tests/data/NetworkLinkDocument.kml

tests/data/NewYork.kml

tests/data/NewYorkDocument.kml

tests/data/ScreenOverlay_Folder.kml

tests/data/ScreenOverlay_kml.kml

tests/data/Tour.kml

tools/constellations2kml/constellations2kml.cpp

tools/dso2kml/dso2kml.cpp

tools/maptheme-previewimage/main.cpp

tools/osm-addresses/OsmParser.cpp

tools/osm-addresses/SqlWriter.h

tools/osm-addresses/pbf/fileformat.proto

tools/osm-addresses/pbf/osmformat.proto

tools/pntreplace/CMakeLists.txt

tools/poly2kml/main.cpp

tools/shp2pn2/shp2pn2.cpp

tools/speaker-files/CMakeLists.txt

tools/stars/stars.cpp

tools/svg2pnt/CMakeLists.txt

tools/tilecreator-srtm2/tccore.cpp

Show diffs side-by-side

added added

removed removed

src/lib/marble/routing/instructions/RoutingInstruction.cpp

297

297

distanceUnit = "mi";

298

298

length /= 1000.0;

299

299

length /= 1.609344;

300

if ( length < 0.1 ) {

301

length = 10 * qRound( length * 528 );

302

precision = 0;

303

distanceUnit = "ft";

304

}

300

305

} else {

301

306

if ( length >= 1000 ) {

302

307

length /= 1000;

Older »