From b832dd82bebf1a514c1437e18a7ac1e34cd92702 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Tue, 19 Dec 2023 09:51:57 +0100 Subject: [PATCH] refactor: Remove deprecated String mixin method --- src/blackmisc/mixin/mixinstring.h | 17 +++-------------- src/blackmisc/valueobject.h | 4 ---- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/blackmisc/mixin/mixinstring.h b/src/blackmisc/mixin/mixinstring.h index c96325220..955dcb9cd 100644 --- a/src/blackmisc/mixin/mixinstring.h +++ b/src/blackmisc/mixin/mixinstring.h @@ -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 - QString String::toFormattedQString(bool i18n) const - { - return derived()->toQString(i18n); - } - template std::string String::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::toQString; \ - using ::BlackMisc::Mixin::String::toFormattedQString; \ - using ::BlackMisc::Mixin::String::toStdString; \ +#define BLACKMISC_DECLARE_USING_MIXIN_STRING(DERIVED) \ + using ::BlackMisc::Mixin::String::toQString; \ + using ::BlackMisc::Mixin::String::toStdString; \ using ::BlackMisc::Mixin::String::stringForStreaming; // *INDENT-ON* } // ns diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index 5cf6a7767..cd156bd51 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -127,10 +127,6 @@ namespace BlackMisc //! \copydoc BlackMisc::Mixin::String::toQString 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 using Mixin::String::toStdString;