Formatting / style

This commit is contained in:
Klaus Basan
2015-11-07 02:34:34 +01:00
committed by Mathew Sutcliffe
parent 6ff9df5c05
commit de011dab1e
11 changed files with 13 additions and 31 deletions

View File

@@ -24,8 +24,6 @@ namespace BlackCore
CContextApplicationProxy::CContextApplicationProxy(const QString &serviceName, QDBusConnection &connection, CRuntimeConfig::ContextMode mode, CRuntime *runtime) : IContextApplication(mode, runtime), m_dBusInterface(nullptr)
{
this->m_dBusInterface = new CGenericDBusInterface(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), connection, this);
// this->m_dBusInterface = new CGenericDBusInterface(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), connection, this);
this->relaySignals(serviceName, connection);
connect(this, &IContextApplication::messageLogged, this, [](const CStatusMessage & message, const CIdentifier & origin)

View File

@@ -25,7 +25,6 @@ namespace BlackCore
class BLACKCORE_EXPORT CContextAudioEmpty : public IContextAudio
{
public:
//! Constructor
CContextAudioEmpty(CRuntime *runtime) : IContextAudio(CRuntimeConfig::NotUsed, runtime) {}
@@ -175,8 +174,7 @@ namespace BlackCore
logEmptyContextWarning(Q_FUNC_INFO);
return false;
}
};
};
} // namespace
#endif // guard

View File

@@ -25,7 +25,6 @@ namespace BlackCore
Q_OBJECT
public:
//! Constructor
CContextNetworkEmpty(CRuntime *runtime) : IContextNetwork(CRuntimeConfig::NotUsed, runtime) {}

View File

@@ -154,6 +154,6 @@ namespace BlackCore
//! Resolve voice rooms
void resolveVoiceRooms();
};
}
} // ns
#endif // guard

View File

@@ -28,12 +28,10 @@ namespace BlackCore
friend class IContextOwnAircraft;
public:
//! Destructor
virtual ~CContextOwnAircraftProxy() {}
public slots: // IContextOwnAircraft overrides
public slots:
//! \copydoc IContextOwnAircraft::getOwnAircraft()
virtual BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const override;
@@ -82,9 +80,7 @@ namespace BlackCore
//! \brief Relay connection signals to local signals.
void relaySignals(const QString &serviceName, QDBusConnection &connection);
};
}
} // ns
#endif // guard

View File

@@ -301,7 +301,7 @@ namespace BlackCore
*/
QString CDBusServer::fixAddressToDBusAddress(const QString &address)
{
if (address.isEmpty() || address == sessionDBusServer() || address == systemDBusServer()) return address;
if (address.isEmpty() || address == sessionDBusServer() || address == systemDBusServer()) { return address; }
if (address.startsWith("tcp:") || address.startsWith("unix:")) return address;
return p2pAddress(address);
}

View File

@@ -51,7 +51,7 @@
</widget>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer">
<spacer name="hs_HotkeyComponent">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -83,7 +83,7 @@
</widget>
</item>
<item row="3" column="1">
<spacer name="verticalSpacer_2">
<spacer name="vs_HotkeyComponent">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>

View File

@@ -21,9 +21,6 @@ namespace BlackGui
{
namespace Models
{
/*
* Constructor
*/
CAtcStationListModel::CAtcStationListModel(AtcStationMode stationMode, QObject *parent) :
CListModelBase("ModelAtcList", parent), m_stationMode(NotSet)
{

View File

@@ -24,7 +24,6 @@ namespace BlackMisc
{
namespace Aviation
{
CAtcStation::CAtcStation()
{ }

View File

@@ -131,7 +131,7 @@ namespace BlackMisc
//! Constructor
ICoordinateWithRelativePosition();
BlackMisc::PhysicalQuantities::CAngle m_bearingToOwnAircraft {0.0, BlackMisc::PhysicalQuantities::CAngleUnit::nullUnit()}; //!< temporary stored value
BlackMisc::PhysicalQuantities::CAngle m_bearingToOwnAircraft {0.0, BlackMisc::PhysicalQuantities::CAngleUnit::nullUnit()}; //!< temporary stored value
BlackMisc::PhysicalQuantities::CLength m_distanceToOwnAircraft {0.0, BlackMisc::PhysicalQuantities::CLengthUnit::nullUnit()}; //!< temporary stored value
};

View File

@@ -45,17 +45,13 @@ namespace BlackMisc
class IGeoObjectList
{
public:
/*!
* Find 0..n objects within range of given coordinate
* \param coordinate other position
* \param range within range of other position
* \return
*/
//! Find 0..n objects within range of given coordinate
//! \param coordinate other position
//! \param range within range of other position
//! \return
CONTAINER findWithinRange(const BlackMisc::Geo::ICoordinateGeodetic &coordinate, const BlackMisc::PhysicalQuantities::CLength &range) const;
/*!
* Find 0..n objects closest to the given coordinate.
*/
//! Find 0..n objects closest to the given coordinate.
CONTAINER findClosest(int number, const BlackMisc::Geo::ICoordinateGeodetic &coordinate) const;
protected:
@@ -102,7 +98,6 @@ namespace BlackMisc
protected:
//! Constructor
IGeoObjectWithRelativePositionList();
};
//! \cond PRIVATE