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

Remove usage of deprecated functions

Browse Source 
Also use proper type for storing date/time data
This commit is contained in:
Chocobo1 2018-03-09 01:38:03 +08:00
parent a3d9e457a0
commit fdf3ebbb6c
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/properties/speedplotview.h
View File

@ -69,7 +69,7 @@ public:
struct PointData struct PointData
{ {
uint x; qint64 x;
int y[NB_GRAPHS]; int y[NB_GRAPHS];
}; };

2
src/gui/properties/speedwidget.cpp
View File

@ -137,7 +137,7 @@ void SpeedWidget::update()
const BitTorrent::SessionStatus &btStatus = BitTorrent::Session::instance()->status(); const BitTorrent::SessionStatus &btStatus = BitTorrent::Session::instance()->status();
SpeedPlotView::PointData point; SpeedPlotView::PointData point;
point.x = QDateTime::currentDateTime().toTime_t(); point.x = QDateTime::currentMSecsSinceEpoch() / 1000;
point.y[SpeedPlotView::UP] = btStatus.uploadRate; point.y[SpeedPlotView::UP] = btStatus.uploadRate;
point.y[SpeedPlotView::DOWN] = btStatus.downloadRate; point.y[SpeedPlotView::DOWN] = btStatus.downloadRate;
point.y[SpeedPlotView::PAYLOAD_UP] = btStatus.payloadUploadRate; point.y[SpeedPlotView::PAYLOAD_UP] = btStatus.payloadUploadRate;

4
src/webui/api/authcontroller.cpp
View File

@ -78,7 +78,7 @@ void AuthController::logoutAction()
bool AuthController::isBanned() const bool AuthController::isBanned() const
{ {
const uint now = QDateTime::currentDateTime().toTime_t(); const qint64 now = QDateTime::currentMSecsSinceEpoch() / 1000;
const FailedLogin failedLogin = m_clientFailedLogins.value(sessionManager()->clientId()); const FailedLogin failedLogin = m_clientFailedLogins.value(sessionManager()->clientId());
bool isBanned = (failedLogin.bannedAt > 0); bool isBanned = (failedLogin.bannedAt > 0);
@ -103,6 +103,6 @@ void AuthController::increaseFailedAttempts()
if (failedLogin.failedAttemptsCount == MAX_AUTH_FAILED_ATTEMPTS) { if (failedLogin.failedAttemptsCount == MAX_AUTH_FAILED_ATTEMPTS) {
// Max number of failed attempts reached // Max number of failed attempts reached
// Start ban period // Start ban period
failedLogin.bannedAt = QDateTime::currentDateTime().toTime_t(); failedLogin.bannedAt = QDateTime::currentMSecsSinceEpoch() / 1000;
} }
} }

2
src/webui/api/authcontroller.h
View File

@ -53,7 +53,7 @@ private:
struct FailedLogin struct FailedLogin
{ {
int failedAttemptsCount = 0; int failedAttemptsCount = 0;
uint bannedAt = 0; qint64 bannedAt = 0;
}; };
mutable QHash<QString, FailedLogin> m_clientFailedLogins; mutable QHash<QString, FailedLogin> m_clientFailedLogins;
}; };

8
src/webui/webapplication.cpp
View File

@ -547,7 +547,7 @@ void WebApplication::sessionInitialize()
if (!sessionId.isEmpty()) { if (!sessionId.isEmpty()) {
m_currentSession = m_sessions.value(sessionId); m_currentSession = m_sessions.value(sessionId);
if (m_currentSession) { if (m_currentSession) {
const uint now = QDateTime::currentDateTime().toTime_t(); const qint64 now = QDateTime::currentMSecsSinceEpoch() / 1000;
if ((now - m_currentSession->m_timestamp) > INACTIVE_TIME) { if ((now - m_currentSession->m_timestamp) > INACTIVE_TIME) {
// session is outdated - removing it // session is outdated - removing it
delete m_sessions.take(sessionId); delete m_sessions.take(sessionId);
@ -605,7 +605,7 @@ void WebApplication::sessionStart()
Q_ASSERT(!m_currentSession); Q_ASSERT(!m_currentSession);
// remove outdated sessions // remove outdated sessions
const uint now = QDateTime::currentDateTime().toTime_t(); const qint64 now = QDateTime::currentMSecsSinceEpoch() / 1000;
foreach (const auto session, m_sessions) { foreach (const auto session, m_sessions) {
if ((now - session->timestamp()) > INACTIVE_TIME) if ((now - session->timestamp()) > INACTIVE_TIME)
delete m_sessions.take(session->id()); delete m_sessions.take(session->id());
@ -737,7 +737,7 @@ QString WebSession::id() const
return m_sid; return m_sid;
} }
uint WebSession::timestamp() const qint64 WebSession::timestamp() const
{ {
return m_timestamp; return m_timestamp;
} }
@ -754,5 +754,5 @@ void WebSession::setData(const QString &id, const QVariant &data)
void WebSession::updateTimestamp() void WebSession::updateTimestamp()
{ {
m_timestamp = QDateTime::currentDateTime().toTime_t(); m_timestamp = QDateTime::currentMSecsSinceEpoch() / 1000;
} }

4
src/webui/webapplication.h
View File

@ -59,7 +59,7 @@ public:
explicit WebSession(const QString &sid); explicit WebSession(const QString &sid);
QString id() const override; QString id() const override;
uint timestamp() const; qint64 timestamp() const;
QVariant getData(const QString &id) const override; QVariant getData(const QString &id) const override;
void setData(const QString &id, const QVariant &data) override; void setData(const QString &id, const QVariant &data) override;
@ -68,7 +68,7 @@ private:
void updateTimestamp(); void updateTimestamp();
const QString m_sid; const QString m_sid;
uint m_timestamp; qint64 m_timestamp;
QVariantHash m_data; QVariantHash m_data;
}; };