Review remarks

Author: jgeudens

src/dialogs/adaptersettings.cpp

@@ -54,7 +54,7 @@ void AdapterSettings::buildSection(const QJsonObject& propSchema, const QJsonVal
             auto* form = new SchemaFormWidget(_pItemTabs);
             form->setSchema(_itemSchema, itemsArray.at(i).toObject());
             pages.append(form);
-            names.append(QString("%1 %2").arg(_propertyKey[0].toUpper() + _propertyKey.mid(1)).arg(i + 1));
+            names.append(formatTabName(i + 1));
         }
 
         if (!pages.isEmpty())
@@ -77,19 +77,26 @@ void AdapterSettings::buildSection(const QJsonObject& propSchema, const QJsonVal
     }
 }
 
+QString AdapterSettings::formatTabName(int index) const
+{
+    if (_propertyKey.isEmpty())
+    {
+        return QString("Item %1").arg(index);
+    }
+    return QString("%1 %2").arg(_propertyKey[0].toUpper() + _propertyKey.mid(1)).arg(index);
+}
+
 void AdapterSettings::addItemTab()
 {
     auto* form = new SchemaFormWidget(_pItemTabs);
     QJsonObject defaultValues;
-    const QJsonArray defaultItems =
-        _pSettingsModel->adapterData(_adapterId)->defaults().value(_propertyKey).toArray();
+    const QJsonArray defaultItems = _pSettingsModel->adapterData(_adapterId)->defaults().value(_propertyKey).toArray();
     if (!defaultItems.isEmpty())
     {
         defaultValues = defaultItems.first().toObject();
     }
     form->setSchema(_itemSchema, defaultValues);
-    const QString name =
-        QString("%1 %2").arg(_propertyKey[0].toUpper() + _propertyKey.mid(1)).arg(_nextItemTabIndex);
+    const QString name = formatTabName(_nextItemTabIndex);
     _nextItemTabIndex++;
     _pItemTabs->addNewTab(name, form);
 }

src/dialogs/adaptersettings.h

@@ -48,6 +48,9 @@ class AdapterSettings : public QWidget
     void buildSection(const QJsonObject& propSchema, const QJsonValue& configValue, QVBoxLayout* layout);
     void addItemTab();
 
+    //! \brief Returns a display name for a tab at the given 1-based \a index.
+    QString formatTabName(int index) const;
+
     SettingsModel* _pSettingsModel;
     QString _adapterId;
     QString _propertyKey;

tests/customwidgets/tst_schemaformwidget.cpp

@@ -344,10 +344,6 @@ void TestSchemaFormWidget::conditionalSwitchShowsSerialHidesTcp()
         }
     }
     QVERIFY(typeCombo != nullptr);
-    if (typeCombo == nullptr)
-    {
-        return;
-    }
     typeCombo->setCurrentIndex(typeCombo->findData(QStringLiteral("serial")));
 
     const QJsonObject result = w.values();