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

refs #538, made CWebDataServicesAware funtions protected

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/network/webdataservicesprovider.cpp
View File

@@ -254,7 +254,7 @@ namespace BlackMisc
return this->m_webDataReaderProvider->updateWithVatsimDataFileData(aircraftToBeUdpated); 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"); Q_ASSERT_X(this->m_webDataReaderProvider, Q_FUNC_INFO, "Missing provider");
if (!hasProvider()) { return CStatusMessageList(); } if (!hasProvider()) { return CStatusMessageList(); }

17
src/blackmisc/network/webdataservicesprovider.h
View File

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

3
src/swiftdata/swiftdatamenus.cpp
View File

@@ -15,6 +15,7 @@
#include "blackgui/stylesheetutility.h" #include "blackgui/stylesheetutility.h"
#include "blackcore/datacache.h" #include "blackcore/datacache.h"
#include "blackcore/settingscache.h" #include "blackcore/settingscache.h"
#include "blackcore/webdataservices.h"
#include "blackmisc/statusmessagelist.h" #include "blackmisc/statusmessagelist.h"
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
#include "blackmisc/project.h" #include "blackmisc/project.h"
@@ -156,7 +157,7 @@ void CSwiftData::initDynamicMenus()
Q_ASSERT_X(this->ui->comp_MainInfoArea, Q_FUNC_INFO, "Missing main info area"); Q_ASSERT_X(this->ui->comp_MainInfoArea, Q_FUNC_INFO, "Missing main info area");
Q_ASSERT_X(this->ui->comp_MainInfoArea->getDataInfoAreaComponent(), Q_FUNC_INFO, "Missing DB info area"); Q_ASSERT_X(this->ui->comp_MainInfoArea->getDataInfoAreaComponent(), Q_FUNC_INFO, "Missing DB info area");
this->ui->menu_Mapping->addAction(CIcons::load16(), "Load DB data", this->ui->comp_MainInfoArea->getDataInfoAreaComponent(), SLOT(readDbDataFromResourceDir())); this->ui->menu_Mapping->addAction(CIcons::load16(), "Load DB data", this->ui->comp_MainInfoArea->getDataInfoAreaComponent(), SLOT(readDbDataFromResourceDir()));
if (CProject::isRunningInDeveloperEnvironment() && this->ui->comp_MainInfoArea->getDataInfoAreaComponent()->canConnectSwiftDb()) if (CProject::isRunningInDeveloperEnvironment() && this->m_webDataReader && this->m_webDataReader->canConnectSwiftDb())
{ {
this->ui->menu_Mapping->addAction(CIcons::save16(), "Save DB data", this->ui->comp_MainInfoArea->getDataInfoAreaComponent(), SLOT(writeDbDataToResourceDir())); this->ui->menu_Mapping->addAction(CIcons::save16(), "Save DB data", this->ui->comp_MainInfoArea->getDataInfoAreaComponent(), SLOT(writeDbDataToResourceDir()));
} }