refs #396, move subproject BlackSim into BlackMisc::Simulation

* removed unused samples / tests
* fixed found Doxygen issues
* removed blacksimfreefunctions, now in BlackMisc::Simulation::registerMetadata()
* samples_vetcor_geo to samples_geo

src/blackcore/airspace_monitor.h

@@ -13,8 +13,8 @@
 #define BLACKCORE_AIRSPACE_MONITOR_H
 
 #include "blackmisc/simulation/simulatedaircraftlist.h"
-#include "blackmisc/simulation/simdirectaccessownaircraft.h"
-#include "blackmisc/simulation/simdirectaccessremoteaircraft.h"
+#include "blackmisc/simulation/ownaircraftprovider.h"
+#include "blackmisc/simulation/remoteaircraftprovider.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
 #include "blackmisc/nwclientlist.h"

src/blackcore/blackcore.pro

@@ -8,7 +8,7 @@ QT       += network dbus xml multimedia
 TARGET = blackcore
 TEMPLATE = lib
 CONFIG += staticlib
-CONFIG += blackmisc blackinput blacksim
+CONFIG += blackmisc blackinput
 
 INCLUDEPATH += ..
 DEPENDPATH += . ..
@@ -25,8 +25,8 @@ DEFINES += LOG_IN_FILE
 HEADERS += *.h
 SOURCES += *.cpp
 
-win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib ../../lib/blacksound.lib ../../lib/blacksim.lib
-else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a ../../lib/libblacksound.a ../../lib/libblacksim.a
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib ../../lib/blacksound.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a ../../lib/libblacksound.a
 
 DESTDIR = ../../lib
 

src/blackcore/context_network_impl.cpp

@@ -21,7 +21,7 @@
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/simplecommandparser.h"
-#include "blackmisc/simulation/simdirectaccessownaircraft.h"
+#include "blackmisc/simulation/ownaircraftprovider.h"
 
 #include <QtXml/QDomElement>
 #include <QNetworkReply>
@@ -33,7 +33,6 @@ using namespace BlackMisc::Network;
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::Audio;
 using namespace BlackMisc::Simulation;
-using namespace BlackSim;
 
 namespace BlackCore
 {

src/blackcore/context_network_impl.h

@@ -15,7 +15,7 @@
 #include "blackcore/context_network.h"
 #include "blackcore/context_settings.h"
 #include "blackcore/context_runtime.h"
-#include "blackmisc/simulation/simdirectaccessremoteaircraft.h"
+#include "blackmisc/simulation/remoteaircraftprovider.h"
 #include "blackcore/dbus_server.h"
 #include "blackcore/network.h"
 #include "blackcore/airspace_monitor.h"

src/blackcore/context_ownaircraft_impl.h

@@ -17,7 +17,7 @@
 #include "blackcore/context_runtime.h"
 #include "blackcore/dbus_server.h"
 #include "blackmisc/aviation/atcstation.h"
-#include "blackmisc/simulation/simdirectaccessownaircraft.h"
+#include "blackmisc/simulation/ownaircraftprovider.h"
 
 namespace BlackCore
 {

src/blackcore/context_runtime.cpp

@@ -11,7 +11,6 @@
 #include "blackcore/context_all_proxies.h"
 #include "blackcore/context_all_empties.h"
 #include "blackcore/blackcorefreefunctions.h"
-#include "blacksim/blacksimfreefunctions.h"
 #include "blackmisc/nwserver.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/aviation/aircraft.h"
@@ -133,7 +132,7 @@ namespace BlackCore
     {
         BlackMisc::registerMetadata();
         BlackMisc::initResources();
-        BlackSim::registerMetadata();
+        BlackMisc::Simulation::registerMetadata();
         BlackCore::registerMetadata();
     }
 

src/blackcore/context_runtime.h

@@ -14,7 +14,7 @@
 
 #include "blackcore/context_runtime_config.h"
 #include "blackmisc/statusmessagelist.h"
-#include "blackmisc/simulation/simdirectaccessownaircraft.h"
+#include "blackmisc/simulation/ownaircraftprovider.h"
 
 #include <QDBusConnection>
 #include <QObject>

src/blackcore/context_settings.h

@@ -136,7 +136,7 @@ namespace BlackCore
         virtual BlackMisc::Settings::CSettingsAudio getAudioSettings() const = 0;
 
         //! Audio settings
-        virtual BlackSim::Settings::CSettingsSimulator getSimulatorSettings() const = 0;
+        virtual BlackMisc::Simulation::Settings::CSettingsSimulator getSimulatorSettings() const = 0;
 
         //! Hotkeys
         virtual BlackMisc::Settings::CSettingKeyboardHotkeyList getHotkeys() const = 0;

src/blackcore/context_settings_impl.cpp

@@ -16,7 +16,7 @@ using namespace BlackMisc;
 using namespace BlackMisc::Settings;
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Hardware;
-using namespace BlackSim::Settings;
+using namespace BlackMisc::Simulation::Settings;
 
 namespace BlackCore
 {

src/blackcore/context_settings_impl.h

@@ -60,7 +60,7 @@ namespace BlackCore
         virtual BlackMisc::Settings::CSettingsAudio getAudioSettings() const override;
 
         //! \copydoc IContextSettings::getSimulatorSettings()
-        virtual BlackSim::Settings::CSettingsSimulator getSimulatorSettings() const override;
+        virtual BlackMisc::Simulation::Settings::CSettingsSimulator getSimulatorSettings() const override;
 
         //! \copydoc IContextSettings::getHotkeys()
         virtual BlackMisc::Settings::CSettingKeyboardHotkeyList getHotkeys() const override;
@@ -86,7 +86,7 @@ namespace BlackCore
 
         BlackMisc::Settings::CSettingsNetwork m_settingsNetwork;
         BlackMisc::Settings::CSettingsAudio m_settingsAudio;
-        BlackSim::Settings::CSettingsSimulator m_settingsSimulator;
+        BlackMisc::Simulation::Settings::CSettingsSimulator m_settingsSimulator;
         BlackMisc::Settings::CSettingKeyboardHotkeyList m_hotkeys;
         QJsonDocument toJsonDocument() const;
         void emitCompletelyChanged();

src/blackcore/context_settings_proxy.cpp

@@ -15,7 +15,7 @@ using namespace BlackMisc;
 using namespace BlackMisc::Settings;
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Hardware;
-using namespace BlackSim::Settings;
+using namespace BlackMisc::Simulation::Settings;
 
 namespace BlackCore
 {

src/blackcore/context_settings_proxy.h

@@ -50,7 +50,7 @@ namespace BlackCore
         virtual BlackMisc::Settings::CSettingsAudio getAudioSettings() const override;
 
         //! \copydoc IContextSettings::getSimulatorSettings()
-        virtual BlackSim::Settings::CSettingsSimulator getSimulatorSettings() const override;
+        virtual BlackMisc::Simulation::Settings::CSettingsSimulator getSimulatorSettings() const override;
 
         //! \copydoc IContextSettings::getHotkeys()
         virtual BlackMisc::Settings::CSettingKeyboardHotkeyList getHotkeys() const override;

src/blackcore/context_simulator.h

@@ -27,8 +27,8 @@
 #include "blackcore/dbus_server.h"
 #include "blackcore/context_runtime.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
-#include "blacksim/simulatorplugininfo.h"
-#include "blacksim/simulatorinfolist.h"
+#include "blackmisc/simulation/simulatorplugininfo.h"
+#include "blackmisc/simulation/simulatorinfolist.h"
 #include "blackmisc/aviation/aircraft.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackmisc/aviation/airportlist.h"
@@ -83,7 +83,7 @@ namespace BlackCore
 
     public slots:
         //! Return list of available simulator plugins
-        virtual BlackSim::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const = 0;
+        virtual BlackMisc::Simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const = 0;
 
         //! Returns true when simulator is connected
         //! \sa isSimulating
@@ -100,7 +100,7 @@ namespace BlackCore
         virtual bool isSimulating() const = 0;
 
         //! Simulator info
-        virtual BlackSim::CSimulatorPluginInfo getSimulatorInfo() const = 0;
+        virtual BlackMisc::Simulation::CSimulatorPluginInfo getSimulatorInfo() const = 0;
 
         //! Airports in range
         virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const = 0;
@@ -155,13 +155,13 @@ namespace BlackCore
         virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const = 0;
 
         //! Load specific simulator plugin
-        virtual bool loadSimulatorPlugin(const BlackSim::CSimulatorPluginInfo &simulatorInfo) = 0;
+        virtual bool loadSimulatorPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo) = 0;
 
         //! Load specific simulator plugin as set in settings
         virtual bool loadSimulatorPluginFromSettings() = 0;
         
         //! Listen for the specific simulator to start, load plugin automatically
-        virtual void listenForSimulator(const BlackSim::CSimulatorPluginInfo &simulatorInfo) = 0;
+        virtual void listenForSimulator(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo) = 0;
         
         //! Listen for all available simulators
         virtual void listenForAllSimulators() = 0;

src/blackcore/context_simulator_impl.cpp

@@ -26,8 +26,8 @@ using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Simulation;
 using namespace BlackMisc::Geo;
-using namespace BlackSim;
-using namespace BlackSim::Settings;
+using namespace BlackMisc::Simulation;
+using namespace BlackMisc::Simulation::Settings;
 
 namespace BlackCore
 {
@@ -122,12 +122,12 @@ namespace BlackCore
         return m_simulator->simulator->disconnectFrom();
     }
 
-    BlackSim::CSimulatorPluginInfo CContextSimulator::getSimulatorInfo() const
+    BlackMisc::Simulation::CSimulatorPluginInfo CContextSimulator::getSimulatorInfo() const
     {
         if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
         if (!m_simulator)
         {
-            return BlackSim::CSimulatorPluginInfo();
+            return BlackMisc::Simulation::CSimulatorPluginInfo();
         }
 
         Q_ASSERT(m_simulator->simulator);

src/blackcore/context_simulator_impl.h

@@ -15,8 +15,8 @@
 #include "blackcore/context_simulator.h"
 #include "blackcore/simulator.h"
 #include "blackmisc/worker.h"
-#include "blacksim/simulatorplugininfo.h"
-#include "blacksim/simulatorinfolist.h"
+#include "blackmisc/simulation/simulatorplugininfo.h"
+#include "blackmisc/simulation/simulatorinfolist.h"
 #include "blackmisc/nwtextmessagelist.h"
 #include "blackmisc/pixmap.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
@@ -43,12 +43,12 @@ namespace BlackCore
         //! Lazy-loads the driver, instantiates the factory and returns it.
         //! \return nullptr if no corresponding driver was found or an error occured during loading it.
         //! \todo Consider moving to private scope.
-        ISimulatorFactory* getSimulatorFactory(const BlackSim::CSimulatorPluginInfo& simulator);
+        ISimulatorFactory* getSimulatorFactory(const BlackMisc::Simulation::CSimulatorPluginInfo& simulator);
 
     public slots:
 
         //! \copydoc IContextSimulator::getSimulatorPluginList()
-        virtual BlackSim::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override;
+        virtual BlackMisc::Simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override;
 
         //! \copydoc IContextSimulator::isConnected()
         virtual bool isConnected() const override;
@@ -66,7 +66,7 @@ namespace BlackCore
         virtual bool isSimulating() const override;
 
         //! \copydoc IContextSimulator::getSimulatorInfo()
-        virtual BlackSim::CSimulatorPluginInfo getSimulatorInfo() const override;
+        virtual BlackMisc::Simulation::CSimulatorPluginInfo getSimulatorInfo() const override;
 
         //! \copydoc IContextSimulator::getAirportsInRange
         virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const override;
@@ -120,13 +120,13 @@ namespace BlackCore
         virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override;
 
         //! \copydoc IContextSimulator::loadSimulatorPlugin()
-        virtual bool loadSimulatorPlugin(const BlackSim::CSimulatorPluginInfo &simulatorInfo) override;
+        virtual bool loadSimulatorPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo) override;
 
         //! \copydoc IContextSimulator::loadSimulatorPluginFromSettings()
         virtual bool loadSimulatorPluginFromSettings() override;
         
         //! \copydoc IContextSimulator::listenForSimulator()
-        virtual void listenForSimulator(const BlackSim::CSimulatorPluginInfo &simulatorInfo) override;
+        virtual void listenForSimulator(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo) override;
         
         //! \copydoc IContextSimulator::listenForAllSimulators()
         virtual void listenForAllSimulators() override;
@@ -200,13 +200,13 @@ namespace BlackCore
         struct PluginData;
         
         //! \brief Locate PluginData (linear search)
-        PluginData* findPlugin(const BlackSim::CSimulatorPluginInfo &info);
+        PluginData* findPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &info);
         
         /*!
          * A simple struct containing all info about the plugin.
          */
         struct PluginData {
-            BlackSim::CSimulatorPluginInfo info;
+            BlackMisc::Simulation::CSimulatorPluginInfo info;
             ISimulatorFactory *factory; //!< Lazy-loaded, nullptr by default
             ISimulatorListener *listener; //!< Listener instance, nullptr by default
             ISimulator *simulator; //!< The simulator itself (always nullptr unless it is the currently working one)

src/blackcore/context_simulator_proxy.cpp

@@ -18,7 +18,7 @@ using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::Simulation;
-using namespace BlackSim;
+using namespace BlackMisc::Simulation;
 
 namespace BlackCore
 {
@@ -104,9 +104,9 @@ namespace BlackCore
         return m_dBusInterface->callDBusRet<CAircraftIcao>(QLatin1Literal("getIcaoForModelString"), modelString);
     }
 
-    BlackSim::CSimulatorPluginInfo CContextSimulatorProxy::getSimulatorInfo() const
+    BlackMisc::Simulation::CSimulatorPluginInfo CContextSimulatorProxy::getSimulatorInfo() const
     {
-        return m_dBusInterface->callDBusRet<BlackSim::CSimulatorPluginInfo>(QLatin1Literal("getSimulatorInfo"));
+        return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatorPluginInfo>(QLatin1Literal("getSimulatorInfo"));
     }
 
     bool CContextSimulatorProxy::setTimeSynchronization(bool enable, CTime offset)
@@ -164,7 +164,7 @@ namespace BlackCore
         return m_dBusInterface->callDBusRet<BlackMisc::PhysicalQuantities::CTime>(QLatin1Literal("getTimeSynchronizationOffset"));
     }
 
-    bool CContextSimulatorProxy::loadSimulatorPlugin(const BlackSim::CSimulatorPluginInfo &simulatorInfo)
+    bool CContextSimulatorProxy::loadSimulatorPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo)
     {
         return m_dBusInterface->callDBusRet<bool>(QLatin1Literal("loadSimulatorPlugin"), simulatorInfo);
     }

src/blackcore/context_simulator_proxy.h

@@ -45,7 +45,7 @@ namespace BlackCore
     public slots:
 
         //! \copydoc IContextSimulator::getSimulatorPluginList()
-        virtual BlackSim::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override;
+        virtual BlackMisc::Simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override;
 
         //! \copydoc IContextSimulator::isConnected()
         virtual bool isConnected() const override;
@@ -81,7 +81,7 @@ namespace BlackCore
         virtual BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const override;
 
         //! \copydoc IContextSimulator::getSimulatorInfo
-        virtual BlackSim::CSimulatorPluginInfo getSimulatorInfo() const override;
+        virtual BlackMisc::Simulation::CSimulatorPluginInfo getSimulatorInfo() const override;
 
         //! \copydoc IContextSimulator::setTimeSynchronization
         virtual bool setTimeSynchronization(bool enable, BlackMisc::PhysicalQuantities::CTime offset) override;
@@ -117,13 +117,13 @@ namespace BlackCore
         virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override;
 
         //! \copydoc IContextSimulator::loadSimulatorPlugin
-        virtual bool loadSimulatorPlugin(const BlackSim::CSimulatorPluginInfo &simulatorInfo) override;
+        virtual bool loadSimulatorPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo) override;
 
         //! \copydoc IContextSimulator::loadSimulatorPluginFromSettings()
         virtual bool loadSimulatorPluginFromSettings();
         
         //! \copydoc IContextSimulator::listenForSimulator()
-        virtual void listenForSimulator(const BlackSim::CSimulatorPluginInfo &simulatorInfo) override;
+        virtual void listenForSimulator(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo) override;
         
         //! \copydoc IContextSimulator::listenForAllSimulators()
         virtual void listenForAllSimulators() override;

src/blackcore/interpolator.h

@@ -13,7 +13,7 @@
 #define BLACKCORE_INTERPOLATOR_H
 
 #include "blackmisc/aviation/aircraftsituation.h"
-#include "blackmisc/simulation/simdirectaccessremoteaircraft.h"
+#include "blackmisc/simulation/remoteaircraftprovider.h"
 #include "blackmisc/worker.h"
 #include <QHash>
 #include <QList>

src/blackcore/network.h

@@ -12,7 +12,7 @@
 #ifndef BLACKCORE_NETWORK_H
 #define BLACKCORE_NETWORK_H
 
-#include "blacksim/simulatorplugininfo.h"
+#include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/aviation/aircraft.h"
 #include "blackmisc/pqfrequency.h"
 #include "blackmisc/coordinategeodetic.h"
@@ -182,7 +182,7 @@ namespace BlackCore
          * Set simulator info before connecting.
          * \pre Network must be disconnected when calling this function.
          */
-        virtual void presetSimulatorInfo(const BlackSim::CSimulatorPluginInfo &simInfo) = 0;
+        virtual void presetSimulatorInfo(const BlackMisc::Simulation::CSimulatorPluginInfo &simInfo) = 0;
 
         /*!
          * Initiate a connection to the network server.

src/blackcore/network_vatlib.cpp

@@ -28,7 +28,7 @@ using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Simulation;
 using namespace BlackMisc;
-using namespace BlackSim;
+using namespace BlackMisc::Simulation;
 
 namespace BlackCore
 {

src/blackcore/network_vatlib.h

@@ -13,7 +13,7 @@
 #define BLACKCORE_NETWORK_VATLIB_H
 
 #include "network.h"
-#include "blackmisc/simulation/simdirectaccessownaircraft.h"
+#include "blackmisc/simulation/ownaircraftprovider.h"
 #include "token_bucket.h"
 #include <vatlib/vatlib2.h>
 #include <QScopedPointer>
@@ -51,7 +51,7 @@ namespace BlackCore
         virtual void presetServer(const BlackMisc::Network::CServer &server) override;
         virtual void presetCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;
         virtual void presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcao &icao) override;
-        virtual void presetSimulatorInfo(const BlackSim::CSimulatorPluginInfo &simInfo) override;
+        virtual void presetSimulatorInfo(const BlackMisc::Simulation::CSimulatorPluginInfo &simInfo) override;
         virtual void initiateConnection() override;
         virtual void terminateConnection() override;
         virtual void sendPing(const BlackMisc::Aviation::CCallsign &callsign) override;
@@ -131,7 +131,7 @@ namespace BlackCore
         void changeConnectionStatus(VatConnectionStatus newStatus);
         bool isDisconnected() const { return m_status != vatStatusConnecting && m_status != vatStatusConnected; }
         static QString convertToUnicodeEscaped(const QString &str);
-        static VatSimType convertToSimType(BlackSim::CSimulatorPluginInfo &simInfo);
+        static VatSimType convertToSimType(BlackMisc::Simulation::CSimulatorPluginInfo &simInfo);
         static void networkLogHandler(SeverityLevel severity, const char *message);
 
         struct JsonPackets
@@ -160,7 +160,7 @@ namespace BlackCore
         LoginMode                          m_loginMode;
         VatConnectionStatus                m_status;
         BlackMisc::Network::CServer        m_server;
-        BlackSim::CSimulatorPluginInfo           m_simulatorInfo;
+        BlackMisc::Simulation::CSimulatorPluginInfo           m_simulatorInfo;
         BlackMisc::Aviation::CCallsign     m_callsign; //!< "buffered callsign", as this must not change when connected
         BlackMisc::Aviation::CAircraftIcao m_icaoCode; //!< "buffered icao", as this must not change when connected
         bool m_sendInterimPositions = false; //!< send interim positions

src/blackcore/settingsallclasses.h

@@ -7,6 +7,6 @@
 #define BLACKCORE_SETTINGSALLCLASSES_H
 
 #include "blackmisc/settingsblackmiscclasses.h"
-#include "blacksim/setsimulator.h"
+#include "blackmisc/simulation/setsimulator.h"
 
 #endif // guard

src/blackcore/simulator.cpp

@@ -15,7 +15,7 @@ using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Simulation;
 using namespace BlackMisc::PhysicalQuantities;
-using namespace BlackSim;
+using namespace BlackMisc::Simulation;
 
 namespace BlackCore
 {

src/blackcore/simulator.h

@@ -13,11 +13,11 @@
 #define BLACKCORE_SIMULATOR_H
 
 #include "blackcore/interpolator.h"
-#include "blacksim/simulatorplugininfo.h"
+#include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
-#include "blackmisc/simulation/simdirectaccessownaircraft.h"
-#include "blackmisc/simulation/simdirectaccessremoteaircraft.h"
+#include "blackmisc/simulation/ownaircraftprovider.h"
+#include "blackmisc/simulation/remoteaircraftprovider.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/aviation/airportlist.h"
 #include "blackmisc/nwtextmessage.h"