Make Clang-Tidy happy.

opencor · Oct 25, 2019 · 4bcd640 · 4bcd640
1 parent 2277589
commit 4bcd640
Show file tree

Hide file tree

Showing 17 changed files with 148 additions and 148 deletions.
diff --git a/src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoreplugin.cpp b/src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoreplugin.cpp
@@ -138,9 +138,9 @@ DataStore::DataStoreExportData * BioSignalMLDataStorePlugin::getExportData(const
                                                 biosignalmlDataStoreDialog.name(),
                                                 biosignalmlDataStoreDialog.author(),
                                                 biosignalmlDataStoreDialog.description(),
-                                                tr("Generated by %1 at %2 from %3.").arg(Core::version())
-                                                                                    .arg(QDateTime::currentDateTimeUtc().toString(Qt::ISODate))
-                                                                                    .arg(pDataStore->uri()),
+                                                tr("Generated by %1 at %2 from %3.").arg(Core::version(),
+                                                                                         QDateTime::currentDateTimeUtc().toString(Qt::ISODate),
+                                                                                         pDataStore->uri()),
                                                 pDataStore,
                                                 biosignalmlDataStoreDialog.selectedData());
         }

diff --git a/src/plugins/dataStore/CSVDataStore/src/csvdatastoreexporter.cpp b/src/plugins/dataStore/CSVDataStore/src/csvdatastoreexporter.cpp
@@ -125,9 +125,9 @@ void CsvDataStoreExporterWorker::run()
         QString header = QString();
 
         if (voi != nullptr) {
-            header += Header.arg(voi->uri().replace("/prime", "'").replace('/', " | "))
-                            .arg(voi->unit())
-                            .arg(QString());
+            header += Header.arg(voi->uri().replace("/prime", "'").replace('/', " | "),
+                                 voi->unit(),
+                                 QString());
         }
 
         for (auto variable : variables) {
@@ -136,9 +136,9 @@ void CsvDataStoreExporterWorker::run()
                     header += ',';
                 }
 
-                header += Header.arg(variable->uri().replace("/prime", "'").replace('/', " | "))
-                                .arg(variable->unit())
-                                .arg((nbOfRuns == 1)?
+                header += Header.arg(variable->uri().replace("/prime", "'").replace('/', " | "),
+                                     variable->unit(),
+                                     (nbOfRuns == 1)?
                                          QString():
                                          RunNb.arg(i+1));
             }

diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewcellmllistwidget.cpp b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewcellmllistwidget.cpp
@@ -166,15 +166,15 @@ CellmlAnnotationViewCellmlElementItem::CellmlAnnotationViewCellmlElementItem(Typ
     } else if (pType == Type::ComponentMapping) {
         ObjRef<iface::cellml_api::MapComponents> mapComponents = dynamic_cast<iface::cellml_api::MapComponents *>(pElement);
 
-        setText(QString("%1 %2 %3").arg(QString::fromStdWString(mapComponents->firstComponentName()))
-                                   .arg(QChar(RightArrow))
-                                   .arg(QString::fromStdWString(mapComponents->secondComponentName())));
+        setText(QString("%1 %2 %3").arg(QString::fromStdWString(mapComponents->firstComponentName()),
+                                        QChar(RightArrow),
+                                        QString::fromStdWString(mapComponents->secondComponentName())));
     } else if (pType == Type::VariableMapping) {
         ObjRef<iface::cellml_api::MapVariables> mapVariables = dynamic_cast<iface::cellml_api::MapVariables *>(pElement);
 
-        setText(QString("%1 %2 %3").arg(QString::fromStdWString(mapVariables->firstVariableName()))
-                                   .arg(QChar(RightArrow))
-                                   .arg(QString::fromStdWString(mapVariables->secondVariableName())));
+        setText(QString("%1 %2 %3").arg(QString::fromStdWString(mapVariables->firstVariableName()),
+                                        QChar(RightArrow),
+                                        QString::fromStdWString(mapVariables->secondVariableName())));
     } else {
         // Another type of element that has a name
 

diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.cpp b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.cpp
@@ -268,10 +268,10 @@ void CellmlAnnotationViewEditingWidget::updateWebViewerWithQualifierDetails(WebV
 
     // Show the information
 
-    pWebViewer->webView()->setHtml(mQualifierInformationTemplate.arg(pQualifier)
-                                                                .arg(qualifierSvg)
-                                                                .arg(shortDescription)
-                                                                .arg(longDescription));
+    pWebViewer->webView()->setHtml(mQualifierInformationTemplate.arg(pQualifier,
+                                                                     qualifierSvg,
+                                                                     shortDescription,
+                                                                     longDescription));
 }
 
 //==============================================================================

diff --git a/...lugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.cpp b/...lugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.cpp
@@ -545,8 +545,8 @@ void CellmlAnnotationViewMetadataEditDetailsWidget::updateItemsGui(const CellmlA
 
         int iconSize = int(16/qApp->devicePixelRatio());
 
-        mOutputOntologicalTerms->webView()->setHtml(mOutputOntologicalTermsTemplate.arg(Core::iconDataUri(":/oxygen/actions/list-add.png", iconSize, iconSize))
-                                                                                   .arg(Core::iconDataUri(":/oxygen/actions/list-add.png", iconSize, iconSize, QIcon::Disabled)));
+        mOutputOntologicalTerms->webView()->setHtml(mOutputOntologicalTermsTemplate.arg(Core::iconDataUri(":/oxygen/actions/list-add.png", iconSize, iconSize),
+                                                                                        Core::iconDataUri(":/oxygen/actions/list-add.png", iconSize, iconSize, QIcon::Disabled)));
 
         // Add the items
 

diff --git a/.../editing/CellMLAnnotationView/src/cellmlannotationviewmetadatanormalviewdetailswidget.cpp b/.../editing/CellMLAnnotationView/src/cellmlannotationviewmetadatanormalviewdetailswidget.cpp
@@ -262,8 +262,8 @@ void CellmlAnnotationViewMetadataNormalViewDetailsWidget::addRdfTriple(CellMLSup
     if (mItemsCount == 0) {
         int iconSize = int(16/qApp->devicePixelRatio());
 
-        mOutputOntologicalTerms->webView()->setHtml(mOutputOntologicalTermsTemplate.arg(Core::iconDataUri(":/oxygen/actions/list-remove.png", iconSize, iconSize))
-                                                                                   .arg(Core::iconDataUri(":/oxygen/actions/list-remove.png", iconSize, iconSize, QIcon::Disabled)));
+        mOutputOntologicalTerms->webView()->setHtml(mOutputOntologicalTermsTemplate.arg(Core::iconDataUri(":/oxygen/actions/list-remove.png", iconSize, iconSize),
+                                                                                        Core::iconDataUri(":/oxygen/actions/list-remove.png", iconSize, iconSize, QIcon::Disabled)));
     }
 
     // Add the item

diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewplugin.h b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewplugin.h
@@ -67,7 +67,7 @@ class CellMLAnnotationViewPlugin : public QObject,
 #include "viewinterface.inl"
 
 private:
-    CellmlAnnotationViewWidget *mViewWidget;
+    CellmlAnnotationViewWidget *mViewWidget = nullptr;
 };
 
 //==============================================================================

diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewwidget.cpp b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewwidget.cpp
@@ -92,7 +92,7 @@ void CellmlAnnotationViewWidget::retranslateUi()
 {
     // Retranslate our editing widgets
 
-    for (auto editingWidget : mEditingWidgets.values()) {
+    for (auto editingWidget : mEditingWidgets) {
         editingWidget->retranslateUi();
     }
 }