[Marble-commits] KDE/kdeedu/marble
Patrick Spendrin
ps_ml at gmx.de
Mon Mar 29 22:11:24 CEST 2010
SVN commit 1108807 by sengels:
-move GeoDataTypes out of the public interface and into a private header
-put the new GeoDataTypes.cpp also into the TestGeoData application
http://reviewboard.kde.org/r/3441/
M +2 -0 src/lib/geodata/data/GeoDataColorStyle.cpp
M +2 -0 src/lib/geodata/data/GeoDataContainer_p.h
M +2 -0 src/lib/geodata/data/GeoDataDocument_p.h
M +2 -0 src/lib/geodata/data/GeoDataFeature_p.h
M +2 -0 src/lib/geodata/data/GeoDataFolder.cpp
M +2 -0 src/lib/geodata/data/GeoDataGeometry_p.h
M +2 -0 src/lib/geodata/data/GeoDataHotSpot.cpp
M +2 -0 src/lib/geodata/data/GeoDataIconStyle.cpp
M +2 -0 src/lib/geodata/data/GeoDataLabelStyle.cpp
M +2 -0 src/lib/geodata/data/GeoDataLatLonAltBox.cpp
M +2 -0 src/lib/geodata/data/GeoDataLatLonBox.cpp
M +2 -0 src/lib/geodata/data/GeoDataLineString_p.h
M +2 -0 src/lib/geodata/data/GeoDataLineStyle.cpp
M +2 -0 src/lib/geodata/data/GeoDataLinearRing_p.h
M +2 -0 src/lib/geodata/data/GeoDataLod_p.h
M +2 -0 src/lib/geodata/data/GeoDataMultiGeometry_p.h
M +2 -0 src/lib/geodata/data/GeoDataObject.cpp
M +2 -0 src/lib/geodata/data/GeoDataPlacemark_p.h
M +2 -0 src/lib/geodata/data/GeoDataPoint.cpp
M +2 -0 src/lib/geodata/data/GeoDataPolyStyle.cpp
M +2 -0 src/lib/geodata/data/GeoDataPolygon_p.h
M +2 -0 src/lib/geodata/data/GeoDataRegion.cpp
M +2 -0 src/lib/geodata/data/GeoDataRegion_p.h
M +2 -0 src/lib/geodata/data/GeoDataStyle.cpp
M +2 -0 src/lib/geodata/data/GeoDataStyleMap.cpp
M +2 -0 src/lib/geodata/data/GeoDataStyleSelector.cpp
A src/lib/geodata/parser/GeoDataTypes.cpp [License: LGPL (v2+)]
A src/lib/geodata/parser/GeoDataTypes.h [License: LGPL (v2+)]
M +0 -32 src/lib/geodata/parser/GeoDocument.cpp
M +0 -36 src/lib/geodata/parser/GeoDocument.h
M +2 -0 src/lib/geodata/writers/kml/KmlDocumentTagWriter.cpp
M +1 -1 src/lib/geodata/writers/kml/KmlPlacemarkTagWriter.cpp
M +1 -1 src/lib/geodata/writers/kml/KmlPointTagWriter.cpp
M +1 -1 tests/CMakeLists.txt
M +1 -0 tests/TestGeoData.cpp
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataColorStyle.cpp #1108806:1108807
@@ -10,6 +10,8 @@
#include "GeoDataColorStyle.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataContainer_p.h #1108806:1108807
@@ -13,6 +13,8 @@
#include "GeoDataFeature_p.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataDocument_p.h #1108806:1108807
@@ -15,6 +15,8 @@
#include "GeoDataStyleMap.h"
#include "GeoDataContainer_p.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFeature_p.h #1108806:1108807
@@ -17,6 +17,8 @@
#include "GeoDataFeature.h"
#include "GeoDataRegion.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFolder.cpp #1108806:1108807
@@ -22,6 +22,8 @@
#include "GeoDataFolder.h"
+#include "GeoDataTypes.h"
+
#include "GeoDataContainer_p.h"
namespace Marble
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataGeometry_p.h #1108806:1108807
@@ -16,6 +16,8 @@
#include "GeoDataGeometry.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataHotSpot.cpp #1108806:1108807
@@ -14,6 +14,8 @@
#include <QtCore/QDataStream>
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataIconStyle.cpp #1108806:1108807
@@ -12,6 +12,8 @@
#include "GeoDataIconStyle.h"
#include "MarbleDebug.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLabelStyle.cpp #1108806:1108807
@@ -13,6 +13,8 @@
#include <QtGui/QFont>
+#include "GeoDataTypes.h"
+
namespace Marble
{
#ifdef Q_OS_MACX
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLatLonAltBox.cpp #1108806:1108807
@@ -16,6 +16,8 @@
#include "GeoDataCoordinates.h"
#include "GeoDataLineString.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLatLonBox.cpp #1108806:1108807
@@ -16,6 +16,8 @@
#include "GeoDataCoordinates.h"
#include "GeoDataLineString.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLineString_p.h #1108806:1108807
@@ -13,6 +13,8 @@
#include "GeoDataGeometry_p.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLineStyle.cpp #1108806:1108807
@@ -11,6 +11,8 @@
#include "GeoDataLineStyle.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLinearRing_p.h #1108806:1108807
@@ -13,6 +13,8 @@
#include "GeoDataLineString_p.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLod_p.h #1108806:1108807
@@ -13,6 +13,8 @@
#include "GeoDataLod.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataMultiGeometry_p.h #1108806:1108807
@@ -13,6 +13,8 @@
#include "GeoDataGeometry_p.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataObject.cpp #1108806:1108807
@@ -16,7 +16,9 @@
#include "GeoDataDocument.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataPlacemark_p.h #1108806:1108807
@@ -13,6 +13,8 @@
#include "GeoDataFeature_p.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataPoint.cpp #1108806:1108807
@@ -22,7 +22,9 @@
#include "MarbleDebug.h"
#include "global.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataPolyStyle.cpp #1108806:1108807
@@ -11,6 +11,8 @@
#include "GeoDataPolyStyle.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataPolygon_p.h #1108806:1108807
@@ -13,6 +13,8 @@
#include "GeoDataGeometry_p.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataRegion.cpp #1108806:1108807
@@ -20,7 +20,9 @@
#include "GeoDataPlacemark.h"
#include "GeoDataGeometry.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
GeoDataRegion::GeoDataRegion()
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataRegion_p.h #1108806:1108807
@@ -13,6 +13,8 @@
#include "GeoDataRegion.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataStyle.cpp #1108806:1108807
@@ -11,6 +11,8 @@
#include "GeoDataStyle.h"
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataStyleMap.cpp #1108806:1108807
@@ -12,6 +12,8 @@
#include "GeoDataStyleMap.h"
#include <QtCore/QDataStream>
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataStyleSelector.cpp #1108806:1108807
@@ -12,6 +12,8 @@
#include "GeoDataStyleSelector.h"
#include <QtCore/QDataStream>
+#include "GeoDataTypes.h"
+
namespace Marble
{
--- trunk/KDE/kdeedu/marble/src/lib/geodata/parser/GeoDocument.cpp #1108806:1108807
@@ -29,38 +29,6 @@
unsigned long GeoDocument::s_leakProtector = 0;
#endif
-namespace GeoDataTypes
-{
-const char* GeoDataColorStyleType = "GeoDataColorStyle";
-const char* GeoDataContainerType = "GeoDataContainer";
-const char* GeoDataDocumentType = "GeoDataDocument";
-const char* GeoDataFeatureType = "GeoDataFeature";
-const char* GeoDataFolderType = "GeoDataFolder";
-const char* GeoDataGeometryType = "GeoDataGeometry";
-const char* GeoDataHotspotType = "GeoDataHotspot";
-const char* GeoDataIconStyleType = "GeoDataIconStyle";
-const char* GeoDataInnerBoundaryType = "GeoDataInnerBoundary";
-const char* GeoDataLabelStyleType = "GeoDataLabelStyle";
-const char* GeoDataLatLonAltBoxType = "GeoDataLatLonAlt";
-const char* GeoDataLatLonBoxType = "GeoDataLatLonBox";
-const char* GeoDataLinearRingType = "GeoDataLinearRing";
-const char* GeoDataLineStringType = "GeoDataLineString";
-const char* GeoDataLineStyleType = "GeoDataLineStyle";
-const char* GeoDataLodType = "GeoDataLod";
-const char* GeoDataMultiGeometryType = "GeoDataMultyGeometry";
-const char* GeoDataObjectType = "GeoDataObject";
-const char* GeoDataOuterBoundaryType = "GeoDataOuterBoundary";
-const char* GeoDataPlacemarkType = "GeoDataPlacemark";
-const char* GeoDataPointType = "GeoDataPoint";
-const char* GeoDataPolygonType = "GeoDataPolygon";
-const char* GeoDataPolyStyleType = "GeoDataPolyStyle";
-const char* GeoDataRegionType = "GeoDataRegion";
-const char* GeoDataStyleSelectorType = "GeoDataStyleSelector";
-const char* GeoDataStyleType = "GeoDataStyle";
-const char* GeoDataSyleMapType = "GeoDataStyleMap";
-}
-
-
GeoDocument::GeoDocument()
{
}
--- trunk/KDE/kdeedu/marble/src/lib/geodata/parser/GeoDocument.h #1108806:1108807
@@ -36,43 +36,7 @@
namespace Marble
{
-namespace GeoDataTypes
-{
/**
- * the following const char* XXType are used to provide RTTI to the GeoData for
- * downcasting to the good object
- * please keep alphabetic order to prevent mess
- */
-extern const char* GeoDataColorStyleType;
-extern const char* GeoDataContainerType;
-extern const char* GeoDataDocumentType;
-extern const char* GeoDataFeatureType;
-extern const char* GeoDataFolderType;
-extern const char* GeoDataGeometryType;
-extern const char* GeoDataHotspotType;
-extern const char* GeoDataIconStyleType;
-extern const char* GeoDataInnerBoundaryType;
-extern const char* GeoDataLabelStyleType;
-extern const char* GeoDataLatLonAltBoxType;
-extern const char* GeoDataLatLonBoxType;
-extern const char* GeoDataLinearRingType;
-extern const char* GeoDataLineStringType;
-extern const char* GeoDataLineStyleType;
-extern const char* GeoDataLodType;
-extern const char* GeoDataMultiGeometryType;
-extern const char* GeoDataObjectType;
-extern const char* GeoDataOuterBoundaryType;
-extern const char* GeoDataPlacemarkType;
-extern const char* GeoDataPointType;
-extern const char* GeoDataPolygonType;
-extern const char* GeoDataPolyStyleType;
-extern const char* GeoDataRegionType;
-extern const char* GeoDataStyleSelectorType;
-extern const char* GeoDataStyleType;
-extern const char* GeoDataSyleMapType;
-}
-
-/**
* @short A shared base class between GeoDataDocument/GeoSourceDocument
*/
class GEODATA_EXPORT GeoDocument
--- trunk/KDE/kdeedu/marble/src/lib/geodata/writers/kml/KmlDocumentTagWriter.cpp #1108806:1108807
@@ -17,6 +17,8 @@
#include "GeoDataObject.h"
#include "MarbleDebug.h"
+#include "GeoDataTypes.h"
+
#include <QtCore/QVector>
namespace Marble
--- trunk/KDE/kdeedu/marble/src/lib/geodata/writers/kml/KmlPlacemarkTagWriter.cpp #1108806:1108807
@@ -13,7 +13,7 @@
#include "KmlElementDictionary.h"
#include "GeoDataPlacemark.h"
//FIXME:should the GeoDataTypes enum be in the GeoDocument?
-#include "GeoDocument.h"
+#include "GeoDataTypes.h"
#include "GeoWriter.h"
namespace Marble
--- trunk/KDE/kdeedu/marble/src/lib/geodata/writers/kml/KmlPointTagWriter.cpp #1108806:1108807
@@ -11,7 +11,7 @@
#include "KmlPointTagWriter.h"
#include "GeoDataPoint.h"
-#include "GeoDocument.h"
+#include "GeoDataTypes.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
--- trunk/KDE/kdeedu/marble/tests/CMakeLists.txt #1108806:1108807
@@ -110,7 +110,7 @@
marble_add_test( PluginManagerTest )
marble_add_test( MarbleWidgetTest )
marble_add_test( TestGeoPainter )
-marble_add_test( TestGeoData )
+marble_add_test( TestGeoData ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/geodata/parser/GeoDataTypes.cpp )
add_definitions( -DCITIES_PATH="\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../data/placemarks/cityplacemarks.kml\\\"" )
marble_add_test( KMLTest )
--- trunk/KDE/kdeedu/marble/tests/TestGeoData.cpp #1108806:1108807
@@ -15,6 +15,7 @@
#include "GeoDataFolder.h"
#include "GeoDataCoordinates.h"
#include "GeoDataLatLonAltBox.h"
+#include "GeoDataTypes.h"
namespace Marble
{
More information about the Marble-commits
mailing list