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);
}