flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 06:07:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #428 Use COriginator instead of QString in internal API

Browse Source
This commit is contained in:
Roland Winklmeier
2015-05-24 13:36:20 +02:00
parent 136587f564
commit ee0bfd62fa
61 changed files with 265 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackgui/components/cockpitcomcomponent.cpp
View File

@@ -62,7 +62,7 @@ namespace BlackGui
// init from aircraft
CAircraft ownAircraft = this->getOwnAircraft();
this->ps_updateCockpitFromContext(ownAircraft, "dummyInitialValues");
this->ps_updateCockpitFromContext(ownAircraft, COriginator("dummyInitialValues"));
// SELCAL pairs in cockpit
this->ui->frp_ComPanelSelcalBottom->clear();
@@ -114,7 +114,7 @@ namespace BlackGui
this->getIContextOwnAircraft()->updateSelcal(this->getSelcal(), cockpitOriginator());
}
void CCockpitComComponent::ps_updateCockpitFromContext(const CAircraft &ownAircraft, const QString &originator)
void CCockpitComComponent::ps_updateCockpitFromContext(const CAircraft &ownAircraft, const COriginator &originator)
{
if (originator == CCockpitComComponent::cockpitOriginator()) return; // comes from myself
@@ -182,7 +182,7 @@ namespace BlackGui
}
}
void CCockpitComComponent::ps_onChangedSelcal(const CSelcal &selcal, const QString &originator)
void CCockpitComComponent::ps_onChangedSelcal(const CSelcal &selcal, const COriginator &originator)
{
if (originator == CCockpitComComponent::cockpitOriginator()) return; // comes from myself
this->ui->frp_ComPanelSelcalBottom->setSelcalCode(selcal);
@@ -286,12 +286,12 @@ namespace BlackGui
Q_UNUSED(connected);
}
const QString &CCockpitComComponent::cockpitOriginator()
COriginator CCockpitComComponent::cockpitOriginator()
{
// string is generated once, the timestamp allows to use multiple
// components (as long as they are not generated at the same ms)
static const QString o = QString("COCKPITCOMCOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch()));
return o;
if (m_originator.getName().isEmpty())
m_originator = COriginator(QStringLiteral("COCKPITCOMCOMPONENT"));
return m_originator;
}
} // namespace