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

refactor: Remove deprecated String mixin method

Browse Source
This commit is contained in:
Lars Toenning
2023-12-19 09:51:57 +01:00
parent 5c8728c38a
commit b832dd82be
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackmisc/mixin/mixinstring.h
View File

@@ -60,10 +60,6 @@ namespace BlackMisc::Mixin
//! Cast as QString
QString toQString(bool i18n = false) const;
//! Cast to pretty-printed QString
//! \deprecated not really used and just using toQString
QString toFormattedQString(bool i18n = false) const;
//! To std string
std::string toStdString(bool i18n = false) const;
@@ -81,12 +77,6 @@ namespace BlackMisc::Mixin
return derived()->convertToQString(i18n);
}
template <class Derived>
QString String<Derived>::toFormattedQString(bool i18n) const
{
return derived()->toQString(i18n);
}
template <class Derived>
std::string String<Derived>::toStdString(bool i18n) const
{
@@ -116,10 +106,9 @@ namespace BlackMisc::Mixin
* 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<DERIVED>::toQString; \
using ::BlackMisc::Mixin::String<DERIVED>::toFormattedQString; \
using ::BlackMisc::Mixin::String<DERIVED>::toStdString; \
#define BLACKMISC_DECLARE_USING_MIXIN_STRING(DERIVED) \
using ::BlackMisc::Mixin::String<DERIVED>::toQString; \
using ::BlackMisc::Mixin::String<DERIVED>::toStdString; \
using ::BlackMisc::Mixin::String<DERIVED>::stringForStreaming;
// *INDENT-ON*
} // ns

4
src/blackmisc/valueobject.h
View File

@@ -127,10 +127,6 @@ namespace BlackMisc
//! \copydoc BlackMisc::Mixin::String::toQString
using Mixin::String<Derived>::toQString;
//! \copydoc BlackMisc::Mixin::String::toFormattedQString
//! \deprecated not really used and just using toQString
using Mixin::String<Derived>::toFormattedQString;
//! \copydoc BlackMisc::Mixin::String::toStdString
using Mixin::String<Derived>::toStdString;