Merge branch 'qt-migration'

.github/workflows/check_build.yml

@@ -11,6 +11,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
+      with:
+        version: 6.2.4
     - name: Configure build
       run: ./configure
     - name: Build sources
@@ -29,7 +31,7 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
       with:
-        version: 5.12.7
+        version: 6.2.4
     - name: Build sources
       run: |
         $Env:PYTHON_DIR = $Env:RUNNER_TOOL_CACHE/Python/

CreateHelp.bat

@@ -1,11 +1,10 @@
 REM
 REM Bind HTML pages to context helps. If you modify help texts, you
 REM don't need recompilation, if you run this script.
-REM Joni-Matti Määttä, Aug 2012
+REM Joni-Matti M��tt�, Aug 2012
 REM
 @echo off
-qhelpgenerator Help/kactus2help.qhp -o Help/Kactus2Help.qch
-qcollectiongenerator Help/kactus2help.qhcp -o Help/Kactus2Help.qhc
+qhelpgenerator Help/kactus2help.qhcp -o Help/Kactus2Help.qhc
 xcopy /Y Help\Kactus2Help.qhc executable\Help\
 xcopy /Y Help\Kactus2Help.qch executable\Help\
 xcopy /Y Help\Kactus2Help.qhc x64\executable\Help\

Help/HelpSystem/ContextHelpBrowser.cpp

@@ -2,7 +2,7 @@
 // File: ContextHelpBrowser.cpp
 //-----------------------------------------------------------------------------
 // Project: Kactus 2
-// Author: Joni-Matti Määttä
+// Author: Joni-Matti Maatta
 // Date: 6.8.2012
 //
 // Description:

Help/HelpSystem/ContextHelpBrowser.h

@@ -2,7 +2,7 @@
 // File: ContextHelpBrowser.h
 //-----------------------------------------------------------------------------
 // Project: Kactus 2
-// Author: Joni-Matti Määttä
+// Author: Joni-Matti Maatta
 // Date: 6.8.2012
 //
 // Description:

Help/HelpSystem/HelpSearchWidget.cpp

@@ -2,7 +2,7 @@
 // File: HelpSearchWidget.cpp
 //-----------------------------------------------------------------------------
 // Project: Kactus 2
-// Author: Joni-Matti Määttä
+// Author: Joni-Matti Maatta
 // Date: 8.8.2012
 //
 // Description:
@@ -41,6 +41,6 @@ HelpSearchWidget::~HelpSearchWidget()
 //-----------------------------------------------------------------------------
 void HelpSearchWidget::onSearch()
 {
-    QList<QHelpSearchQuery> query = searchEngine_->queryWidget()->query();
+    auto query = searchEngine_->queryWidget()->searchInput();
     searchEngine_->search(query);
 }

Help/HelpSystem/HelpSearchWidget.h

@@ -2,7 +2,7 @@
 // File: HelpSearchWidget.h
 //-----------------------------------------------------------------------------
 // Project: Kactus 2
-// Author: Joni-Matti Määttä
+// Author: Joni-Matti Maatta
 // Date: 8.8.2012
 //
 // Description:

Help/HelpSystem/HelpWindow.cpp

@@ -2,7 +2,7 @@
 // File: HelpWindow.cpp
 //-----------------------------------------------------------------------------
 // Project: Kactus 2
-// Author: Joni-Matti Määttä
+// Author: Joni-Matti Maatta
 // Date: 7.8.2012
 //
 // Description:
@@ -27,7 +27,7 @@ HelpWindow::HelpWindow(QHelpEngine* engine, QWidget* parent): QMainWindow(parent
     engine_(engine),
     menu_(new QMenuBar(this)),
     tocDock_(new QDockWidget(tr("Contents"), this)),
-    browser_(new ContextHelpBrowser(engine, "qthelp://com.tut.kactus2.2.0/doc", this))
+    browser_(new ContextHelpBrowser(engine, "qthelp://fi.tuni.kactus2/doc", this))
 {
     setWindowTitle(tr("Kactus2 Help"));
     resize(800, 500);

Help/HelpSystem/HelpWindow.h

@@ -2,7 +2,7 @@
 // File: HelpWindow.h
 //-----------------------------------------------------------------------------
 // Project: Kactus 2
-// Author: Joni-Matti Määttä
+// Author: Joni-Matti Maatta
 // Date: 7.8.2012
 //
 // Description:

Help/componenteditor/choices.html

@@ -13,10 +13,11 @@ <h2>Choices editor</h2>
       containing component.
     </p>
     <p>
-      Each choice has a mandatory <b>name</b> and at least one <b>enumeration</b> must be specified.
+      Choices are identified by a mandatory <b>name</b> in the Choice list.
     </p>
     <p>
-      Each <b>enumeration</b> has a mandatory <b>value</b>, an optional <b>text</b> to display instead 
+      Each choice must have at least one <b>enumeration</b> defined. An <b>enumeration</b> has 
+	  a mandatory <b>value</b>, an optional <b>text</b> to display instead 
       of the value and an optional <b>description</b>. When the value of e.g. a parameter refers to the
       choice, the possible model parameter value is selected from the set of enumerations in that choice.
     </p>

Help/kactus2help.qhcp

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <QHelpCollectionProject version="1.0">
     <docFiles>
+        <generate>
+            <file>
+                <input>kactus2help.qhp</input>
+                <output>Kactus2Help.qch</output>
+            </file>
+        </generate>
         <register>
             <file>Kactus2Help.qch</file>
         </register>

Help/kactus2help.qhp

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <QtHelpProject version="1.0">
-  <namespace>com.tut.kactus2.2.0</namespace>
+  <namespace>fi.tuni.kactus2</namespace>
   <virtualFolder>doc</virtualFolder>
   <customFilter name="Kactus2 2.0">
     <filterAttribute>kactus2</filterAttribute>

IPXACTmodels/Component/AddressSpace.cpp

@@ -23,7 +23,7 @@ range_(range),
 width_(width),
 segments_(new QList<QSharedPointer<Segment> > ()),
 addressUnitBits_(),
-localMemoryMap_(0),
+localMemoryMap_(nullptr),
 parameters_(new QList<QSharedPointer<Parameter> > ())
 {
 
@@ -159,7 +159,7 @@ QSharedPointer<MemoryMapBase> AddressSpace::getLocalMemoryMap()
 //-----------------------------------------------------------------------------
 bool AddressSpace::hasLocalMemoryMap() const
 {
-    return localMemoryMap_;
+    return localMemoryMap_.isNull() == false;
 }
 
 //-----------------------------------------------------------------------------
@@ -226,7 +226,7 @@ void AddressSpace::copySegments(const AddressSpace& other)
     {
         if (segment)
         {
-            QSharedPointer<Segment> copy = QSharedPointer<Segment>(new Segment(*segment.data()));
+            auto copy = QSharedPointer<Segment>(new Segment(*segment.data()));
             segments_->append(copy);
         }
     }
@@ -241,7 +241,7 @@ void AddressSpace::copyParameters(const AddressSpace& other)
     {
         if (parameter)
         {
-            QSharedPointer<Parameter> copy = QSharedPointer<Parameter>(new Parameter(*parameter.data()));
+            auto copy = QSharedPointer<Parameter>(new Parameter(*parameter.data()));
             parameters_->append(copy);
         }
     }

IPXACTmodels/Component/validators/MemoryMapValidator.cpp

@@ -37,7 +37,7 @@ void MemoryMapValidator::componentChange(QSharedPointer<Component> newComponent)
 {
     if (availableRemapStates_)
     {
-        availableRemapStates_->clear();
+        availableRemapStates_.clear();
     }
 
     if (newComponent)

IPXACTmodels/Component/validators/MemoryReserve.cpp

@@ -46,29 +46,31 @@ void MemoryReserve::addArea(QString const& newId, qint64 newBegin, qint64 newEnd
 //-----------------------------------------------------------------------------
 bool MemoryReserve::hasOverlap()
 {
-    if (!reservedArea_.isEmpty())
+    if (reservedArea_.isEmpty())
     {
-        qSort(reservedArea_);
+        return false;
+    }
 
-        for (int areaIndex = 0; areaIndex < reservedArea_.size(); ++areaIndex)
-        {
-            MemoryArea const& area = reservedArea_.at(areaIndex);
+	std::sort(reservedArea_.begin(), reservedArea_.end());
 
-            for (int nextIndex = areaIndex+1; nextIndex < reservedArea_.size(); ++nextIndex)
-            {
-                MemoryArea const& nextArea = reservedArea_.at(nextIndex);
+	for (int areaIndex = 0; areaIndex < reservedArea_.size(); ++areaIndex)
+	{
+		MemoryArea const& area = reservedArea_.at(areaIndex);
 
-                if (nextArea.begin_ > area.end_)
-                {
-                    break;
-                }
-                else
-                {
-                    return true;
-                }
-            }
-        }
-    }
+		for (int nextIndex = areaIndex + 1; nextIndex < reservedArea_.size(); ++nextIndex)
+		{
+			MemoryArea const& nextArea = reservedArea_.at(nextIndex);
+
+			if (nextArea.begin_ > area.end_)
+			{
+				break;
+			}
+			else
+			{
+				return true;
+			}
+		}
+	}
 
     return false;
 }
@@ -80,7 +82,7 @@ bool MemoryReserve::hasIdDependantOverlap()
 {
     if (!reservedArea_.isEmpty())
     {
-        qSort(reservedArea_);
+        std::sort(reservedArea_.begin(), reservedArea_.end());
 
         for (int areaIndex = 0; areaIndex < reservedArea_.size(); ++areaIndex)
         {
@@ -114,30 +116,32 @@ bool MemoryReserve::hasIdDependantOverlap()
 void MemoryReserve::findErrorsInOverlap(QVector<QString>& errors, QString const& itemIdentifier,
     QString const& context)
 {
-    if (!reservedArea_.isEmpty())
+    if (reservedArea_.isEmpty())
     {
-        qSort(reservedArea_);
-
-        for (int i = 0; i < reservedArea_.size(); ++i)
-        {
-            MemoryArea area = reservedArea_.at(i);
-
-            for (int j = i+1; j < reservedArea_.size(); ++j)
-            {
-                MemoryArea nextArea = reservedArea_.at(j);
-
-                if (nextArea.begin_ > area.end_)
-                {
-                    break;
-                }
-                else
-                {
-                    errors.append(QObject::tr("%1 %2 and %3 overlap within %4")
-                        .arg(itemIdentifier).arg(area.id_).arg(nextArea.id_).arg(context));
-                }
-            }
-        }
-    }
+        return;
+	}
+
+	std::sort(reservedArea_.begin(), reservedArea_.end());
+
+	for (int i = 0; i < reservedArea_.size(); ++i)
+	{
+		MemoryArea area = reservedArea_.at(i);
+
+		for (int j = i + 1; j < reservedArea_.size(); ++j)
+		{
+			MemoryArea nextArea = reservedArea_.at(j);
+
+			if (nextArea.begin_ > area.end_)
+			{
+				break;
+			}
+			else
+			{
+				errors.append(QObject::tr("%1 %2 and %3 overlap within %4")
+					.arg(itemIdentifier).arg(area.id_).arg(nextArea.id_).arg(context));
+			}
+		}
+	}
 }
 
 //-----------------------------------------------------------------------------
@@ -146,28 +150,27 @@ void MemoryReserve::findErrorsInOverlap(QVector<QString>& errors, QString const&
 void MemoryReserve::findErrorsInIdDependantOverlap(QVector<QString>& errors, QString const& itemIdentifier,
     QString const& context)
 {
-    if (!reservedArea_.isEmpty())
-    {
-        qSort(reservedArea_);
-
-        for (int i = 0; i < reservedArea_.size(); ++i)
-        {
-            MemoryArea const& area = reservedArea_.at(i);
-
-            for (int j = i+1; j < reservedArea_.size(); ++j)
-            {
-                MemoryArea const& nextArea = reservedArea_.at(j);
-
-                if (area.id_ == nextArea.id_)
-                {
-                    if (nextArea.begin_ <= area.end_)
-                    {
-                        errors.append(QObject::tr("Multiple definitions of %1 %2 overlap within %3")
-                            .arg(itemIdentifier).arg(area.id_).arg(context));
-                        break;
-                    }
-                }
-            }
-        }
-    }
-}
+    if (reservedArea_.isEmpty())
+	{
+		return;
+	}
+
+	std::sort(reservedArea_.begin(), reservedArea_.end());
+
+	for (int i = 0; i < reservedArea_.size(); ++i)
+	{
+		MemoryArea const& area = reservedArea_.at(i);
+
+		for (int j = i + 1; j < reservedArea_.size(); ++j)
+		{
+			MemoryArea const& nextArea = reservedArea_.at(j);
+
+			if (area.id_ == nextArea.id_ && nextArea.begin_ <= area.end_)
+			{
+				errors.append(QObject::tr("Multiple definitions of %1 %2 overlap within %3")
+					.arg(itemIdentifier).arg(area.id_).arg(context));
+				break;
+			}
+		}
+	}
+}