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

Ref T171, formatting of some existing completers

Browse Source 
* private slots -> private
* this->m_ -> m_
* removed unused utility function (model string completer)
This commit is contained in:
Klaus Basan
2017-10-16 13:00:47 +02:00
parent 73c76155f7
commit bf390f592a
11 changed files with 111 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackgui/components/dbairlineicaoselectorbase.cpp
View File

@@ -42,7 +42,7 @@ namespace BlackGui
this->setAcceptDrops(true);
this->setAcceptedMetaTypeIds({qMetaTypeId<CAirlineIcaoCode>(), qMetaTypeId<CAirlineIcaoCodeList>()});
connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbAirlineIcaoSelectorBase::ps_codesRead);
connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbAirlineIcaoSelectorBase::onCodesRead);
// when we already have data, init completers. This can not be done directly in the
// constructor due to virtual functions
@@ -51,7 +51,7 @@ namespace BlackGui
{
QTimer::singleShot(500, [this, c]()
{
this->ps_codesRead(CEntityFlags::AirlineIcaoEntity, CEntityFlags::ReadFinished, c);
this->onCodesRead(CEntityFlags::AirlineIcaoEntity, CEntityFlags::ReadFinished, c);
});
}
}
@@ -64,13 +64,13 @@ namespace BlackGui
if (icao == m_currentIcao) { return false; }
if (icao.isLoadedFromDb())
{
this->m_currentIcao = icao;
m_currentIcao = icao;
}
else
{
this->m_currentIcao = sGui->getWebDataServices()->smartAirlineIcaoSelector(icao);
m_currentIcao = sGui->getWebDataServices()->smartAirlineIcaoSelector(icao);
}
emit changedAirlineIcao(this->m_currentIcao);
emit changedAirlineIcao(m_currentIcao);
return true;
}
@@ -134,7 +134,7 @@ namespace BlackGui
}
}
void CDbAirlineIcaoSelectorBase::ps_codesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count)
void CDbAirlineIcaoSelectorBase::onCodesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count)
{
if (!sGui) { return; }
if (entity.testFlag(CEntityFlags::AirlineIcaoEntity) && readState == CEntityFlags::ReadFinished)
@@ -143,19 +143,19 @@ namespace BlackGui
{
QCompleter *c = this->createCompleter();
Q_ASSERT_X(c, Q_FUNC_INFO, "missing converter");
connect(c, static_cast<void (QCompleter::*)(const QString &)>(&QCompleter::activated), this, &CDbAirlineIcaoSelectorBase::ps_completerActivated);
connect(c, static_cast<void (QCompleter::*)(const QString &)>(&QCompleter::activated), this, &CDbAirlineIcaoSelectorBase::onCompleterActivated);
m_completer.reset(c); // deletes any old completer
}
else
{
this->m_completer.reset(nullptr);
m_completer.reset(nullptr);
}
}
}
void CDbAirlineIcaoSelectorBase::ps_completerActivated(const QString &icaoString)
void CDbAirlineIcaoSelectorBase::onCompleterActivated(const QString &icaoString)
{
int dbKey = CDatastoreUtility::extractIntegerKey(icaoString);
const int dbKey = CDatastoreUtility::extractIntegerKey(icaoString);
if (dbKey < 0) { return; }
this->setAirlineIcao(dbKey);
}