refs #395, refs #413, refs #403 Post merge tasks

* missing exports for new classes
* public non virtual convertToQString, propertyByIndex
* removed left-over of watchdog
* virtual destructor for avionicsbase.h
This commit is contained in:
Klaus Basan
2015-05-07 03:21:45 +02:00
committed by Mathew Sutcliffe
parent e7f65ba0b6
commit f18cfed087
16 changed files with 47 additions and 138 deletions

View File

@@ -12,6 +12,7 @@
#ifndef BLACKCORE_SIMULATOR_COMMON_H
#define BLACKCORE_SIMULATOR_COMMON_H
#include "blackcore/blackcoreexport.h"
#include "blackcore/interpolator.h"
#include "blackcore/simulator.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
@@ -31,7 +32,7 @@ namespace BlackCore
{
//! Common base class with providers, interface and some base functionality
class CSimulatorCommon :
class BLACKCORE_EXPORT CSimulatorCommon :
public BlackCore::ISimulator,
public BlackMisc::Simulation::COwnAircraftAware, // gain access to in memor own aircraft data
public BlackMisc::Simulation::CRemoteAircraftAware // gain access to in memory remote aircraft data