From c6e3e385ff4b7e36b93bf6636bd95fa917c96e8f Mon Sep 17 00:00:00 2001
From: joshua <Joshua@qelectrotech.org>
Date: Sat, 9 Oct 2021 12:08:18 +0200
Subject: [PATCH] Clear code

---
 sources/TerminalStrip/terminalstrip.cpp | 20 +++++++-------------
 sources/TerminalStrip/terminalstrip.h   |  3 ---
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/sources/TerminalStrip/terminalstrip.cpp b/sources/TerminalStrip/terminalstrip.cpp
index 64a9af193..8a4bfdbe2 100644
--- a/sources/TerminalStrip/terminalstrip.cpp
+++ b/sources/TerminalStrip/terminalstrip.cpp
@@ -509,7 +509,6 @@ PhysicalTerminalData TerminalStrip::physicalTerminalData(int index) const
 	if (index < m_physical_terminals.size())
 	{
 		auto physical_terminal = m_physical_terminals.at(index);
-		ptd.physical_terminal = physical_terminal;
 		ptd.pos_ = index;
 		for (auto real_terminal : physical_terminal->terminals()) {
 			auto rtd = realTerminalData(real_terminal);
@@ -541,7 +540,6 @@ PhysicalTerminalData TerminalStrip::physicalTerminalData(const RealTerminalData
 		return ptd_;
 	}
 
-	ptd_.physical_terminal = phy_t;
 	ptd_.pos_ = m_physical_terminals.indexOf(phy_t);
 	for (auto real_terminal : phy_t->terminals()) {
 		auto rtd = realTerminalData(real_terminal);
@@ -590,8 +588,13 @@ bool TerminalStrip::setOrderTo(QVector<PhysicalTerminalData> sorted_vector)
 	QVector<QSharedPointer<PhysicalTerminal>> new_order;
 	for (auto ptd : sorted_vector)
 	{
-		if (m_physical_terminals.contains(ptd.physical_terminal)) {
-			new_order.append(ptd.physical_terminal);
+		const auto physical_t = physicalTerminalForUuid(ptd.uuid_);
+		if (physical_t.isNull()) {
+			continue;
+		}
+
+		if (m_physical_terminals.contains(physical_t)) {
+			new_order.append(physical_t);
 		} else {
 			return false;
 		}
@@ -806,15 +809,6 @@ QSharedPointer<PhysicalTerminal> TerminalStrip::physicalTerminal(QSharedPointer<
 	return pt;
 }
 
-/**
- * @brief TerminalStrip::elementForRealTerminal
- * @param rt
- * @return the element associated to \p rt, the returned element can be nullptr;
- */
-Element *TerminalStrip::elementForRealTerminal(QSharedPointer<RealTerminal> rt) const {
-	return rt.data()->element();
-}
-
 RealTerminalData TerminalStrip::realTerminalData(QSharedPointer<RealTerminal> real_terminal) const
 {
 	RealTerminalData rtd;
diff --git a/sources/TerminalStrip/terminalstrip.h b/sources/TerminalStrip/terminalstrip.h
index 3373a9c4f..25bbf2d82 100644
--- a/sources/TerminalStrip/terminalstrip.h
+++ b/sources/TerminalStrip/terminalstrip.h
@@ -58,7 +58,6 @@ struct PhysicalTerminalData
 {
 		QVector<RealTerminalData> real_terminals_vector;
 		int pos_ = -1;
-		QSharedPointer<PhysicalTerminal> physical_terminal;
 		QUuid uuid_;
 };
 
@@ -120,8 +119,6 @@ class TerminalStrip : public QObject
 		QDomElement toXml(QDomDocument &parent_document);
 		bool fromXml(QDomElement &xml_element);
 
-		Element *elementForRealTerminal(QSharedPointer<RealTerminal> rt) const;
-
 	private:
 		QSharedPointer<RealTerminal> realTerminal(Element *terminal);
 		QSharedPointer<PhysicalTerminal> physicalTerminal(QSharedPointer<RealTerminal> terminal) const;