diff --git a/companion/src/converteeprom.cpp b/companion/src/converteeprom.cpp index 065123d29..3af874584 100755 --- a/companion/src/converteeprom.cpp +++ b/companion/src/converteeprom.cpp @@ -26,7 +26,7 @@ bool convertEEprom(const QString &sourceEEprom, const QString &destinationEEprom sourceFile.close(); QSharedPointer radioData = QSharedPointer(new RadioData()); - std::bitset errors(LoadEeprom(*radioData, (uint8_t *)eeprom.data(), eeprom_size)); + std::bitset errors((unsigned long long)LoadEeprom(*radioData, (uint8_t *)eeprom.data(), eeprom_size)); if (!errors.test(NO_ERROR) || !currentFirmware->saveEEPROM((uint8_t *)eeprom.data(), *radioData, variant, version)) { return false; diff --git a/companion/src/flasheepromdialog.cpp b/companion/src/flasheepromdialog.cpp index b1dbee9a4..ee175841f 100755 --- a/companion/src/flasheepromdialog.cpp +++ b/companion/src/flasheepromdialog.cpp @@ -125,7 +125,7 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename) bool xmlOK = doc.setContent(&file); if (xmlOK) { RadioData * radioData = new RadioData(); - std::bitset errors(LoadEepromXml(*radioData, doc)); + std::bitset errors((unsigned long long)LoadEepromXml(*radioData, doc)); if (!errors.test(NO_ERROR)) { QMessageBox::warning(this, tr("Error"), tr("Invalid Models and Settings File %1").arg(filename)); } @@ -161,7 +161,7 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename) } RadioData * radioData = new RadioData(); - std::bitset errors(LoadEeprom(*radioData, (const uint8_t *)eeprom.data(), eeprom_size)); + std::bitset errors((unsigned long long)LoadEeprom(*radioData, (const uint8_t *)eeprom.data(), eeprom_size)); if (eeprom_size == 0 || !errors.test(NO_ERROR)) { QMessageBox::warning(this, tr("Error"), tr("Invalid Models and Settings file %1").arg(filename)); } diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index 484b5d4f7..0eac6e804 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -264,7 +264,7 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile) QDomDocument doc(ER9X_EEPROM_FILE_TYPE); bool xmlOK = doc.setContent(&file); if(xmlOK) { - std::bitset errors(LoadEepromXml(radioData, doc)); + std::bitset errors((unsigned long long)LoadEepromXml(radioData, doc)); if (errors.test(NO_ERROR)) { ui->modelsList->refreshList(); if(resetCurrentFile) setCurrentFile(fileName); @@ -295,7 +295,7 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile) file.close(); - std::bitset errors(LoadEeprom(radioData, (uint8_t *)eeprom.data(), eeprom_size)); + std::bitset errors((unsigned long long)LoadEeprom(radioData, (uint8_t *)eeprom.data(), eeprom_size)); if (!errors.test(NO_ERROR)) { ShowEepromErrors(this, tr("Error"), tr("Invalid EEPROM File %1").arg(fileName), errors.to_ulong()); return false; @@ -333,9 +333,9 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile) return false; } - std::bitset errorsEeprom(LoadEeprom(radioData, eeprom, eeprom_size)); + std::bitset errorsEeprom((unsigned long long)LoadEeprom(radioData, eeprom, eeprom_size)); if (!errorsEeprom.test(NO_ERROR)) { - std::bitset errorsBackup(LoadBackup(radioData, eeprom, eeprom_size, 0)); + std::bitset errorsBackup((unsigned long long)LoadBackup(radioData, eeprom, eeprom_size, 0)); if (!errorsBackup.test(NO_ERROR)) { ShowEepromErrors(this, tr("Error"), tr("Invalid binary EEPROM File %1").arg(fileName), (errorsEeprom | errorsBackup).to_ulong()); return false; @@ -611,7 +611,7 @@ bool MdiChild::loadBackup() return false; } - std::bitset errorsEeprom(LoadBackup(radioData, (uint8_t *)eeprom.data(), eeprom_size, index)); + std::bitset errorsEeprom((unsigned long long)LoadBackup(radioData, (uint8_t *)eeprom.data(), eeprom_size, index)); if (!errorsEeprom.test(NO_ERROR)) { ShowEepromErrors(this, tr("Error"), tr("Invalid binary backup File %1").arg(fileName), (errorsEeprom).to_ulong()); return false;