d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-03-09 20:01:08 +00:00
Code Issues Projects Releases Wiki Activity

Clean up code

Browse Source
This commit is contained in:
Chocobo1 2019-09-25 15:49:27 +08:00
parent 103e2b9398
commit de7d62c128
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/base/logger.cpp
View File

@ -74,26 +74,26 @@ void Logger::freeInstance()
void Logger::addMessage(const QString &message, const Log::MsgType &type) void Logger::addMessage(const QString &message, const Log::MsgType &type)
{ {
QWriteLocker locker(&m_lock); QWriteLocker locker(&m_lock);
const Log::Msg temp = {m_msgCounter++, QDateTime::currentMSecsSinceEpoch(), type, message.toHtmlEscaped()}; const Log::Msg msg = {m_msgCounter++, QDateTime::currentMSecsSinceEpoch(), type, message.toHtmlEscaped()};
m_messages.push_back(temp); m_messages.push_back(msg);
locker.unlock(); locker.unlock();
emit newLogMessage(temp); emit newLogMessage(msg);
} }
void Logger::addPeer(const QString &ip, const bool blocked, const QString &reason) void Logger::addPeer(const QString &ip, const bool blocked, const QString &reason)
{ {
QWriteLocker locker(&m_lock); QWriteLocker locker(&m_lock);
const Log::Peer temp = {m_peerCounter++, QDateTime::currentMSecsSinceEpoch(), ip.toHtmlEscaped(), blocked, reason.toHtmlEscaped()}; const Log::Peer msg = {m_peerCounter++, QDateTime::currentMSecsSinceEpoch(), ip.toHtmlEscaped(), blocked, reason.toHtmlEscaped()};
m_peers.push_back(temp); m_peers.push_back(msg);
locker.unlock(); locker.unlock();
emit newLogPeer(temp); emit newLogPeer(msg);
} }
QVector<Log::Msg> Logger::getMessages(const int lastKnownId) const QVector<Log::Msg> Logger::getMessages(const int lastKnownId) const
{ {
QReadLocker locker(&m_lock); const QReadLocker locker(&m_lock);
const int diff = m_msgCounter - lastKnownId - 1; const int diff = m_msgCounter - lastKnownId - 1;
const int size = m_messages.size(); const int size = m_messages.size();
@ -109,7 +109,7 @@ QVector<Log::Msg> Logger::getMessages(const int lastKnownId) const
QVector<Log::Peer> Logger::getPeers(const int lastKnownId) const QVector<Log::Peer> Logger::getPeers(const int lastKnownId) const
{ {
QReadLocker locker(&m_lock); const QReadLocker locker(&m_lock);
const int diff = m_peerCounter - lastKnownId - 1; const int diff = m_peerCounter - lastKnownId - 1;
const int size = m_peers.size(); const int size = m_peers.size();

3
src/base/settingsstorage.cpp
View File

@ -201,8 +201,9 @@ bool SettingsStorage::save()
QVariant SettingsStorage::loadValue(const QString &key, const QVariant &defaultValue) const QVariant SettingsStorage::loadValue(const QString &key, const QVariant &defaultValue) const
{ {
const QString realKey = mapKey(key);
const QReadLocker locker(&m_lock); const QReadLocker locker(&m_lock);
return m_data.value(mapKey(key), defaultValue); return m_data.value(realKey, defaultValue);
} }
void SettingsStorage::storeValue(const QString &key, const QVariant &value) void SettingsStorage::storeValue(const QString &key, const QVariant &value)