flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 12:35:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #77 toIcon returns a simple enum instead of a full object

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-10-26 22:55:10 +00:00
parent 59bbac9a1f
commit b1185eb541
61 changed files with 157 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackmisc/aviation/airlineicaocode.cpp
View File

@@ -175,15 +175,15 @@ namespace BlackMisc
return this->hasValidDesignator() && this->hasValidCountry() && this->hasName();
}
CIcon CAirlineIcaoCode::toIcon() const
CIcons::IconIndex CAirlineIcaoCode::toIcon() const
{
if (this->hasValidDbKey() && CAirlineIcaoCode::iconIds().contains(this->getDbKey()))
{
static const QString p("airlines/%1_%2.png");
const QString n(p.arg(this->getDbKey(), 5, 10, QChar('0')).arg(this->getDesignator()));
return CIcon(n, this->convertToQString());
}
return CIcon::iconByIndex(CIcons::StandardIconEmpty);
//if (this->hasValidDbKey() && CAirlineIcaoCode::iconIds().contains(this->getDbKey()))
//{
// static const QString p("airlines/%1_%2.png");
// const QString n(p.arg(this->getDbKey(), 5, 10, QChar('0')).arg(this->getDesignator()));
// return CIcon(n, this->convertToQString());
//}
return CIcons::StandardIconEmpty;
}
QString CAirlineIcaoCode::getIconResourcePath() const

2
src/blackmisc/aviation/airlineicaocode.h
View File

@@ -209,7 +209,7 @@ namespace BlackMisc
CAirlineIcaoCode thisOrCallsignCode(const CCallsign &callsign) const;
//! \copydoc Mixin::Icon::toIcon
CIcon toIcon() const;
CIcons::IconIndex toIcon() const;
//! \copydoc Mixin::String::toQString
QString convertToQString(bool i18n = false) const;

4
src/blackmisc/aviation/altitude.cpp
View File

@@ -403,9 +403,9 @@ namespace BlackMisc
return e;
}
CIcon CAltitude::toIcon() const
CIcons::IconIndex CAltitude::toIcon() const
{
return BlackMisc::CIcon::iconByIndex(CIcons::GeoPosition);
return CIcons::GeoPosition;
}
int CAltitude::compare(const CAltitude &otherAltitude) const

2
src/blackmisc/aviation/altitude.h
View File

@@ -193,7 +193,7 @@ namespace BlackMisc
static QString fpAltitudeExamples();
//! \copydoc BlackMisc::Mixin::Icon::toIcon
BlackMisc::CIcon toIcon() const;
BlackMisc::CIcons::IconIndex toIcon() const;
//! \copydoc PhysicalQuantities::CPhysicalQuantity::compare
int compare(const CAltitude &otherAltitude) const;

2
src/blackmisc/aviation/atcstation.h
View File

@@ -269,7 +269,7 @@ namespace BlackMisc
QString convertToQString(bool i18n = false) const;
//! \copydoc BlackMisc::Mixin::Icon::toIcon()
BlackMisc::CIcon toIcon() const { return m_callsign.toIcon(); }
BlackMisc::CIcons::IconIndex toIcon() const { return m_callsign.toIcon(); }
private:
CCallsign m_callsign;

2
src/blackmisc/aviation/callsign.h
View File

@@ -156,7 +156,7 @@ namespace BlackMisc
bool isValid() const;
//! \copydoc BlackMisc::Mixin::Icon::toIcon()
CIcon toIcon() const { return convertToIcon(*this); }
CIcons::IconIndex toIcon() const { return convertToIcon(*this).getIndex(); }
//! \copydoc BlackMisc::Mixin::Index::propertyByIndex
CVariant propertyByIndex(const CPropertyIndex &index) const;

4
src/blackmisc/aviation/flightplan.cpp
View File

@@ -960,9 +960,9 @@ namespace BlackMisc
return p;
}
CIcon CFlightPlan::toIcon() const
CIcons::IconIndex CFlightPlan::toIcon() const
{
return CIcon::iconByIndex(CIcons::StandardIconAppFlightPlan16);
return CIcons::StandardIconAppFlightPlan16;
}
} // namespace

2
src/blackmisc/aviation/flightplan.h
View File

@@ -379,7 +379,7 @@ namespace BlackMisc
void setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant);
//! \copydoc BlackMisc::Mixin::Icon::toIcon
CIcon toIcon() const;
CIcons::IconIndex toIcon() const;
//! \copydoc BlackMisc::Mixin::String::toQString()
QString convertToQString(bool i18n = false) const;