From 3621b26403a490e4c253018d0d90bee3545a7ead Mon Sep 17 00:00:00 2001 From: elecpower Date: Thu, 21 Jul 2022 07:57:04 +1000 Subject: [PATCH] Fix MacOSX OS compile and warnings --- companion/src/updates/updatecompanion.cpp | 9 ++++----- companion/src/updates/updatecompanion.h | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/companion/src/updates/updatecompanion.cpp b/companion/src/updates/updatecompanion.cpp index af1be0336..c56d1bd6e 100644 --- a/companion/src/updates/updatecompanion.cpp +++ b/companion/src/updates/updatecompanion.cpp @@ -28,22 +28,21 @@ #include #ifdef Q_OS_MACOS - #define #define OS_FILEPATTERN "edgetx-cpn-osx" #define OS_INSTALLER_EXTN "*.dmg" - #define OS_INSTALL_QUESTION tr("Would you like to open the disk image to install the new version?") + #define OS_INSTALL_QUESTION tr("Would you like to open the disk image to install the new version of Companion?") #elif defined(Q_OS_WIN64) #define OS_FILEPATTERN "edgetx-cpn-win64" #define OS_INSTALLER_EXTN "*.exe" - #define OS_INSTALL_QUESTION tr("Would you like to launch the installer?") + #define OS_INSTALL_QUESTION tr("Would you like to launch the Companion installer?") #elif defined(Q_OS_WIN32) #define OS_FILEPATTERN "edgetx-cpn-win32" #define OS_INSTALLER_EXTN "*.exe" - #define OS_INSTALL_QUESTION tr("Would you like to launch the installer?") + #define OS_INSTALL_QUESTION tr("Would you like to launch the Companion installer?") #else #define OS_FILEPATTERN "edgetx-cpn-linux" #define OS_INSTALLER_EXTN "*.AppImage" - #define OS_INSTALL_QUESTION tr("Would you like to open the app image to install the new version?") + #define OS_INSTALL_QUESTION tr("Would you like to open the app image to install the new version of Companion?") #endif UpdateCompanion::UpdateCompanion(QWidget * parent) : diff --git a/companion/src/updates/updatecompanion.h b/companion/src/updates/updatecompanion.h index fe3d596af..a1b488326 100644 --- a/companion/src/updates/updatecompanion.h +++ b/companion/src/updates/updatecompanion.h @@ -34,8 +34,8 @@ class UpdateCompanion : public UpdateInterface protected: virtual bool asyncInstall() override; - virtual const QString currentRelease(); - virtual const QString currentVersion(); - virtual const bool isLatestRelease(); - virtual const bool isUpdateAvailable(); + virtual const QString currentRelease() override; + virtual const QString currentVersion() override; + virtual const bool isLatestRelease() override; + virtual const bool isUpdateAvailable() override; };