diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp index f1d7f5482..bfdf0bc76 100644 --- a/companion/src/burndialog.cpp +++ b/companion/src/burndialog.cpp @@ -212,8 +212,8 @@ void burnDialog::checkFw(QString fileName) ui->SplashFrame->show(); ui->ImageLoadButton->setEnabled(true); ui->libraryButton->setEnabled(true); - ui->FwImage->setFixedSize(flash.getSplashWidth(),flash.getSplashHeight()); - ui->imageLabel->setFixedSize(flash.getSplashWidth(),flash.getSplashHeight()); + ui->FwImage->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight()); + ui->imageLabel->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight()); ui->FwImage->show(); ui->FwImage->setPixmap(QPixmap::fromImage(flash.getSplash())); QString ImageStr = settings.value("SplashImage", "").toString(); diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp index 5e072e851..420266b7a 100644 --- a/companion/src/customizesplashdialog.cpp +++ b/companion/src/customizesplashdialog.cpp @@ -37,7 +37,7 @@ bool Side::displayImage( QString fileName, Source pictSource ) return false; else image = flash.getSplash(); - *format = flash.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X; + *format = (flash.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X); } else { image.load(fileName); diff --git a/companion/src/flashinterface.cpp b/companion/src/flashinterface.cpp index 86c677ef8..b72c39cbf 100644 --- a/companion/src/flashinterface.cpp +++ b/companion/src/flashinterface.cpp @@ -413,7 +413,7 @@ bool FlashInterface::setSplash(const QImage & newsplash) } } -uint FlashInterface::getSplashWidth() +int FlashInterface::getSplashWidth() { return splash_width; } diff --git a/companion/src/flashinterface.h b/companion/src/flashinterface.h index d7e6f0de9..402c2410d 100644 --- a/companion/src/flashinterface.h +++ b/companion/src/flashinterface.h @@ -59,7 +59,7 @@ public: QImage getSplash(); bool setSplash(const QImage & newsplash); bool hasSplash(); - uint getSplashWidth(); + int getSplashWidth(); uint getSplashHeight(); uint getSplashColors(); QImage::Format getSplashFormat();