Warning removed

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();

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);

companion/src/flashinterface.cpp

@@ -413,7 +413,7 @@ bool FlashInterface::setSplash(const QImage & newsplash)
   }
 }
 
-uint FlashInterface::getSplashWidth()
+int FlashInterface::getSplashWidth()
 {
   return splash_width;
 }

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();