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

refs #413 Access control of convertToQString changed from protected to public.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-04-30 21:11:12 +01:00
parent 97d83e5e41
commit b64ae55a86
61 changed files with 24 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackmisc/aviation/aircraft.h
View File

@@ -272,7 +272,6 @@ namespace BlackMisc
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
protected:
//! \copydoc CValueObject::convertToQString()
virtual QString convertToQString(bool i18n = false) const override;

1
src/blackmisc/aviation/aircraftengine.h
View File

@@ -42,7 +42,6 @@ namespace BlackMisc
//! Set to on/off
void setOn(bool on) { m_on = on; }
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;

1
src/blackmisc/aviation/aircrafticao.h
View File

@@ -153,7 +153,6 @@ namespace BlackMisc
//! Valid designator?
static bool isValidAirlineDesignator(const QString &airline);
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;

1
src/blackmisc/aviation/aircraftlights.h
View File

@@ -96,7 +96,6 @@ namespace BlackMisc
//! Returns object with all lights switched off
static CAircraftLights allLightsOff();
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;

1
src/blackmisc/aviation/aircraftparts.h
View File

@@ -119,7 +119,6 @@ namespace BlackMisc
//! Corresponding callsign
void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { this->m_correspondingCallsign = callsign; }
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;

1
src/blackmisc/aviation/aircraftsituation.h
View File

@@ -143,7 +143,6 @@ namespace BlackMisc
//! Corresponding callsign
void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { this->m_correspondingCallsign = callsign; }
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;

1
src/blackmisc/aviation/airport.h
View File

@@ -102,7 +102,6 @@ namespace BlackMisc
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;

1
src/blackmisc/aviation/airporticao.h
View File

@@ -51,7 +51,6 @@ namespace BlackMisc
//! Valid ICAO designator
static bool isValidIcaoDesignator(const QString &icaoCode);
protected:
//! \copydoc CValueObject::convertToQString()
virtual QString convertToQString(bool i18n = false) const override;

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

@@ -48,11 +48,9 @@ namespace BlackMisc
FlightLevel //!< Flight level
};
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
public:
//! Default constructor: 0 Altitude true
CAltitude() : CValueObject(0, BlackMisc::PhysicalQuantities::CLengthUnit::m()), m_datum(MeanSeaLevel) {}

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

@@ -248,7 +248,6 @@ namespace BlackMisc
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) override;
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;

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

@@ -46,10 +46,10 @@ namespace BlackMisc
this->m_name = name;
}
public:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override { Q_UNUSED(i18n); return ""; }
public:
//! \brief Name
QString getName() const
{

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

@@ -112,10 +112,10 @@ namespace BlackMisc
//! Representing icon
static const CIcon &convertToIcon(const CCallsign &callsign);
protected:
//! \copydoc CValueObject::convertToQString()
virtual QString convertToQString(bool i18n = false) const override;
protected:
//! Unify the callsign
static QString unifyCallsign(const QString &callsign);

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

@@ -182,7 +182,6 @@ namespace BlackMisc
//! \copydoc CValueObject::toIcon
virtual CIcon toIcon() const override;
protected:
//! \copydoc CValueObject::convertToQString()
virtual QString convertToQString(bool i18n = false) const override;

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

@@ -45,11 +45,9 @@ namespace BlackMisc
True = 1 //!< true north
};
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
public:
//! \brief Default constructor: 0 heading true
CHeading() : CValueObject(0, BlackMisc::PhysicalQuantities::CAngleUnit::rad()), m_north(Magnetic) {}

1
src/blackmisc/aviation/informationmessage.h
View File

@@ -90,7 +90,6 @@ namespace BlackMisc
//! Is empty?
bool isEmpty() const { return this->m_message.isEmpty(); }
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;

6
src/blackmisc/aviation/modulator.h
View File

@@ -82,6 +82,9 @@ namespace BlackMisc
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
protected:
//! Default constructor
CModulator();
@@ -89,9 +92,6 @@ namespace BlackMisc
//! Constructor
CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency);
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
//! Set active frequency
void setFrequencyActiveKHz(double frequencyKHz);

1
src/blackmisc/aviation/selcal.h
View File

@@ -70,7 +70,6 @@ namespace BlackMisc
//! All valid code pairs: AB, AC, AD ...
static const QStringList &codePairs();
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;

1
src/blackmisc/aviation/track.h
View File

@@ -74,7 +74,6 @@ namespace BlackMisc
//! \brief Get reference north (magnetic or true)
ReferenceNorth getReferenceNorth() const { return m_north; }
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;

6
src/blackmisc/aviation/transponder.h
View File

@@ -171,13 +171,13 @@ namespace BlackMisc
//! Is valid transponder code?
static bool isValidTransponderCode(qint32 transponderMode);
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
protected:
//! Default value?
virtual bool isDefaultValue() const { return this->m_transponderCode == 0; }
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CTransponder)
int m_transponderCode; //!< Transponder code