From a05d11fff05cd31782adf5f7ff82d353d6ca9cbc Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 28 Jul 2018 00:07:36 +0200 Subject: [PATCH] Ref T294, name pair style --- src/blackgui/views/namevariantpairview.h | 2 -- src/blackmisc/namevariantpairlist.cpp | 2 +- src/blackmisc/namevariantpairlist.h | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/blackgui/views/namevariantpairview.h b/src/blackgui/views/namevariantpairview.h index 98d37f924..46bfe264c 100644 --- a/src/blackgui/views/namevariantpairview.h +++ b/src/blackgui/views/namevariantpairview.h @@ -21,8 +21,6 @@ #include -class QWidget; - namespace BlackMisc { class CNameVariantPair; } namespace BlackGui { diff --git a/src/blackmisc/namevariantpairlist.cpp b/src/blackmisc/namevariantpairlist.cpp index c204a5155..ed007e4d3 100644 --- a/src/blackmisc/namevariantpairlist.cpp +++ b/src/blackmisc/namevariantpairlist.cpp @@ -48,7 +48,7 @@ namespace BlackMisc QString CNameVariantPairList::getValueAsString(const QString &name) const { if (name.isEmpty()) { return QString(); } - CVariant cs(getValue(name).getVariant()); + const CVariant cs(getValue(name).getVariant()); if (cs.isNull() || !cs.canConvert()) { return QString(); } return cs.value(); } diff --git a/src/blackmisc/namevariantpairlist.h b/src/blackmisc/namevariantpairlist.h index a5c17269d..b65c0783f 100644 --- a/src/blackmisc/namevariantpairlist.h +++ b/src/blackmisc/namevariantpairlist.h @@ -28,7 +28,7 @@ namespace BlackMisc //! \note Currently name must be unique class BLACKMISC_EXPORT CNameVariantPairList : public CSequence, - public BlackMisc::Mixin::MetaType + public Mixin::MetaType { public: BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CNameVariantPairList)