fix(cpn): compilation breakage due to #7438 (#7544)

This commit is contained in:
philmoz
2026-07-11 20:17:04 +10:00
committed by GitHub
parent a0fcc8e069
commit 2eb090f66e
7 changed files with 17 additions and 16 deletions
+1 -1
View File
@@ -366,7 +366,7 @@ QStringList RadioData::modelErrorsList()
for(auto &model: models) { for(auto &model: models) {
if (!model.isValid()) { if (!model.isValid()) {
ret.append(""); ret.append("");
ret.append(model.name); ret.append(model.name.toQString());
ret.append(model.errorsList()); ret.append(model.errorsList());
} }
} }
+6 -3
View File
@@ -62,9 +62,12 @@ QString formatTitle(const QString & name)
void debugHtml(const QString & html) void debugHtml(const QString & html)
{ {
QFile file("foo.html"); QFile file("foo.html");
file.open(QIODevice::Truncate | QIODevice::WriteOnly); if (file.open(QIODevice::Truncate | QIODevice::WriteOnly)) {
file.write(html.toUtf8()); file.write(html.toUtf8());
file.close(); file.close();
} else {
// TODO: error handling
}
} }
QString addFont(const QString & input, const QString & color, const QString & size, const QString & face) QString addFont(const QString & input, const QString & color, const QString & size, const QString & face)
+1 -1
View File
@@ -41,7 +41,7 @@ class AutoBitMappedComboBox : public QComboBox, public AutoWidget
virtual void insertItems(int index, const QStringList & items); virtual void insertItems(int index, const QStringList & items);
// AutoWidget // AutoWidget
virtual void updateValue() override; virtual void updateValue() override;
virtual void setAutoModel(QAbstractItemModel * model); void setAutoModel(QAbstractItemModel * model) override;
void setBindText(std::function<QString()> fn) = delete; void setBindText(std::function<QString()> fn) = delete;
void clear(); void clear();
+1 -1
View File
@@ -49,7 +49,7 @@ class AutoComboBox : public QComboBox, public AutoWidget
virtual void insertItems(int index, const QStringList & items); virtual void insertItems(int index, const QStringList & items);
// AutoWidget // AutoWidget
virtual void updateValue() override; virtual void updateValue() override;
virtual void setAutoModel(QAbstractItemModel * model); void setAutoModel(QAbstractItemModel * model) override;
void setBindText(std::function<QString()> fn) = delete; void setBindText(std::function<QString()> fn) = delete;
void clear(); void clear();
-5
View File
@@ -563,11 +563,6 @@ void AppData::loadNamedJS()
} }
} }
static QString fmtHex(quint32 num)
{
return QString::number(num, 16).toUpper();
}
void AppData::init() void AppData::init()
{ {
qInfo().noquote() << "Settings init with" << m_settings.organizationName() << m_settings.applicationName() qInfo().noquote() << "Settings init with" << m_settings.organizationName() << m_settings.applicationName()
+6 -3
View File
@@ -178,9 +178,12 @@ FirmwareInterface::FirmwareInterface(const QString &filename, QDialog *parent) :
if (filename.isEmpty()) return; if (filename.isEmpty()) return;
QFile file(filename); QFile file(filename);
file.open(QIODevice::ReadOnly); if (file.open(QIODevice::ReadOnly)) {
initFlash(file.readAll()); initFlash(file.readAll());
file.close(); file.close();
} else {
// TODO: error handling
}
} }
FirmwareInterface::FirmwareInterface(const QByteArray &flashData, QDialog *parent) : FirmwareInterface::FirmwareInterface(const QByteArray &flashData, QDialog *parent) :
+2 -2
View File
@@ -324,7 +324,7 @@ bool LabelsStorageFormat::write(RadioData & radioData)
QByteArray modelData; QByteArray modelData;
if (!writeModelToYaml(model, 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; return false;
} }
@@ -344,7 +344,7 @@ bool LabelsStorageFormat::write(RadioData & radioData)
if (!writeChecklist(model)) if (!writeChecklist(model))
return false; return false;
statusMsg(tr("Model written: %1").arg(model.name)); statusMsg(tr("Model written: %1").arg(model.name.toQString()));
progressSetValue(++steps); progressSetValue(++steps);
} }