Resolved clang warnings: refactor output handling and signal emissions across multiple classes for improved clarity and performance

Author: arkottke

source/AbstractOutputCatalog.cpp

@@ -38,7 +38,8 @@ void AbstractOutputCatalog::setApproach(int approach) {
 
   // Disable time series only outputs
   if (_approach == MotionLibrary::RandomVibrationTheory) {
-    for (auto *ao : outputs()) {
+    const auto outputList = outputs();
+    for (auto *ao : outputList) {
       auto *apo = qobject_cast<AbstractProfileOutput *>(ao);
       if (apo && apo->timeSeriesOnly())
         apo->setEnabled(false);

source/AbstractOutputCatalog.h

@@ -45,9 +45,9 @@ public slots:
   void setApproach(int approach);
 
 signals:
-  void timesAreNeededChanged(bool timesAreNeeded) const;
-  void periodIsNeededChanged(bool periodIsNeeded) const;
-  void frequencyIsNeededChanged(bool frequencyIsNeeded) const;
+  void timesAreNeededChanged(bool timesAreNeeded);
+  void periodIsNeededChanged(bool periodIsNeeded);
+  void frequencyIsNeededChanged(bool frequencyIsNeeded);
 
   void wasModified();
 

source/BatchRunner.h

@@ -23,8 +23,8 @@
 #define BATCHRUNNER_H
 
 #include <QElapsedTimer>
+#include <QStringList>
 #include <QTextStream>
-#include <QtCore>
 
 #include "SiteResponseModel.h"
 

source/CustomNonlinearProperty.cpp

@@ -52,7 +52,7 @@ auto CustomNonlinearProperty::setData(const QModelIndex &index,
       gsl_interp_accel_reset(_acc);
       break;
     }
-    dataChanged(index, index);
+    emit dataChanged(index, index);
     return true;
   } else {
     return false;
@@ -69,13 +69,13 @@ auto CustomNonlinearProperty::insertRows(int row, int count,
   if (!count)
     return false;
 
-  emit beginInsertRows(parent, row, row + count - 1);
+  beginInsertRows(parent, row, row + count - 1);
 
   _strain.insert(row, count, 0);
   _average.insert(row, count, 0);
   _varied.insert(row, count, 0);
 
-  emit endInsertRows();
+  endInsertRows();
   return true;
 }
 
@@ -84,12 +84,12 @@ auto CustomNonlinearProperty::removeRows(int row, int count,
   if (!count)
     return false;
 
-  emit beginRemoveRows(parent, row, row + count - 1);
+  beginRemoveRows(parent, row, row + count - 1);
 
   _strain.remove(row, count);
   _average.remove(row, count);
   _varied.remove(row, count);
 
-  emit endRemoveRows();
+  endRemoveRows();
   return true;
 }

source/OutputCatalog.cpp

@@ -370,8 +370,9 @@ auto OutputCatalog::motionNameAt(int row) const -> const QString {
 void OutputCatalog::initialize(int siteCount, MotionLibrary *motionLibrary) {
   // Create a list of all enabled outputs
   _outputs.clear();
-  for (auto *catalog : _catalogs) {
-    for (auto *output : catalog->outputs()) {
+  for (auto *catalog : std::as_const(_catalogs)) {
+    const auto catalogOutputs = catalog->outputs();
+    for (auto *output : catalogOutputs) {
       if (!output->needsTime() ||
           (output->needsTime() &&
            motionLibrary->approach() == MotionLibrary::TimeSeries)) {
@@ -420,8 +421,9 @@ void OutputCatalog::clear() {
 
   // Need to loop over the catalogs as _outputs my have previously deleted
   // pointers
-  for (auto *catalog : _catalogs) {
-    for (auto *output : catalog->outputs()) {
+  for (auto *catalog : std::as_const(_catalogs)) {
+    const auto catalogOutputs = catalog->outputs();
+    for (auto *output : catalogOutputs) {
       output->clear();
     }
   }
@@ -430,14 +432,14 @@ void OutputCatalog::clear() {
 }
 
 void OutputCatalog::finalize() {
-  for (AbstractOutput *output : _outputs)
+  for (AbstractOutput *output : std::as_const(_outputs))
     output->finalize();
 
   emit wasModified();
 }
 
 void OutputCatalog::setReadOnly(bool readOnly) {
-  for (AbstractOutputCatalog *catalog : _catalogs)
+  for (AbstractOutputCatalog *catalog : std::as_const(_catalogs))
     catalog->setReadOnly(readOnly);
 }
 
@@ -447,13 +449,13 @@ void OutputCatalog::saveResults(int motion,
   // sublayer. These depths are updated as the velocity profile is varied.
   populateDepthVector(calculator->site()->subLayers().last().depthToBase());
 
-  for (AbstractOutput *output : _outputs) {
+  for (AbstractOutput *output : std::as_const(_outputs)) {
     output->addData(motion, calculator);
   }
 }
 
 void OutputCatalog::removeLastSite() {
-  for (AbstractOutput *output : _outputs)
+  for (AbstractOutput *output : std::as_const(_outputs))
     output->removeLastSite();
 }
 
@@ -486,7 +488,7 @@ void OutputCatalog::setFrequencyIsNeeded(bool frequencyIsNeeded) {
 auto OutputCatalog::outputNames() const -> QStringList {
   QStringList list;
 
-  for (AbstractOutput *output : _outputs)
+  for (AbstractOutput *output : std::as_const(_outputs))
     list << output->fullName();
 
   return list;
@@ -498,7 +500,7 @@ auto OutputCatalog::outputs() const -> const QList<AbstractOutput *> & {
 
 void OutputCatalog::exportData(const QString &path, const QString &separator,
                                const QString &prefix) {
-  for (AbstractOutput *output : _outputs) {
+  for (AbstractOutput *output : std::as_const(_outputs)) {
     if (output->exportEnabled())
       output->exportData(path, separator, prefix);
   }
@@ -561,9 +563,11 @@ void OutputCatalog::fromJson(const QJsonObject &json) {
   }
 
   _enabled.clear();
-  for (const QJsonValue &value : json["enabled"].toArray()) {
+  const QJsonArray enabledArray = json["enabled"].toArray();
+  for (const QJsonValue &value : enabledArray) {
     QList<bool> l;
-    for (const QJsonValue &v : value.toArray())
+    const QJsonArray innerArray = value.toArray();
+    for (const QJsonValue &v : innerArray)
       l << v.toBool();
     _enabled << l;
   }

source/ProfilesOutputCatalog.cpp

@@ -62,7 +62,7 @@ ProfilesOutputCatalog::ProfilesOutputCatalog(OutputCatalog *outputCatalog)
            << new VerticalTotalStressProfileOutput(_outputCatalog)
            << new VerticalEffectiveStressProfileOutput(_outputCatalog);
 
-  for (auto *output : _outputs)
+  for (auto *output : std::as_const(_outputs))
     connect(output, &AbstractOutput::wasModified, this,
             &ProfilesOutputCatalog::wasModified);
 }
@@ -144,19 +144,19 @@ auto ProfilesOutputCatalog::removeRows(int row, int count,
                                        const QModelIndex &parent) -> bool {
   if (!count)
     return false;
-  emit beginRemoveRows(parent, row, row + count - 1);
+  beginRemoveRows(parent, row, row + count - 1);
 
   for (int i = 0; i < count; ++i)
     _outputs.takeAt(row)->deleteLater();
 
-  emit endRemoveRows();
+  endRemoveRows();
   return true;
 }
 
 auto ProfilesOutputCatalog::outputs() const -> QList<AbstractOutput *> {
   QList<AbstractOutput *> list;
 
-  for (AbstractProfileOutput *apo : _outputs)
+  for (AbstractProfileOutput *apo : std::as_const(_outputs))
     if (apo->enabled())
       list << static_cast<AbstractOutput *>(apo);
 
@@ -167,7 +167,7 @@ void ProfilesOutputCatalog::fromJson(const QJsonArray &json) {
   beginResetModel();
 
   QMap<QString, AbstractProfileOutput *> output_map;
-  for (AbstractProfileOutput *o : _outputs)
+  for (AbstractProfileOutput *o : std::as_const(_outputs))
     output_map.insert(o->metaObject()->className(), o);
 
   for (const QJsonValue &qjv : json) {
@@ -182,7 +182,7 @@ void ProfilesOutputCatalog::fromJson(const QJsonArray &json) {
 
 auto ProfilesOutputCatalog::toJson() const -> QJsonArray {
   QJsonArray json;
-  for (AbstractProfileOutput *apo : _outputs) {
+  for (AbstractProfileOutput *apo : std::as_const(_outputs)) {
     json << apo->toJson();
   }
 
@@ -193,7 +193,7 @@ auto operator<<(QDataStream &out, const ProfilesOutputCatalog *poc)
     -> QDataStream & {
   out << (quint8)4;
 
-  for (AbstractProfileOutput *apo : poc->_outputs) {
+  for (AbstractProfileOutput *apo : std::as_const(poc->_outputs)) {
     out << apo;
   }
 
@@ -205,7 +205,7 @@ auto operator>>(QDataStream &in, ProfilesOutputCatalog *poc) -> QDataStream & {
   in >> ver;
   poc->beginResetModel();
 
-  for (AbstractProfileOutput *apo : poc->_outputs) {
+  for (AbstractProfileOutput *apo : std::as_const(poc->_outputs)) {
     // Skip profiles not included in earlier versions
     if (ver < 2 && qobject_cast<MaxDispProfileOutput *>(apo))
       continue;

source/SiteResponseModel.cpp

@@ -615,10 +615,9 @@ auto SiteResponseModel::toHtml() -> QString {
          "<tr><th>Units System:</th><td>%4</td></tr>"
          "</table>"
          "</li>")
-          .arg(_outputCatalog->title())
-          .arg(_notes->toHtml())
-          .arg(_outputCatalog->filePrefix())
-          .arg(Units::instance()->systemList().at(Units::instance()->system()));
+          .arg(_outputCatalog->title(), _notes->toHtml(),
+               _outputCatalog->filePrefix(),
+               Units::instance()->systemList().at(Units::instance()->system()));
 
   // Type of Analysis
   html += tr("<li>Type of Analysis"
@@ -628,9 +627,9 @@ auto SiteResponseModel::toHtml() -> QString {
              "<tr><th>Properties Varied:</th><td>%3</td></tr>"
              "</table>"
              "</li>")
-              .arg(methodList().at(_method))
-              .arg(MotionLibrary::approachList().at(_motionLibrary->approach()))
-              .arg(boolToString(_siteProfile->isVaried()));
+              .arg(methodList().at(_method),
+                   MotionLibrary::approachList().at(_motionLibrary->approach()),
+                   boolToString(_siteProfile->isVaried()));
 
   // Site Variation
   if (_siteProfile->isVaried())
@@ -644,8 +643,8 @@ auto SiteResponseModel::toHtml() -> QString {
            "</li>")
             .arg(_siteProfile->profileCount())
             .arg(boolToString(
-                _siteProfile->nonlinearPropertyRandomizer()->enabled()))
-            .arg(boolToString(_siteProfile->profileRandomizer()->enabled()));
+                     _siteProfile->nonlinearPropertyRandomizer()->enabled()),
+                 boolToString(_siteProfile->profileRandomizer()->enabled()));
 
   // Layer Discretization
   html += tr("<li>Layer Discretization"

source/SoilTypeCatalog.cpp

@@ -233,14 +233,14 @@ auto SoilTypeCatalog::insertRows(int row, int count, const QModelIndex &parent)
   if (!count)
     return false;
 
-  emit beginInsertRows(parent, row, row + count - 1);
+  beginInsertRows(parent, row, row + count - 1);
 
   for (int i = 0; i < count; ++i) {
     _soilTypes.insert(row, new SoilType(this));
     emit soilTypeAdded(_soilTypes.at(row));
   }
 
-  emit endInsertRows();
+  endInsertRows();
   return true;
 }
 
@@ -249,14 +249,14 @@ auto SoilTypeCatalog::removeRows(int row, int count, const QModelIndex &parent)
   if (!count)
     return false;
 
-  emit beginRemoveRows(parent, row, row + count - 1);
+  beginRemoveRows(parent, row, row + count - 1);
 
   for (int i = 0; i < count; ++i) {
     emit soilTypeRemoved(_soilTypes.at(row));
     _soilTypes.takeAt(row)->deleteLater();
   }
 
-  emit endRemoveRows();
+  endRemoveRows();
 
   return true;
 }
@@ -314,7 +314,7 @@ void SoilTypeCatalog::fromJson(const QJsonArray &json) {
   while (_soilTypes.size())
     _soilTypes.takeLast()->deleteLater();
 
-  foreach (const QJsonValue &v, json) {
+  for (const QJsonValue &v : json) {
     auto *st = new SoilType(this);
     st->fromJson(v.toObject());
     _soilTypes << st;

source/SpectraOutputCatalog.cpp

@@ -243,7 +243,7 @@ void SpectraOutputCatalog::fromJson(const QJsonArray &array) {
   while (_outputs.size())
     _outputs.takeLast()->deleteLater();
 
-  foreach (const QJsonValue &v, array) {
+  for (const QJsonValue &v : array) {
     QJsonObject json = v.toObject();
     AbstractLocationOutput *alo =
         factory(json["className"].toString(), _outputCatalog);