[Marble-commits] KDE/kdeedu/marble/src/lib/geodata
Bernhard Beschow
bbeschow at cs.tu-berlin.de
Sat Jun 19 18:51:51 CEST 2010
SVN commit 1139963 by beschow:
rename enum value GeoSceneTexture::StorageLayout::Other back to GeoSceneTexture::StorageLayout::OpenStreetMap
M +1 -1 handlers/dgml/DgmlStorageLayoutTagHandler.cpp
M +1 -1 scene/GeoSceneTexture.cpp
M +1 -1 scene/GeoSceneTexture.h
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DgmlStorageLayoutTagHandler.cpp #1139962:1139963
@@ -67,7 +67,7 @@
GeoSceneTexture *texture = parentItem.nodeAs<GeoSceneTexture>();
// Attribute mode
- GeoSceneTexture::StorageLayout storageLayout = GeoSceneTexture::Other;
+ GeoSceneTexture::StorageLayout storageLayout = GeoSceneTexture::OpenStreetMap;
ServerLayout *serverLayout = 0;
const QString modeStr = parser.attribute(dgmlAttr_mode).trimmed();
if ( modeStr == "OpenStreetMap" )
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneTexture.cpp #1139962:1139963
@@ -163,7 +163,7 @@
.arg( id.x(), tileDigits, 10, QChar('0') )
.arg( suffix );
break;
- case GeoSceneTexture::Other:
+ case GeoSceneTexture::OpenStreetMap:
relFileName = QString( "%1/%2/%3/%4.%5" )
.arg( themeStr() )
.arg( id.zoomLevel() )
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneTexture.h #1139962:1139963
@@ -46,7 +46,7 @@
class GeoSceneTexture : public GeoSceneAbstractDataset
{
public:
- enum StorageLayout { Marble, Other };
+ enum StorageLayout { Marble, OpenStreetMap };
enum Projection { Equirectangular, Mercator };
explicit GeoSceneTexture( const QString& name );
More information about the Marble-commits
mailing list