kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the real terminal uuid, and use instead the uuid of the terminal element itself

Browse Source
This commit is contained in:
joshua
2022-02-09 18:13:35 +01:00
parent c037d3ea0a
commit ffd904749e
4 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sources/TerminalStrip/realterminal.cpp
View File

@@ -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 * @brief RealTerminal::RealTerminal::xmlTagName
* @return * @return

2
sources/TerminalStrip/realterminal.h
View File

@@ -77,13 +77,11 @@ class RealTerminal
Element* element() const; Element* element() const;
QUuid elementUuid() const; QUuid elementUuid() const;
QUuid uuid() const;
static QString xmlTagName(); static QString xmlTagName();
private : private :
QPointer<Element> m_element; QPointer<Element> m_element;
QUuid m_uuid = QUuid::createUuid();
QWeakPointer<RealTerminal> m_this_weak; QWeakPointer<RealTerminal> m_this_weak;
QSharedPointer<PhysicalTerminal> m_physical_terminal; QSharedPointer<PhysicalTerminal> m_physical_terminal;
}; };

2
sources/TerminalStrip/terminalstrip.cpp
View File

@@ -250,7 +250,7 @@ QSharedPointer<RealTerminal> TerminalStrip::realTerminal(Element *terminal) cons
QSharedPointer<RealTerminal> TerminalStrip::realTerminalForUuid(const QUuid &uuid) const QSharedPointer<RealTerminal> TerminalStrip::realTerminalForUuid(const QUuid &uuid) const
{ {
for (const auto &t : qAsConst(m_real_terminals)) { for (const auto &t : qAsConst(m_real_terminals)) {
if (t->uuid() == uuid) { if (t->elementUuid() == uuid) {
return t; return t;
} }
} }

2
sources/TerminalStrip/terminalstripbridge.cpp
View File

@@ -90,7 +90,7 @@ QDomElement TerminalStripBridge::toXml(QDomDocument &parent_document) const
if (real_t) if (real_t)
{ {
auto terminal_elmt = parent_document.createElement(QStringLiteral("real_terminal")); 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); terminals_elmt.appendChild(terminal_elmt);
} }
} }