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

Ref T118, "protected slots" -> "protected"

Browse Source
This commit is contained in:
Klaus Basan
2017-10-19 20:08:05 +02:00
parent e920dc77b8
commit 66624e064d
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackmisc/simulation/aircraftmodelloader.cpp
View File

@@ -34,8 +34,8 @@ namespace BlackMisc
m_caches.setCurrentSimulator(simulator); m_caches.setCurrentSimulator(simulator);
// first connect is an internal connection to log info about load status // first connect is an internal connection to log info about load status
connect(this, &IAircraftModelLoader::loadingFinished, this, &IAircraftModelLoader::ps_loadFinished); connect(this, &IAircraftModelLoader::loadingFinished, this, &IAircraftModelLoader::loadFinished);
connect(&m_caches, &IMultiSimulatorModelCaches::cacheChanged, this, &IAircraftModelLoader::ps_cacheChanged); connect(&m_caches, &IMultiSimulatorModelCaches::cacheChanged, this, &IAircraftModelLoader::cacheChanged);
} }
QString IAircraftModelLoader::enumToString(IAircraftModelLoader::LoadFinishedInfo info) QString IAircraftModelLoader::enumToString(IAircraftModelLoader::LoadFinishedInfo info)
@@ -109,7 +109,7 @@ namespace BlackMisc
} }
} }
void IAircraftModelLoader::ps_loadFinished(const CStatusMessage &status, const BlackMisc::Simulation::CSimulatorInfo &simulator, LoadFinishedInfo info) void IAircraftModelLoader::loadFinished(const CStatusMessage &status, const BlackMisc::Simulation::CSimulatorInfo &simulator, LoadFinishedInfo info)
{ {
Q_UNUSED(info); Q_UNUSED(info);
@@ -127,7 +127,7 @@ namespace BlackMisc
} }
} }
void IAircraftModelLoader::ps_cacheChanged(const CSimulatorInfo &simInfo) void IAircraftModelLoader::cacheChanged(const CSimulatorInfo &simInfo)
{ {
static const CStatusMessage status(this, CStatusMessage::SeverityInfo, "Cached changed"); static const CStatusMessage status(this, CStatusMessage::SeverityInfo, "Cached changed");
emit this->loadingFinished(status, simInfo, CacheLoaded); emit this->loadingFinished(status, simInfo, CacheLoaded);

17
src/blackmisc/simulation/aircraftmodelloader.h
View File

@@ -94,7 +94,7 @@ namespace BlackMisc
//! Start the loading process from disk. //! Start the loading process from disk.
//! Optional DB models can be passed and used for data consolidation. //! Optional DB models can be passed and used for data consolidation.
void startLoading(LoadMode mode = InBackgroundWithCache, const ModelConsolidation &modelConsolidation = {}, const QString &directory = {}); void startLoading(LoadMode mode = InBackgroundWithCache, const ModelConsolidation &modelConsolidation = {}, const QStringList &modelDirectories = {});
//! Loading finished? //! Loading finished?
virtual bool isLoadingFinished() const = 0; virtual bool isLoadingFinished() const = 0;
@@ -190,7 +190,13 @@ namespace BlackMisc
BlackMisc::CStatusMessage clearCache(); BlackMisc::CStatusMessage clearCache();
//! Start the loading process from disk //! Start the loading process from disk
virtual void startLoadingFromDisk(LoadMode mode, const ModelConsolidation &modelConsolidation, const QString &directory) = 0; virtual void startLoadingFromDisk(LoadMode mode, const ModelConsolidation &modelConsolidation, const QStringList &modelDirectories) = 0;
//! Loading finished, also logs messages
void loadFinished(const CStatusMessage &status, const CSimulatorInfo &simulator, LoadFinishedInfo info);
//! A cache has been changed
void cacheChanged(const CSimulatorInfo &simInfo);
std::atomic<bool> m_cancelLoading { false }; //!< flag, requesting to cancel loading std::atomic<bool> m_cancelLoading { false }; //!< flag, requesting to cancel loading
std::atomic<bool> m_loadingInProgress { false }; //!< Loading in progress std::atomic<bool> m_loadingInProgress { false }; //!< Loading in progress
@@ -198,13 +204,6 @@ namespace BlackMisc
Data::CModelCaches m_caches { false, this }; //!< caches used with this loader Data::CModelCaches m_caches { false, this }; //!< caches used with this loader
Settings::CMultiSimulatorSettings m_settings { this }; //!< settings Settings::CMultiSimulatorSettings m_settings { this }; //!< settings
CStatusMessageList m_loadingMessages; //!< loading messages CStatusMessageList m_loadingMessages; //!< loading messages
protected slots:
//! Loading finished, also logs messages
void ps_loadFinished(const CStatusMessage &status, const CSimulatorInfo &simulator, LoadFinishedInfo info);
//! A cache has been changed
void ps_cacheChanged(const CSimulatorInfo &simInfo);
}; };
} // ns } // ns
} // ns } // ns