From 7bee8e9ee83271e89ab901254d8ce636cc60eabe Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 28 May 2018 21:33:33 +0200 Subject: [PATCH] Formatting --- src/blackcore/context/contextsimulatorimpl.cpp | 2 +- src/blackgui/components/settingsadvancedcomponent.h | 7 ++----- src/blackmisc/simulation/settings/simulatorsettings.h | 8 ++++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index 4008ca1ff..0ebd63783 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -86,7 +86,7 @@ namespace BlackCore CContextSimulator *CContextSimulator::registerWithDBus(CDBusServer *server) { - if (!server || m_mode != CCoreFacadeConfig::LocalInDBusServer) return this; + if (!server || m_mode != CCoreFacadeConfig::LocalInDBusServer) { return this; } server->addObject(CContextSimulator::ObjectPath(), this); return this; } diff --git a/src/blackgui/components/settingsadvancedcomponent.h b/src/blackgui/components/settingsadvancedcomponent.h index fc5ed4211..5eb8c35b0 100644 --- a/src/blackgui/components/settingsadvancedcomponent.h +++ b/src/blackgui/components/settingsadvancedcomponent.h @@ -23,14 +23,12 @@ class QWidget; namespace Ui { class CSettingsAdvancedComponent; } - namespace BlackGui { namespace Components { //! Configure general settings - class BLACKGUI_EXPORT CSettingsAdvancedComponent : - public QFrame + class BLACKGUI_EXPORT CSettingsAdvancedComponent : public QFrame { Q_OBJECT @@ -39,7 +37,7 @@ namespace BlackGui CSettingsAdvancedComponent(QWidget *parent = nullptr); //! Destructor - ~CSettingsAdvancedComponent(); + virtual ~CSettingsAdvancedComponent(); private: void crashDumpUploadEnabledChanged(int state); @@ -47,7 +45,6 @@ namespace BlackGui QScopedPointer ui; BlackMisc::CSetting m_crashDumpUploadEnabled { this }; }; - } // ns } // ns diff --git a/src/blackmisc/simulation/settings/simulatorsettings.h b/src/blackmisc/simulation/settings/simulatorsettings.h index bf994ee51..34240359d 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.h +++ b/src/blackmisc/simulation/settings/simulatorsettings.h @@ -289,10 +289,10 @@ namespace BlackMisc static const QString &defaultSimulatorDirectory(const CSimulatorInfo &simulator); private: - CSetting m_simSettingsFsx {this}; //!< FSX cache - CSetting m_simSettingsFs9 {this}; //!< FS9 cache - CSetting m_simSettingsP3D {this}; //!< P3D cache - CSetting m_simSettingsXP {this}; //!< XP cache + CSetting m_simSettingsFsx {this}; //!< FSX settings + CSetting m_simSettingsFs9 {this}; //!< FS9 settings + CSetting m_simSettingsP3D {this}; //!< P3D settings + CSetting m_simSettingsXP {this}; //!< XP settings }; //! Settings regarding message handling.