Ref T730, CPP check issues fixed

This commit is contained in:
Klaus Basan
2019-10-11 15:05:11 +02:00
committed by Mat Sutcliffe
parent 1d9cd50463
commit 30baa12a86
11 changed files with 221 additions and 222 deletions

View File

@@ -18,7 +18,7 @@ namespace BlackCore
{ }
ClientIdentification::ClientIdentification(const QString &sender, quint16 clientId, const QString &clientName, int clientVersionMajor,
int clientVersionMinor, const QString &userCid, const QString &sysUid, const QString &initialChallenge)
int clientVersionMinor, const QString &userCid, const QString &sysUid, const QString &initialChallenge)
: MessageBase(sender, "SERVER"),
m_clientId(clientId), m_clientName(clientName),
m_clientVersionMajor(clientVersionMajor), m_clientVersionMinor(clientVersionMinor),
@@ -47,9 +47,10 @@ namespace BlackCore
{
BlackMisc::CLogMessage(static_cast<ClientIdentification *>(nullptr)).warning(u"Wrong number of arguments.");
return {};
};
}
ClientIdentification packet(tokens[0], tokens[2].toUShort(nullptr, 16), tokens[3], tokens[4].toInt(), tokens[5].toInt(),
tokens[6], tokens[7], tokens.size() > 8 ? tokens[8] : QString());
tokens[6], tokens[7], tokens.size() > 8 ? tokens[8] : QString());
return packet;
}
}

View File

@@ -12,6 +12,7 @@
#define BLACKCORE_FSD_CLIENTIDENTIFICATION_H
#include "messagebase.h"
#include "blackconfig/buildconfig.h"
namespace BlackCore
{
@@ -34,8 +35,8 @@ namespace BlackCore
std::uint16_t m_clientId;
QString m_clientName;
int m_clientVersionMajor;
int m_clientVersionMinor;
int m_clientVersionMajor = BlackConfig::CBuildConfig::getVersion().majorVersion();
int m_clientVersionMinor = BlackConfig::CBuildConfig::getVersion().minorVersion();
QString m_userCid;
QString m_sysUid;
QString m_initialChallenge;