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

refs #314, fixed missing virtual keyword and Doxygen comment

Browse Source
This commit is contained in:
Klaus Basan
2014-08-25 13:10:13 +02:00
parent 40b428a315
commit c1895c1ab2
35 changed files with 79 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/audiodevice.h
View File

@@ -86,7 +86,7 @@ namespace BlackMisc
//! Register metadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
//! Device index for default device

2
src/blackmisc/avaircraft.h
View File

@@ -240,7 +240,7 @@ namespace BlackMisc
//! Register metadata
static void registerMetadata();
//! Members
//! JSON member names
static const QStringList &jsonMembers();
protected:

2
src/blackmisc/avaircrafticao.h
View File

@@ -160,7 +160,7 @@ namespace BlackMisc
//! Register metadata
static void registerMetadata();
//! Members
//! JSON member names
static const QStringList &jsonMembers();
//! Valid designator?

4
src/blackmisc/avairport.h
View File

@@ -135,12 +135,12 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! Register metadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! \copydoc TupleConverter::jsonMembers()
static const QStringList &jsonMembers();
protected:

2
src/blackmisc/avaltitude.cpp
View File

@@ -153,7 +153,7 @@ namespace BlackMisc
}
/*
* To JSON
* From JSON
*/
void CAltitude::convertFromJson(const QJsonObject &json)
{

8
src/blackmisc/avaltitude.h
View File

@@ -103,7 +103,7 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
@@ -112,10 +112,10 @@ namespace BlackMisc
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
//! \copydoc CValueObject::parseFromString(const QString &value)
void parseFromString(const QString &value) override;
virtual void parseFromString(const QString &value) override;
//! \copydoc CValueObject::parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode)
void parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode) override;
virtual void parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode) override;
//! \copydoc CValueObject::toIcon
BlackMisc::CIcon toIcon() const override;
@@ -123,7 +123,7 @@ namespace BlackMisc
//! Register metadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
};

4
src/blackmisc/avatcstation.h
View File

@@ -285,12 +285,12 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! Register metadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
protected:

2
src/blackmisc/avcallsign.cpp
View File

@@ -114,7 +114,7 @@ namespace BlackMisc
}
/*
* To JSON
* From JSON
*/
void CCallsign::convertFromJson(const QJsonObject &json)
{

4
src/blackmisc/avheading.h
View File

@@ -94,12 +94,12 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! \brief Register metadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
};

4
src/blackmisc/avinformationmessage.h
View File

@@ -115,12 +115,12 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! Register metadata
static void registerMetadata();
//! Members
//! JSON member names
static const QStringList &jsonMembers();
protected:

4
src/blackmisc/aviotransponder.h
View File

@@ -163,7 +163,7 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
@@ -177,7 +177,7 @@ namespace BlackMisc
//! \copydoc CValueObject::setPropertyByIndex(variant, index)
virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override;
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
//! Is valid transponder code?

4
src/blackmisc/avselcal.h
View File

@@ -71,12 +71,12 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! Register metadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
//! Equals given string

2
src/blackmisc/avtrack.h
View File

@@ -81,7 +81,7 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! \brief Register metadata
static void registerMetadata();

2
src/blackmisc/containerbase.h
View File

@@ -114,7 +114,7 @@ namespace BlackMisc
}
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override
virtual void convertFromJson(const QJsonObject &json) override
{
QJsonArray array = json.value("containerbase").toArray();
for (auto i = array.begin(); i != array.end(); ++i)

2
src/blackmisc/coordinategeodetic.h
View File

@@ -193,7 +193,7 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! Register metadata
static void registerMetadata();

2
src/blackmisc/dictionary.h
View File

@@ -231,7 +231,7 @@ namespace BlackMisc
}
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override
virtual void convertFromJson(const QJsonObject &json) override
{
QJsonArray array = json.value("associativecontainerbase").toArray();
for (auto it = array.begin(); it != array.end(); ++it)

2
src/blackmisc/hotkeyfunction.h
View File

@@ -62,7 +62,7 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! Register metadata
static void registerMetadata();

2
src/blackmisc/hwkeyboardkey.h
View File

@@ -78,7 +78,7 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! Register metadata
static void registerMetadata();

2
src/blackmisc/icon.h
View File

@@ -73,7 +73,7 @@ namespace BlackMisc
//! Register metadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
//! Implicit conversion

2
src/blackmisc/mathmatrixbase.h
View File

@@ -249,7 +249,7 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
private:
//! \brief Check range of row / column

4
src/blackmisc/nwaircraftmodel.h
View File

@@ -59,7 +59,7 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! \copydoc CValueObject::propertyByIndex(int)
virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
@@ -85,7 +85,7 @@ namespace BlackMisc
//! Register metadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
protected:

4
src/blackmisc/nwclient.h
View File

@@ -74,7 +74,7 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! \copydoc CValueObject::toQVariant()
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
@@ -139,7 +139,7 @@ namespace BlackMisc
//! Register metadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
protected:

2
src/blackmisc/nwserver.h
View File

@@ -109,7 +109,7 @@ namespace BlackMisc
//! \copydoc CValueObject::setPropertyByIndex(const QVariant &, int index)
virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override;
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
//! Register metadata

2
src/blackmisc/nwvoicecapabilities.h
View File

@@ -73,7 +73,7 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! Register metadata
static void registerMetadata();

2
src/blackmisc/propertyindex.h
View File

@@ -111,7 +111,7 @@ namespace BlackMisc
//! Register metadata
static void registerMetadata();
//! Members
//! JSON member names
static const QStringList &jsonMembers();
protected:

2
src/blackmisc/setaudio.h
View File

@@ -75,7 +75,7 @@ namespace BlackMisc
//! \copydoc CValueObject::registerMetadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
protected:

2
src/blackmisc/setkeyboardhotkey.h
View File

@@ -65,7 +65,7 @@ namespace BlackMisc
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! Register metadata
static void registerMetadata();

2
src/blackmisc/setnetwork.h
View File

@@ -111,7 +111,7 @@ namespace BlackMisc
//! \copydoc CValueObject::registerMetadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
protected:

26
src/blackmisc/statusmessage.cpp
View File

@@ -121,6 +121,30 @@ namespace BlackMisc
}
}
/*
* To JSON
*/
QJsonObject CStatusMessage::toJson() const
{
return BlackMisc::serializeJson(CStatusMessage::jsonMembers(), TupleConverter<CStatusMessage>::toTuple(*this));
}
/*
* From JSON
*/
void CStatusMessage::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, CStatusMessage::jsonMembers(), TupleConverter<CStatusMessage>::toTuple(*this));
}
/*
* Members
*/
const QStringList &CStatusMessage::jsonMembers()
{
return TupleConverter<CStatusMessage>::jsonMembers();
}
/*
* Type
*/
@@ -257,7 +281,7 @@ namespace BlackMisc
}
/*
* Equal
* Unequal
*/
bool CStatusMessage::operator !=(const CStatusMessage &other) const
{

9
src/blackmisc/statusmessage.h
View File

@@ -102,6 +102,12 @@ namespace BlackMisc
//! Type as string
const QString &getSeverityAsString() const;
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override;
//! \copydoc CValueObject::propertyByIndex(int)
virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
@@ -120,6 +126,9 @@ namespace BlackMisc
//! Register metadata
static void registerMetadata();
//! JSON member names
static const QStringList &jsonMembers();
//! Validation error
static CStatusMessage getValidationError(const QString &message);

4
src/blackmisc/voiceroom.h
View File

@@ -106,7 +106,7 @@ namespace BlackMisc
virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override;
//! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) override;
virtual void convertFromJson(const QJsonObject &json) override;
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
@@ -117,7 +117,7 @@ namespace BlackMisc
//! Register metadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
//! Protocol prefix "vvl"

2
src/blacksim/fscommon/aircraftcfgentries.h
View File

@@ -123,7 +123,7 @@ namespace BlackSim
//! Register the metatypes
static void registerMetadata();
//! Members
//! JSON member names
static const QStringList &jsonMembers();
protected:

2
src/blacksim/fscommon/aircraftmapping.h
View File

@@ -215,7 +215,7 @@ namespace BlackSim
//! Register metadata
static void registerMetadata();
//! Members
//! JSON member names
static const QStringList &jsonMembers();
};
} // namespace

2
src/blacksim/setsimulator.h
View File

@@ -101,7 +101,7 @@ namespace BlackSim
//! \copydoc CValueObject::registerMetadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
//! JSON member names
static const QStringList &jsonMembers();
protected:

2
src/blacksim/simulatorinfo.h
View File

@@ -58,7 +58,7 @@ namespace BlackSim
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override;
//! Members
//! JSON member names
static const QStringList &jsonMembers();
//! Register the metatypes