fix Warning
This commit is contained in:
1 parent
593c221d23
commit
8345470273
316 files changed
+1246
-929
No files matched your search
+1
-1
@@ -11,8 +11,8 @@ namespace BSM
|
||||
{
|
||||
Api::Api(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_socketHandler(new SocketHandler(this))
|
||||
, m_logger(TrainingAreaBase::getLogger("BSM.Api"))
|
||||
, m_socketHandler(new SocketHandler(this))
|
||||
{
|
||||
connect(m_socketHandler, &SocketHandler::opticalShot,
|
||||
this, &Api::opticalShot);
|
||||
|
||||
+1
-1
@@ -15,11 +15,11 @@ namespace BSM
|
||||
{
|
||||
Socket::Socket(const Bsm &cfg, QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(TrainingAreaBase::getLogger("BSM.Socket"))
|
||||
, m_config(cfg)
|
||||
, m_tcpSocket(new QTcpSocket(this))
|
||||
, m_reconnectTimer(nullptr)
|
||||
, m_aliveTimer(new QTimer(this))
|
||||
, m_logger(TrainingAreaBase::getLogger("BSM.Socket"))
|
||||
{
|
||||
m_aliveTimer->setTimerType(Qt::VeryCoarseTimer);
|
||||
m_aliveTimer->setSingleShot(true);
|
||||
|
||||
+2
-2
@@ -12,8 +12,8 @@ namespace BuildingControlUnit
|
||||
namespace Json
|
||||
{
|
||||
WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
|
||||
, m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
, m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this)) {}
|
||||
|
||||
WebSocketHandler::~WebSocketHandler()
|
||||
{
|
||||
|
||||
+1
-1
@@ -41,8 +41,8 @@ static const bool point3dRegistered = []() {
|
||||
|
||||
Api::Api(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_lastHitResult(HitResult())
|
||||
, m_logger(TrainingAreaBase::getLogger("VWM.Api"))
|
||||
, m_lastHitResult(HitResult())
|
||||
{
|
||||
Q_UNUSED(point3dRegistered);
|
||||
}
|
||||
|
||||
+3
-5
@@ -294,12 +294,10 @@ bool readBuilding(const QString &fn, Building &cfg)
|
||||
bool readBuilding(const QByteArray &data, Building &cfg)
|
||||
{
|
||||
QDomDocument doc;
|
||||
QString errorMsg;
|
||||
int errorLine;
|
||||
int errorColumn;
|
||||
if (!doc.setContent(data, &errorMsg, &errorLine, &errorColumn))
|
||||
const auto parseResult = doc.setContent(data);
|
||||
if (!parseResult)
|
||||
{
|
||||
ERROR_LOG(logger()) << "Line=" << errorLine << ", Column=" << errorColumn << ": " << errorMsg;
|
||||
ERROR_LOG(logger()) << "Line=" << int(parseResult.errorLine) << ", Column=" << int(parseResult.errorColumn) << ": " << parseResult.errorMessage;
|
||||
return false;
|
||||
}
|
||||
const QDomElement domRoot = doc.documentElement();
|
||||
|
||||
+3
-5
@@ -32,13 +32,11 @@ QDomElement readFile(const QString &fn, const QString &rootTag)
|
||||
return QDomElement();
|
||||
}
|
||||
|
||||
QString errMsg;
|
||||
int errLine = 0;
|
||||
int errColumn = 0;
|
||||
QDomDocument doc;
|
||||
if (!doc.setContent(data, &errMsg, &errLine, &errColumn))
|
||||
const auto parseResult = doc.setContent(data);
|
||||
if (!parseResult)
|
||||
{
|
||||
WARNING_LOG(logger()) << "Could not parse xml file '" << fn << "' at " << errLine << ":" << errColumn << ": " << errMsg;
|
||||
WARNING_LOG(logger()) << "Could not parse xml file '" << fn << "' at " << int(parseResult.errorLine) << ":" << int(parseResult.errorColumn) << ": " << parseResult.errorMessage;
|
||||
return QDomElement();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user