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

@@ -7,12 +7,14 @@
* contained in the LICENSE file.
*/
#include "blackgui/guiapplication.h"
#include "blackmisc/aviation/liverylist.h"
#include "liveryform.h"
#include "ui_liveryform.h"
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackGui;
using namespace BlackGui::Components;
namespace BlackGui
@@ -43,13 +45,6 @@ namespace BlackGui
CLiveryForm::~CLiveryForm() { }
void CLiveryForm::setProvider(BlackMisc::Network::IWebDataServicesProvider *provider)
{
CWebDataServicesAware::setProvider(provider);
this->ui->editor_AirlineIcao->setProvider(provider);
this->ui->livery_Selector->setProvider(provider);
}
CLivery CLiveryForm::getValue() const
{
CLivery livery(this->ui->livery_Selector->getLivery());
@@ -168,7 +163,7 @@ namespace BlackGui
if (!code.hasCompleteData()) { return; }
if (!code.hasValidDbKey()) { return; }
CLivery stdLivery(this->getLiveries().findStdLiveryByAirlineIcaoDesignator(code));
CLivery stdLivery(sGui->getWebDataServices()->getLiveries().findStdLiveryByAirlineIcaoDesignator(code));
if (stdLivery.hasValidDbKey())
{
this->setValue(stdLivery);