hm/gcs-nf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vs 版无法编译通过

Browse Source
This commit is contained in:
hm
2020-02-20 22:45:48 +08:00
parent 5ae0fbc720
commit 779815f080
51 changed files with 523 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opmap/core/accessmode.h
+8 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file accessmode.h
@@ -33,7 +33,14 @@
#include <QMetaEnum>
#include <QStringList>
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT AccessMode : public QObject {
#else
class AccessMode : public QObject {
#endif
Q_OBJECT Q_ENUMS(Types)
public:
enum Types {
opmap/core/alllayersoftype.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file alllayersoftype.h
@@ -32,7 +32,16 @@
#include <QVector>
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT AllLayersOfType {
#else
class AllLayersOfType {
#endif
public:
AllLayersOfType();
QVector<MapType::Types> GetAllLayersOfType(const MapType::Types &type);
opmap/core/cache.h
+8 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file cache.h
@@ -31,7 +31,14 @@
#include "debugheader.h"
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT Cache {
#else
class Cache {
#endif
public:
static Cache *Instance();
opmap/core/cacheitemqueue.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file cacheitemqueue.h
@@ -33,7 +33,15 @@
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT CacheItemQueue {
#else
class CacheItemQueue {
#endif
public:
CacheItemQueue(const MapType::Types &Type, const core::Point &Pos, const QByteArray &Img, const int &Zoom);
CacheItemQueue() {};
opmap/core/core.pro
+17
View File
@@ -1,6 +1,17 @@
TEMPLATE = lib
TARGET = core
DEFINES += OPMAPCORE_LIBRARY
DEFINES += QtOpmapCore
#VS的补丁 使用 自定义的数学常数
DEFINES += _USE_MATH_DEFINES
#目标生成路径
DESTDIR = $$PWD/../../thirdpart/lib
MOC_DIR = $$PWD/../../build
@@ -29,6 +40,8 @@ SOURCES += opmaps.cpp \
kibertilecache.cpp \
diagnostics.cpp
HEADERS += opmaps.h \
coreglobal.h \
mathdefine.h \
size.h \
maptype.h \
pureimagecache.h \
@@ -50,6 +63,10 @@ HEADERS += opmaps.h \
debugheader.h \
diagnostics.h
#hander
INCLUDEPATH += $$PWD/../../thirdpart/include
opmap/core/coreglobal.h
+12
View File
@@ -0,0 +1,12 @@
#ifndef COREGLOBAL_H
#define COREGLOBAL_H
#ifdef QtOpmapCore
#if defined(OPMAPCORE_LIBRARY)
# define OPMAPCORESHARED_EXPORT Q_DECL_EXPORT
#else
# define OPMAPCORESHARED_EXPORT Q_DECL_IMPORT
#endif
#endif
#endif // COREGLOBAL_H
opmap/core/geodecoderstatus.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file geodecoderstatus.h
@@ -32,7 +32,15 @@
#include <QMetaEnum>
#include <QStringList>
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT GeoCoderStatusCode : public QObject {
#else
class GeoCoderStatusCode : public QObject {
#endif
Q_OBJECT Q_ENUMS(Types)
public:
enum Types {
opmap/core/kibertilecache.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file kibertilecache.h
@@ -34,7 +34,15 @@
#include <QDebug>
#include "debugheader.h"
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT KiberTileCache {
#else
class KiberTileCache {
#endif
public:
KiberTileCache();
opmap/core/languagetype.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file languagetype.h
@@ -34,7 +34,15 @@
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT LanguageType : public QObject {
#else
class LanguageType : public QObject {
#endif
Q_OBJECT Q_ENUMS(Types)
public:
enum Types {
opmap/core/maptype.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file maptype.h
@@ -31,7 +31,15 @@
#include <QStringList>
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT MapType : public QObject {
#else
class MapType : public QObject {
#endif
Q_OBJECT Q_ENUMS(Types)
public:
enum Types {
opmap/core/mathdefine.h
+25
View File
@@ -0,0 +1,25 @@
#ifndef MATHDEFINE_H
#define MATHDEFINE_H
#ifdef _USE_MATH_DEFINES
#define M_E 2.71828182845904523536
#define M_LOG2E 1.44269504088896340736
#define M_LOG10E 0.434294481903251827651
#define M_LN2 0.693147180559945309417
#define M_LN10 2.30258509299404568402
#define M_PI 3.14159265358979323846
#define M_PI_2 1.57079632679489661923
#define M_PI_4 0.785398163397448309616
#define M_1_PI 0.318309886183790671538
#define M_2_PI 0.636619772367581343076
#define M_2_SQRTPI 1.12837916709551257390
#define M_SQRT2 1.41421356237309504880
#define M_SQRT1_2 0.707106781186547524401
#endif /* _USE_MATH_DEFINES */
#endif /* END FILE */
opmap/core/memorycache.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file memorycache.h
@@ -35,7 +35,15 @@
#include <QDebug>
#include "debugheader.h"
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT MemoryCache {
#else
class MemoryCache {
#endif
public:
MemoryCache();
opmap/core/opmaps.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file OPMaps.h
@@ -45,7 +45,16 @@
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT OPMaps : public MemoryCache, public AllLayersOfType, public UrlFactory {
#else
class OPMaps : public MemoryCache, public AllLayersOfType, public UrlFactory {
#endif
public: ~OPMaps();
static OPMaps *Instance();
opmap/core/placemark.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file placemark.h
@@ -31,7 +31,15 @@
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT Placemark {
#else
class Placemark {
#endif
public:
Placemark(const QString &address)
{
opmap/core/providerstrings.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file providerstrings.h
@@ -31,7 +31,16 @@
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT ProviderStrings {
#else
class ProviderStrings {
#endif
public:
ProviderStrings();
static const QString levelsForSigPacSpainMap[];
opmap/core/pureimage.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file pureimage.h
@@ -32,7 +32,16 @@
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT PureImageProxy {
#else
class PureImageProxy {
#endif
public:
PureImageProxy();
static QPixmap FromStream(const QByteArray &array);
opmap/core/pureimagecache.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file pureimagecache.h
@@ -43,7 +43,16 @@
#include <QMutex>
#include <QReadWriteLock>
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT PureImageCache {
#else
class PureImageCache {
#endif
public:
PureImageCache();
static bool CreateEmptyDB(const QString &file);
opmap/core/rawtile.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file rawtile.h
@@ -33,7 +33,15 @@
#include <QHash>
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT RawTile {
#else
class RawTile {
#endif
friend uint qHash(RawTile const & tile);
friend bool operator==(RawTile const & lhs, RawTile const & rhs);
opmap/core/tilecachequeue.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file tilecachequeue.h
@@ -39,7 +39,15 @@
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT TileCacheQueue : public QThread {
#else
class TileCacheQueue : public QThread {
#endif
Q_OBJECT
public:
TileCacheQueue();
opmap/core/urlfactory.cpp
+2 -2
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file urlfactory.cpp
@@ -26,7 +26,7 @@
*/
#include "urlfactory.h"
#include <QRegExp>
//#define M_PI 3.14159265358979323846
namespace core {
const double UrlFactory::EarthRadiusKm = 6378.137; // WGS-84
opmap/core/urlfactory.h
+9 -2
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file urlfactory.h
@@ -45,12 +45,19 @@
#include "cmath"
#include "math.h"
#include "mathdefine.h"
//#define M_PI 3.14159265358
namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
class OPMAPCORESHARED_EXPORT UrlFactory : public QObject, public ProviderStrings {
#else
class UrlFactory : public QObject, public ProviderStrings {
#endif
Q_OBJECT
public:
/// <summary>
opmap/internals/core.h
+8 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file core.h
@@ -63,7 +63,14 @@ class MapGraphicItem;
}
namespace internals {
#ifdef QtOpmapInternals
#include <internalglobal.h>
class OPMAPINTERNALSHARED_EXPORT Core : public QObject, public QRunnable {
#else
class Core : public QObject, public QRunnable {
#endif
Q_OBJECT
friend class mapcontrol::OPMapControl;
opmap/internals/internalglobal.h
+14
View File
@@ -0,0 +1,14 @@
#ifndef INTERNALGLOBAL_H
#define INTERNALGLOBAL_H
#ifdef QtOpmapInternals
#if defined(OPMAPINTERNALS_LIBRARY)
# define OPMAPINTERNALSHARED_EXPORT Q_DECL_EXPORT
#else
# define OPMAPINTERNALSHARED_EXPORT Q_DECL_IMPORT
#endif
#endif
#endif // INTERNALGLOBAL_H
opmap/internals/internals.pro
+11
View File
@@ -1,6 +1,15 @@
TEMPLATE = lib
TARGET = internals
DEFINES += OPMAPINTERNALS_LIBRARY
DEFINES += QtOpmapInternals
#VS的补丁 使用 自定义的数学常数
DEFINES += _USE_MATH_DEFINES
#目标生成路径
DESTDIR = $$PWD/../../thirdpart/lib
MOC_DIR = $$PWD/../../build
@@ -12,6 +21,8 @@ CONFIG += staticlib\
plugin
HEADERS += core.h \
internalglobal.h \
mathdefine.h \
mousewheelzoomtype.h \
rectangle.h \
tile.h \
opmap/internals/mathdefine.h
+25
View File
@@ -0,0 +1,25 @@
#ifndef MATHDEFINE_H
#define MATHDEFINE_H
#ifdef _USE_MATH_DEFINES
#define M_E 2.71828182845904523536
#define M_LOG2E 1.44269504088896340736
#define M_LOG10E 0.434294481903251827651
#define M_LN2 0.693147180559945309417
#define M_LN10 2.30258509299404568402
#define M_PI 3.14159265358979323846
#define M_PI_2 1.57079632679489661923
#define M_PI_4 0.785398163397448309616
#define M_1_PI 0.318309886183790671538
#define M_2_PI 0.636619772367581343076
#define M_2_SQRTPI 1.12837916709551257390
#define M_SQRT2 1.41421356237309504880
#define M_SQRT1_2 0.707106781186547524401
#endif /* _USE_MATH_DEFINES */
#endif /* END FILE */
opmap/internals/mousewheelzoomtype.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file mousewheelzoomtype.h
@@ -32,7 +32,15 @@
#include <QMetaObject>
#include <QMetaEnum>
namespace internals {
#ifdef QtOpmapInternals
#include <internalglobal.h>
class OPMAPINTERNALSHARED_EXPORT MouseWheelZoomType : public QObject {
#else
class MouseWheelZoomType : public QObject {
#endif
Q_OBJECT Q_ENUMS(Types)
public:
enum Types {
opmap/internals/projections/lks94projection.h
+11 -2
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file lks94projection.h
@@ -29,11 +29,20 @@
#include <QVector>
#include "cmath"
#include "../pureprojection.h"
#include "mathdefine.h"
//#define M_PI 3.14159265358979323846
namespace projections {
#ifdef QtOpmapInternals
#include <internalglobal.h>
class OPMAPINTERNALSHARED_EXPORT LKS94Projection : public internals::PureProjection {
#else
class LKS94Projection : public internals::PureProjection {
#endif
public:
LKS94Projection();
double GetTileMatrixResolution(int const & zoom);
opmap/internals/projections/mercatorprojection.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file mercatorprojection.h
@@ -30,7 +30,15 @@
namespace projections {
#ifdef QtOpmapInternals
#include <internalglobal.h>
class OPMAPINTERNALSHARED_EXPORT MercatorProjection : public internals::PureProjection {
#else
class MercatorProjection : public internals::PureProjection {
#endif
public:
MercatorProjection();
virtual QString Type()
opmap/internals/projections/mercatorprojectionyandex.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file mercatorprojectionyandex.h
@@ -31,7 +31,16 @@
namespace projections {
#ifdef QtOpmapInternals
#include <internalglobal.h>
class OPMAPINTERNALSHARED_EXPORT MercatorProjectionYandex : public internals::PureProjection {
#else
class MercatorProjectionYandex : public internals::PureProjection {
#endif
public:
MercatorProjectionYandex();
virtual QString Type()
opmap/internals/projections/platecarreeprojection.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file platecarreeprojection.h
@@ -31,7 +31,16 @@
namespace projections {
#ifdef QtOpmapInternals
#include <internalglobal.h>
class OPMAPINTERNALSHARED_EXPORT PlateCarreeProjection : public internals::PureProjection {
#else
class PlateCarreeProjection : public internals::PureProjection {
#endif
public:
PlateCarreeProjection();
virtual QString Type()
opmap/internals/projections/platecarreeprojectionpergo.h
+11 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file platecarreeprojectionpergo.h
@@ -31,7 +31,17 @@
namespace projections {
#ifdef QtOpmapInternals
#include <internalglobal.h>
class OPMAPINTERNALSHARED_EXPORT PlateCarreeProjectionPergo : public internals::PureProjection {
#else
class PlateCarreeProjectionPergo : public internals::PureProjection {
#endif
public:
PlateCarreeProjectionPergo();
virtual QString Type()
opmap/internals/pureprojection.h
+12 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file pureprojection.h
@@ -34,10 +34,21 @@
#include "cmath"
#include "rectlatlng.h"
#include <QDebug>
#include "mathdefine.h"
using namespace core;
namespace internals {
#ifdef QtOpmapInternals
#include <internalglobal.h>
class OPMAPINTERNALSHARED_EXPORT PureProjection {
#else
class PureProjection {
#endif
public:
virtual Size TileSize() const = 0;
opmap/internals/tile.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file tile.h
@@ -35,7 +35,15 @@
#include "debugheader.h"
using namespace core;
namespace internals {
#ifdef QtOpmapInternals
#include <internalglobal.h>
class OPMAPINTERNALSHARED_EXPORT Tile {
#else
class Tile {
#endif
public:
Tile(int zoom, core::Point pos);
Tile();
opmap/internals/tilematrix.h
+8 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file tilematrix.h
@@ -34,7 +34,14 @@
#include "debugheader.h"
#include <QBuffer>
namespace internals {
#ifdef QtOpmapInternals
#include <internalglobal.h>
class OPMAPINTERNALSHARED_EXPORT TileMatrix {
#else
class TileMatrix {
#endif
public:
TileMatrix();
void Clear();
opmap/mapwidget/configuration.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file configuration.h
@@ -41,7 +41,15 @@ namespace mapcontrol {
*
* @class Configuration configuration.h "configuration.h"
*/
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT Configuration {
#else
class Configuration {
#endif
public:
Configuration();
/**
opmap/mapwidget/gpsitem.h
+8 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file gpsitem.h
@@ -48,7 +48,14 @@ class OPMapWidget;
*
* @class UAVItem gpsitem.h "mapwidget/gpsitem.h"
*/
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT GPSItem : public QObject, public QGraphicsItem {
#else
class GPSItem : public QObject, public QGraphicsItem {
#endif
Q_OBJECT Q_INTERFACES(QGraphicsItem)
public:
enum { Type = UserType + 6 };
opmap/mapwidget/homeitem.h
+8 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file homeitem.h
@@ -34,7 +34,14 @@
#include <QObject>
#include "opmapwidget.h"
namespace mapcontrol {
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT HomeItem : public QObject, public QGraphicsItem {
#else
class HomeItem : public QObject, public QGraphicsItem {
#endif
Q_OBJECT Q_INTERFACES(QGraphicsItem)
public:
enum { Type = UserType + 4 };
opmap/mapwidget/mapripform.h
+7 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file mapripform.h
@@ -33,7 +33,13 @@ namespace Ui {
class MapRipForm;
}
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT MapRipForm : public QWidget {
#else
class MapRipForm : public QWidget {
#endif
Q_OBJECT
public:
opmap/mapwidget/mapripper.h
+8 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file mapripper.h
@@ -33,7 +33,14 @@
#include <QObject>
#include <QMessageBox>
namespace mapcontrol {
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT MapRipper : public QThread {
#else
class MapRipper : public QThread {
#endif
Q_OBJECT
public:
MapRipper(internals::Core *, internals::RectLatLng const &);
opmap/mapwidget/mapwidget.pro
+9 -1
View File
@@ -7,8 +7,15 @@ QT += svg
TEMPLATE = lib
TARGET = opmapwidget
DEFINES += OPMAPWIDGET_LIBRARY
DEFINES += QtopmapWidget
#VS的补丁 使用 自定义的数学常数
DEFINES += _USE_MATH_DEFINES
#目标生成路径
DESTDIR = $$PWD/../../thirdpart/lib
MOC_DIR = $$PWD/../../build
@@ -49,7 +56,8 @@ HEADERS += $$PWD/mapgraphicitem.h \
$$PWD/mapripper.h \
$$PWD/traillineitem.h \
$$PWD/waypointline.h \
$$PWD/waypointcircle.h
$$PWD/waypointcircle.h \
mapwidgetglobal.h
RESOURCES += mapresources.qrc
opmap/mapwidget/mapwidgetglobal.h
+16
View File
@@ -0,0 +1,16 @@
#ifndef MAPWIDGETGLOBAL_H
#define MAPWIDGETGLOBAL_H
#include <QtCore/qglobal.h>
#ifdef QtopmapWidget
#if defined(OPMAPWIDGET_LIBRARY)
# define OPMAPWIDGETSHARED_EXPORT Q_DECL_EXPORT
#else
# define OPMAPWIDGETSHARED_EXPORT Q_DECL_IMPORT
#endif
#endif
#endif // MAPWIDGETGLOLAB_H
opmap/mapwidget/opmapwidget.h
+19 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file opmapwidget.h
@@ -46,16 +46,34 @@
#include "waypointcircle.h"
#include "waypointitem.h"
namespace mapcontrol {
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT UAVItem;
class OPMAPWIDGETSHARED_EXPORT GPSItem;
class OPMAPWIDGETSHARED_EXPORT HomeItem;
#else
class UAVItem;
class GPSItem;
class HomeItem;
#endif
/**
* @brief Collection of static functions to help dealing with various enums used
* Contains functions for enumToString conversio, StringToEnum, QStringList of enum values...
*
* @class Helper opmapwidget.h "opmapwidget.h"
*/
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT Helper {
#else
class Helper {
#endif
public:
/**
* @brief Converts from String to Type
opmap/mapwidget/trailitem.h
+9 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file trailitem.h
@@ -35,7 +35,15 @@
#include "mapgraphicitem.h"
namespace mapcontrol {
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT TrailItem : public QObject, public QGraphicsItem {
#else
class TrailItem : public QObject, public QGraphicsItem {
#endif
Q_OBJECT Q_INTERFACES(QGraphicsItem)
public:
enum { Type = UserType + 3 };
opmap/mapwidget/traillineitem.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file traillineitem.h
@@ -35,7 +35,16 @@
#include "mapgraphicitem.h"
namespace mapcontrol {
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT TrailLineItem : public QObject, public QGraphicsLineItem {
#else
class TrailLineItem : public QObject, public QGraphicsLineItem {
#endif
Q_OBJECT Q_INTERFACES(QGraphicsItem)
public:
enum { Type = UserType + 7 };
opmap/mapwidget/uavitem.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file uavitem.h
@@ -48,7 +48,16 @@ class OPMapWidget;
*
* @class UAVItem uavitem.h "mapwidget/uavitem.h"
*/
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT UAVItem : public QObject, public QGraphicsItem {
#else
class UAVItem : public QObject, public QGraphicsItem {
#endif
Q_OBJECT Q_INTERFACES(QGraphicsItem)
public:
enum { Type = UserType + 2 };
opmap/mapwidget/uavmapfollowtype.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file uavmapfollowtype.h
@@ -32,7 +32,16 @@
#include <QMetaEnum>
#include <QStringList>
namespace mapcontrol {
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT UAVMapFollowType : public QObject {
#else
class UAVMapFollowType : public QObject {
#endif
Q_OBJECT Q_ENUMS(Types)
public:
enum Types {
opmap/mapwidget/uavtrailtype.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file uavtrailtype.h
@@ -32,7 +32,16 @@
#include <QMetaEnum>
#include <QStringList>
namespace mapcontrol {
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT UAVTrailType : public QObject {
#else
class UAVTrailType : public QObject {
#endif
Q_OBJECT Q_ENUMS(Types)
public:
enum Types {
opmap/mapwidget/waypointcircle.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file waypointcircle.h
@@ -36,7 +36,16 @@
#include <QPoint>
namespace mapcontrol {
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT WayPointCircle : public QObject, public QGraphicsEllipseItem {
#else
class WayPointCircle : public QObject, public QGraphicsEllipseItem {
#endif
Q_OBJECT Q_INTERFACES(QGraphicsItem)
public:
enum { Type = UserType + 9 };
opmap/mapwidget/waypointitem.h
+8 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file waypointitem.h
@@ -55,7 +55,14 @@ class HomeItem;
*
* @class WayPointItem waypointitem.h "waypointitem.h"
*/
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT WayPointItem : public QObject, public QGraphicsItem {
#else
class WayPointItem : public QObject, public QGraphicsItem {
#endif
Q_OBJECT Q_INTERFACES(QGraphicsItem)
public:
enum { Type = UserType + 1 };
opmap/mapwidget/waypointline.h
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file waypointline.h
@@ -36,7 +36,16 @@
#include <QPoint>
namespace mapcontrol {
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT WayPointLine : public QObject, public QGraphicsLineItem {
#else
class WayPointLine : public QObject, public QGraphicsLineItem {
#endif
Q_OBJECT Q_INTERFACES(QGraphicsItem)
public:
enum { Type = UserType + 8 };
opmap/opmap.pro
+3
View File
@@ -3,6 +3,9 @@
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += core