Use nested namespaces (C++17 feature)

This commit is contained in:
Mat Sutcliffe
2021-09-15 21:44:54 +01:00
parent 3f2e5b0b69
commit 57d32da826
1345 changed files with 146075 additions and 150376 deletions

View File

@@ -11,61 +11,58 @@
#include "blackmisc/logmessage.h"
namespace BlackCore
namespace BlackCore::Fsd
{
namespace Fsd
ServerError::ServerError()
{ }
ServerError::ServerError(const QString &sender, const QString &receiver, ServerErrorCode errorCode, const QString &causingParameter, const QString &description)
: MessageBase(sender, receiver),
m_errorNumber(errorCode),
m_causingParameter(causingParameter),
m_description(description)
{ }
bool ServerError::isFatalError() const
{
ServerError::ServerError()
{ }
ServerError::ServerError(const QString &sender, const QString &receiver, ServerErrorCode errorCode, const QString &causingParameter, const QString &description)
: MessageBase(sender, receiver),
m_errorNumber(errorCode),
m_causingParameter(causingParameter),
m_description(description)
{ }
bool ServerError::isFatalError() const
static const QVector<ServerErrorCode> fatalErrors
{
static const QVector<ServerErrorCode> fatalErrors
{
ServerErrorCode::CallsignInUse,
ServerErrorCode::InvalidCallsign,
ServerErrorCode::AlreadyRegistered,
ServerErrorCode::InvalidCidPassword,
ServerErrorCode::InvalidRevision,
ServerErrorCode::RequestedLevelTooHigh,
ServerErrorCode::ServerFull,
ServerErrorCode::CidSuspended,
ServerErrorCode::RatingTooLow,
ServerErrorCode::InvalidClient,
ServerErrorCode::AuthTimeout,
};
ServerErrorCode::CallsignInUse,
ServerErrorCode::InvalidCallsign,
ServerErrorCode::AlreadyRegistered,
ServerErrorCode::InvalidCidPassword,
ServerErrorCode::InvalidRevision,
ServerErrorCode::RequestedLevelTooHigh,
ServerErrorCode::ServerFull,
ServerErrorCode::CidSuspended,
ServerErrorCode::RatingTooLow,
ServerErrorCode::InvalidClient,
ServerErrorCode::AuthTimeout,
};
if(fatalErrors.contains(m_errorNumber)) { return true; }
else { return false; }
}
if(fatalErrors.contains(m_errorNumber)) { return true; }
else { return false; }
}
QStringList ServerError::toTokens() const
QStringList ServerError::toTokens() const
{
auto tokens = QStringList {};
tokens.push_back(m_sender);
tokens.push_back(m_receiver);
tokens.push_back(QString::number(static_cast<int>(m_errorNumber)));
tokens.push_back(m_causingParameter);
tokens.push_back(m_description);
return tokens;
}
ServerError ServerError::fromTokens(const QStringList &tokens)
{
if (tokens.size() < 5)
{
auto tokens = QStringList {};
tokens.push_back(m_sender);
tokens.push_back(m_receiver);
tokens.push_back(QString::number(static_cast<int>(m_errorNumber)));
tokens.push_back(m_causingParameter);
tokens.push_back(m_description);
return tokens;
}
ServerError ServerError::fromTokens(const QStringList &tokens)
{
if (tokens.size() < 5)
{
BlackMisc::CLogMessage(static_cast<ServerError *>(nullptr)).debug(u"Wrong number of arguments.");
return {};
}
return ServerError(tokens[0], tokens[1], static_cast<ServerErrorCode>(tokens[2].toInt()), tokens[3], tokens[4]);
BlackMisc::CLogMessage(static_cast<ServerError *>(nullptr)).debug(u"Wrong number of arguments.");
return {};
}
return ServerError(tokens[0], tokens[1], static_cast<ServerErrorCode>(tokens[2].toInt()), tokens[3], tokens[4]);
}
}