OSX compilation failures

This commit is contained in:
Bertrand
2014-06-05 19:49:33 +02:00
committed by Bertrand Songis
parent 5b277378c6
commit 9cc0b8b608
4 changed files with 22 additions and 10 deletions
+4 -1
View File
@@ -221,6 +221,7 @@ bool burnDialog::checkeEprom(QString fileName)
}
burnraw=false;
int fileType = getFileType(fileName);
#if 0
if (fileType==FILE_TYPE_XML) {
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { //reading HEX TEXT file
QMessageBox::critical(this, tr("Error"),tr("Error opening file %1:\n%2.").arg(fileName).arg(file.errorString()));
@@ -229,7 +230,9 @@ bool burnDialog::checkeEprom(QString fileName)
QTextStream inputStream(&file);
XmlInterface(inputStream).load(radioData);
}
else if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { //read HEX file
else
#endif
if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { //read HEX file
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { //reading HEX TEXT file
QMessageBox::critical(this, tr("Error"),tr("Error opening file %1:\n%2.").arg(fileName).arg(file.errorString()));
return false;