diff --git a/src/blackmisc/avaltitude.cpp b/src/blackmisc/avaltitude.cpp index db4a7a9f5..3b20ad72d 100644 --- a/src/blackmisc/avaltitude.cpp +++ b/src/blackmisc/avaltitude.cpp @@ -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"); } diff --git a/src/blackmisc/avaltitude.h b/src/blackmisc/avaltitude.h index 4dec1c96f..3ddc1f8f3 100644 --- a/src/blackmisc/avaltitude.h +++ b/src/blackmisc/avaltitude.h @@ -27,7 +27,7 @@ protected: * \param i18n * \return */ - virtual QString stringForConverter(bool i18n) const; + virtual QString convertToQString(bool i18n) const; /*! * \brief Stream to DBus << diff --git a/src/blackmisc/avheading.cpp b/src/blackmisc/avheading.cpp index 985bf73ae..1116b13f8 100644 --- a/src/blackmisc/avheading.cpp +++ b/src/blackmisc/avheading.cpp @@ -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"); } diff --git a/src/blackmisc/avheading.h b/src/blackmisc/avheading.h index 1a3897364..224edd116 100644 --- a/src/blackmisc/avheading.h +++ b/src/blackmisc/avheading.h @@ -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 << diff --git a/src/blackmisc/aviomodulator.h b/src/blackmisc/aviomodulator.h index 00ae1e42e..4985a5822 100644 --- a/src/blackmisc/aviomodulator.h +++ b/src/blackmisc/aviomodulator.h @@ -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)); diff --git a/src/blackmisc/aviotransponder.cpp b/src/blackmisc/aviotransponder.cpp index d8ca230ee..431c393ff 100644 --- a/src/blackmisc/aviotransponder.cpp +++ b/src/blackmisc/aviotransponder.cpp @@ -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()); diff --git a/src/blackmisc/aviotransponder.h b/src/blackmisc/aviotransponder.h index 477441f53..97621277a 100644 --- a/src/blackmisc/aviotransponder.h +++ b/src/blackmisc/aviotransponder.h @@ -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 << diff --git a/src/blackmisc/avtrack.cpp b/src/blackmisc/avtrack.cpp index 4f9ed363f..341d93a32 100644 --- a/src/blackmisc/avtrack.cpp +++ b/src/blackmisc/avtrack.cpp @@ -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"); } diff --git a/src/blackmisc/avtrack.h b/src/blackmisc/avtrack.h index e93cc280f..84c2ecffb 100644 --- a/src/blackmisc/avtrack.h +++ b/src/blackmisc/avtrack.h @@ -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 << diff --git a/src/blackmisc/avverticalpositions.cpp b/src/blackmisc/avverticalpositions.cpp index cdb93f60e..6b6c4d38d 100644 --- a/src/blackmisc/avverticalpositions.cpp +++ b/src/blackmisc/avverticalpositions.cpp @@ -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()). diff --git a/src/blackmisc/avverticalpositions.h b/src/blackmisc/avverticalpositions.h index 0250d2598..ead990609 100644 --- a/src/blackmisc/avverticalpositions.h +++ b/src/blackmisc/avverticalpositions.h @@ -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 diff --git a/src/blackmisc/basestreamstringifier.h b/src/blackmisc/basestreamstringifier.h index 14e6c8c06..1246b2cee 100644 --- a/src/blackmisc/basestreamstringifier.h +++ b/src/blackmisc/basestreamstringifier.h @@ -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. diff --git a/src/blackmisc/coordinateecef.h b/src/blackmisc/coordinateecef.h index 0e21b8e20..42695a483 100644 --- a/src/blackmisc/coordinateecef.h +++ b/src/blackmisc/coordinateecef.h @@ -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)). diff --git a/src/blackmisc/coordinategeodetic.cpp b/src/blackmisc/coordinategeodetic.cpp index cc6c503e2..363dd370d 100644 --- a/src/blackmisc/coordinategeodetic.cpp +++ b/src/blackmisc/coordinategeodetic.cpp @@ -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)); diff --git a/src/blackmisc/coordinategeodetic.h b/src/blackmisc/coordinategeodetic.h index 5f11bb2b3..7af0596c1 100644 --- a/src/blackmisc/coordinategeodetic.h +++ b/src/blackmisc/coordinategeodetic.h @@ -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 diff --git a/src/blackmisc/coordinatened.h b/src/blackmisc/coordinatened.h index c620aa83c..00972ec7c 100644 --- a/src/blackmisc/coordinatened.h +++ b/src/blackmisc/coordinatened.h @@ -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)). diff --git a/src/blackmisc/geoearthangle.h b/src/blackmisc/geoearthangle.h index 7d1b2fc4f..29e93cd1e 100644 --- a/src/blackmisc/geoearthangle.h +++ b/src/blackmisc/geoearthangle.h @@ -72,7 +72,7 @@ protected: * \brief String for converter and streaming * \return */ - virtual QString stringForConverter() const + virtual QString convertToQString() const { return this->unitValueRoundedWithUnit(6); } diff --git a/src/blackmisc/geolatitude.h b/src/blackmisc/geolatitude.h index a7187a60f..d4f7ac644 100644 --- a/src/blackmisc/geolatitude.h +++ b/src/blackmisc/geolatitude.h @@ -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: diff --git a/src/blackmisc/geolongitude.h b/src/blackmisc/geolongitude.h index 9099d10de..884e3913c 100644 --- a/src/blackmisc/geolongitude.h +++ b/src/blackmisc/geolongitude.h @@ -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: diff --git a/src/blackmisc/mathmatrixbase.cpp b/src/blackmisc/mathmatrixbase.cpp index 17412a656..b00c1f9de 100644 --- a/src/blackmisc/mathmatrixbase.cpp +++ b/src/blackmisc/mathmatrixbase.cpp @@ -149,7 +149,7 @@ template void CMatrixBase QString CMatrixBase::stringForConverter(bool /** i18n **/) const +template QString CMatrixBase::convertToQString(bool /** i18n **/) const { QString s = "{"; for (int r = 0; r < Rows; r++) diff --git a/src/blackmisc/mathmatrixbase.h b/src/blackmisc/mathmatrixbase.h index 1463e4566..a2090e5c0 100644 --- a/src/blackmisc/mathmatrixbase.h +++ b/src/blackmisc/mathmatrixbase.h @@ -49,7 +49,7 @@ protected: * \param i18n * \return */ - QString stringForConverter(bool i18n = false) const; + QString convertToQString(bool i18n = false) const; /*! * \brief Stream to DBus diff --git a/src/blackmisc/mathvector3dbase.cpp b/src/blackmisc/mathvector3dbase.cpp index fb2a0d8c2..8c07decb3 100644 --- a/src/blackmisc/mathvector3dbase.cpp +++ b/src/blackmisc/mathvector3dbase.cpp @@ -16,7 +16,7 @@ namespace Math /* * Convert to string */ -template QString CVector3DBase::stringForConverter(bool /** i18n **/) const +template QString CVector3DBase::convertToQString(bool /** i18n **/) const { QString s = ("{%1, %2, %3}"); s = s.arg(QString::number(this->m_i, 'f')). diff --git a/src/blackmisc/mathvector3dbase.h b/src/blackmisc/mathvector3dbase.h index 90a9ed036..aae74f5f4 100644 --- a/src/blackmisc/mathvector3dbase.h +++ b/src/blackmisc/mathvector3dbase.h @@ -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 diff --git a/src/blackmisc/pqbase.h b/src/blackmisc/pqbase.h index e3aefaf9c..ff1bb2cd5 100644 --- a/src/blackmisc/pqbase.h +++ b/src/blackmisc/pqbase.h @@ -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); } diff --git a/src/blackmisc/pqphysicalquantity.h b/src/blackmisc/pqphysicalquantity.h index 14d72e494..b09eab05e 100644 --- a/src/blackmisc/pqphysicalquantity.h +++ b/src/blackmisc/pqphysicalquantity.h @@ -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); }