diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 2d2042f6b..c2e85f6b3 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -1282,7 +1282,7 @@ namespace BlackCore if (msgs.isEmpty()) { return false; } if (!msgs.hasErrorMessages()) { return false; } CApplication::cmdLineErrorMessage( - msgs.toFormattedQString(true) + msgs.toQString(true) ); return false; } diff --git a/src/blackcore/db/databasereaderconfig.cpp b/src/blackcore/db/databasereaderconfig.cpp index db206962f..49200f108 100644 --- a/src/blackcore/db/databasereaderconfig.cpp +++ b/src/blackcore/db/databasereaderconfig.cpp @@ -35,7 +35,7 @@ namespace BlackCore QStringLiteral(" ") % CEntityFlags::flagToString(this->getEntities()) % QStringLiteral(" ") % - this->m_cacheLifetime.toFormattedQString(i18n); + this->m_cacheLifetime.toQString(i18n); } CEntityFlags::Entity CDatabaseReaderConfig::getEntities() const diff --git a/src/blackgui/components/hotkeydialog.cpp b/src/blackgui/components/hotkeydialog.cpp index 9231eae07..7f6c2cc41 100644 --- a/src/blackgui/components/hotkeydialog.cpp +++ b/src/blackgui/components/hotkeydialog.cpp @@ -160,7 +160,7 @@ namespace BlackGui void CHotkeyDialog::combinationSelectionChanged(const CHotkeyCombination &combination) { - ui->pb_SelectedHotkey->setText(combination.toFormattedQString()); + ui->pb_SelectedHotkey->setText(combination.toQString()); } void CHotkeyDialog::combinationSelectionFinished(const CHotkeyCombination &combination) @@ -216,7 +216,7 @@ namespace BlackGui void CHotkeyDialog::synchronizeSimpleSelection() { - ui->pb_SelectedHotkey->setText(m_actionHotkey.getCombination().toFormattedQString()); + ui->pb_SelectedHotkey->setText(m_actionHotkey.getCombination().toQString()); } void CHotkeyDialog::synchronizeAdvancedSelection() diff --git a/src/blackgui/components/simulatorcomponent.cpp b/src/blackgui/components/simulatorcomponent.cpp index 30e17c0b4..e37d323e2 100644 --- a/src/blackgui/components/simulatorcomponent.cpp +++ b/src/blackgui/components/simulatorcomponent.cpp @@ -134,22 +134,22 @@ namespace BlackGui static const CIcon iconRadio(CIcon::iconByIndex(CIcons::StandardIconRadio16)); static const CIcon iconAttitude(CIcon::iconByIndex(CIcons::AviationAttitudeIndicator)); - this->addOrUpdateLiveDataByName("latitude", s.latitude().toFormattedQString(), iconLatLng); - this->addOrUpdateLiveDataByName("longitude", s.longitude().toFormattedQString(), iconLatLng); + this->addOrUpdateLiveDataByName("latitude", s.latitude().toQString(), iconLatLng); + this->addOrUpdateLiveDataByName("longitude", s.longitude().toQString(), iconLatLng); this->addOrUpdateLiveDataByName("altitude", s.getAltitude().valueRoundedWithUnit(CLengthUnit::ft(), 2), iconAlt); if (s.hasGroundElevation()) { this->addOrUpdateLiveDataByName("elevation", s.getGroundElevation().valueRoundedWithUnit(CLengthUnit::ft(), 2), iconAlt); } - this->addOrUpdateLiveDataByName("pitch", s.getPitch().toFormattedQString(), iconAttitude); - this->addOrUpdateLiveDataByName("bank", s.getBank().toFormattedQString(), iconAttitude); - this->addOrUpdateLiveDataByName("heading", s.getHeading().toFormattedQString(), s.getHeading().toIcon()); - this->addOrUpdateLiveDataByName("ground speed", s.getGroundSpeed().toFormattedQString(), s.getGroundSpeed().toIcon()); + this->addOrUpdateLiveDataByName("pitch", s.getPitch().toQString(), iconAttitude); + this->addOrUpdateLiveDataByName("bank", s.getBank().toQString(), iconAttitude); + this->addOrUpdateLiveDataByName("heading", s.getHeading().toQString(), s.getHeading().toIcon()); + this->addOrUpdateLiveDataByName("ground speed", s.getGroundSpeed().toQString(), s.getGroundSpeed().toIcon()); - this->addOrUpdateLiveDataByName("COM1 active", c1.getFrequencyActive().toFormattedQString(), iconRadio); - this->addOrUpdateLiveDataByName("COM2 active", c2.getFrequencyActive().toFormattedQString(), iconRadio); - this->addOrUpdateLiveDataByName("COM1 standby", c1.getFrequencyStandby().toFormattedQString(), iconRadio); - this->addOrUpdateLiveDataByName("COM2 standby", c2.getFrequencyStandby().toFormattedQString(), iconRadio); + this->addOrUpdateLiveDataByName("COM1 active", c1.getFrequencyActive().toQString(), iconRadio); + this->addOrUpdateLiveDataByName("COM2 active", c2.getFrequencyActive().toQString(), iconRadio); + this->addOrUpdateLiveDataByName("COM1 standby", c1.getFrequencyStandby().toQString(), iconRadio); + this->addOrUpdateLiveDataByName("COM2 standby", c2.getFrequencyStandby().toQString(), iconRadio); this->addOrUpdateLiveDataByName("Transponder", ownAircraft.getTransponderCodeFormatted(), iconRadio); } diff --git a/src/blackmisc/stringutils.h b/src/blackmisc/stringutils.h index 05399555f..43b1652d1 100644 --- a/src/blackmisc/stringutils.h +++ b/src/blackmisc/stringutils.h @@ -96,7 +96,7 @@ namespace BlackMisc template QString qmapToString(const QMap &map) { QString s; - const QString kv("%1: %2 "); + static const QString kv("%1: %2 "); QMapIterator i(map); while (i.hasNext()) { @@ -240,6 +240,7 @@ namespace BlackMisc QString toQString(bool i18n = false) const { return derived()->convertToQString(i18n); } //! Cast to pretty-printed QString + //! \deprecated not really used and just using toQString QString toFormattedQString(bool i18n = false) const { return derived()->toQString(i18n); } //! To std string @@ -253,15 +254,17 @@ namespace BlackMisc Derived *derived() { return static_cast(this); } }; + // *INDENT-OFF* /*! * When a derived class and a base class both inherit from Mixin::String, * the derived class uses this macro to disambiguate the inherited members. */ # define BLACKMISC_DECLARE_USING_MIXIN_STRING(DERIVED) \ - using ::BlackMisc::Mixin::String::toQString; \ - using ::BlackMisc::Mixin::String::toFormattedQString; \ - using ::BlackMisc::Mixin::String::toStdString; \ - using ::BlackMisc::Mixin::String::stringForStreaming; + using ::BlackMisc::Mixin::String::toQString; \ + using ::BlackMisc::Mixin::String::toFormattedQString; \ + using ::BlackMisc::Mixin::String::toStdString; \ + using ::BlackMisc::Mixin::String::stringForStreaming; + // *INDENT-ON* } // ns } // ns diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index eeb3c41c7..c4e02ab05 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -89,6 +89,7 @@ namespace BlackMisc using Mixin::String::toQString; //! \copydoc BlackMisc::Mixin::String::toFormattedQString + //! \deprecated not really used and just using toQString using Mixin::String::toFormattedQString; //! \copydoc BlackMisc::Mixin::String::toStdString