From e4dfa01c2ea3f81b500212e94c6477faf479aca6 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 2 Oct 2018 20:00:55 +0200 Subject: [PATCH] Ref T384, strip added name before adding a changed one --- src/blackmisc/identifier.cpp | 3 +++ src/blackmisc/identifier.h | 1 + 2 files changed, 4 insertions(+) diff --git a/src/blackmisc/identifier.cpp b/src/blackmisc/identifier.cpp index c346d642c..b15d591a1 100644 --- a/src/blackmisc/identifier.cpp +++ b/src/blackmisc/identifier.cpp @@ -86,6 +86,9 @@ namespace BlackMisc void CIdentifier::appendName(const QString &name) { if (m_name.endsWith(name)) { return; } + if (name.isEmpty()) { return; } + const int index = m_name.lastIndexOf(':'); + if (index >= 0) { m_name = m_name.left(index); } m_name += QStringLiteral(":") + name; } diff --git a/src/blackmisc/identifier.h b/src/blackmisc/identifier.h index 60becf49e..7dadfbe6f 100644 --- a/src/blackmisc/identifier.h +++ b/src/blackmisc/identifier.h @@ -58,6 +58,7 @@ namespace BlackMisc CIdentifier(const QString &name); //! Constructor using object's name + //! \remark automatically changes if object's name changes CIdentifier(const QString &name, QObject *object); //! Returns an anonymous identifier, which is a valid identifier without name