mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-01-06 15:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Log::Msg and Log::Peer

Browse Source 
Also fixes some unitialized scalar field bugs.
This commit is contained in:
Vladimir Golovnev (Glassez) 2016-01-15 08:50:36 +03:00
parent 909fc3fa50
commit 9bdd26de43
2 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/base/logger.cpp
View File

@ -2,31 +2,6 @@
#include <QDateTime> #include <QDateTime>
namespace Log
{
Msg::Msg() {}
Msg::Msg(int id, MsgType type, const QString &message)
: id(id)
, timestamp(QDateTime::currentMSecsSinceEpoch())
, type(type)
, message(message)
{
}
Peer::Peer() {}
Peer::Peer(int id, const QString &ip, bool blocked, const QString &reason)
: id(id)
, timestamp(QDateTime::currentMSecsSinceEpoch())
, ip(ip)
, blocked(blocked)
, reason(reason)
{
}
}
Logger* Logger::m_instance = 0; Logger* Logger::m_instance = 0;
Logger::Logger() Logger::Logger()
@ -61,7 +36,7 @@ void Logger::addMessage(const QString &message, const Log::MsgType &type)
{ {
QWriteLocker locker(&lock); QWriteLocker locker(&lock);
Log::Msg temp(msgCounter++, type, message); Log::Msg temp = { msgCounter++, QDateTime::currentMSecsSinceEpoch(), type, message };
m_messages.push_back(temp); m_messages.push_back(temp);
if (m_messages.size() >= MAX_LOG_MESSAGES) if (m_messages.size() >= MAX_LOG_MESSAGES)
@ -74,7 +49,7 @@ void Logger::addPeer(const QString &ip, bool blocked, const QString &reason)
{ {
QWriteLocker locker(&lock); QWriteLocker locker(&lock);
Log::Peer temp(peerCounter++, ip, blocked, reason); Log::Peer temp = { peerCounter++, QDateTime::currentMSecsSinceEpoch(), ip, blocked, reason };
m_peers.push_back(temp); m_peers.push_back(temp);
if (m_peers.size() >= MAX_LOG_MESSAGES) if (m_peers.size() >= MAX_LOG_MESSAGES)

4
src/base/logger.h
View File

@ -20,8 +20,6 @@ namespace Log
struct Msg struct Msg
{ {
Msg();
Msg(int id, MsgType type, const QString &message);
int id; int id;
qint64 timestamp; qint64 timestamp;
MsgType type; MsgType type;
@ -30,8 +28,6 @@ namespace Log
struct Peer struct Peer
{ {
Peer(int id, const QString &ip, bool blocked, const QString &reason);
Peer();
int id; int id;
qint64 timestamp; qint64 timestamp;
QString ip; QString ip;