Share common data between b2qt emulator and simulator plugin

Share position information structs between client
and server implementations for simulator plugin.
Required structs exported as private export.

Change-Id: I7c8fb4b93d8cacd6217096e28f770409c8939c29
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

3 files changed, 1 insertions, 228 deletions

diff --git a/src/plugins/position/simulator/qlocationdata_simulator.cpp b/src/plugins/position/simulator/qlocationdata_simulator.cpp
deleted file mode 100644
index b1ab808c..00000000
--- a/src/plugins/position/simulator/qlocationdata_simulator.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtPositioning module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qlocationdata_simulator_p.h"
-
-#include <QtCore/QDataStream>
-
-QT_BEGIN_NAMESPACE
-
-QGeoPositionInfoData::QGeoPositionInfoData()
-    : latitude(0.0),
-      longitude(0.0),
-      altitude(0.0),
-      direction(0.0),
-      groundSpeed(0.0),
-      verticalSpeed(0.0),
-      magneticVariation(0.0),
-      horizontalAccuracy(0.0),
-      verticalAccuracy(0.0),
-      dateTime(),
-      minimumInterval(0),
-      enabled(false) {}
-
-QGeoSatelliteInfoData::SatelliteInfo::SatelliteInfo()
-    : azimuth(0.0),
-      elevation(0.0),
-      signalStrength(0),
-      inUse(false),
-      satelliteSystem(Undefined),
-      satelliteIdentifier(0) {}
-
-void qt_registerLocationTypes()
-{
-    qRegisterMetaTypeStreamOperators<QGeoPositionInfoData>("QGeoPositionInfoData");
-    qRegisterMetaTypeStreamOperators<QGeoSatelliteInfoData>("QGeoSatelliteInfoData");
-    qRegisterMetaTypeStreamOperators<QGeoSatelliteInfoData::SatelliteInfo>("QGeoSatelliteInfoData::SatelliteInfo");
-}
-
-QDataStream &operator<<(QDataStream &out, const QGeoPositionInfoData &s)
-{
-    out << s.latitude << s.longitude << s.altitude;
-    out << s.direction << s.groundSpeed << s.verticalSpeed << s.magneticVariation << s.horizontalAccuracy << s.verticalAccuracy;
-    out << s.dateTime;
-    out << s.minimumInterval << s.enabled;
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QGeoPositionInfoData &s)
-{
-    in >> s.latitude >> s.longitude >> s.altitude;
-    in >> s.direction >> s.groundSpeed >> s.verticalSpeed >> s.magneticVariation >> s.horizontalAccuracy >> s.verticalAccuracy;
-    in >> s.dateTime;
-    in >> s.minimumInterval >> s.enabled;
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QGeoSatelliteInfoData &s)
-{
-    out << s.satellites;
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QGeoSatelliteInfoData &s)
-{
-    in >> s.satellites;
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QGeoSatelliteInfoData::SatelliteInfo &s)
-{
-    out << s.azimuth << s.elevation << s.signalStrength << s.inUse << static_cast<qint32>(s.satelliteSystem) << s.satelliteIdentifier;
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QGeoSatelliteInfoData::SatelliteInfo &s)
-{
-    qint32 satelliteSystem;
-    in >> s.azimuth >> s.elevation >> s.signalStrength >> s.inUse >> satelliteSystem >> s.satelliteIdentifier;
-    s.satelliteSystem = static_cast<QGeoSatelliteInfoData::SatelliteInfo::SatelliteSystem>(satelliteSystem);
-    return in;
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/position/simulator/qlocationdata_simulator_p.h b/src/plugins/position/simulator/qlocationdata_simulator_p.h
deleted file mode 100644
index a847a80f..00000000
--- a/src/plugins/position/simulator/qlocationdata_simulator_p.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtPositioning module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGEOPOSITIONINFODATA_SIMULATOR_P_H
-#define QGEOPOSITIONINFODATA_SIMULATOR_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/QMetaType>
-#include <QtCore/QDateTime>
-#include <QtCore/QList>
-
-QT_BEGIN_NAMESPACE
-
-struct QGeoPositionInfoData
-{
-    QGeoPositionInfoData();
-
-    // Coordinate information
-    double latitude;
-    double longitude;
-    double altitude;
-
-    // Attributes
-    // ### transmit whether attributes are set or not
-    qreal direction;
-    qreal groundSpeed;
-    qreal verticalSpeed;
-    qreal magneticVariation;
-    qreal horizontalAccuracy;
-    qreal verticalAccuracy;
-
-    // DateTime info
-    QDateTime dateTime;
-
-    int minimumInterval;
-    bool enabled;
-};
-
-struct QGeoSatelliteInfoData
-{
-    struct SatelliteInfo
-    {
-        SatelliteInfo();
-
-        // This enum duplicates the SatelliteSystem enum defined in qgeosatelliteinfo.h, which cannot be
-        // included as this file must compile with Qt4 (it is used by Qt Simulator)
-        enum SatelliteSystem
-        {
-            Undefined = 0x00,
-            GPS = 0x01,
-            GLONASS = 0x02
-        };
-
-        qreal azimuth;
-        qreal elevation;
-        int signalStrength;
-        bool inUse;
-        SatelliteSystem satelliteSystem;
-        int satelliteIdentifier;
-    };
-
-    QList<SatelliteInfo> satellites;
-};
-
-void qt_registerLocationTypes();
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QGeoPositionInfoData)
-Q_DECLARE_METATYPE(QGeoSatelliteInfoData)
-Q_DECLARE_METATYPE(QGeoSatelliteInfoData::SatelliteInfo)
-
-#endif // QGEOPOSITIONINFODATA_SIMULATOR_P_H
diff --git a/src/plugins/position/simulator/simulator.pro b/src/plugins/position/simulator/simulator.pro
index f9e2bdb5..dc00ae1a 100644
--- a/src/plugins/position/simulator/simulator.pro
+++ b/src/plugins/position/simulator/simulator.pro
@@ -4,16 +4,15 @@ QT = core network positioning
 PLUGIN_TYPE = position
 PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactorySimulator
 load(qt_plugin)
+INCLUDEPATH += ../../../positioning
 
 QT += simulator
 DEFINES += QT_SIMULATOR
 SOURCES += qgeopositioninfosource_simulator.cpp \
-            qlocationdata_simulator.cpp \
             qgeosatelliteinfosource_simulator.cpp \
             qlocationconnection_simulator.cpp \
     qgeopositioninfosourcefactory_simulator.cpp
 HEADERS += qgeopositioninfosource_simulator_p.h \
-            qlocationdata_simulator_p.h \
             qgeosatelliteinfosource_simulator_p.h \
             qlocationconnection_simulator_p.h \
     qgeopositioninfosourcefactory_simulator.h