From 2eb090f66ead850f4f6b5e49e3d45d89e2ac23f2 Mon Sep 17 00:00:00 2001
From: philmoz <philmoz@users.noreply.github.com>
Date: Sat, 11 Jul 2026 20:17:04 +1000
Subject: [PATCH] fix(cpn): compilation breakage due to #7438 (#7544)

---
 companion/src/firmwares/radiodata.cpp        | 2 +-
 companion/src/print/modelprinter.cpp         | 9 ++++++---
 companion/src/shared/autobitmappedcombobox.h | 2 +-
 companion/src/shared/autocombobox.h          | 2 +-
 companion/src/storage/appdata.cpp            | 5 -----
 companion/src/storage/firmwareinterface.cpp  | 9 ++++++---
 companion/src/storage/labeled.cpp            | 4 ++--
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/companion/src/firmwares/radiodata.cpp b/companion/src/firmwares/radiodata.cpp
index c5994b56b..f027e7439 100644
--- a/companion/src/firmwares/radiodata.cpp
+++ b/companion/src/firmwares/radiodata.cpp
@@ -366,7 +366,7 @@ QStringList RadioData::modelErrorsList()
   for(auto &model: models) {
     if (!model.isValid()) {
       ret.append("");
-      ret.append(model.name);
+      ret.append(model.name.toQString());
       ret.append(model.errorsList());
     }
   }
diff --git a/companion/src/print/modelprinter.cpp b/companion/src/print/modelprinter.cpp
index b2751f952..4e61c658e 100644
--- a/companion/src/print/modelprinter.cpp
+++ b/companion/src/print/modelprinter.cpp
@@ -62,9 +62,12 @@ QString formatTitle(const QString & name)
 void debugHtml(const QString & html)
 {
   QFile file("foo.html");
-  file.open(QIODevice::Truncate | QIODevice::WriteOnly);
-  file.write(html.toUtf8());
-  file.close();
+  if (file.open(QIODevice::Truncate | QIODevice::WriteOnly)) {
+    file.write(html.toUtf8());
+    file.close();
+  } else {
+    // TODO: error handling
+  }
 }
 
 QString addFont(const QString & input, const QString & color, const QString & size, const QString & face)
diff --git a/companion/src/shared/autobitmappedcombobox.h b/companion/src/shared/autobitmappedcombobox.h
index c0464f3f0..baccd9d37 100644
--- a/companion/src/shared/autobitmappedcombobox.h
+++ b/companion/src/shared/autobitmappedcombobox.h
@@ -41,7 +41,7 @@ class AutoBitMappedComboBox : public QComboBox, public AutoWidget
     virtual void insertItems(int index, const QStringList & items);
     // AutoWidget
     virtual void updateValue() override;
-    virtual void setAutoModel(QAbstractItemModel * model);
+    void setAutoModel(QAbstractItemModel * model) override;
     void setBindText(std::function<QString()> fn) = delete;
 
     void clear();
diff --git a/companion/src/shared/autocombobox.h b/companion/src/shared/autocombobox.h
index 82e38cca6..80602dfba 100644
--- a/companion/src/shared/autocombobox.h
+++ b/companion/src/shared/autocombobox.h
@@ -49,7 +49,7 @@ class AutoComboBox : public QComboBox, public AutoWidget
     virtual void insertItems(int index, const QStringList & items);
     // AutoWidget
     virtual void updateValue() override;
-    virtual void setAutoModel(QAbstractItemModel * model);
+    void setAutoModel(QAbstractItemModel * model) override;
     void setBindText(std::function<QString()> fn) = delete;
 
     void clear();
diff --git a/companion/src/storage/appdata.cpp b/companion/src/storage/appdata.cpp
index fc4164cde..fc18ebbee 100644
--- a/companion/src/storage/appdata.cpp
+++ b/companion/src/storage/appdata.cpp
@@ -563,11 +563,6 @@ void AppData::loadNamedJS()
   }
 }
 
-static QString fmtHex(quint32 num)
-{
-  return QString::number(num, 16).toUpper();
-}
-
 void AppData::init()
 {
   qInfo().noquote() << "Settings init with" << m_settings.organizationName() << m_settings.applicationName()
diff --git a/companion/src/storage/firmwareinterface.cpp b/companion/src/storage/firmwareinterface.cpp
index 03af54579..3466e233b 100644
--- a/companion/src/storage/firmwareinterface.cpp
+++ b/companion/src/storage/firmwareinterface.cpp
@@ -178,9 +178,12 @@ FirmwareInterface::FirmwareInterface(const QString &filename, QDialog *parent) :
   if (filename.isEmpty()) return;
 
   QFile file(filename);
-  file.open(QIODevice::ReadOnly);
-  initFlash(file.readAll());
-  file.close();
+  if (file.open(QIODevice::ReadOnly)) {
+    initFlash(file.readAll());
+    file.close();
+  } else {
+    // TODO: error handling
+  }
 }
 
 FirmwareInterface::FirmwareInterface(const QByteArray &flashData, QDialog *parent) :
diff --git a/companion/src/storage/labeled.cpp b/companion/src/storage/labeled.cpp
index ef1d1058b..7b792c722 100644
--- a/companion/src/storage/labeled.cpp
+++ b/companion/src/storage/labeled.cpp
@@ -324,7 +324,7 @@ bool LabelsStorageFormat::write(RadioData & radioData)
 
     QByteArray modelData;
     if (!writeModelToYaml(model, modelData)) {
-      fatalMsg(tr("Error converting model to yaml: %1").arg(model.name));
+      fatalMsg(tr("Error converting model to yaml: %1").arg(model.name.toQString()));
       return false;
     }
 
@@ -344,7 +344,7 @@ bool LabelsStorageFormat::write(RadioData & radioData)
     if (!writeChecklist(model))
       return false;
 
-    statusMsg(tr("Model written: %1").arg(model.name));
+    statusMsg(tr("Model written: %1").arg(model.name.toQString()));
     progressSetValue(++steps);
   }