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

Refactoring, renamed: convertToQString (old: stringForConvert)

Browse Source
This commit is contained in:
Klaus Basan
2013-07-28 03:31:04 +02:00
parent a53ea0c5fd
commit 62591a750f
25 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/avaltitude.cpp
View File

@@ -16,9 +16,9 @@ namespace Aviation
/*
* Own implementation for streaming
*/
QString CAltitude::stringForConverter(bool /** i18n **/) const
QString CAltitude::convertToQString(bool /** i18n **/) const
{
QString s = CLength::stringForConverter();
QString s = CLength::convertToQString();
return s.append(this->m_msl ? " MSL" : " AGL");
}

2
src/blackmisc/avaltitude.h
View File

@@ -27,7 +27,7 @@ protected:
* \param i18n
* \return
*/
virtual QString stringForConverter(bool i18n) const;
virtual QString convertToQString(bool i18n) const;
/*!
* \brief Stream to DBus <<

4
src/blackmisc/avheading.cpp
View File

@@ -16,9 +16,9 @@ namespace Aviation
/*
* Own implementation for streaming
*/
QString CHeading::stringForConverter(bool i18n) const
QString CHeading::convertToQString(bool i18n) const
{
QString s = CAngle::stringForConverter(i18n);
QString s = CAngle::convertToQString(i18n);
return s.append(this->m_magnetic ? " magnetic" : " true");
}

2
src/blackmisc/avheading.h
View File

@@ -26,7 +26,7 @@ protected:
* \param i18n
* \return
*/
virtual QString stringForConverter(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const;
/*!
* \brief Stream to DBus <<

2
src/blackmisc/aviomodulator.h
View File

@@ -83,7 +83,7 @@ protected:
* \param i18n
* \return
*/
virtual QString stringForConverter(bool i18n = false) const {
virtual QString convertToQString(bool i18n = false) const {
QString s(this->getName());
s.append(" Active: ").append(this->m_frequencyActive.unitValueRoundedWithUnit(3, i18n));
s.append(" Standby: ").append(this->m_frequencyStandby.unitValueRoundedWithUnit(3, i18n));

2
src/blackmisc/aviotransponder.cpp
View File

@@ -45,7 +45,7 @@ bool CTransponder::validate(bool strict) const
/**
* String representation
*/
QString CTransponder::stringForConverter(bool /** i18n **/) const
QString CTransponder::convertToQString(bool /** i18n **/) const
{
QString s = this->getName();
s = s.append(" ").append(this->getTransponderCodeFormatted()).append(" ").append(this->getModeAsString());

2
src/blackmisc/aviotransponder.h
View File

@@ -95,7 +95,7 @@ protected:
* \param i18n
* \return
*/
virtual QString stringForConverter(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const;
/*!
* \brief Stream to DBus <<

4
src/blackmisc/avtrack.cpp
View File

@@ -16,9 +16,9 @@ namespace Aviation
/*
* Own implementation for streaming
*/
QString CTrack::stringForConverter(bool i18n) const
QString CTrack::convertToQString(bool i18n) const
{
QString s = CAngle::stringForConverter(i18n);
QString s = CAngle::convertToQString(i18n);
return s.append(this->m_magnetic ? " magnetic" : " true");
}

2
src/blackmisc/avtrack.h
View File

@@ -27,7 +27,7 @@ protected:
* \brief Specific stream operation for Track
* \return
*/
virtual QString stringForConverter(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const;
/*!
* \brief Stream to DBus <<

2
src/blackmisc/avverticalpositions.cpp
View File

@@ -76,7 +76,7 @@ bool CAviationVerticalPositions::operator !=(const CAviationVerticalPositions &o
/*
* String representation for converter
*/
QString CAviationVerticalPositions::stringForConverter(bool /** i18n **/) const
QString CAviationVerticalPositions::convertToQString(bool /** i18n **/) const
{
QString s = QString("Altitude: ").
append(this->m_altitude.unitValueRoundedWithUnit()).

2
src/blackmisc/avverticalpositions.h
View File

@@ -31,7 +31,7 @@ protected:
* \param i18n
* \return
*/
virtual QString stringForConverter(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const;
/*!
* \brief Unmarshall from Dbus

10
src/blackmisc/basestreamstringifier.h
View File

@@ -133,7 +133,7 @@ public:
*/
QString toQString(bool i18n = false) const
{
return this->stringForConverter(i18n);
return this->convertToQString(i18n);
}
protected:
@@ -149,7 +149,7 @@ protected:
virtual QString stringForStreaming() const
{
// simplest default implementation requires only one method
return this->stringForConverter();
return this->convertToQString();
}
/*!
@@ -157,19 +157,19 @@ protected:
* \param i18n
* \return
*/
virtual QString stringForConverter(bool i18n = false) const = 0;
virtual QString convertToQString(bool i18n = false) const = 0;
/*!
* \brief Stream to DBus
* \param argument
*/
virtual void marshallToDbus(QDBusArgument &) const {}
virtual void marshallToDbus(QDBusArgument &) const = 0;
/*!
* \brief Stream from DBus
* \param argument
*/
virtual void unmarshallFromDbus(const QDBusArgument &) {}
virtual void unmarshallFromDbus(const QDBusArgument &) = 0;
/*!
* \brief Copy assignment operator.

2
src/blackmisc/coordinateecef.h
View File

@@ -104,7 +104,7 @@ protected:
* \brief String for converter
* \return
*/
virtual QString stringForConverter() const
virtual QString convertToQString() const
{
QString s = "ECEF: {x %1, y %2, z %3}";
s = s.arg(QString::number(this->x(), 'f', 6)).

2
src/blackmisc/coordinategeodetic.cpp
View File

@@ -13,7 +13,7 @@ namespace Geo
/*
* String for converter
*/
QString CCoordinateGeodetic::stringForConverter(bool i18n) const
QString CCoordinateGeodetic::convertToQString(bool i18n) const
{
QString s = "Geodetic: {%1, %2, %3}";
return s.arg(this->m_latitude.unitValueRoundedWithUnit(6, i18n)).arg(this->m_longitude.unitValueRoundedWithUnit(6, i18n)).arg(this->m_height.unitValueRoundedWithUnit(i18n));

2
src/blackmisc/coordinategeodetic.h
View File

@@ -52,7 +52,7 @@ protected:
* \param i18n
* \return
*/
virtual QString stringForConverter(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const;
/*!
* \brief Stream to DBus

2
src/blackmisc/coordinatened.h
View File

@@ -28,7 +28,7 @@ protected:
* \brief String for converter
* \return
*/
virtual QString stringForConverter() const
virtual QString convertToQString() const
{
QString s = "NED: {N %1, E %2, D %3}";
s = s.arg(QString::number(this->north(), 'f', 6)).

2
src/blackmisc/geoearthangle.h
View File

@@ -72,7 +72,7 @@ protected:
* \brief String for converter and streaming
* \return
*/
virtual QString stringForConverter() const
virtual QString convertToQString() const
{
return this->unitValueRoundedWithUnit(6);
}

4
src/blackmisc/geolatitude.h
View File

@@ -19,10 +19,10 @@ protected:
/*!
* \brief Specific string representation
*/
virtual QString stringForConverter() const
virtual QString convertToQString() const
{
QString s = "latitude ";
return s.append(CEarthAngle::stringForConverter());
return s.append(CEarthAngle::convertToQString());
}
public:

4
src/blackmisc/geolongitude.h
View File

@@ -16,10 +16,10 @@ protected:
/*!
* \brief Specific string representation
*/
virtual QString stringForConverter() const
virtual QString convertToQString() const
{
QString s = "longitude ";
return s.append(CEarthAngle::stringForConverter());
return s.append(CEarthAngle::convertToQString());
}
public:

2
src/blackmisc/mathmatrixbase.cpp
View File

@@ -149,7 +149,7 @@ template<class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, R
/*
* Convert to string
*/
template <class ImplMatrix, int Rows, int Columns> QString CMatrixBase<ImplMatrix, Rows, Columns>::stringForConverter(bool /** i18n **/) const
template <class ImplMatrix, int Rows, int Columns> QString CMatrixBase<ImplMatrix, Rows, Columns>::convertToQString(bool /** i18n **/) const
{
QString s = "{";
for (int r = 0; r < Rows; r++)

2
src/blackmisc/mathmatrixbase.h
View File

@@ -49,7 +49,7 @@ protected:
* \param i18n
* \return
*/
QString stringForConverter(bool i18n = false) const;
QString convertToQString(bool i18n = false) const;
/*!
* \brief Stream to DBus

2
src/blackmisc/mathvector3dbase.cpp
View File

@@ -16,7 +16,7 @@ namespace Math
/*
* Convert to string
*/
template <class ImplVector> QString CVector3DBase<ImplVector>::stringForConverter(bool /** i18n **/) const
template <class ImplVector> QString CVector3DBase<ImplVector>::convertToQString(bool /** i18n **/) const
{
QString s = ("{%1, %2, %3}");
s = s.arg(QString::number(this->m_i, 'f')).

2
src/blackmisc/mathvector3dbase.h
View File

@@ -107,7 +107,7 @@ protected:
* \param i18n
* \return
*/
virtual QString stringForConverter(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const;
/*!
* \brief Unmarshall from Dbus

4
src/blackmisc/pqbase.h
View File

@@ -47,7 +47,7 @@ protected:
* \param i18n
* \return
*/
virtual QString stringForConverter(bool /* i18n */ = false) const
virtual QString convertToQString(bool /* i18n */ = false) const
{
return this->m_name;
}
@@ -355,7 +355,7 @@ protected:
* \param i18n
* \return
*/
virtual QString stringForConverter(bool i18n = false) const
virtual QString convertToQString(bool i18n = false) const
{
return this->getUnitName(i18n);
}

2
src/blackmisc/pqphysicalquantity.h
View File

@@ -75,7 +75,7 @@ protected:
* \param i18n
* \return
*/
virtual QString stringForConverter(bool i18n = false) const
virtual QString convertToQString(bool i18n = false) const
{
return this->unitValueRoundedWithUnit(-1, i18n);
}