This commit is contained in:
Klaus Basan
2019-03-22 03:07:53 +01:00
committed by Mat Sutcliffe
parent 77a898c9ec
commit 6a2b0a89d1
8 changed files with 6 additions and 21 deletions

View File

@@ -31,7 +31,7 @@ namespace BlackGui
explicit CAboutDialog(QWidget *parent = nullptr);
//! Destructor
virtual ~CAboutDialog();
virtual ~CAboutDialog() override;
private:
//! Init values

View File

@@ -40,7 +40,6 @@ namespace BlackGui
// 1st init when running in distributed environment
QPointer<CAircraftModelValidationComponent> myself(this);
const qint64 lastResults = m_lastResults;
QTimer::singleShot(2500, this, [ = ]
{

View File

@@ -46,7 +46,7 @@ namespace BlackGui
explicit CAircraftModelValidationComponent(QWidget *parent = nullptr);
//! Destructor
virtual ~CAircraftModelValidationComponent();
virtual ~CAircraftModelValidationComponent() override;
//! Validated a model set
void validatedModelSet(const BlackMisc::Simulation::CSimulatorInfo &simulator, const BlackMisc::Simulation::CAircraftModelList &valid, const BlackMisc::Simulation::CAircraftModelList &invalid, bool stopped, const BlackMisc::CStatusMessageList &msgs);

View File

@@ -17,8 +17,6 @@
#include <QObject>
#include <QScopedPointer>
class QWidget;
namespace Ui { class CAudioComponent; }
namespace BlackGui
{
@@ -34,7 +32,7 @@ namespace BlackGui
explicit CAudioComponent(QWidget *parent = nullptr);
//! Destructor
virtual ~CAudioComponent();
virtual ~CAudioComponent() override;
private:
QScopedPointer<Ui::CAudioComponent> ui;

View File

@@ -59,16 +59,6 @@ namespace BlackGui
// init if data already available
this->onWebDataRead();
/**
//! \todo remove this block when no longer needed after 2019-02
//! \fixme hardcoded stylesheet setting per stylesheet does NOT work, this hardcoded stuff should be removed
const QString style("background-image: url(:/textures/icons/textures/texture-inner.jpg)");
ui->wp2_Aircraft->setStyleSheet(style);
ui->wp3_LiveryColor->setStyleSheet(style);
ui->wp4_Livery->setStyleSheet(style);
ui->wp5_Distributor->setStyleSheet(style);
**/
}
CDbQuickMappingWizard::~CDbQuickMappingWizard()

View File

@@ -30,6 +30,7 @@
#include <Qt>
#include <QtGlobal>
#include <QPointer>
#include <QStringBuilder>
#include <QTimer>
using namespace BlackConfig;
@@ -154,7 +155,7 @@ namespace BlackGui
{
// at least connected
const QString s(
sGui->getIContextSimulator()->getSimulatorPluginInfo().getDescription() + ": " +
sGui->getIContextSimulator()->getSimulatorPluginInfo().getDescription() % u": " %
ISimulator::statusToString(simStatus)
);
@@ -197,7 +198,7 @@ namespace BlackGui
break;
case INetwork::Connected:
ui->led_Network->setOn(true);
ui->led_Network->setOnToolTip("Connected: " + sGui->getIContextNetwork()->getConnectedServer().getName());
ui->led_Network->setOnToolTip(u"Connected: " % sGui->getIContextNetwork()->getConnectedServer().getName());
break;
case INetwork::Connecting:
ui->led_Network->setTriStateColor(CLedWidget::Yellow);

View File

@@ -52,7 +52,6 @@ namespace BlackGui
//! Enables/disabled the given plugin.
void setEnabled(const QString &identifier, bool enabled);
private:
void handlePluginStateChange();

View File

@@ -16,8 +16,6 @@
#include <QObject>
#include <QScopedPointer>
class QWidget;
namespace Ui { class CShowHideBar; }
namespace BlackGui
{