From 703f14d1537a44f92694372d2c554399fd168fe9 Mon Sep 17 00:00:00 2001 From: elecpower Date: Mon, 29 Nov 2021 08:50:47 +1100 Subject: [PATCH] Rename functions from eeprom to settings --- companion/src/mainwindow.cpp | 8 ++++---- companion/src/mainwindow.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index c76351781..973cc372a 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -912,9 +912,9 @@ void MainWindow::readSettings() else tempFile = generateProcessUniqueTempFileName("temp.bin"); - qDebug() << "MainWindow::readEeprom(): using temp file: " << tempFile; + qDebug() << "Reading models and settings into temp file: " << tempFile; - if (readEepromFromRadio(tempFile)) { + if (readSettingsFromRadio(tempFile)) { MdiChild * child = createMdiChild(); child->newFile(false); child->loadFile(tempFile, false); @@ -933,7 +933,7 @@ bool MainWindow::readFirmwareFromRadio(const QString & filename) return result; } -bool MainWindow::readEepromFromRadio(const QString & filename) +bool MainWindow::readSettingsFromRadio(const QString & filename) { ProgressDialog progressDialog(this, tr("Read Models and Settings from Radio"), CompanionIcon("read_eeprom.png")); bool result = ::readSettings(filename, progressDialog.progress()); @@ -974,7 +974,7 @@ void MainWindow::readBackup() } QString fileName = QFileDialog::getSaveFileName(this, tr("Save Radio Backup to File"), g.eepromDir(), EXTERNAL_EEPROM_FILES_FILTER); if (!fileName.isEmpty()) { - if (!readEepromFromRadio(fileName)) + if (!readSettingsFromRadio(fileName)) return; } } diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h index 87202acf2..a93a8a84b 100644 --- a/companion/src/mainwindow.h +++ b/companion/src/mainwindow.h @@ -156,7 +156,7 @@ class MainWindow : public QMainWindow QMdiSubWindow * findMdiChild(const QString & fileName); bool anyChildrenDirty(); - bool readEepromFromRadio(const QString & filename); + bool readSettingsFromRadio(const QString & filename); bool readFirmwareFromRadio(const QString & filename); bool checkProfileRadioExists(int profId);