This commit is contained in:
Klaus Basan
2019-02-04 00:40:52 +01:00
committed by Mat Sutcliffe
parent 72bba35423
commit 2d30c1cce8
4 changed files with 6 additions and 10 deletions

View File

@@ -29,7 +29,7 @@ namespace BlackMisc
//! Value object encapsulating a list of keyboard keys.
class BLACKMISC_EXPORT CKeyboardKeyList :
public CSequence<CKeyboardKey>,
public BlackMisc::Mixin::MetaType<CKeyboardKeyList>
public Mixin::MetaType<CKeyboardKeyList>
{
public:
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CKeyboardKeyList)

View File

@@ -208,7 +208,7 @@ namespace BlackMisc
m_loadingInProgress = false;
const QMap<int, int> counts = statusMsgs.countSeverities();
const int errors = counts.value(SeverityError);
const int errors = counts.value(SeverityError);
const int warnings = counts.value(SeverityWarning);
if (statusMsgs.hasWarningOrErrorMessages())

View File

@@ -132,21 +132,21 @@ namespace BlackMisc
signals:
//! Disk loading started
//! \remark will only indicate loading from disk, not cache loading
void diskLoadingStarted(const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadMode loadMode);
void diskLoadingStarted(const CSimulatorInfo &simulator, IAircraftModelLoader::LoadMode loadMode);
//! Parsing is finished or cache has been loaded
//! \remark does to fire if the cache has been changed elsewhere and it has just been reloaded here!
void loadingFinished(const BlackMisc::CStatusMessageList &status, const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadFinishedInfo info);
void loadingFinished(const CStatusMessageList &status, const CSimulatorInfo &simulator, IAircraftModelLoader::LoadFinishedInfo info);
//! Loading progress, normally from disk
//! \param simulator corresponding simulator
//! \param message a progress message which can be sent by each individual loader implementation as needed
//! \param progressPercentage 0-100 or -1 if not available
void loadingProgress(const BlackMisc::Simulation::CSimulatorInfo &simulator, const QString &message, int progressPercentage);
void loadingProgress(const CSimulatorInfo &simulator, const QString &message, int progressPercentage);
//! Relayed from centralized caches
//! \remark this can result from loading, the cache changed elsewhere or clearing data
void cacheChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator);
void cacheChanged(const CSimulatorInfo &simulator);
protected:
//! Constructor

View File

@@ -440,10 +440,6 @@ void SwiftGuiStd::onValidatedModelSet(const CSimulatorInfo &simulator, const CAi
{
this->displayValidationDialog();
m_validationDialog->validatedModelSet(simulator, valid, invalid, stopped, msgs);
// modal version
// const int r = m_validationDialog->exec();
// Q_UNUSED(r);
}
void SwiftGuiStd::displayValidationDialog()