This commit is contained in:
Klaus Basan
2017-03-13 16:24:23 +01:00
committed by Mathew Sutcliffe
parent 099680c054
commit 0f2680ba2a
8 changed files with 14 additions and 17 deletions

View File

@@ -236,7 +236,6 @@ namespace BlackCore
Q_OBJECT Q_OBJECT
public: public:
//! Constructor //! Constructor
//! \sa ISimulatorFactory::createListener(). //! \sa ISimulatorFactory::createListener().
//! \note msvc2015: use inherited constructor //! \note msvc2015: use inherited constructor

View File

@@ -17,13 +17,13 @@
#include "blackgui/pluginconfigwindow.h" #include "blackgui/pluginconfigwindow.h"
#include "blackgui/plugindetailswindow.h" #include "blackgui/plugindetailswindow.h"
#include "blackgui/pluginselector.h" #include "blackgui/pluginselector.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfolist.h"
#include "blackmisc/iterator.h" #include "blackmisc/iterator.h"
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
#include "blackmisc/pq/length.h" #include "blackmisc/pq/length.h"
#include "blackmisc/pq/time.h" #include "blackmisc/pq/time.h"
#include "blackmisc/pq/units.h" #include "blackmisc/pq/units.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfolist.h"
#include "blackmisc/statusmessage.h" #include "blackmisc/statusmessage.h"
#include "ui_settingssimulatorcomponent.h" #include "ui_settingssimulatorcomponent.h"
@@ -285,9 +285,10 @@ namespace BlackGui
void CSettingsSimulatorComponent::ps_showPluginDetails(const QString &identifier) void CSettingsSimulatorComponent::ps_showPluginDetails(const QString &identifier)
{ {
CSimulatorPluginInfoList simDrivers(getAvailablePlugins()); const CSimulatorPluginInfoList simDrivers(getAvailablePlugins());
auto selected = std::find_if(simDrivers.begin(), simDrivers.end(), const auto selected = std::find_if(
[&identifier](const CSimulatorPluginInfo & info) simDrivers.begin(), simDrivers.end(),
[&identifier](const CSimulatorPluginInfo & info)
{ {
return info.getIdentifier() == identifier; return info.getIdentifier() == identifier;
}); });

View File

@@ -7,9 +7,7 @@
* contained in the LICENSE file. * contained in the LICENSE file.
*/ */
/*! //! \file
\file
*/
#ifndef BLACKMISC_ITERATOR_H #ifndef BLACKMISC_ITERATOR_H
#define BLACKMISC_ITERATOR_H #define BLACKMISC_ITERATOR_H

View File

@@ -12,9 +12,9 @@
#ifndef BLACKMISC_SIMULATION_FSX_SIMCONNECTUTILITIES_H #ifndef BLACKMISC_SIMULATION_FSX_SIMCONNECTUTILITIES_H
#define BLACKMISC_SIMULATION_FSX_SIMCONNECTUTILITIES_H #define BLACKMISC_SIMULATION_FSX_SIMCONNECTUTILITIES_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/aviation/aircraftlights.h" #include "blackmisc/aviation/aircraftlights.h"
#include "blackmisc/weather/gridpoint.h" #include "blackmisc/weather/gridpoint.h"
#include "blackmisc/blackmiscexport.h"
#include <QMetaType> #include <QMetaType>
#include <QObject> #include <QObject>

View File

@@ -7,9 +7,7 @@
* contained in the LICENSE file. * contained in the LICENSE file.
*/ */
#include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/simulatorplugininfo.h"
#include <QJsonValue> #include <QJsonValue>
#include <QtGlobal> #include <QtGlobal>

View File

@@ -162,13 +162,13 @@ namespace BlackSimPlugin
if (sGui->getIContextApplication()->writeToFile(fileName, CSimConnectUtilities::simConnectCfg(address, p))) if (sGui->getIContextApplication()->writeToFile(fileName, CSimConnectUtilities::simConnectCfg(address, p)))
{ {
QMessageBox::information(qApp->activeWindow(), tr("File saved"), QMessageBox::information(qApp->activeWindow(), tr("File saved"),
tr("File %1 saved.").arg(fileName)); tr("File '%1' saved.").arg(fileName));
checkSimConnectCfgFile(); checkSimConnectCfgFile();
} }
else else
{ {
QMessageBox::warning(qApp->activeWindow(), tr("Failed writing simConnect.cfg"), QMessageBox::warning(qApp->activeWindow(), tr("Failed writing simConnect.cfg"),
tr("Failed writing %1!").arg(fileName)); tr("Failed writing '%1'!").arg(fileName));
} }
} }
} // ns } // ns

View File

@@ -10,8 +10,9 @@
#include "simulatorfsxcommon.h" #include "simulatorfsxcommon.h"
#include "blackcore/application.h" #include "blackcore/application.h"
#include "blackmisc/network/textmessage.h" #include "blackmisc/network/textmessage.h"
#include "blackmisc/simulation/fscommon/bcdconversions.h"
#include "blackmisc/simulation/fsx/simconnectutilities.h" #include "blackmisc/simulation/fsx/simconnectutilities.h"
#include "blackmisc/simulation/fscommon/bcdconversions.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/simulation/interpolatorlinear.h" #include "blackmisc/simulation/interpolatorlinear.h"
#include "blackmisc/simulation/interpolatorspline.h" #include "blackmisc/simulation/interpolatorspline.h"
@@ -22,7 +23,6 @@
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
#include "blackmisc/threadutils.h" #include "blackmisc/threadutils.h"
#include "blackmisc/verify.h" #include "blackmisc/verify.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include <QTimer> #include <QTimer>
#include <type_traits> #include <type_traits>

View File

@@ -312,7 +312,8 @@ namespace BlackSimPlugin
QString m_simulatorName; QString m_simulatorName;
QString m_simulatorDetails; QString m_simulatorDetails;
//! SimConnect Callback //! SimConnect Callback (simplified version for listener)
//! \sa CSimConnectObjects::SimConnectProc
static void CALLBACK SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext); static void CALLBACK SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext);
}; };
} }