From 6fec158534ce871e1f0f7506612a51255ad8da27 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Wed, 4 Apr 2018 10:22:24 +0200 Subject: [PATCH] [xswiftbus] Move CAircraftModel into its own file --- src/xswiftbus/aircraftmodel.h | 89 +++++++++++++++++++++++++++++++++++ src/xswiftbus/service.h | 68 +------------------------- 2 files changed, 90 insertions(+), 67 deletions(-) create mode 100644 src/xswiftbus/aircraftmodel.h diff --git a/src/xswiftbus/aircraftmodel.h b/src/xswiftbus/aircraftmodel.h new file mode 100644 index 000000000..a9a2bbe5f --- /dev/null +++ b/src/xswiftbus/aircraftmodel.h @@ -0,0 +1,89 @@ +/* Copyright (C) 2018 + * swift Project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, + * including this file, may be copied, modified, propagated, or distributed except according to the terms + * contained in the LICENSE file. + */ + +//! \file + +#ifndef BLACKSIM_XSWIFTBUS_AIRCRAFTMODEL_H +#define BLACKSIM_XSWIFTBUS_AIRCRAFTMODEL_H + +#include + +namespace XSwiftBus +{ + + //! Simplified implementation of \sa BlackMisc::Simulation::CDistributor + class CDistributor + { + public: + //! Default constructor + CDistributor() = default; + + //! Constructor + CDistributor(const std::string &description) : m_description(description) {} + + //! \copydoc BlackMisc::Simulation::CDistributor::hasDescription + bool hasDescription() const { return !m_description.empty(); } + + //! \copydoc BlackMisc::Simulation::CDistributor::getDescription + std::string getDescription() const { return m_description; } + + private: + std::string m_description; + }; + + //! Simplified implementation of \sa BlackMisc::Simulation::CAircraftModel + class CAircraftModel + { + public: + CAircraftModel() = default; + + //! \copydoc BlackMisc::Simulation::CAircraftModel::hasDescription + bool hasDescription() const { return !m_description.empty(); } + + //! \copydoc BlackMisc::Simulation::CAircraftModel::hasAircraftDesignator + bool hasAircraftDesignator() const { return !m_icao.empty(); } + + //! \copydoc BlackMisc::Simulation::CAircraftModel::getName + std::string getName() const { return m_name; } + + //! \copydoc BlackMisc::Simulation::CAircraftModel::getDistributor + CDistributor getDistributor() const { return m_distributor; } + + //! \copydoc BlackMisc::Simulation::CAircraftModel::getAircraftIcaoCodeDesignator + std::string getAircraftIcaoCodeDesignator() const { return m_icao; } + + //! \copydoc BlackMisc::Simulation::CAircraftModel::getModelString + std::string getModelString() const { return m_modelString; } + + //! \copydoc BlackMisc::Simulation::CAircraftModel::setAircraftIcaoCode + void setAircraftIcaoCode(const std::string &icao) { m_icao = icao; } + + //! \copydoc BlackMisc::Simulation::CAircraftModel::setDescription + void setDescription(const std::string &description) { m_description = description; } + + //! \copydoc BlackMisc::Simulation::CAircraftModel::setName + void setName(const std::string &name) { m_name = name; } + + //! \copydoc BlackMisc::Simulation::CAircraftModel::setDistributor + void setDistributor(const CDistributor &distributor) { m_distributor = distributor; } + + //! \copydoc BlackMisc::Simulation::CAircraftModel::setModelString + void setModelString(const std::string &modelString) { m_modelString = modelString; } + + private: + std::string m_name; + std::string m_icao; + std::string m_description; + CDistributor m_distributor; + std::string m_modelString; + }; + +} + +#endif // guard diff --git a/src/xswiftbus/service.h b/src/xswiftbus/service.h index ebcb36d2c..09b0f7ec3 100644 --- a/src/xswiftbus/service.h +++ b/src/xswiftbus/service.h @@ -20,6 +20,7 @@ #include "datarefs.h" #include "messages.h" #include "navdatareference.h" +#include "aircraftmodel.h" #include #include @@ -31,73 +32,6 @@ namespace XSwiftBus { - //! Simplified implementation of \sa BlackMisc::Simulation::CDistributor - class CDistributor - { - public: - //! Default constructor - CDistributor() = default; - - //! Constructor - CDistributor(const std::string &description) : m_description(description) {} - - //! \copydoc BlackMisc::Simulation::CDistributor::hasDescription - bool hasDescription() const { return !m_description.empty(); } - - //! \copydoc BlackMisc::Simulation::CDistributor::getDescription - std::string getDescription() const { return m_description; } - - private: - std::string m_description; - }; - - //! Simplified implementation of \sa BlackMisc::Simulation::CAircraftModel - class CAircraftModel - { - public: - CAircraftModel() = default; - - //! \copydoc BlackMisc::Simulation::CAircraftModel::hasDescription - bool hasDescription() const { return !m_description.empty(); } - - //! \copydoc BlackMisc::Simulation::CAircraftModel::hasAircraftDesignator - bool hasAircraftDesignator() const { return !m_icao.empty(); } - - //! \copydoc BlackMisc::Simulation::CAircraftModel::getName - std::string getName() const { return m_name; } - - //! \copydoc BlackMisc::Simulation::CAircraftModel::getDistributor - CDistributor getDistributor() const { return m_distributor; } - - //! \copydoc BlackMisc::Simulation::CAircraftModel::getAircraftIcaoCodeDesignator - std::string getAircraftIcaoCodeDesignator() const { return m_icao; } - - //! \copydoc BlackMisc::Simulation::CAircraftModel::getModelString - std::string getModelString() const { return m_modelString; } - - //! \copydoc BlackMisc::Simulation::CAircraftModel::setAircraftIcaoCode - void setAircraftIcaoCode(const std::string &icao) { m_icao = icao; } - - //! \copydoc BlackMisc::Simulation::CAircraftModel::setDescription - void setDescription(const std::string &description) { m_description = description; } - - //! \copydoc BlackMisc::Simulation::CAircraftModel::setName - void setName(const std::string &name) { m_name = name; } - - //! \copydoc BlackMisc::Simulation::CAircraftModel::setDistributor - void setDistributor(const CDistributor &distributor) { m_distributor = distributor; } - - //! \copydoc BlackMisc::Simulation::CAircraftModel::setModelString - void setModelString(const std::string &modelString) { m_modelString = modelString; } - - private: - std::string m_name; - std::string m_icao; - std::string m_description; - CDistributor m_distributor; - std::string m_modelString; - }; - /*! * XSwiftBus service object which is accessible through DBus */