Browse Source

Clean up code

adaptive-webui-19844
Chocobo1 5 years ago
parent
commit
de7d62c128
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 16
      src/base/logger.cpp
  2. 3
      src/base/settingsstorage.cpp

16
src/base/logger.cpp

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

3
src/base/settingsstorage.cpp

@ -201,8 +201,9 @@ bool SettingsStorage::save() @@ -201,8 +201,9 @@ bool SettingsStorage::save()
QVariant SettingsStorage::loadValue(const QString &key, const QVariant &defaultValue) const
{
const QString realKey = mapKey(key);
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)

Loading…
Cancel
Save