This commit is contained in:
Klaus Basan
2018-10-24 02:54:50 +02:00
parent 793265722f
commit d7380966de
6 changed files with 6 additions and 8 deletions

View File

@@ -255,13 +255,13 @@ namespace BlackCore
const QString &CApplication::getApplicationNameAndVersion() const const QString &CApplication::getApplicationNameAndVersion() const
{ {
static const QString s(m_applicationName + " " + CBuildConfig::getVersionString()); static const QString s(m_applicationName % QStringLiteral(" ") % CBuildConfig::getVersionString());
return s; return s;
} }
const QString &CApplication::getApplicationNameVersionDetailed() const const QString &CApplication::getApplicationNameVersionDetailed() const
{ {
static const QString s(m_applicationName + " " + this->versionStringDetailed()); static const QString s(m_applicationName % QStringLiteral(" ") % this->versionStringDetailed());
return s; return s;
} }

View File

@@ -86,7 +86,7 @@ namespace BlackGui
CGuiApplication(const QString &applicationName = executable(), BlackMisc::CApplicationInfo::Application application = BlackMisc::CApplicationInfo::Unknown, const QPixmap &icon = BlackMisc::CIcons::swift64()); CGuiApplication(const QString &applicationName = executable(), BlackMisc::CApplicationInfo::Application application = BlackMisc::CApplicationInfo::Unknown, const QPixmap &icon = BlackMisc::CIcons::swift64());
//! Destructor //! Destructor
virtual ~CGuiApplication(); virtual ~CGuiApplication() override;
//! CMD line arguments //! CMD line arguments
void addWindowStateOption(); void addWindowStateOption();

View File

@@ -22,7 +22,6 @@
#include <Qt> #include <Qt>
class QModelIndex; class QModelIndex;
class QObject;
namespace BlackMisc { namespace Simulation { class CAircraftModel; } } namespace BlackMisc { namespace Simulation { class CAircraftModel; } }
namespace BlackGui namespace BlackGui

View File

@@ -42,7 +42,7 @@ namespace BlackGui
void CPluginDetailsWindow::setPluginName(const QString &name) void CPluginDetailsWindow::setPluginName(const QString &name)
{ {
ui->lbl_PluginName->setText(name); ui->lbl_PluginName->setText(name);
setWindowTitle(name); this->setWindowTitle(name);
} }
void CPluginDetailsWindow::setPluginIdentifier(const QString &id) void CPluginDetailsWindow::setPluginIdentifier(const QString &id)

View File

@@ -22,7 +22,6 @@
class QShowEvent; class QShowEvent;
namespace Ui { class CPluginDetailsWindow; } namespace Ui { class CPluginDetailsWindow; }
namespace BlackGui namespace BlackGui
{ {
/*! /*!
@@ -37,7 +36,7 @@ namespace BlackGui
explicit CPluginDetailsWindow(QWidget *parent = nullptr); explicit CPluginDetailsWindow(QWidget *parent = nullptr);
//! Destructor //! Destructor
virtual ~CPluginDetailsWindow(); virtual ~CPluginDetailsWindow() override;
//! Sets the plugin name //! Sets the plugin name
void setPluginName(const QString &name); void setPluginName(const QString &name);

View File

@@ -111,7 +111,7 @@ void CSwiftData::init()
const CGlobalSetup s(sApp->getGlobalSetup()); const CGlobalSetup s(sApp->getGlobalSetup());
if (!s.getDbHomePageUrl().isEmpty()) 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); sGui->triggerNewVersionCheck(15 * 1000);