chore(cpn): update to Qt 5.15.2 and rework application packaging (#4270)

Co-authored-by: raphaelcoeffic <raphael.coeffic@frafos.com>
Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
This commit is contained in:
Neil Horne
2023-11-10 15:12:28 +10:00
committed by GitHub
co-authored by raphaelcoeffic philmoz
parent 9d5c6e62cb
commit a3faf7e9df
49 changed files with 347 additions and 197 deletions
+4 -4
View File
@@ -181,7 +181,7 @@ bool RadioData::renameLabel(QString from, QString to)
}
if (success) {
for(auto& model : models) {
QStringList modelLabels = QString(model.labels).split(',',QString::SkipEmptyParts);
QStringList modelLabels = QString(model.labels).split(',', Qt::SkipEmptyParts);
int ind = modelLabels.indexOf(csvFrom);
if (ind != -1) {
modelLabels.replace(ind, csvTo);
@@ -231,7 +231,7 @@ bool RadioData::addLabelToModel(int index, QString label)
char *modelLabelCsv = models[index].labels;
// Make sure it will fit
if (strlen(modelLabelCsv) + label.size() + 1 < sizeof(models[index].labels)-1) {
QStringList modelLabels = QString::fromUtf8(modelLabelCsv).split(',',QString::SkipEmptyParts);
QStringList modelLabels = QString::fromUtf8(modelLabelCsv).split(',', Qt::SkipEmptyParts);
if (modelLabels.indexOf(label) == -1) {
modelLabels.append(label);
strcpy(models[index].labels, QString(modelLabels.join(',')).toUtf8().data());
@@ -258,7 +258,7 @@ bool RadioData::removeLabelFromModel(int index, QString label)
void RadioData::addLabelsFromModels()
{
for(const auto &model: models) {
QStringList labels = QString(model.labels).split(',',QString::SkipEmptyParts);
QStringList labels = QString(model.labels).split(',', Qt::SkipEmptyParts);
foreach(QString label, labels) {
addLabel(label);
}
@@ -281,7 +281,7 @@ int RadioData::indexOfLabel(QString & label) const
QStringList RadioData::fromCSV(const QString &csv)
{
QStringList lbls = QString(csv).split(',',QString::SkipEmptyParts);
QStringList lbls = QString(csv).split(',', Qt::SkipEmptyParts);
for(QString &label: lbls) {
label = unEscapeCSV(label);
}