Merge branch 'std-update' of https://github.com/kactus2/kactus2dev in…

…to std-update
kactus2 · Nov 17, 2023 · 6fc92e3 · 6fc92e3
2 parents 8aeb84e + 7e6f7f9
commit 6fc92e3
Show file tree

Hide file tree

Showing 116 changed files with 2,358 additions and 2,275 deletions.
diff --git a/IPXACTmodels/AbstractionDefinition/AbstractionDefinition.cpp b/IPXACTmodels/AbstractionDefinition/AbstractionDefinition.cpp
@@ -15,7 +15,9 @@
 #include <IPXACTmodels/AbstractionDefinition/WireAbstraction.h>
 #include <IPXACTmodels/AbstractionDefinition/PortAbstraction.h>
 
-#include <IPXACTmodels/Component/Choice.h>
+#include <IPXACTmodels/common/Choice.h>
+
+#include <IPXACTmodels/utilities/Copy.h>
 
 #include <QDomDocument>
 #include <QString>
@@ -27,22 +29,14 @@
 #include <QStringList>
 #include <QXmlStreamWriter>
 
-//-----------------------------------------------------------------------------
-// Function: AbstractionDefinition::AbstractionDefinition()
-//-----------------------------------------------------------------------------
-AbstractionDefinition::AbstractionDefinition(): 
-Document()
-{
-
-}
 
 //-----------------------------------------------------------------------------
 // Function: AbstractionDefinition::AbstractionDefinition()
 //-----------------------------------------------------------------------------
 AbstractionDefinition::AbstractionDefinition(VLNV const& vlnv, Document::Revision revision):
-Document(revision)
+Document(vlnv, revision)
 {
-    setVlnv(vlnv);
+
 }
 
 //-----------------------------------------------------------------------------
@@ -53,8 +47,8 @@ Document(other),
     busType_(other.busType_),
     extends_(other.extends_)
 {
-    Utilities::copyList(logicalPorts_, other.logicalPorts_);
-    Utilities::copyList(choices_, other.choices_);
+    Copy::copyList(other.logicalPorts_, logicalPorts_);
+    Copy::copyList(other.choices_, choices_);
 }
 
 //-----------------------------------------------------------------------------
@@ -68,8 +62,11 @@ AbstractionDefinition & AbstractionDefinition::operator=(AbstractionDefinition c
         busType_ = other.busType_;
 		extends_ = other.extends_;
 
-        Utilities::copyList(logicalPorts_, other.logicalPorts_);
-        Utilities::copyList(choices_, other.choices_);
+        logicalPorts_->clear();
+        Copy::copyList(other.logicalPorts_, logicalPorts_);
+
+        choices_->clear();
+        Copy::copyList(other.choices_, choices_);
 	}
 	return *this;
 }

diff --git a/IPXACTmodels/AbstractionDefinition/AbstractionDefinition.h b/IPXACTmodels/AbstractionDefinition/AbstractionDefinition.h
@@ -32,9 +32,6 @@ class IPXACTMODELS_EXPORT AbstractionDefinition: public Document
 {
 public:
 
-	//! The default constructor.
-	AbstractionDefinition();
-
     AbstractionDefinition(VLNV const& vlnv, Document::Revision revision);
 
 	//! Copy constructor.

diff --git a/IPXACTmodels/AbstractionDefinition/Packet.cpp b/IPXACTmodels/AbstractionDefinition/Packet.cpp
@@ -11,6 +11,8 @@
 
 #include "Packet.h"
 
+#include <IPXACTmodels/utilities/Copy.h>
+
 //-----------------------------------------------------------------------------
 // Function: Packet::Packet()
 //-----------------------------------------------------------------------------
@@ -28,7 +30,7 @@ Packet::Packet(Packet const& other) :
     Extendable(other),
     endianness_(other.endianness_)
 {
-    Utilities::copyList(packetFields_, other.packetFields_);
+    Copy::copyList(other.packetFields_, packetFields_);
 }
 
 //-----------------------------------------------------------------------------
@@ -40,9 +42,10 @@ Packet& Packet::operator=(Packet const& other)
     {
         NameGroup::operator=(other);
         Extendable::operator=(other);
-
         endianness_ = other.endianness_;
-        Utilities::copyList(packetFields_, other.packetFields_);
+
+        packetFields_->clear();
+        Copy::copyList(other.packetFields_, packetFields_);
     }
 
     return *this;

diff --git a/IPXACTmodels/AbstractionDefinition/PacketReader.cpp b/IPXACTmodels/AbstractionDefinition/PacketReader.cpp
@@ -12,6 +12,7 @@
 #include "PacketReader.h"
 
 #include <IPXACTmodels/common/CommonItemsReader.h>
+#include <IPXACTmodels/common/QualifierReader.h>
 
 //-----------------------------------------------------------------------------
 // Function: PacketReader::createPacketFrom()
@@ -85,7 +86,7 @@ void PacketReader::Details::parseSinglePacketField(QDomNode const& fieldNode, QS
         fieldNode.firstChildElement(QStringLiteral("ipxact:endianness")).firstChild().nodeValue());
 
     QSharedPointer<Qualifier> fieldQualifier(new Qualifier());
-    CommonItemsReader::parseQualifier(
+    QualifierReader::parseQualifier(
         fieldNode.firstChildElement(QStringLiteral("ipxact:qualifier")), fieldQualifier, Document::Revision::Std22);
 
     parsedPacketField->setQualifier(fieldQualifier);

diff --git a/IPXACTmodels/AbstractionDefinition/PacketWriter.cpp b/IPXACTmodels/AbstractionDefinition/PacketWriter.cpp
@@ -13,6 +13,7 @@
 
 #include <IPXACTmodels/common/NameGroupWriter.h>
 #include <IPXACTmodels/common/CommonItemsWriter.h>
+#include <IPXACTmodels/common/QualifierWriter.h>
 
 //-----------------------------------------------------------------------------
 // Function: PacketWriter::writePacket()
@@ -67,7 +68,7 @@ void PacketWriter::Details::writeSinglePacketField(QXmlStreamWriter& writer, QSh
     CommonItemsWriter::writeNonEmptyElement(writer, QStringLiteral("ipxact:value"), packetField->getValue());
     CommonItemsWriter::writeNonEmptyElement(writer, QStringLiteral("ipxact:endianness"), packetField->getEndianness());
 
-    CommonItemsWriter::writeQualifier(writer, packetField->getQualifier());
+    QualifierWriter::writeQualifier(writer, packetField->getQualifier());
 
     CommonItemsWriter::writeVendorExtensions(writer, packetField);
 

diff --git a/IPXACTmodels/AbstractionDefinition/PortAbstraction.cpp b/IPXACTmodels/AbstractionDefinition/PortAbstraction.cpp
@@ -17,6 +17,7 @@
 #include "Packet.h"
 
 #include <IPXACTmodels/common/Qualifier.h>
+#include <IPXACTmodels/utilities/Copy.h>
 
 #include <QString>
 #include <QSharedPointer>
@@ -27,10 +28,7 @@
 //-----------------------------------------------------------------------------
 PortAbstraction::PortAbstraction():
 NameGroup(),
-    Extendable(),
-    isPresent_(),
-    wire_(),
-    transactional_()
+    Extendable()
 {
 
 }
@@ -41,24 +39,22 @@ NameGroup(),
 PortAbstraction::PortAbstraction(PortAbstraction const& other):
 NameGroup(other),
     Extendable(other),
-    isPresent_(),
-    wire_(),
-    transactional_(),
+    isPresent_(other.isPresent_),
     match_(other.match_)
 {
 
  	if (other.wire_)
     {
- 		wire_ = QSharedPointer<WireAbstraction>(new WireAbstraction(*other.wire_.data()));
+ 		wire_ = QSharedPointer<WireAbstraction>(new WireAbstraction(*other.wire_));
  	}
 
     if (other.transactional_)
     {
         transactional_ = QSharedPointer<TransactionalAbstraction>(
-            new TransactionalAbstraction(*other.transactional_.data()));
+            new TransactionalAbstraction(*other.transactional_));
     }
 
-    Utilities::copyList(packets_, other.packets_);
+    Copy::copyList(other.packets_, packets_);
 }
 
 //-----------------------------------------------------------------------------
@@ -81,26 +77,21 @@ PortAbstraction& PortAbstraction::operator=(PortAbstraction const& other)
         isPresent_ = other.isPresent_;
         match_ = other.match_;
 
+        wire_.clear();
 		if (other.wire_)
         {
-			wire_ = QSharedPointer<WireAbstraction>(new WireAbstraction(*other.wire_.data()));
+			wire_ = QSharedPointer<WireAbstraction>(new WireAbstraction(*other.wire_));
 		}
-		else
-        {
-			wire_ = QSharedPointer<WireAbstraction>();
-        }
 
+        transactional_.clear();
 		if (other.transactional_)
         {
 			transactional_ = QSharedPointer<TransactionalAbstraction>(
-                new TransactionalAbstraction(*other.transactional_.data()));
+                new TransactionalAbstraction(*other.transactional_));
 		}
-		else
-        {
-			transactional_ = QSharedPointer<TransactionalAbstraction>();
-        }
 
-        Utilities::copyList(packets_, other.packets_);
+        packets_->clear();
+        Copy::copyList(other.packets_, packets_);
 	}
 	return *this;
 }

diff --git a/IPXACTmodels/AbstractionDefinition/TransactionalAbstraction.cpp b/IPXACTmodels/AbstractionDefinition/TransactionalAbstraction.cpp
@@ -15,6 +15,8 @@
 
 #include <IPXACTmodels/common/TransactionalTypes.h>
 
+#include <IPXACTmodels/utilities/Copy.h>
+
 #include <QList>
 #include <QObject>
 #include <QString>
@@ -42,14 +44,15 @@ qualifier_(new Qualifier(*other.qualifier_)),
 {
 	if (other.onInitiator_)
     {
-		onInitiator_ = QSharedPointer<TransactionalPort>(new TransactionalPort(*other.onInitiator_.data()));
+		onInitiator_ = QSharedPointer<TransactionalPort>(new TransactionalPort(*other.onInitiator_));
 	}
+
 	if (other.onTarget_)
     {
-		onTarget_ = QSharedPointer<TransactionalPort>(new TransactionalPort(*other.onTarget_.data()));
+		onTarget_ = QSharedPointer<TransactionalPort>(new TransactionalPort(*other.onTarget_));
 	}
 
-    Utilities::copyList(onSystem_, other.onSystem_);
+    Copy::copyList(other.onSystem_, onSystem_);
 }
 
 //-----------------------------------------------------------------------------
@@ -61,24 +64,20 @@ TransactionalAbstraction& TransactionalAbstraction::operator=(TransactionalAbstr
     {
 	    qualifier_ = other.qualifier_;
 
+        onInitiator_.clear();
 		if (other.onInitiator_)
         {
-			onInitiator_ = QSharedPointer<TransactionalPort>(new TransactionalPort(*other.onInitiator_.data()));
+			onInitiator_ = QSharedPointer<TransactionalPort>(new TransactionalPort(*other.onInitiator_));
 		}
-		else
-        {
-			onInitiator_ = QSharedPointer<TransactionalPort>();
-        }
+
+        onTarget_.clear();
 		if (other.onTarget_)
         {
-			onTarget_ = QSharedPointer<TransactionalPort>(new TransactionalPort(*other.onTarget_.data()));
+			onTarget_ = QSharedPointer<TransactionalPort>(new TransactionalPort(*other.onTarget_));
 		}
-		else
-        {
-			onTarget_ = QSharedPointer<TransactionalPort>();
-        }
 
-        Utilities::copyList(onSystem_, other.onSystem_);
+        onSystem_->clear();
+        Copy::copyList(other.onSystem_, onSystem_);
     }
 	return *this;
 }

diff --git a/IPXACTmodels/AbstractionDefinition/TransactionalAbstractionReader.cpp b/IPXACTmodels/AbstractionDefinition/TransactionalAbstractionReader.cpp
@@ -11,14 +11,12 @@
 
 #include "TransactionalAbstractionReader.h"
 
+#include <IPXACTmodels/common/CommonItemsReader.h>
 #include <IPXACTmodels/common/GenericVendorExtension.h>
-
 #include <IPXACTmodels/common/Protocol.h>
 #include <IPXACTmodels/common/ProtocolReader.h>
-
 #include <IPXACTmodels/common/PresenceTypes.h>
-
-#include <IPXACTmodels/common/CommonItemsReader.h>
+#include <IPXACTmodels/common/QualifierReader.h>
 
 #include "TransactionalAbstraction.h"
 #include "TransactionalPort.h"
@@ -52,7 +50,7 @@ void TransactionalAbstractionReader::Details::parseQualifier(QDomNode const& tra
 
     auto qualifier = transactional->getQualifier();
 
-    CommonItemsReader::parseQualifier(qualifierNode, qualifier, revision);
+    QualifierReader::parseQualifier(qualifierNode, qualifier, revision);
 }
 
 //-----------------------------------------------------------------------------

diff --git a/IPXACTmodels/AbstractionDefinition/TransactionalAbstractionWriter.cpp b/IPXACTmodels/AbstractionDefinition/TransactionalAbstractionWriter.cpp
@@ -17,6 +17,7 @@
 #include <IPXACTmodels/common/Protocol.h>
 #include <IPXACTmodels/common/ProtocolWriter.h>
 #include <IPXACTmodels/common/CommonItemsWriter.h>
+#include <IPXACTmodels/common/QualifierWriter.h>
 
 #include <IPXACTmodels/common/VendorExtension.h>
 
@@ -28,7 +29,7 @@ void TransactionalAbstractionWriter::writeTransactional(QXmlStreamWriter& writer
 {
     writer.writeStartElement(QStringLiteral("ipxact:transactional"));
 
-    Details::writeQualifier(writer, transactional);
+    QualifierWriter::writeQualifier(writer, transactional->getQualifier());
 
     Details::writeSystem(writer, transactional);
 
@@ -47,24 +48,13 @@ void TransactionalAbstractionWriter::writeTransactional(QXmlStreamWriter& writer
     writer.writeEndElement();
 }
 
-//-----------------------------------------------------------------------------
-// Function: TransactionalAbstractionWriter::Details::writeQualifier()
-//-----------------------------------------------------------------------------
-void TransactionalAbstractionWriter::Details::writeQualifier(QXmlStreamWriter& writer, 
-    QSharedPointer<TransactionalAbstraction> transactional)
-{
-    auto qualifier = transactional->getQualifier();
-
-    CommonItemsWriter::writeQualifier(writer, qualifier);
-}
-
 //-----------------------------------------------------------------------------
 // Function: TransactionalAbstractionWriter::Details::writeSystem()
 //-----------------------------------------------------------------------------
 void TransactionalAbstractionWriter::Details::writeSystem(QXmlStreamWriter& writer,
     QSharedPointer<TransactionalAbstraction> transactional)
 {
-    for (auto systemPort : *transactional->getSystemPorts())
+    for (auto const& systemPort : *transactional->getSystemPorts())
     {
         writer.writeStartElement(QStringLiteral("ipxact:onSystem"));
         writer.writeTextElement(QStringLiteral("ipxact:group"), systemPort->getSystemGroup());

diff --git a/IPXACTmodels/AbstractionDefinition/TransactionalAbstractionWriter.h b/IPXACTmodels/AbstractionDefinition/TransactionalAbstractionWriter.h
@@ -40,15 +40,6 @@ namespace TransactionalAbstractionWriter
 
     namespace Details
     {
-
-        /*!
-         *  Writes the given transactional qualifier into XML.
-         *
-         *      @param [in] writer          The XML writer to use.
-         *      @param [in] transactional   The transactional whose qualifier to write.
-         */
-        void writeQualifier(QXmlStreamWriter& writer, QSharedPointer<TransactionalAbstraction> transactional);
-
         /*!
          *  Writes the system port for the given transactional into XML.
          *