diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index abe79e4d6..aa653dd7c 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -255,13 +255,13 @@ namespace BlackCore const QString &CApplication::getApplicationNameAndVersion() const { - static const QString s(m_applicationName + " " + CBuildConfig::getVersionString()); + static const QString s(m_applicationName % QStringLiteral(" ") % CBuildConfig::getVersionString()); return s; } const QString &CApplication::getApplicationNameVersionDetailed() const { - static const QString s(m_applicationName + " " + this->versionStringDetailed()); + static const QString s(m_applicationName % QStringLiteral(" ") % this->versionStringDetailed()); return s; } diff --git a/src/blackgui/guiapplication.h b/src/blackgui/guiapplication.h index b1aa74b30..c7e37c0c0 100644 --- a/src/blackgui/guiapplication.h +++ b/src/blackgui/guiapplication.h @@ -86,7 +86,7 @@ namespace BlackGui CGuiApplication(const QString &applicationName = executable(), BlackMisc::CApplicationInfo::Application application = BlackMisc::CApplicationInfo::Unknown, const QPixmap &icon = BlackMisc::CIcons::swift64()); //! Destructor - virtual ~CGuiApplication(); + virtual ~CGuiApplication() override; //! CMD line arguments void addWindowStateOption(); diff --git a/src/blackgui/models/aircraftmodellistmodel.h b/src/blackgui/models/aircraftmodellistmodel.h index c9fddf0b9..8be668889 100644 --- a/src/blackgui/models/aircraftmodellistmodel.h +++ b/src/blackgui/models/aircraftmodellistmodel.h @@ -22,7 +22,6 @@ #include class QModelIndex; -class QObject; namespace BlackMisc { namespace Simulation { class CAircraftModel; } } namespace BlackGui diff --git a/src/blackgui/plugindetailswindow.cpp b/src/blackgui/plugindetailswindow.cpp index c8b48e5b7..54ab2b1e8 100644 --- a/src/blackgui/plugindetailswindow.cpp +++ b/src/blackgui/plugindetailswindow.cpp @@ -42,7 +42,7 @@ namespace BlackGui void CPluginDetailsWindow::setPluginName(const QString &name) { ui->lbl_PluginName->setText(name); - setWindowTitle(name); + this->setWindowTitle(name); } void CPluginDetailsWindow::setPluginIdentifier(const QString &id) diff --git a/src/blackgui/plugindetailswindow.h b/src/blackgui/plugindetailswindow.h index 2b9b9ba0b..7211e7655 100644 --- a/src/blackgui/plugindetailswindow.h +++ b/src/blackgui/plugindetailswindow.h @@ -22,7 +22,6 @@ class QShowEvent; namespace Ui { class CPluginDetailsWindow; } - namespace BlackGui { /*! @@ -37,7 +36,7 @@ namespace BlackGui explicit CPluginDetailsWindow(QWidget *parent = nullptr); //! Destructor - virtual ~CPluginDetailsWindow(); + virtual ~CPluginDetailsWindow() override; //! Sets the plugin name void setPluginName(const QString &name); diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp index cb2e20dbf..65157963a 100644 --- a/src/swiftdata/swiftdata.cpp +++ b/src/swiftdata/swiftdata.cpp @@ -111,7 +111,7 @@ void CSwiftData::init() const CGlobalSetup s(sApp->getGlobalSetup()); if (!s.getDbHomePageUrl().isEmpty()) { - this->setWindowTitle(QString("%1 %2").arg(this->windowTitle(), s.getDbHomePageUrl().toQString(true))); + this->setWindowTitle(QStringLiteral("%1 %2").arg(this->windowTitle(), s.getDbHomePageUrl().toQString(true))); } sGui->triggerNewVersionCheck(15 * 1000);