From df446cfdd60ebab9dad930a1d5e0c87fa88a900e Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Tue, 12 Oct 2021 16:53:35 +0100 Subject: [PATCH] Fix mistake --- src/blackmisc/mixin/mixinjson.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blackmisc/mixin/mixinjson.h b/src/blackmisc/mixin/mixinjson.h index 3cf5a51d0..dee7d141c 100644 --- a/src/blackmisc/mixin/mixinjson.h +++ b/src/blackmisc/mixin/mixinjson.h @@ -114,7 +114,7 @@ namespace BlackMisc //! Get object from JSON string template - static Derived fromJsonNoThrow(const QString &jsonString, bool acceptCacheJson, bool &success, QString &errMsg); + static DerivedObj fromJsonNoThrow(const QString &jsonString, bool acceptCacheJson, bool &success, QString &errMsg); private: const Derived *derived() const; @@ -205,10 +205,10 @@ namespace BlackMisc template template - Derived JsonByMetaClass::fromJsonNoThrow(const QString &jsonString, bool acceptCacheJson, bool &success, QString &errMsg) + DerivedObj JsonByMetaClass::fromJsonNoThrow(const QString &jsonString, bool acceptCacheJson, bool &success, QString &errMsg) { success = false; - Derived obj; + DerivedObj obj; try { if (jsonString.isEmpty()) { return obj; }