refs #538, made CWebDataServicesAware funtions protected

actually there is no reason why any using class should expose them
only exception is that airspace monitor exposes the metar function
This commit is contained in:
Klaus Basan
2015-12-02 01:04:58 +01:00
parent 51d4301899
commit 88f14f150d
3 changed files with 12 additions and 10 deletions

View File

@@ -254,7 +254,7 @@ namespace BlackMisc
return this->m_webDataReaderProvider->updateWithVatsimDataFileData(aircraftToBeUdpated);
}
CStatusMessageList CWebDataServicesAware::asyncWriteModel(CAircraftModel &model) const
CStatusMessageList CWebDataServicesAware::asyncWriteModelToDb(CAircraftModel &model) const
{
Q_ASSERT_X(this->m_webDataReaderProvider, Q_FUNC_INFO, "Missing provider");
if (!hasProvider()) { return CStatusMessageList(); }

View File

@@ -211,6 +211,14 @@ namespace BlackMisc
//! Destructor
~CWebDataServicesAware();
public:
//! \copydoc IWebDataReaderProvider::getMetarForAirport
BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &icao) const;
protected:
//! Constructor
CWebDataServicesAware(IWebDataServicesProvider *webDataReaderProvider = nullptr) : m_webDataReaderProvider(webDataReaderProvider) { }
//! \copydoc IWebDataReaderProvider::getVatsimFsdServers
BlackMisc::Network::CServerList getVatsimFsdServers() const;
@@ -301,9 +309,6 @@ namespace BlackMisc
//! \copydoc IWebDataReaderProvider::getMetars
BlackMisc::Weather::CMetarSet getMetars() const;
//! \copydoc IWebDataReaderProvider::getMetarForAirport
BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &icao) const;
//! \copydoc IWebDataReaderProvider::getMetarCount
int getMetarCount() const;
@@ -311,7 +316,7 @@ namespace BlackMisc
void updateWithVatsimDataFileData(BlackMisc::Simulation::CSimulatedAircraft &aircraftToBeUdpated) const;
//! \copydoc IWebDataReaderProvider::asyncWriteModel
BlackMisc::CStatusMessageList asyncWriteModel(BlackMisc::Simulation::CAircraftModel &model) const;
BlackMisc::CStatusMessageList asyncWriteModelToDb(BlackMisc::Simulation::CAircraftModel &model) const;
//! Set the provider
virtual void setProvider(IWebDataServicesProvider *webDataReaderProvider);
@@ -339,10 +344,6 @@ namespace BlackMisc
//! \copydoc IWebDataReaderProvider::readDbDataFromDisk
bool readDbDataFromDisk(const QString &dir, bool inBackround);
protected:
//! Constructor
CWebDataServicesAware(IWebDataServicesProvider *webDataReaderProvider = nullptr) : m_webDataReaderProvider(webDataReaderProvider) { }
private:
IWebDataServicesProvider *m_webDataReaderProvider = nullptr; //!< access to object
BlackMisc::CConnectionGuard m_swiftConnections; //!< signal connection with swift