[CORRECTIVE] Bulk fix compilation warnings

kactus2 · Dec 7, 2023 · 03caf9c · 03caf9c
1 parent e36030c
commit 03caf9c
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 67 deletions.
diff --git a/IPXACTmodels/AbstractionDefinition/validators/AbstractionDefinitionValidator.h b/IPXACTmodels/AbstractionDefinition/validators/AbstractionDefinitionValidator.h
@@ -58,15 +58,15 @@ class IPXACTMODELS_EXPORT AbstractionDefinitionValidator
      *
      *      @return True, if the AbstractionDefinition is valid IP-XACT, otherwise false.
      */
-    virtual bool validate(QSharedPointer<AbstractionDefinition> abstractionDefinition);
+    bool validate(QSharedPointer<AbstractionDefinition> abstractionDefinition);
 
     /*!
      *  Finds possible errors in a AbstractionDefinition and creates a list of them.
      *
      *      @param [in] errors      List of found errors.
      *      @param [in] AbstractionDefinition   The AbstractionDefinition whose errors to find.
      */
-    virtual void findErrorsIn(QVector<QString>& errors,
+    void findErrorsIn(QVector<QString>& errors,
 		QSharedPointer<AbstractionDefinition> abstractionDefinition);
 
 private:

diff --git a/editors/AbstractionDefinitionEditor/AbstractionPortsDelegate.cpp b/editors/AbstractionDefinitionEditor/AbstractionPortsDelegate.cpp
@@ -207,11 +207,7 @@ void AbstractionPortsDelegate::setModelData(QWidget* editor, QAbstractItemModel*
         QualifierEditor* qualifierEditor = qobject_cast<QualifierEditor*>(editor);
         Q_ASSERT_X(qualifierEditor, "AbstractionPortsDelegate::setModelData", "Type conversion failed for qualifier editor");
 
-        auto qualifierData = qualifierEditor->getQualifierData();
-        QVariant qualifierAsVariant;
-        qualifierAsVariant.setValue(qualifierData);
-
-        model->setData(index, qualifierAsVariant, Qt::EditRole);
+        model->setData(index, QVariant::fromValue(qualifierEditor->getQualifierData()), Qt::EditRole);
     }
     else
     {

diff --git a/editors/AbstractionDefinitionEditor/AbstractionPortsModel.cpp b/editors/AbstractionDefinitionEditor/AbstractionPortsModel.cpp
@@ -351,39 +351,28 @@ QVariant AbstractionPortsModel::data(QModelIndex const& index, int role) const
         }
     }
 
-    else if (role == Qt::UserRole)
+    else if (role == Qt::UserRole && index.column() == LogicalPortColumns::QUALIFIER)
     {
-        if (index.column() == LogicalPortColumns::QUALIFIER)
+        QStringList qualifierList;
+        for (auto const& qualifier : portInterface_->getQualifierStringList(index.row()))
         {
-            QStringList qualifierList;
-            for (auto const& qualifier : portInterface_->getQualifierStringList(index.row()))
-            {
-                qualifierList.append(QString::fromStdString(qualifier));
-            }
-
-            std::vector<std::string> attributesList = portInterface_->getQualifierAttributes(index.row());
-            QMap<QString, QString> attributes;
-
-            for (int i = 0; i + 1 < attributesList.size(); i += 2)
-            {
-                auto const& name = QString::fromStdString(attributesList.at(i));
-                auto const& value = QString::fromStdString(attributesList.at(i + 1));
-
-                attributes.insert(name, value);
-            }
+            qualifierList.append(QString::fromStdString(qualifier));
+        }
 
-            QualifierData qualifierData;
-            QVariant qualifierAsVariant;
+        std::vector<std::string> attributesList = portInterface_->getQualifierAttributes(index.row());
+        QMap<QString, QString> attributes;
 
-            qualifierData.activeQualifiers_ = qualifierList;
-            qualifierData.attributes_ = attributes;
+        for (size_t i = 0; i + 1 < attributesList.size(); i += 2)
+        {
+            auto const& name = QString::fromStdString(attributesList.at(i));
+            auto const& value = QString::fromStdString(attributesList.at(i + 1));
 
-            qualifierAsVariant.setValue(qualifierData);
-
-            return qualifierAsVariant;
+            attributes.insert(name, value);
         }
+
+        return QVariant::fromValue(QualifierData{ qualifierList, attributes });
     }
- 
+
 
     return QVariant();
 }

diff --git a/editors/AbstractionDefinitionEditor/QualifierData.h b/editors/AbstractionDefinitionEditor/QualifierData.h
@@ -26,22 +26,6 @@ struct QualifierData
 
     //! The set qualifier attributes
     QMap<QString, QString> attributes_;
-
-    QualifierData() = default;
-
-    QualifierData(QStringList const& qualifiers, QMap<QString, QString> attributes) :
-        activeQualifiers_(qualifiers),
-        attributes_(attributes)
-    {
-    }
-
-    ~QualifierData() = default;
-
-    QualifierData(QualifierData const& other) :
-        activeQualifiers_(other.activeQualifiers_),
-        attributes_(other.attributes_)
-    {
-    }
 };
 
 //! Declare metatype for use in QVariant

diff --git a/editors/AbstractionDefinitionEditor/QualifierEditor.cpp b/editors/AbstractionDefinitionEditor/QualifierEditor.cpp
@@ -145,7 +145,7 @@ QMap<QString, QString> QualifierEditor::getAttributes() const
 //-----------------------------------------------------------------------------
 QualifierData QualifierEditor::getQualifierData() const
 {
-    return QualifierData(getSelectedItems(), getAttributes());
+    return QualifierData{ getSelectedItems(), getAttributes() };
 }
 
 //-----------------------------------------------------------------------------

diff --git a/editors/CatalogEditor/CatalogFileFilter.cpp b/editors/CatalogEditor/CatalogFileFilter.cpp
@@ -56,7 +56,7 @@ void CatalogFileFilter::onOpenItem(QModelIndex const& index)
 //-----------------------------------------------------------------------------
 // Function: CatalogFileFilter::filterAcceptsColumn()
 //-----------------------------------------------------------------------------
-bool CatalogFileFilter::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
+bool CatalogFileFilter::filterAcceptsRow(int source_row, const QModelIndex& /*source_parent*/) const
 {
     if (source_row == CatalogFileColumns::TYPE_DEFINITIONS && docRevision_ != Document::Revision::Std22)
     {

diff --git a/editors/ComponentEditor/modes/ModesEditor.cpp b/editors/ComponentEditor/modes/ModesEditor.cpp
@@ -29,12 +29,11 @@
 // Function: ModesEditor::ModesEditor()
 //-----------------------------------------------------------------------------
 ModesEditor::ModesEditor(QSharedPointer<Component> component, LibraryInterface* handler, 
-    ExpressionSet expressions,
 	QWidget* parent) :
 ItemEditor(component, handler, parent),
     view_(this),
     proxy_(this),
-    model_(component, expressions, this)
+    model_(component, this)
 {
     // display a label on top the table
     SummaryLabel* summaryLabel = new SummaryLabel(tr("Modes summary"), this);

diff --git a/editors/ComponentEditor/modes/ModesEditor.h b/editors/ComponentEditor/modes/ModesEditor.h
@@ -39,11 +39,9 @@ class ModesEditor : public ItemEditor
 	 *      @param [in] component   The component being edited.
 	 *      @param [in] handler     The instance managing the library.
      *      @param [in] validator   The validator for Modes.
-     *      @param [in] expressions	The collection of objects for expression handling.
 	 *      @param [in] parent      The parent of this editor.
 	*/
 	ModesEditor(QSharedPointer<Component> component, LibraryInterface* handler, 
-		ExpressionSet expressions,
 		QWidget* parent = 0);
 
 	//! The destructor

diff --git a/editors/ComponentEditor/modes/ModesModel.cpp b/editors/ComponentEditor/modes/ModesModel.cpp
@@ -25,7 +25,6 @@
 // Function: ModesModel::ModesModel()
 //-----------------------------------------------------------------------------
 ModesModel::ModesModel(QSharedPointer<Component> component, 
-    ExpressionSet expressions,
     QObject* parent): 
     QAbstractTableModel(parent),
     modes_(component->getModes())

diff --git a/editors/ComponentEditor/modes/ModesModel.h b/editors/ComponentEditor/modes/ModesModel.h
@@ -37,11 +37,9 @@ class ModesModel : public QAbstractTableModel
 	/*! The constructor
 	 *
      *      @param [in] component   The component being edited.
-     *      @param [in] expressions	The collection of objects for expression handling.
 	 *      @param [in] parent      The owner of this model.
 	*/
 	ModesModel(QSharedPointer<Component> component, 
-		ExpressionSet expressions,
         QObject* parent);
 
 	//! The destructor

diff --git a/editors/ComponentEditor/treeStructure/ModesItem.cpp b/editors/ComponentEditor/treeStructure/ModesItem.cpp
@@ -70,7 +70,7 @@ ItemEditor* ModesItem::editor()
 {
     if (!editor_)
     {
-        editor_ = new ModesEditor(component_, libHandler_, expressions_);
+        editor_ = new ModesEditor(component_, libHandler_);
         editor_->setProtection(locked_);
 
         connect(editor_, SIGNAL(contentChanged()), this, SLOT(onEditorChanged()), Qt::UniqueConnection);

diff --git a/editors/HWDesign/undoCommands/ConfigurableElementRemoveCommand.cpp b/editors/HWDesign/undoCommands/ConfigurableElementRemoveCommand.cpp
@@ -23,8 +23,8 @@ QObject(0),
 QUndoCommand(parent),
 parentName_(parentName),
 itemRow_(itemRow),
-configurableElements_(configurableElements),
 rowInConfigurableElements_(0),
+configurableElements_(configurableElements),
 removedElement_(getRemovedConfigurableElement(elementID))
 {
 

diff --git a/editors/MemoryDesigner/MemoryConnectionHandler.cpp b/editors/MemoryDesigner/MemoryConnectionHandler.cpp
@@ -447,7 +447,7 @@ QVector<MainMemoryGraphicsItem*> MemoryConnectionHandler::createSpaceChain(
 
     MemoryConnectionAddressCalculator::ChainedSpace previousChainedSpace;
 
-    foreach(MemoryConnectionAddressCalculator::ChainedSpace chainedSpace, spaceChain)
+    for(auto const& chainedSpace : spaceChain)
     {
         MainMemoryGraphicsItem* connectionMiddleItem = getMainGraphicsItem(
             chainedSpace.spaceInterface_, MemoryDesignerConstants::ADDRESSSPACECOLUMN_NAME);
@@ -456,8 +456,6 @@ QVector<MainMemoryGraphicsItem*> MemoryConnectionHandler::createSpaceChain(
         {
             connectionMiddleItem->changeAddressRange(chainedSpace.spaceConnectionBaseAddress_);
 
-            QPointF middlePosition = connectionMiddleItem->scenePos();
-
             spaceItemChain.append(connectionMiddleItem);
 
             createSpaceConnection(connectionPath, spaceChainStartItem,

diff --git a/editors/SystemDesign/SystemDesignDiagram.cpp b/editors/SystemDesign/SystemDesignDiagram.cpp
@@ -1261,7 +1261,7 @@ void SystemDesignDiagram::loadDesign(QSharedPointer<Design> design)
     // Create (HW) component instances.
     if (!onlySW_)
     {
-        for (QSharedPointer<ComponentInstance> instance : *design->getComponentInstances())
+        for (auto const& instance : *design->getComponentInstances())
         {
             QSharedPointer<Document> libComponent = getLibraryInterface()->getModel(*instance->getComponentRef());
             QSharedPointer<Component> component = libComponent.staticCast<Component>();
@@ -1317,7 +1317,7 @@ void SystemDesignDiagram::loadDesign(QSharedPointer<Design> design)
     }
 
     // Create SW instances.
-    for (QSharedPointer<ComponentInstance> const instance : *design->getComponentInstances())
+    for (auto const& instance : *design->getComponentInstances())
     {
         QSharedPointer<Component> component;
 

diff --git a/editors/common/ComponentItemAutoConnector/AutoConnectorConnectionTable.cpp b/editors/common/ComponentItemAutoConnector/AutoConnectorConnectionTable.cpp
@@ -61,7 +61,7 @@ itemMatcher_(itemMatcher)
 void AutoConnectorConnectionTable::setupActions()
 {
     QList<QKeySequence> addRowShortcuts;
-    addRowShortcuts << QKeySequence::InsertLineSeparator << Qt::SHIFT + Qt::Key_Return;
+    addRowShortcuts << QKeySequence::InsertLineSeparator << QKeySequence(Qt::SHIFT | Qt::Key_Return);
 
     addAction(addRowAction_);
     addRowAction_->setToolTip(tr("Add a new row to table"));
@@ -73,7 +73,7 @@ void AutoConnectorConnectionTable::setupActions()
     addAction(removeRowAction_);
     removeRowAction_->setToolTip(tr("Remove a connection from the table"));
     removeRowAction_->setStatusTip(tr("Remove a connection from the table"));
-    removeRowAction_->setShortcut(Qt::SHIFT + Qt::Key_Delete);
+    removeRowAction_->setShortcut(Qt::SHIFT | Qt::Key_Delete);
     removeRowAction_->setShortcutContext(Qt::WidgetShortcut);
     connect(removeRowAction_, SIGNAL(triggered()), this, SLOT(onRemoveRow()), Qt::UniqueConnection);