summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-11-08 23:35:23 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-11-08 23:36:57 (GMT)
commit0e8a7b92d5dc51e9bc7a9b11ddd451c22470cd30 (patch)
tree4d15f4c4b0c968be889a2dd7ab57eb453cbe76b9
parent322f9c816ae3eb9f6b0fcc4ebd1fce569174f729 (diff)
Use consistently GEODATA_EXPORT in geodata/data
-rw-r--r--src/lib/marble/geodata/data/GeoDataAccuracy.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataAlias.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataChange.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataCreate.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataDelete.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataFlyTo.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataGroundOverlay.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataImagePyramid.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataLatLonQuad.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataLink.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataLocation.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataModel.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataOrientation.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataPhotoOverlay.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataResourceMap.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataScale.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataScreenOverlay.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataUpdate.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataVec2.h5
-rw-r--r--src/lib/marble/geodata/data/GeoDataViewVolume.h4
21 files changed, 32 insertions, 31 deletions
diff --git a/src/lib/marble/geodata/data/GeoDataAccuracy.h b/src/lib/marble/geodata/data/GeoDataAccuracy.h
index 6466b42..4ee6e6c 100644
--- a/src/lib/marble/geodata/data/GeoDataAccuracy.h
+++ b/src/lib/marble/geodata/data/GeoDataAccuracy.h
@@ -12,7 +12,7 @@
#ifndef MARBLE_GEODATAACCURACY_H
#define MARBLE_GEODATAACCURACY_H
-#include "marble_export.h"
+#include "geodata_export.h"
#include <QtGlobal>
@@ -21,7 +21,7 @@ namespace Marble
/**
*/
-class MARBLE_EXPORT GeoDataAccuracy
+class GEODATA_EXPORT GeoDataAccuracy
{
public:
enum Level {
diff --git a/src/lib/marble/geodata/data/GeoDataAlias.h b/src/lib/marble/geodata/data/GeoDataAlias.h
index 54ddc2b..c28c5ac 100644
--- a/src/lib/marble/geodata/data/GeoDataAlias.h
+++ b/src/lib/marble/geodata/data/GeoDataAlias.h
@@ -21,7 +21,7 @@ class GeoDataAliasPrivate;
/**
*/
-class MARBLE_EXPORT GeoDataAlias: public GeoNode
+class GEODATA_EXPORT GeoDataAlias: public GeoNode
{
public:
diff --git a/src/lib/marble/geodata/data/GeoDataChange.h b/src/lib/marble/geodata/data/GeoDataChange.h
index 84117ec..d6fcfdf 100644
--- a/src/lib/marble/geodata/data/GeoDataChange.h
+++ b/src/lib/marble/geodata/data/GeoDataChange.h
@@ -12,7 +12,7 @@
#define GEODATACHANGE_H
#include "GeoDataContainer.h"
-#include "marble_export.h"
+#include "geodata_export.h"
namespace Marble
{
@@ -21,7 +21,7 @@ class GeoDataChangePrivate;
/**
*/
-class MARBLE_EXPORT GeoDataChange : public GeoDataContainer
+class GEODATA_EXPORT GeoDataChange : public GeoDataContainer
{
public:
GeoDataChange();
diff --git a/src/lib/marble/geodata/data/GeoDataCreate.h b/src/lib/marble/geodata/data/GeoDataCreate.h
index 3995599..558db57 100644
--- a/src/lib/marble/geodata/data/GeoDataCreate.h
+++ b/src/lib/marble/geodata/data/GeoDataCreate.h
@@ -12,7 +12,7 @@
#define GEODATACREATE_H
#include "GeoDataContainer.h"
-#include "marble_export.h"
+#include "geodata_export.h"
namespace Marble
{
@@ -21,7 +21,7 @@ class GeoDataCreatePrivate;
/**
*/
-class MARBLE_EXPORT GeoDataCreate : public GeoDataContainer
+class GEODATA_EXPORT GeoDataCreate : public GeoDataContainer
{
public:
GeoDataCreate();
diff --git a/src/lib/marble/geodata/data/GeoDataDelete.h b/src/lib/marble/geodata/data/GeoDataDelete.h
index 24ff602..76848cc 100644
--- a/src/lib/marble/geodata/data/GeoDataDelete.h
+++ b/src/lib/marble/geodata/data/GeoDataDelete.h
@@ -12,7 +12,7 @@
#define GEODATADELETE_H
#include "GeoDataContainer.h"
-#include "marble_export.h"
+#include "geodata_export.h"
namespace Marble
{
@@ -21,7 +21,7 @@ class GeoDataDeletePrivate;
/**
*/
-class MARBLE_EXPORT GeoDataDelete : public GeoDataContainer
+class GEODATA_EXPORT GeoDataDelete : public GeoDataContainer
{
public:
GeoDataDelete();
diff --git a/src/lib/marble/geodata/data/GeoDataFlyTo.h b/src/lib/marble/geodata/data/GeoDataFlyTo.h
index d246940..2d029f9 100644
--- a/src/lib/marble/geodata/data/GeoDataFlyTo.h
+++ b/src/lib/marble/geodata/data/GeoDataFlyTo.h
@@ -22,7 +22,7 @@ class GeoDataFlyToPrivate;
/**
*/
-class MARBLE_EXPORT GeoDataFlyTo: public GeoDataTourPrimitive
+class GEODATA_EXPORT GeoDataFlyTo: public GeoDataTourPrimitive
{
public:
enum FlyToMode {
diff --git a/src/lib/marble/geodata/data/GeoDataGroundOverlay.h b/src/lib/marble/geodata/data/GeoDataGroundOverlay.h
index d852c3b..8f466ec 100644
--- a/src/lib/marble/geodata/data/GeoDataGroundOverlay.h
+++ b/src/lib/marble/geodata/data/GeoDataGroundOverlay.h
@@ -23,7 +23,7 @@ class GeoDataLatLonQuad;
/**
*/
-class MARBLE_EXPORT GeoDataGroundOverlay: public GeoDataOverlay
+class GEODATA_EXPORT GeoDataGroundOverlay: public GeoDataOverlay
{
public:
GeoDataGroundOverlay();
diff --git a/src/lib/marble/geodata/data/GeoDataImagePyramid.h b/src/lib/marble/geodata/data/GeoDataImagePyramid.h
index ce96288..4ab8f74 100644
--- a/src/lib/marble/geodata/data/GeoDataImagePyramid.h
+++ b/src/lib/marble/geodata/data/GeoDataImagePyramid.h
@@ -12,7 +12,7 @@
#define GEODATAIMAGEPYRAMID_H
#include "GeoDataObject.h"
-#include "marble_export.h"
+#include "geodata_export.h"
namespace Marble
{
@@ -21,7 +21,7 @@ class GeoDataImagePyramidPrivate;
/**
*/
-class MARBLE_EXPORT GeoDataImagePyramid : public GeoDataObject
+class GEODATA_EXPORT GeoDataImagePyramid : public GeoDataObject
{
public:
GeoDataImagePyramid();
diff --git a/src/lib/marble/geodata/data/GeoDataLatLonQuad.h b/src/lib/marble/geodata/data/GeoDataLatLonQuad.h
index e3c3bfb..e288946 100644
--- a/src/lib/marble/geodata/data/GeoDataLatLonQuad.h
+++ b/src/lib/marble/geodata/data/GeoDataLatLonQuad.h
@@ -21,7 +21,7 @@ class GeoDataLatLonQuadPrivate;
/**
*/
-class MARBLE_EXPORT GeoDataLatLonQuad: public GeoDataObject
+class GEODATA_EXPORT GeoDataLatLonQuad: public GeoDataObject
{
public:
GeoDataLatLonQuad();
diff --git a/src/lib/marble/geodata/data/GeoDataLink.h b/src/lib/marble/geodata/data/GeoDataLink.h
index 93b8cca..b6e4b57 100644
--- a/src/lib/marble/geodata/data/GeoDataLink.h
+++ b/src/lib/marble/geodata/data/GeoDataLink.h
@@ -21,7 +21,7 @@ class GeoDataLinkPrivate;
/**
*/
-class MARBLE_EXPORT GeoDataLink: public GeoDataObject
+class GEODATA_EXPORT GeoDataLink: public GeoDataObject
{
public:
enum RefreshMode {
diff --git a/src/lib/marble/geodata/data/GeoDataLocation.h b/src/lib/marble/geodata/data/GeoDataLocation.h
index 8ef95dd..2455108 100644
--- a/src/lib/marble/geodata/data/GeoDataLocation.h
+++ b/src/lib/marble/geodata/data/GeoDataLocation.h
@@ -22,7 +22,7 @@ class GeoDataLocationPrivate;
/**
*/
-class MARBLE_EXPORT GeoDataLocation: public GeoDataObject
+class GEODATA_EXPORT GeoDataLocation: public GeoDataObject
{
public:
GeoDataLocation();
diff --git a/src/lib/marble/geodata/data/GeoDataModel.h b/src/lib/marble/geodata/data/GeoDataModel.h
index 0dee528..7329421 100644
--- a/src/lib/marble/geodata/data/GeoDataModel.h
+++ b/src/lib/marble/geodata/data/GeoDataModel.h
@@ -28,7 +28,7 @@ class GeoDataModelPrivate;
/**
*/
-class MARBLE_EXPORT GeoDataModel: public GeoDataGeometry
+class GEODATA_EXPORT GeoDataModel: public GeoDataGeometry
{
public:
GeoDataModel();
diff --git a/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h b/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h
index 079fc30..b5d5fbb 100644
--- a/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h
+++ b/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h
@@ -12,7 +12,7 @@
#define GEODATANETWORKLINKCONTROL_H
#include "GeoDataContainer.h"
-#include "marble_export.h"
+#include "geodata_export.h"
class QDateTime;
@@ -25,7 +25,7 @@ class GeoDataNetworkLinkControlPrivate;
/**
*/
-class MARBLE_EXPORT GeoDataNetworkLinkControl : public GeoDataContainer
+class GEODATA_EXPORT GeoDataNetworkLinkControl : public GeoDataContainer
{
public:
GeoDataNetworkLinkControl();
diff --git a/src/lib/marble/geodata/data/GeoDataOrientation.h b/src/lib/marble/geodata/data/GeoDataOrientation.h
index 84d1757..99ae23d 100644
--- a/src/lib/marble/geodata/data/GeoDataOrientation.h
+++ b/src/lib/marble/geodata/data/GeoDataOrientation.h
@@ -20,7 +20,7 @@ class GeoDataOrientationPrivate;
/**
*/
-class MARBLE_EXPORT GeoDataOrientation: public GeoDataObject
+class GEODATA_EXPORT GeoDataOrientation: public GeoDataObject
{
public:
GeoDataOrientation();
diff --git a/src/lib/marble/geodata/data/GeoDataPhotoOverlay.h b/src/lib/marble/geodata/data/GeoDataPhotoOverlay.h
index 66226bf..b9720ef 100644
--- a/src/lib/marble/geodata/data/GeoDataPhotoOverlay.h
+++ b/src/lib/marble/geodata/data/GeoDataPhotoOverlay.h
@@ -15,7 +15,7 @@
#include "GeoDataOverlay.h"
#include "MarbleGlobal.h"
-#include "marble_export.h"
+#include "geodata_export.h"
namespace Marble {
@@ -26,7 +26,7 @@ class GeoDataViewVolume;
/**
*/
-class MARBLE_EXPORT GeoDataPhotoOverlay: public GeoDataOverlay
+class GEODATA_EXPORT GeoDataPhotoOverlay: public GeoDataOverlay
{
public:
GeoDataPhotoOverlay();
diff --git a/src/lib/marble/geodata/data/GeoDataResourceMap.h b/src/lib/marble/geodata/data/GeoDataResourceMap.h
index 99c517f..05f2a68 100644
--- a/src/lib/marble/geodata/data/GeoDataResourceMap.h
+++ b/src/lib/marble/geodata/data/GeoDataResourceMap.h
@@ -21,7 +21,7 @@ class GeoDataResourceMapPrivate;
/**
*/
-class MARBLE_EXPORT GeoDataResourceMap: public GeoNode
+class GEODATA_EXPORT GeoDataResourceMap: public GeoNode
{
public:
GeoDataResourceMap();
diff --git a/src/lib/marble/geodata/data/GeoDataScale.h b/src/lib/marble/geodata/data/GeoDataScale.h
index 63e8495..ef2c7a4 100644
--- a/src/lib/marble/geodata/data/GeoDataScale.h
+++ b/src/lib/marble/geodata/data/GeoDataScale.h
@@ -21,7 +21,7 @@ class GeoDataScalePrivate;
/**
*/
-class MARBLE_EXPORT GeoDataScale: public GeoDataObject
+class GEODATA_EXPORT GeoDataScale: public GeoDataObject
{
public:
GeoDataScale();
diff --git a/src/lib/marble/geodata/data/GeoDataScreenOverlay.h b/src/lib/marble/geodata/data/GeoDataScreenOverlay.h
index c4a7bd8..85e80b6 100644
--- a/src/lib/marble/geodata/data/GeoDataScreenOverlay.h
+++ b/src/lib/marble/geodata/data/GeoDataScreenOverlay.h
@@ -21,7 +21,7 @@ class GeoDataScreenOverlayPrivate;
/**
*/
-class MARBLE_EXPORT GeoDataScreenOverlay: public GeoDataOverlay
+class GEODATA_EXPORT GeoDataScreenOverlay: public GeoDataOverlay
{
public:
GeoDataScreenOverlay();
diff --git a/src/lib/marble/geodata/data/GeoDataUpdate.h b/src/lib/marble/geodata/data/GeoDataUpdate.h
index aa9ede2..55875b0 100644
--- a/src/lib/marble/geodata/data/GeoDataUpdate.h
+++ b/src/lib/marble/geodata/data/GeoDataUpdate.h
@@ -12,7 +12,7 @@
#define GEODATAUPDATE_H
#include "GeoDataObject.h"
-#include "marble_export.h"
+#include "geodata_export.h"
namespace Marble
{
@@ -24,7 +24,7 @@ class GeoDataUpdatePrivate;
/**
*/
-class MARBLE_EXPORT GeoDataUpdate : public GeoDataObject
+class GEODATA_EXPORT GeoDataUpdate : public GeoDataObject
{
public:
GeoDataUpdate();
diff --git a/src/lib/marble/geodata/data/GeoDataVec2.h b/src/lib/marble/geodata/data/GeoDataVec2.h
index dce60e9..6567ca6 100644
--- a/src/lib/marble/geodata/data/GeoDataVec2.h
+++ b/src/lib/marble/geodata/data/GeoDataVec2.h
@@ -12,14 +12,15 @@
#define GEODATAVEC2_H
#include <QPointF>
+#include "geodata_export.h"
-#include "MarbleGlobal.h"
+class QString;
namespace Marble {
class GeoDataVec2Private;
-class MARBLE_EXPORT GeoDataVec2 : public QPointF
+class GEODATA_EXPORT GeoDataVec2 : public QPointF
{
public:
enum Unit {Fraction, Pixels, InsetPixels};
diff --git a/src/lib/marble/geodata/data/GeoDataViewVolume.h b/src/lib/marble/geodata/data/GeoDataViewVolume.h
index a937ba3..e0cd947 100644
--- a/src/lib/marble/geodata/data/GeoDataViewVolume.h
+++ b/src/lib/marble/geodata/data/GeoDataViewVolume.h
@@ -12,7 +12,7 @@
#define GEODATAVIEWVOLUME_H
#include "GeoDataObject.h"
-#include "marble_export.h"
+#include "geodata_export.h"
namespace Marble
{
@@ -21,7 +21,7 @@ class GeoDataViewVolumePrivate;
/**
*/
-class MARBLE_EXPORT GeoDataViewVolume : public GeoDataObject
+class GEODATA_EXPORT GeoDataViewVolume : public GeoDataObject
{
public:
GeoDataViewVolume();