flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-04 00:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T289, merge CSimulatorCommonn/ISimulator

Browse Source
This commit is contained in:
Klaus Basan
2018-07-11 23:39:27 +02:00
parent 78861166ad
commit d0adcc98cb
11 changed files with 1183 additions and 1359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/simulator/plugincommon/simulatorplugincommon.cpp
View File

@@ -31,7 +31,7 @@ namespace BlackSimPlugin
IWeatherGridProvider *weatherGridProvider,
IClientProvider *clientProvider,
QObject *parent) :
CSimulatorCommon(info, ownAircraftProvider, renderedAircraftProvider, weatherGridProvider, clientProvider, parent)
ISimulator(info, ownAircraftProvider, renderedAircraftProvider, weatherGridProvider, clientProvider, parent)
{
CSimulatorPluginCommon::registerHelp();
}
@@ -75,19 +75,19 @@ namespace BlackSimPlugin
this->showInterpolationDisplay();
return true;
}
return CSimulatorCommon::parseDetails(parser);
return false;
}
void CSimulatorPluginCommon::unload()
{
this->deleteInterpolationDisplay();
CSimulatorCommon::unload();
ISimulator::unload();
}
bool CSimulatorPluginCommon::disconnectFrom()
{
this->deleteInterpolationDisplay();
return CSimulatorCommon::disconnectFrom();
return ISimulator::disconnectFrom();
}
void CSimulatorPluginCommon::registerHelp()

4
src/plugins/simulator/plugincommon/simulatorplugincommon.h
View File

@@ -12,7 +12,7 @@
#ifndef BLACKSIMPLUGIN_COMMON_SIMULATORPLUGINCOMMON_H
#define BLACKSIMPLUGIN_COMMON_SIMULATORPLUGINCOMMON_H
#include "blackcore/simulatorcommon.h"
#include "blackcore/simulator.h"
#include <QObject>
#include <QPointer>
@@ -22,7 +22,7 @@ namespace BlackSimPlugin
namespace Common
{
//! Common base class for simulator plugins
class CSimulatorPluginCommon : public BlackCore::CSimulatorCommon
class CSimulatorPluginCommon : public BlackCore::ISimulator
{
Q_OBJECT
Q_INTERFACES(BlackCore::ISimulator)