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

style fixes: mostly just things that make my eyes bleed :)

Browse Source
This commit is contained in:
Mathew Sutcliffe
2013-08-13 22:29:48 +01:00
parent e8b52b33d0
commit 2c781e8b36
50 changed files with 975 additions and 917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/blackmisc/coordinatened.h
View File

@@ -18,7 +18,6 @@ namespace Geo
*/
class CCoordinateNed : public BlackMisc::Math::CVector3DBase<CCoordinateNed>
{
private:
CCoordinateGeodetic m_referencePosition; //!< geodetic reference position
bool m_hasReferencePosition; //!< valid reference position?
@@ -70,58 +69,57 @@ public:
* \brief Copy constructor
* \param otherNed
*/
CCoordinateNed(const CCoordinateNed &otherNed) :
CVector3DBase(otherNed), m_referencePosition(otherNed.m_referencePosition), m_hasReferencePosition(otherNed.m_hasReferencePosition) {}
CCoordinateNed(const CCoordinateNed &other) :
CVector3DBase(other), m_referencePosition(other.m_referencePosition), m_hasReferencePosition(other.m_hasReferencePosition) {}
/*!
* \brief Constructor by math vector
* \param vector
*/
explicit CCoordinateNed(const BlackMisc::Math::CVector3D vector) : CVector3DBase(vector.i(), vector.j(), vector.k()), m_referencePosition(), m_hasReferencePosition(false) {}
explicit CCoordinateNed(const BlackMisc::Math::CVector3D &vector) : CVector3DBase(vector.i(), vector.j(), vector.k()), m_referencePosition(), m_hasReferencePosition(false) {}
/*!
* \brief Constructor by math vector and reference position
* \param referencePosition
* \param vector
*/
CCoordinateNed(const CCoordinateGeodetic &referencePosition, const BlackMisc::Math::CVector3D vector) : CVector3DBase(vector.i(), vector.j(), vector.k()), m_referencePosition(referencePosition), m_hasReferencePosition(true) {}
CCoordinateNed(const CCoordinateGeodetic &referencePosition, const BlackMisc::Math::CVector3D &vector) : CVector3DBase(vector.i(), vector.j(), vector.k()), m_referencePosition(referencePosition), m_hasReferencePosition(true) {}
/*!
* \brief Equal operator ==
* \param otherNed
* \param other
* \return
*/
bool operator ==(const CCoordinateNed &otherNed) const
bool operator ==(const CCoordinateNed &other) const
{
if (this == &otherNed) return true;
return this->m_hasReferencePosition == otherNed.m_hasReferencePosition &&
this->m_referencePosition == otherNed.m_referencePosition &&
CVector3DBase::operator== (otherNed);
if (this == &other) return true;
return this->m_hasReferencePosition == other.m_hasReferencePosition &&
this->m_referencePosition == other.m_referencePosition &&
this->CVector3DBase::operator== (other);
}
/*!
* \brief Unequal operator !=
* \param otherNed
* \param other
* \return
*/
bool operator !=(const CCoordinateNed &otherNed) const
bool operator !=(const CCoordinateNed &other) const
{
if (this == &otherNed) return false;
return !((*this) == otherNed);
return !((*this) == other);
}
/*!
* \brief Assigment operator =
* \param otherNed
* \param other
* \return
*/
CCoordinateNed &operator =(const CCoordinateNed &otherNed)
CCoordinateNed &operator =(const CCoordinateNed &other)
{
if (this == &otherNed) return *this; // Same object?
CVector3DBase::operator = (otherNed);
this->m_hasReferencePosition = otherNed.m_hasReferencePosition;
this->m_referencePosition = otherNed.m_referencePosition;
return (*this);
if (this == &other) return *this;
this->CVector3DBase::operator = (other);
this->m_hasReferencePosition = other.m_hasReferencePosition;
this->m_referencePosition = other.m_referencePosition;
return *this;
}
/*!
@@ -218,6 +216,7 @@ public:
} // namespace
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Geo::CCoordinateNed)
#endif // guard