refs #602, emoved web service provider

* webservices now directly accessible via sGui
* interface no longer needed
* no init of provider (setProvider) needed anymore
This commit is contained in:
Klaus Basan
2016-02-25 04:30:08 +01:00
committed by Mathew Sutcliffe
parent a0cfa2e687
commit 79f95845b2
69 changed files with 396 additions and 1453 deletions

View File

@@ -14,7 +14,7 @@
#include "blackgui/blackguiexport.h"
#include "blackmisc/aviation/livery.h"
#include "blackcore/webdataservices.h"
#include "blackmisc/network/entityflags.h"
#include "blackgui/dropbase.h"
#include <QFrame>
#include <QScopedPointer>
@@ -32,7 +32,6 @@ namespace BlackGui
*/
class BLACKGUI_EXPORT CDbLiverySelectorComponent :
public QFrame,
public BlackMisc::Network::CWebDataServicesAware,
public BlackGui::CDropBase
{
Q_OBJECT
@@ -44,9 +43,6 @@ namespace BlackGui
//! Destructor
~CDbLiverySelectorComponent();
//! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
//! Current livery
void setLivery(const BlackMisc::Aviation::CLivery &livery);
@@ -68,9 +64,6 @@ namespace BlackGui
//! Clear selection
void clear();
public slots:
//! Distributors have been read
void ps_liveriesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count);
signals:
//! Distributor was changed
@@ -96,6 +89,9 @@ namespace BlackGui
//! Completer activated
void ps_completerActivated(const QString &liveryCode);
//! Distributors have been read
void ps_liveriesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count);
private:
//! Strip extra info from livery code
QString stripExtraInfo(const QString &liveryCode) const;