From 87abbf975b0bce3875d65e1f099cc4332cc14871 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 18 Apr 2016 23:34:23 +0200 Subject: [PATCH] refs #640, renamed allowDragDrop and const --- src/blackgui/components/dbaircrafticaocomponent.cpp | 2 +- src/blackgui/components/dbairlineicaocomponent.cpp | 2 +- src/blackgui/components/dbcountrycomponent.cpp | 2 +- src/blackgui/components/dbdistributorcomponent.cpp | 2 +- src/blackgui/components/dbliverycomponent.cpp | 2 +- src/blackgui/components/dbliveryselectorcomponent.cpp | 2 +- src/blackgui/components/dbmodelcomponent.cpp | 2 +- src/blackgui/components/dbstashcomponent.cpp | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/blackgui/components/dbaircrafticaocomponent.cpp b/src/blackgui/components/dbaircrafticaocomponent.cpp index 76e03cfed..af8447ad5 100644 --- a/src/blackgui/components/dbaircrafticaocomponent.cpp +++ b/src/blackgui/components/dbaircrafticaocomponent.cpp @@ -31,7 +31,7 @@ namespace BlackGui this->ui->tvp_AircraftIcao->setResizeMode(CAircraftIcaoCodeView::ResizingOff); connect(this->ui->tvp_AircraftIcao, &CAircraftIcaoCodeView::requestNewBackendData, this, &CDbAircraftIcaoComponent::ps_reload); - this->ui->tvp_AircraftIcao->allowDragDropValueObjects(true, false); + this->ui->tvp_AircraftIcao->allowDragDrop(true, false); this->ui->tvp_AircraftIcao->setFilterWidget(this->ui->filter_AircraftIcao); connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbAircraftIcaoComponent::ps_icaoRead); diff --git a/src/blackgui/components/dbairlineicaocomponent.cpp b/src/blackgui/components/dbairlineicaocomponent.cpp index 751c19830..2f57c5007 100644 --- a/src/blackgui/components/dbairlineicaocomponent.cpp +++ b/src/blackgui/components/dbairlineicaocomponent.cpp @@ -30,7 +30,7 @@ namespace BlackGui this->setViewWithIndicator(this->ui->tvp_AirlineIcao); this->ui->tvp_AirlineIcao->setResizeMode(CAirlineIcaoCodeView::ResizingOff); this->ui->tvp_AirlineIcao->setResizeMode(CAirlineIcaoCodeView::ResizingOff); - this->ui->tvp_AirlineIcao->allowDragDropValueObjects(true, false); + this->ui->tvp_AirlineIcao->allowDragDrop(true, false); this->ui->tvp_AirlineIcao->setFilterWidget(this->ui->filter_AirlineIcao); connect(this->ui->tvp_AirlineIcao, &CAirlineIcaoCodeView::requestNewBackendData, this, &CDbAirlineIcaoComponent::ps_reload); diff --git a/src/blackgui/components/dbcountrycomponent.cpp b/src/blackgui/components/dbcountrycomponent.cpp index 2e49210b5..17bdfed81 100644 --- a/src/blackgui/components/dbcountrycomponent.cpp +++ b/src/blackgui/components/dbcountrycomponent.cpp @@ -32,7 +32,7 @@ namespace BlackGui // filter and drag and drop this->ui->tvp_Countries->setFilterWidget(this->ui->filter_CountryComponent); - this->ui->tvp_Countries->allowDragDropValueObjects(true, false); + this->ui->tvp_Countries->allowDragDrop(true, false); connect(sApp->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbCountryComponent::ps_countriesRead); this->ps_countriesRead(CEntityFlags::CountryEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getCountriesCount()); diff --git a/src/blackgui/components/dbdistributorcomponent.cpp b/src/blackgui/components/dbdistributorcomponent.cpp index dd142e9ed..9ebb6a651 100644 --- a/src/blackgui/components/dbdistributorcomponent.cpp +++ b/src/blackgui/components/dbdistributorcomponent.cpp @@ -28,7 +28,7 @@ namespace BlackGui ui->setupUi(this); this->setViewWithIndicator(this->ui->tvp_Distributors); this->ui->tvp_Distributors->setResizeMode(CViewBaseNonTemplate::ResizingAuto); - this->ui->tvp_Distributors->allowDragDropValueObjects(true, false); + this->ui->tvp_Distributors->allowDragDrop(true, false); connect(this->ui->tvp_Distributors, &CDistributorView::requestNewBackendData, this, &CDbDistributorComponent::ps_reload); connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbDistributorComponent::ps_distributorsRead); this->ps_distributorsRead(CEntityFlags::DistributorEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getDistributorsCount()); diff --git a/src/blackgui/components/dbliverycomponent.cpp b/src/blackgui/components/dbliverycomponent.cpp index 892fe05a4..097fa15b1 100644 --- a/src/blackgui/components/dbliverycomponent.cpp +++ b/src/blackgui/components/dbliverycomponent.cpp @@ -31,7 +31,7 @@ namespace BlackGui // filter and drag and drop this->ui->tvp_Liveries->setFilterWidget(this->ui->filter_Livery); - this->ui->tvp_Liveries->allowDragDropValueObjects(true, false); + this->ui->tvp_Liveries->allowDragDrop(true, false); connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbLiveryComponent::ps_liveriesRead); this->ps_liveriesRead(CEntityFlags::LiveryEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getLiveriesCount()); diff --git a/src/blackgui/components/dbliveryselectorcomponent.cpp b/src/blackgui/components/dbliveryselectorcomponent.cpp index 43d05f72a..ddf49cc3e 100644 --- a/src/blackgui/components/dbliveryselectorcomponent.cpp +++ b/src/blackgui/components/dbliveryselectorcomponent.cpp @@ -150,7 +150,7 @@ namespace BlackGui void CDbLiverySelectorComponent::dropEvent(QDropEvent *event) { if (!event || !acceptDrop(event->mimeData())) { return; } - CVariant valueVariant(toCVariant(event->mimeData())); + const CVariant valueVariant(toCVariant(event->mimeData())); if (valueVariant.isValid()) { if (valueVariant.canConvert()) diff --git a/src/blackgui/components/dbmodelcomponent.cpp b/src/blackgui/components/dbmodelcomponent.cpp index d44bec493..b8e0a7ff7 100644 --- a/src/blackgui/components/dbmodelcomponent.cpp +++ b/src/blackgui/components/dbmodelcomponent.cpp @@ -44,7 +44,7 @@ namespace BlackGui // configure view this->ui->tvp_AircraftModel->setFilterWidget(this->ui->filter_AircraftModelFilter); - this->ui->tvp_AircraftModel->allowDragDropValueObjects(true, false); + this->ui->tvp_AircraftModel->allowDragDrop(true, false); connect(sApp->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbModelComponent::ps_modelsRead); this->ps_modelsRead(CEntityFlags::ModelEntity, CEntityFlags::ReadFinished, sApp->getWebDataServices()->getModelsCount()); diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/blackgui/components/dbstashcomponent.cpp index 3c8a8b98d..d0a2b1cfd 100644 --- a/src/blackgui/components/dbstashcomponent.cpp +++ b/src/blackgui/components/dbstashcomponent.cpp @@ -36,8 +36,8 @@ namespace BlackGui { ui->setupUi(this); this->ui->tvp_StashAircraftModels->setAircraftModelMode(CAircraftModelListModel::StashModel); - this->ui->tvp_StashAircraftModels->allowDragDropValueObjects(false, true); - this->ui->tvp_StashAircraftModels->setImplementedMetaTypeIds(); + this->ui->tvp_StashAircraftModels->allowDragDrop(false, true); + this->ui->tvp_StashAircraftModels->setAcceptedMetaTypeIds(); this->ui->tvp_StashAircraftModels->menuAddItems(CAircraftModelView::MenuLoadAndSave); connect(this->ui->pb_Unstash, &QPushButton::pressed, this, &CDbStashComponent::ps_onUnstashPressed);