flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-11 23:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #413 Make all value class methods non-virtual.

Browse Source 
toCVariant() and convertFromCVariant() are now deprecated,
use CVariant::from() and CVariant::to() instead.
This commit is contained in:
Mathew Sutcliffe
2015-05-05 17:08:30 +01:00
parent fe08792bef
commit 6b40cde862
90 changed files with 234 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ namespace BlackMisc
CAircraft(const CCallsign &callsign, const BlackMisc::Network::CUser &user, const CAircraftSituation &situation);
//! \copydoc CValueObject::toIcon()
virtual BlackMisc::CIcon toIcon() const override { return this->m_callsign.toIcon(); }
BlackMisc::CIcon toIcon() const { return this->m_callsign.toIcon(); }
//! Get callsign.
const CCallsign &getCallsign() const { return m_callsign; }
@@ -267,13 +267,13 @@ namespace BlackMisc
bool isVtol() const;
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
//! \copydoc CValueObject::convertToQString()
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraft)

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

@@ -43,7 +43,7 @@ namespace BlackMisc
void setOn(bool on) { m_on = on; }
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftEngine)

4
src/blackmisc/aviation/aircraftenginelist.h
View File

@@ -42,10 +42,10 @@ namespace BlackMisc
bool isEngineOn(int engineNumber) const;
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! \copydoc CValueObject::toJson
QJsonObject toJson() const;

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

@@ -139,10 +139,10 @@ namespace BlackMisc
bool isVtol() const;
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
//! Valid designator?
static bool isValidDesignator(const QString &designator);
@@ -154,7 +154,7 @@ namespace BlackMisc
static bool isValidAirlineDesignator(const QString &airline);
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftIcao)

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

@@ -43,10 +43,10 @@ namespace BlackMisc
CAircraftLights(bool strobeOn, bool landingOn, bool taxiOn, bool beaconOn, bool navOn, bool logoOn);
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
//! Strobes lights on?
bool isStrobeOn() const { return m_strobeOn; }
@@ -97,7 +97,7 @@ namespace BlackMisc
static CAircraftLights allLightsOff();
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftLights)

4
src/blackmisc/aviation/aircraftlist.h
View File

@@ -49,10 +49,10 @@ namespace BlackMisc
bool updateWithVatsimDataFileData(CAircraft &aircraftToBeUpdated) const;
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! Register metadata
static void registerMetadata();

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

@@ -60,10 +60,10 @@ namespace BlackMisc
{}
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
//! Get aircraft lights
CAircraftLights getLights() const { return m_lights; }
@@ -120,7 +120,7 @@ namespace BlackMisc
void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { this->m_correspondingCallsign = callsign; }
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftParts)

4
src/blackmisc/aviation/aircraftpartslist.h
View File

@@ -36,10 +36,10 @@ namespace BlackMisc
CAircraftPartsList(const CSequence<CAircraftParts> &other);
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! Register metadata
static void registerMetadata();

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

@@ -71,10 +71,10 @@ namespace BlackMisc
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
//! Get position
const BlackMisc::Geo::CCoordinateGeodetic &getPosition() const { return this->m_position; }
@@ -144,7 +144,7 @@ namespace BlackMisc
void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { this->m_correspondingCallsign = callsign; }
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftSituation)

4
src/blackmisc/aviation/aircraftsituationlist.h
View File

@@ -36,10 +36,10 @@ namespace BlackMisc
CAircraftSituationList(const CSequence<CAircraftSituation> &other);
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! Metadata
static void registerMetadata();

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

@@ -97,13 +97,13 @@ namespace BlackMisc
}
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAirport)

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

@@ -52,7 +52,7 @@ namespace BlackMisc
static bool isValidIcaoDesignator(const QString &icaoCode);
//! \copydoc CValueObject::convertToQString()
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAirportIcao)

4
src/blackmisc/aviation/airportlist.h
View File

@@ -48,10 +48,10 @@ namespace BlackMisc
CAirport findFirstByIcao(const CAirportIcao &icao, const CAirport &ifNotFound = CAirport()) const;
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! Register metadata
static void registerMetadata();

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

@@ -49,7 +49,7 @@ namespace BlackMisc
};
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
//! Default constructor: 0 Altitude true
CAltitude() : CValueObject(0, BlackMisc::PhysicalQuantities::CLengthUnit::m()), m_datum(MeanSeaLevel) {}
@@ -82,13 +82,13 @@ namespace BlackMisc
void toMeanSeaLevel();
//! \copydoc CValueObject::parseFromString(const QString &value)
virtual void parseFromString(const QString &value) override;
void parseFromString(const QString &value);
//! \copydoc CValueObject::parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode)
virtual void parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode) override;
void parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode);
//! \copydoc CValueObject::toIcon
BlackMisc::CIcon toIcon() const override;
BlackMisc::CIcon toIcon() const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAltitude)

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

@@ -67,7 +67,7 @@ namespace BlackMisc
const CInformationMessage &atis = CInformationMessage(CInformationMessage::ATIS), const CInformationMessage &metar = CInformationMessage(CInformationMessage::METAR));
//! \copydoc CValueObject::toIcon()
virtual BlackMisc::CIcon toIcon() const override { return this->m_callsign.toIcon(); }
BlackMisc::CIcon toIcon() const { return this->m_callsign.toIcon(); }
//! Has booking times?
bool hasBookingTimes() const
@@ -243,13 +243,13 @@ namespace BlackMisc
const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const override;
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) override;
void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index);
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAtcStation)

4
src/blackmisc/aviation/atcstationlist.h
View File

@@ -60,10 +60,10 @@ namespace BlackMisc
bool updateFromVatsimDataFileStation(CAtcStation &stationToBeUpdated) const;
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! Register metadata
static void registerMetadata();

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

@@ -40,6 +40,9 @@ namespace BlackMisc
//! \brief Constructor
CAvionicsBase(const QString &name) : m_name(name) {}
//! Destructor
virtual ~CAvionicsBase() = default;
//! \brief Set name
void setName(const QString &name)
{
@@ -48,7 +51,7 @@ namespace BlackMisc
public:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override { Q_UNUSED(i18n); return ""; }
QString convertToQString(bool i18n = false) const { Q_UNUSED(i18n); return ""; }
//! \brief Name
QString getName() const

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

@@ -89,13 +89,13 @@ namespace BlackMisc
bool equalsString(const QString &callsignString) const;
//! \copydoc CValueObject::toIcon()
virtual BlackMisc::CIcon toIcon() const override { return convertToIcon(*this); }
BlackMisc::CIcon toIcon() const { return convertToIcon(*this); }
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
//! Valid callsign?
static bool isValidCallsign(const QString &callsign);
@@ -113,7 +113,7 @@ namespace BlackMisc
static const CIcon &convertToIcon(const CCallsign &callsign);
//! \copydoc CValueObject::convertToQString()
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
protected:
//! Unify the callsign

4
src/blackmisc/aviation/callsignset.h
View File

@@ -33,10 +33,10 @@ namespace BlackMisc
CCallsignSet(const CCollection<CCallsign> &other);
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! Register metadata
static void registerMetadata();

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

@@ -180,10 +180,10 @@ namespace BlackMisc
const QString &getRemarks() const { return m_remarks; }
//! \copydoc CValueObject::toIcon
virtual CIcon toIcon() const override;
CIcon toIcon() const;
//! \copydoc CValueObject::convertToQString()
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CFlightPlan)

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

@@ -46,7 +46,7 @@ namespace BlackMisc
};
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
//! \brief Default constructor: 0 heading true
CHeading() : CValueObject(0, BlackMisc::PhysicalQuantities::CAngleUnit::rad()), m_north(Magnetic) {}

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

@@ -91,7 +91,7 @@ namespace BlackMisc
bool isEmpty() const { return this->m_message.isEmpty(); }
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CInformationMessage)

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

@@ -77,13 +77,13 @@ namespace BlackMisc
void setEnabled(bool enable);
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
protected:
//! Default constructor

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

@@ -71,7 +71,7 @@ namespace BlackMisc
static const QStringList &codePairs();
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CSelcal)

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

@@ -75,7 +75,7 @@ namespace BlackMisc
ReferenceNorth getReferenceNorth() const { return m_north; }
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CTrack)

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

@@ -160,10 +160,10 @@ namespace BlackMisc
}
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
//! Is valid transponder code?
static bool isValidTransponderCode(const QString &transponderCode);
@@ -172,7 +172,7 @@ namespace BlackMisc
static bool isValidTransponderCode(qint32 transponderMode);
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
protected:
//! Default value?