From 9cc0b8b6081c3636187f7b5085b581de94bfdf33 Mon Sep 17 00:00:00 2001 From: Bertrand Date: Thu, 5 Jun 2014 19:45:34 +0200 Subject: [PATCH] OSX compilation failures --- companion/src/CMakeLists.txt | 4 ++-- companion/src/burndialog.cpp | 5 ++++- companion/src/mainwindow.cpp | 13 ++++++++----- companion/src/mdichild.cpp | 10 ++++++++-- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 4498164bb..fe3241dd2 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -147,8 +147,8 @@ add_library(common ${common_SRCS}) set(companion_SRCS hexinterface.cpp flashinterface.cpp - xmlinterface.cpp - ${PROJECT_BINARY_DIR}/radio.cxx + # xmlinterface.cpp + # ${PROJECT_BINARY_DIR}/radio.cxx ${RADIO_SRC_DIRECTORY}/stamp-opentx.h ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm ${RADIO_SRC_DIRECTORY}/translations/en.h diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp index f96a57a1d..21bdc3f19 100644 --- a/companion/src/burndialog.cpp +++ b/companion/src/burndialog.cpp @@ -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; diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 3822f9ef3..4b2d7db8f 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -423,7 +423,7 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply) if (msgBox.clickedButton() == rnButton) { contributorsDialog *cd = new contributorsDialog(this,2,rn); cd->exec(); - int ret2 = QMessageBox::question(this, "Companion", tr("Do you want to download release %1 %2 now ?").arg(versionString), QMessageBox::Yes | QMessageBox::No); + int ret2 = QMessageBox::question(this, "Companion", tr("Do you want to download release %1 now ?").arg(versionString), QMessageBox::Yes | QMessageBox::No); if (ret2 == QMessageBox::Yes) download = true; else @@ -438,7 +438,7 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply) } else if (version > currentVersion) { QString rn = GetFirmware(current_firmware_variant.id)->getReleaseNotesUrl(); - QAbstractButton *rnButton; + QAbstractButton *rnButton = NULL; msgBox.setText("Companion"); msgBox.setInformativeText(tr("A new version of %1 firmware is available:\n - current is %2\n - newer is %3\n\nDo you want to download it now ?").arg(current_firmware_variant.id).arg(currentVersionString).arg(versionString)); QAbstractButton *YesButton = msgBox.addButton(trUtf8("Yes"), QMessageBox::YesRole); @@ -563,7 +563,7 @@ void MainWindow::setIconThemeSize(int index) void MainWindow::newFile() { - MdiChild *child = createMdiChild(); + MdiChild * child = createMdiChild(); child->newFile(); child->show(); } @@ -1470,7 +1470,7 @@ void MainWindow::updateMenus() MdiChild *MainWindow::createMdiChild() { - MdiChild *child = new MdiChild(); + MdiChild * child = new MdiChild(); mdiArea->addSubWindow(child); if(!child->parentWidget()->isMaximized() && !child->parentWidget()->isMinimized()) child->parentWidget()->resize(400, 400); @@ -1971,6 +1971,7 @@ int MainWindow::getEpromVersion(QString fileName) return -1; } 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())); @@ -1979,7 +1980,9 @@ int MainWindow::getEpromVersion(QString fileName) QTextStream inputStream(&file); XmlInterface(inputStream).load(testData); } - 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 -1; diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index fdbfaef60..e9c5b1317 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -241,6 +241,7 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile) 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"), @@ -252,7 +253,9 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile) 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.") @@ -415,6 +418,7 @@ bool MdiChild::saveFile(const QString &fileName, bool setCurrent) QTextStream outputStream(&file); +#if 0 if (fileType==FILE_TYPE_XML) { if (!XmlInterface(outputStream).save(radioData)) { QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString())); @@ -422,7 +426,9 @@ bool MdiChild::saveFile(const QString &fileName, bool setCurrent) return false; } } - else if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { // write hex + else +#endif + if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { // write hex if (fileType==FILE_TYPE_EEPE) outputStream << EEPE_EEPROM_FILE_HEADER << "\n";