This commit is contained in:
Bertrand Songis
2020-06-14 18:41:37 +02:00
parent 89efdadba7
commit 23aaafbfa2
4 changed files with 4 additions and 5 deletions
+1 -1
View File
@@ -114,7 +114,7 @@ void DownloadDialog::updateDataReadProgress(qint64 bytesRead, qint64 totalBytes)
void DownloadDialog::fileError() void DownloadDialog::fileError()
{ {
delete file; delete file;
file = NULL; file = nullptr;
reject(); reject();
} }
+1 -2
View File
@@ -21,7 +21,6 @@
#include "flashfirmwaredialog.h" #include "flashfirmwaredialog.h"
#include "ui_flashfirmwaredialog.h" #include "ui_flashfirmwaredialog.h"
#include "appdata.h" #include "appdata.h"
#include "process_flash.h"
#include "helpers.h" #include "helpers.h"
#include "progressdialog.h" #include "progressdialog.h"
#include "radiointerface.h" #include "radiointerface.h"
@@ -202,7 +201,7 @@ void FlashFirmwareDialog::on_useExternalSplash_clicked()
void FlashFirmwareDialog::on_useLibrarySplash_clicked() void FlashFirmwareDialog::on_useLibrarySplash_clicked()
{ {
QString fileName; QString fileName;
SplashLibraryDialog *ld = new SplashLibraryDialog(this, &fileName); auto ld = new SplashLibraryDialog(this, &fileName);
ld->exec(); ld->exec();
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
QImage image(fileName); QImage image(fileName);
+1 -1
View File
@@ -39,7 +39,7 @@
class FirmwareInterface class FirmwareInterface
{ {
public: public:
FirmwareInterface(const QString &filename); FirmwareInterface(const QString & filename);
inline QString getDate() { return date; } inline QString getDate() { return date; }
inline QString getTime() { return time; } inline QString getTime() { return time; }
int getSize() { return flashSize; } int getSize() { return flashSize; }
+1 -1
View File
@@ -45,7 +45,7 @@
#endif #endif
#if defined(COLORLCD) #if defined(COLORLCD)
const char vers_stamp[] = "VERS" TAB ": " "opentx-" FLAVOUR "-" VERSION DISPLAY_VERSION " (" GIT_STR ")"; const char vers_stamp[] = "VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")";
const char date_stamp[] = "DATE" TAB ": " DATE; const char date_stamp[] = "DATE" TAB ": " DATE;
const char time_stamp[] = "TIME" TAB ": " TIME; const char time_stamp[] = "TIME" TAB ": " TIME;
const char eeprom_stamp[] = "EEPR" TAB ": " EEPROM_STR; const char eeprom_stamp[] = "EEPR" TAB ": " EEPROM_STR;