diff --git a/sources/TerminalStrip/realterminal.cpp b/sources/TerminalStrip/realterminal.cpp index ffbe95599..75ccbb1f7 100644 --- a/sources/TerminalStrip/realterminal.cpp +++ b/sources/TerminalStrip/realterminal.cpp @@ -263,15 +263,6 @@ QUuid RealTerminal::elementUuid() const { } } -/** - * @brief uuid - * @return the uuid of this real terminal - */ -QUuid RealTerminal::uuid() const { - return elementUuid(); - return m_uuid; -} - /** * @brief RealTerminal::RealTerminal::xmlTagName * @return diff --git a/sources/TerminalStrip/realterminal.h b/sources/TerminalStrip/realterminal.h index e7d007db2..e3f7e996d 100644 --- a/sources/TerminalStrip/realterminal.h +++ b/sources/TerminalStrip/realterminal.h @@ -77,13 +77,11 @@ class RealTerminal Element* element() const; QUuid elementUuid() const; - QUuid uuid() const; static QString xmlTagName(); private : QPointer m_element; - QUuid m_uuid = QUuid::createUuid(); QWeakPointer m_this_weak; QSharedPointer m_physical_terminal; }; diff --git a/sources/TerminalStrip/terminalstrip.cpp b/sources/TerminalStrip/terminalstrip.cpp index ea53ac5d1..059603642 100644 --- a/sources/TerminalStrip/terminalstrip.cpp +++ b/sources/TerminalStrip/terminalstrip.cpp @@ -250,7 +250,7 @@ QSharedPointer TerminalStrip::realTerminal(Element *terminal) cons QSharedPointer TerminalStrip::realTerminalForUuid(const QUuid &uuid) const { for (const auto &t : qAsConst(m_real_terminals)) { - if (t->uuid() == uuid) { + if (t->elementUuid() == uuid) { return t; } } diff --git a/sources/TerminalStrip/terminalstripbridge.cpp b/sources/TerminalStrip/terminalstripbridge.cpp index 81e203542..d48fc0d56 100644 --- a/sources/TerminalStrip/terminalstripbridge.cpp +++ b/sources/TerminalStrip/terminalstripbridge.cpp @@ -90,7 +90,7 @@ QDomElement TerminalStripBridge::toXml(QDomDocument &parent_document) const if (real_t) { auto terminal_elmt = parent_document.createElement(QStringLiteral("real_terminal")); - terminal_elmt.setAttribute(QStringLiteral("uuid"), real_t->uuid().toString()); + terminal_elmt.setAttribute(QStringLiteral("uuid"), real_t->elementUuid().toString()); terminals_elmt.appendChild(terminal_elmt); } }