diff --git a/src/app/upgrade.h b/src/app/upgrade.h
index 40c720f4d..2a591ed4a 100644
--- a/src/app/upgrade.h
+++ b/src/app/upgrade.h
@@ -195,7 +195,7 @@ bool upgrade(bool ask = true)
             resumeData["qBt-forced"] = false;
 
             resumeData["qBt-savePath"] = oldTorrent.value("save_path").toString().toStdString();
-            resumeData["qBt-ratioLimit"] = QString::number(oldTorrent.value("max_ratio", -2).toReal()).toStdString();
+            resumeData["qBt-ratioLimit"] = static_cast<int>(oldTorrent.value("max_ratio", -2).toReal() * 1000);
             resumeData["qBt-label"] = oldTorrent.value("label").toString().toStdString();
             resumeData["qBt-name"] = oldTorrent.value("name").toString().toStdString();
             resumeData["qBt-seedStatus"] = oldTorrent.value("seed").toBool();
diff --git a/src/base/bittorrent/infohash.h b/src/base/bittorrent/infohash.h
index 7a1a49150..9b1291672 100644
--- a/src/base/bittorrent/infohash.h
+++ b/src/base/bittorrent/infohash.h
@@ -29,8 +29,8 @@
 #ifndef BITTORRENT_INFOHASH_H
 #define BITTORRENT_INFOHASH_H
 
-#include <libtorrent/sha1_hash.hpp>
 #include <QString>
+#include <libtorrent/sha1_hash.hpp>
 
 namespace BitTorrent
 {
diff --git a/src/base/bittorrent/magneturi.h b/src/base/bittorrent/magneturi.h
index e7e23becf..07981f85b 100644
--- a/src/base/bittorrent/magneturi.h
+++ b/src/base/bittorrent/magneturi.h
@@ -29,8 +29,8 @@
 #ifndef BITTORRENT_MAGNETURI_H
 #define BITTORRENT_MAGNETURI_H
 
-#include <QString>
 #include <QList>
+#include <QString>
 #include <QUrl>
 
 #include <libtorrent/add_torrent_params.hpp>
diff --git a/src/base/bittorrent/peerinfo.cpp b/src/base/bittorrent/peerinfo.cpp
index d054e38d7..91ffd225f 100644
--- a/src/base/bittorrent/peerinfo.cpp
+++ b/src/base/bittorrent/peerinfo.cpp
@@ -26,12 +26,13 @@
  * exception statement from your version.
  */
 
-#include "base/net/geoipmanager.h"
-#include "base/utils/string.h"
-#include "base/unicodestrings.h"
-#include "base/bittorrent/torrenthandle.h"
 #include "peerinfo.h"
 
+#include "base/bittorrent/torrenthandle.h"
+#include "base/net/geoipmanager.h"
+#include "base/unicodestrings.h"
+#include "base/utils/string.h"
+
 namespace libt = libtorrent;
 using namespace BitTorrent;
 
@@ -99,7 +100,6 @@ bool PeerInfo::isRemoteChocked() const
     return (m_nativeInfo.flags & libt::peer_info::remote_choked);
 }
 
-
 bool PeerInfo::isSupportsExtensions() const
 {
     return (m_nativeInfo.flags & libt::peer_info::supports_extensions);
@@ -115,7 +115,6 @@ bool PeerInfo::isHandshake() const
     return (m_nativeInfo.flags & libt::peer_info::handshake);
 }
 
-
 bool PeerInfo::isConnecting() const
 {
     return (m_nativeInfo.flags & libt::peer_info::connecting);
@@ -136,7 +135,6 @@ bool PeerInfo::optimisticUnchoke() const
     return (m_nativeInfo.flags & libt::peer_info::optimistic_unchoke);
 }
 
-
 bool PeerInfo::isSnubbed() const
 {
     return (m_nativeInfo.flags & libt::peer_info::snubbed);
@@ -152,7 +150,6 @@ bool PeerInfo::isEndgameMode() const
     return (m_nativeInfo.flags & libt::peer_info::endgame_mode);
 }
 
-
 bool PeerInfo::isHolepunched() const
 {
     return (m_nativeInfo.flags & libt::peer_info::holepunched);
@@ -183,7 +180,6 @@ bool PeerInfo::isPlaintextEncrypted() const
     return (m_nativeInfo.flags & libt::peer_info::plaintext_encrypted);
 }
 
-
 PeerAddress PeerInfo::address() const
 {
     return PeerAddress(QHostAddress(QString::fromStdString(m_nativeInfo.ip.address().to_string())),
@@ -195,7 +191,6 @@ QString PeerInfo::client() const
     return QString::fromStdString(m_nativeInfo.client);
 }
 
-
 qreal PeerInfo::progress() const
 {
     return m_nativeInfo.progress;
@@ -206,7 +201,6 @@ int PeerInfo::payloadUpSpeed() const
     return m_nativeInfo.payload_up_speed;
 }
 
-
 int PeerInfo::payloadDownSpeed() const
 {
     return m_nativeInfo.payload_down_speed;
@@ -217,7 +211,6 @@ qlonglong PeerInfo::totalUpload() const
     return m_nativeInfo.total_upload;
 }
 
-
 qlonglong PeerInfo::totalDownload() const
 {
     return m_nativeInfo.total_download;
@@ -239,7 +232,7 @@ QString PeerInfo::connectionType() const
         return QString::fromUtf8(C_UTP);
 
     QString connection;
-    switch(m_nativeInfo.connection_type) {
+    switch (m_nativeInfo.connection_type) {
     case libt::peer_info::http_seed:
     case libt::peer_info::web_seed:
         connection = "Web";
@@ -281,14 +274,14 @@ qreal PeerInfo::relevance() const
 void PeerInfo::determineFlags()
 {
     if (isInteresting()) {
-        //d = Your client wants to download, but peer doesn't want to send (interested and choked)
+        // d = Your client wants to download, but peer doesn't want to send (interested and choked)
         if (isRemoteChocked()) {
             m_flags += "d ";
             m_flagsDescription += tr("interested(local) and choked(peer)");
             m_flagsDescription += ", ";
         }
         else {
-            //D = Currently downloading (interested and not choked)
+            // D = Currently downloading (interested and not choked)
             m_flags += "D ";
             m_flagsDescription += tr("interested(local) and unchoked(peer)");
             m_flagsDescription += ", ";
@@ -296,92 +289,91 @@ void PeerInfo::determineFlags()
     }
 
     if (isRemoteInterested()) {
-        //u = Peer wants your client to upload, but your client doesn't want to (interested and choked)
+        // u = Peer wants your client to upload, but your client doesn't want to (interested and choked)
         if (isChocked()) {
             m_flags += "u ";
             m_flagsDescription += tr("interested(peer) and choked(local)");
             m_flagsDescription += ", ";
         }
         else {
-            //U = Currently uploading (interested and not choked)
+            // U = Currently uploading (interested and not choked)
             m_flags += "U ";
             m_flagsDescription += tr("interested(peer) and unchoked(local)");
             m_flagsDescription += ", ";
         }
     }
 
-    //O = Optimistic unchoke
+    // O = Optimistic unchoke
     if (optimisticUnchoke()) {
         m_flags += "O ";
         m_flagsDescription += tr("optimistic unchoke");
         m_flagsDescription += ", ";
     }
 
-    //S = Peer is snubbed
+    // S = Peer is snubbed
     if (isSnubbed()) {
         m_flags += "S ";
         m_flagsDescription += tr("peer snubbed");
         m_flagsDescription += ", ";
     }
 
-    //I = Peer is an incoming connection
+    // I = Peer is an incoming connection
     if (!isLocalConnection()) {
         m_flags += "I ";
         m_flagsDescription += tr("incoming connection");
         m_flagsDescription += ", ";
     }
 
-    //K = Peer is unchoking your client, but your client is not interested
+    // K = Peer is unchoking your client, but your client is not interested
     if (!isRemoteChocked() && !isInteresting()) {
         m_flags += "K ";
         m_flagsDescription += tr("not interested(local) and unchoked(peer)");
         m_flagsDescription += ", ";
     }
 
-    //? = Your client unchoked the peer but the peer is not interested
+    // ? = Your client unchoked the peer but the peer is not interested
     if (!isChocked() && !isRemoteInterested()) {
         m_flags += "? ";
         m_flagsDescription += tr("not interested(peer) and unchoked(local)");
         m_flagsDescription += ", ";
     }
 
-    //X = Peer was included in peerlists obtained through Peer Exchange (PEX)
+    // X = Peer was included in peerlists obtained through Peer Exchange (PEX)
     if (fromPeX()) {
         m_flags += "X ";
         m_flagsDescription += tr("peer from PEX");
         m_flagsDescription += ", ";
     }
 
-    //H = Peer was obtained through DHT
+    // H = Peer was obtained through DHT
     if (fromDHT()) {
         m_flags += "H ";
         m_flagsDescription += tr("peer from DHT");
         m_flagsDescription += ", ";
     }
 
-    //E = Peer is using Protocol Encryption (all traffic)
+    // E = Peer is using Protocol Encryption (all traffic)
     if (isRC4Encrypted()) {
         m_flags += "E ";
         m_flagsDescription += tr("encrypted traffic");
         m_flagsDescription += ", ";
     }
 
-    //e = Peer is using Protocol Encryption (handshake)
+    // e = Peer is using Protocol Encryption (handshake)
     if (isPlaintextEncrypted()) {
         m_flags += "e ";
         m_flagsDescription += tr("encrypted handshake");
         m_flagsDescription += ", ";
     }
 
-    //P = Peer is using uTorrent uTP
-
+    // P = Peer is using uTorrent uTP
     if (useUTPSocket()) {
         m_flags += "P ";
         m_flagsDescription += QString::fromUtf8(C_UTP);
         m_flagsDescription += ", ";
     }
 
-    //L = Peer is local
+    // L = Peer is local
     if (fromLSD()) {
         m_flags += "L";
         m_flagsDescription += tr("peer from LSD");
diff --git a/src/base/bittorrent/peerinfo.h b/src/base/bittorrent/peerinfo.h
index 0d096c493..bdeed4cad 100644
--- a/src/base/bittorrent/peerinfo.h
+++ b/src/base/bittorrent/peerinfo.h
@@ -29,11 +29,11 @@
 #ifndef BITTORRENT_PEERINFO_H
 #define BITTORRENT_PEERINFO_H
 
-#include <libtorrent/peer_info.hpp>
-
-#include <QHostAddress>
 #include <QBitArray>
 #include <QCoreApplication>
+#include <QHostAddress>
+
+#include <libtorrent/peer_info.hpp>
 
 namespace BitTorrent
 {
diff --git a/src/base/bittorrent/private/filterparserthread.cpp b/src/base/bittorrent/private/filterparserthread.cpp
index eaf81a3a8..047bd80a5 100644
--- a/src/base/bittorrent/private/filterparserthread.cpp
+++ b/src/base/bittorrent/private/filterparserthread.cpp
@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libt.
- * Copyright (C) 2006  Christophe Dumez
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,17 +24,15 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #include "filterparserthread.h"
 
+#include <cctype>
+
 #include <QDataStream>
 #include <QFile>
 
-#include <cctype>
-
 #include "base/logger.h"
 
 namespace libt = libtorrent;
diff --git a/src/base/bittorrent/private/filterparserthread.h b/src/base/bittorrent/private/filterparserthread.h
index 5db6fce73..ab5f4a6ab 100644
--- a/src/base/bittorrent/private/filterparserthread.h
+++ b/src/base/bittorrent/private/filterparserthread.h
@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +24,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #ifndef FILTERPARSERTHREAD_H
@@ -42,7 +40,7 @@ class FilterParserThread : public QThread
     Q_OBJECT
 
 public:
-    FilterParserThread(QObject *parent = 0);
+    FilterParserThread(QObject *parent = nullptr);
     ~FilterParserThread();
     void processFilterFile(const QString &filePath);
     libtorrent::ip_filter IPfilter();
diff --git a/src/base/bittorrent/private/resumedatasavingmanager.h b/src/base/bittorrent/private/resumedatasavingmanager.h
index 08bcfb0e2..7b3be45c9 100644
--- a/src/base/bittorrent/private/resumedatasavingmanager.h
+++ b/src/base/bittorrent/private/resumedatasavingmanager.h
@@ -29,11 +29,11 @@
 #ifndef RESUMEDATASAVINGMANAGER_H
 #define RESUMEDATASAVINGMANAGER_H
 
-#include <QObject>
 #include <QByteArray>
 #include <QDir>
+#include <QObject>
 
-class ResumeDataSavingManager: public QObject
+class ResumeDataSavingManager : public QObject
 {
     Q_OBJECT
 
diff --git a/src/base/bittorrent/private/statistics.cpp b/src/base/bittorrent/private/statistics.cpp
index 97e3f0424..eda236606 100644
--- a/src/base/bittorrent/private/statistics.cpp
+++ b/src/base/bittorrent/private/statistics.cpp
@@ -4,9 +4,9 @@
 
 #include <libtorrent/session.hpp>
 
+#include "base/bittorrent/session.h"
 #include "base/bittorrent/sessionstatus.h"
 #include "base/profile.h"
-#include "base/bittorrent/session.h"
 
 static const qint64 SAVE_INTERVAL = 15 * 60 * 1000;
 
diff --git a/src/base/bittorrent/private/statistics.h b/src/base/bittorrent/private/statistics.h
index c012c409e..e99eb2fe8 100644
--- a/src/base/bittorrent/private/statistics.h
+++ b/src/base/bittorrent/private/statistics.h
@@ -4,7 +4,10 @@
 #include <QObject>
 #include <QTimer>
 
-namespace BitTorrent { class Session; }
+namespace BitTorrent
+{
+    class Session;
+}
 
 class Statistics : QObject
 {
diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp
index 30dcc3d3e..c00dadfc3 100644
--- a/src/base/bittorrent/session.cpp
+++ b/src/base/bittorrent/session.cpp
@@ -29,6 +29,11 @@
 
 #include "session.h"
 
+#include <cstdlib>
+#include <queue>
+#include <string>
+#include <vector>
+
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QDebug>
@@ -43,10 +48,6 @@
 #include <QTimer>
 #include <QUuid>
 
-#include <cstdlib>
-#include <queue>
-#include <vector>
-
 #include <libtorrent/alert_types.hpp>
 #if LIBTORRENT_VERSION_NUM >= 10100
 #include <libtorrent/bdecode.hpp>
@@ -71,24 +72,24 @@
 #include <libtorrent/torrent_info.hpp>
 
 #include "base/logger.h"
-#include "base/profile.h"
 #include "base/net/downloadhandler.h"
 #include "base/net/downloadmanager.h"
 #include "base/net/portforwarder.h"
 #include "base/net/proxyconfigurationmanager.h"
+#include "base/profile.h"
 #include "base/torrentfileguard.h"
 #include "base/torrentfilter.h"
 #include "base/unicodestrings.h"
-#include "base/utils/net.h"
-#include "base/utils/misc.h"
 #include "base/utils/fs.h"
+#include "base/utils/misc.h"
+#include "base/utils/net.h"
 #include "base/utils/random.h"
 #include "base/utils/string.h"
 #include "magneturi.h"
-#include "private/filterparserthread.h"
-#include "private/statistics.h"
 #include "private/bandwidthscheduler.h"
+#include "private/filterparserthread.h"
 #include "private/resumedatasavingmanager.h"
+#include "private/statistics.h"
 #include "torrenthandle.h"
 #include "tracker.h"
 #include "trackerentry.h"
@@ -3384,7 +3385,7 @@ bool Session::isKnownTorrent(const InfoHash &hash) const
 
 void Session::updateSeedingLimitTimer()
 {
-    if ((globalMaxRatio() == -1) && !hasPerTorrentRatioLimit()
+    if ((globalMaxRatio() == TorrentHandle::NO_RATIO_LIMIT) && !hasPerTorrentRatioLimit()
         && (globalMaxSeedingMinutes() == TorrentHandle::NO_SEEDING_TIME_LIMIT) && !hasPerTorrentSeedingTimeLimit()) {
         if (m_seedingLimitTimer->isActive())
             m_seedingLimitTimer->stop();
@@ -4372,7 +4373,12 @@ namespace
 
         torrentData.savePath = Profile::instance().fromPortablePath(
             Utils::Fs::fromNativePath(QString::fromStdString(fast.dict_find_string_value("qBt-savePath"))));
-        torrentData.ratioLimit = QString::fromStdString(fast.dict_find_string_value("qBt-ratioLimit")).toDouble();
+
+        std::string ratioLimitString = fast.dict_find_string_value("qBt-ratioLimit");
+        if (ratioLimitString.empty())
+            torrentData.ratioLimit = fast.dict_find_int_value("qBt-ratioLimit", TorrentHandle::USE_GLOBAL_RATIO * 1000) / 1000.0;
+        else
+            torrentData.ratioLimit = QString::fromStdString(ratioLimitString).toDouble();
         torrentData.seedingTimeLimit = fast.dict_find_int_value("qBt-seedingTimeLimit", TorrentHandle::USE_GLOBAL_SEEDING_TIME);
         // **************************************************************************************
         // Workaround to convert legacy label to category
diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp
index 8616c8a27..9f3f4a4d4 100644
--- a/src/base/bittorrent/torrenthandle.cpp
+++ b/src/base/bittorrent/torrenthandle.cpp
@@ -27,21 +27,23 @@
  * exception statement from your version.
  */
 
+#include "torrenthandle.h"
+
 #include <algorithm>
 #include <type_traits>
 
-#include <QDebug>
-#include <QStringList>
-#include <QFile>
-#include <QDir>
-#include <QByteArray>
 #include <QBitArray>
+#include <QByteArray>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QStringList>
 
-#include <libtorrent/entry.hpp>
-#include <libtorrent/bencode.hpp>
 #include <libtorrent/address.hpp>
 #include <libtorrent/alert_types.hpp>
+#include <libtorrent/bencode.hpp>
 #include <libtorrent/create_torrent.hpp>
+#include <libtorrent/entry.hpp>
 #include <libtorrent/magnet_uri.hpp>
 #if LIBTORRENT_VERSION_NUM >= 10100
 #include <libtorrent/time.hpp>
@@ -56,13 +58,12 @@
 #include "base/logger.h"
 #include "base/preferences.h"
 #include "base/profile.h"
-#include "base/utils/string.h"
 #include "base/utils/fs.h"
 #include "base/utils/misc.h"
-#include "session.h"
+#include "base/utils/string.h"
 #include "peerinfo.h"
+#include "session.h"
 #include "trackerentry.h"
-#include "torrenthandle.h"
 
 const QString QB_EXT {".!qB"};
 
@@ -1180,38 +1181,20 @@ qreal TorrentHandle::distributedCopies() const
     return m_nativeStatus.distributed_copies;
 }
 
-qreal TorrentHandle::maxRatio(bool *usesGlobalRatio) const
+qreal TorrentHandle::maxRatio() const
 {
-    qreal ratioLimit = m_ratioLimit;
+    if (m_ratioLimit == USE_GLOBAL_RATIO)
+        return m_session->globalMaxRatio();
 
-    if (ratioLimit == USE_GLOBAL_RATIO) {
-        ratioLimit = m_session->globalMaxRatio();
-        if (usesGlobalRatio)
-            *usesGlobalRatio = true;
-    }
-    else {
-        if (usesGlobalRatio)
-            *usesGlobalRatio = false;
-    }
-
-    return ratioLimit;
+    return m_ratioLimit;
 }
 
-int TorrentHandle::maxSeedingTime(bool *usesGlobalSeedingTime) const
+int TorrentHandle::maxSeedingTime() const
 {
-    int seedingTimeLimit = m_seedingTimeLimit;
+    if (m_seedingTimeLimit == USE_GLOBAL_SEEDING_TIME)
+        return m_session->globalMaxSeedingMinutes();
 
-    if (seedingTimeLimit == USE_GLOBAL_SEEDING_TIME) {
-        seedingTimeLimit = m_session->globalMaxSeedingMinutes();
-        if (usesGlobalSeedingTime)
-            *usesGlobalSeedingTime = true;
-    }
-    else {
-        if (usesGlobalSeedingTime)
-            *usesGlobalSeedingTime = false;
-    }
-
-    return seedingTimeLimit;
+    return m_seedingTimeLimit;
 }
 
 qreal TorrentHandle::realRatio() const
@@ -1687,8 +1670,8 @@ void TorrentHandle::handleSaveResumeDataAlert(libtorrent::save_resume_data_alert
         resumeData["save_path"] = Profile::instance().toPortablePath(QString::fromStdString(savePath)).toStdString();
     }
     resumeData["qBt-savePath"] = m_useAutoTMM ? "" : Profile::instance().toPortablePath(m_savePath).toStdString();
-    resumeData["qBt-ratioLimit"] = QString::number(m_ratioLimit).toStdString();
-    resumeData["qBt-seedingTimeLimit"] = QString::number(m_seedingTimeLimit).toStdString();
+    resumeData["qBt-ratioLimit"] = static_cast<int>(m_ratioLimit * 1000);
+    resumeData["qBt-seedingTimeLimit"] = m_seedingTimeLimit;
     resumeData["qBt-category"] = m_category.toStdString();
     resumeData["qBt-tags"] = setToEntryList(m_tags);
     resumeData["qBt-name"] = m_name.toStdString();
diff --git a/src/base/bittorrent/torrenthandle.h b/src/base/bittorrent/torrenthandle.h
index b6aa59c86..167fec71d 100644
--- a/src/base/bittorrent/torrenthandle.h
+++ b/src/base/bittorrent/torrenthandle.h
@@ -328,8 +328,8 @@ namespace BitTorrent
         QBitArray downloadingPieces() const;
         QVector<int> pieceAvailability() const;
         qreal distributedCopies() const;
-        qreal maxRatio(bool *usesGlobalRatio = 0) const;
-        int maxSeedingTime(bool *usesGlobalSeedingTime = 0) const;
+        qreal maxRatio() const;
+        int maxSeedingTime() const;
         qreal realRatio() const;
         int uploadPayloadRate() const;
         int downloadPayloadRate() const;
diff --git a/src/base/bittorrent/tracker.cpp b/src/base/bittorrent/tracker.cpp
index 3acd539a2..f914aa8aa 100644
--- a/src/base/bittorrent/tracker.cpp
+++ b/src/base/bittorrent/tracker.cpp
@@ -1,7 +1,7 @@
 /*
  * Bittorrent Client using Qt4 and libtorrent.
  * Copyright (C) 2015  Vladimir Golovnev <glassez@yandex.ru>
- * Copyright (C) 2006  Christophe Dumez
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,16 +25,15 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #include <vector>
+
 #include <libtorrent/bencode.hpp>
 #include <libtorrent/entry.hpp>
 
-#include "base/preferences.h"
 #include "base/http/server.h"
+#include "base/preferences.h"
 #include "base/utils/string.h"
 #include "tracker.h"
 
diff --git a/src/base/bittorrent/tracker.h b/src/base/bittorrent/tracker.h
index 7e8f9f318..967433445 100644
--- a/src/base/bittorrent/tracker.h
+++ b/src/base/bittorrent/tracker.h
@@ -1,7 +1,7 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
  * Copyright (C) 2015  Vladimir Golovnev <glassez@yandex.ru>
- * Copyright (C) 2010  Christophe Dumez
+ * Copyright (C) 2010  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,17 +25,16 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #ifndef BITTORRENT_TRACKER_H
 #define BITTORRENT_TRACKER_H
 
 #include <QHash>
-#include "base/http/types.h"
-#include "base/http/responsebuilder.h"
+
 #include "base/http/irequesthandler.h"
+#include "base/http/responsebuilder.h"
+#include "base/http/types.h"
 
 namespace libtorrent
 {
@@ -82,7 +81,7 @@ namespace BitTorrent
         Q_DISABLE_COPY(Tracker)
 
     public:
-        explicit Tracker(QObject *parent = 0);
+        explicit Tracker(QObject *parent = nullptr);
         ~Tracker();
 
         bool start();
diff --git a/src/base/filesystemwatcher.cpp b/src/base/filesystemwatcher.cpp
index 834a0300f..6e387cee9 100644
--- a/src/base/filesystemwatcher.cpp
+++ b/src/base/filesystemwatcher.cpp
@@ -12,9 +12,9 @@
 #endif
 #endif
 
-#include "base/preferences.h"
-#include "base/bittorrent/torrentinfo.h"
 #include "base/bittorrent/magneturi.h"
+#include "base/bittorrent/torrentinfo.h"
+#include "base/preferences.h"
 #include "filesystemwatcher.h"
 
 #ifndef CIFS_MAGIC_NUMBER
diff --git a/src/base/filesystemwatcher.h b/src/base/filesystemwatcher.h
index 9e71958ef..b209bdfb7 100644
--- a/src/base/filesystemwatcher.h
+++ b/src/base/filesystemwatcher.h
@@ -1,12 +1,12 @@
 #ifndef FILESYSTEMWATCHER_H
 #define FILESYSTEMWATCHER_H
 
-#include <QFileSystemWatcher>
 #include <QDir>
-#include <QTimer>
+#include <QFileSystemWatcher>
+#include <QHash>
 #include <QPointer>
 #include <QStringList>
-#include <QHash>
+#include <QTimer>
 
 /*
  * Subclassing QFileSystemWatcher in order to support Network File
@@ -17,7 +17,7 @@ class FileSystemWatcher : public QFileSystemWatcher
     Q_OBJECT
 
 public:
-    explicit FileSystemWatcher(QObject *parent = 0);
+    explicit FileSystemWatcher(QObject *parent = nullptr);
     ~FileSystemWatcher();
 
     QStringList directories() const;
diff --git a/src/base/http/requestparser.cpp b/src/base/http/requestparser.cpp
index ca85f49bf..ad02fce62 100644
--- a/src/base/http/requestparser.cpp
+++ b/src/base/http/requestparser.cpp
@@ -1,7 +1,7 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
  * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
- * Copyright (C) 2006  Ishan Arora and Christophe Dumez
+ * Copyright (C) 2006  Ishan Arora and Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,21 +25,20 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
+#include "requestparser.h"
+
+#include <QDebug>
+#include <QDir>
 #include <QStringList>
 #include <QUrl>
 #include <QUrlQuery>
-#include <QDir>
-#include <QDebug>
-#include "requestparser.h"
 
 const QByteArray EOL("\r\n");
 const QByteArray EOH("\r\n\r\n");
 
-inline QString unquoted(const QString& str)
+inline QString unquoted(const QString &str)
 {
     if ((str[0] == '\"') && (str[str.length() - 1] == '\"'))
         return str.mid(1, str.length() - 2);
@@ -49,7 +48,7 @@ inline QString unquoted(const QString& str)
 
 using namespace Http;
 
-RequestParser::ErrorCode RequestParser::parse(const QByteArray& data, Request& request, uint maxContentLength)
+RequestParser::ErrorCode RequestParser::parse(const QByteArray &data, Request &request, uint maxContentLength)
 {
     return RequestParser(maxContentLength).parseHttpRequest(data, request);
 }
@@ -59,42 +58,42 @@ RequestParser::RequestParser(uint maxContentLength)
 {
 }
 
-RequestParser::ErrorCode RequestParser::parseHttpRequest(const QByteArray& data, Request& request)
+RequestParser::ErrorCode RequestParser::parseHttpRequest(const QByteArray &data, Request &request)
 {
     m_request = Request();
 
     // Parse HTTP request header
-    const int header_end = data.indexOf(EOH);
-    if (header_end < 0) {
+    const int headerEnd = data.indexOf(EOH);
+    if (headerEnd < 0) {
         qDebug() << Q_FUNC_INFO << "incomplete request";
         return IncompleteRequest;
     }
 
-    if (!parseHttpHeader(data.left(header_end))) {
+    if (!parseHttpHeader(data.left(headerEnd))) {
         qWarning() << Q_FUNC_INFO << "header parsing error";
         return BadRequest;
     }
 
     // Parse HTTP request message
     if (m_request.headers.contains("content-length")) {
-        int content_length = m_request.headers["content-length"].toInt();
-        if (content_length < 0) {
-            qWarning() << Q_FUNC_INFO << "bad request: content-length negative";
+        int contentLength = m_request.headers["content-length"].toInt();
+        if (contentLength < 0) {
+            qWarning() << Q_FUNC_INFO << "bad request: content-length is negative";
             return BadRequest;
         }
 
-        if (content_length > static_cast<int>(m_maxContentLength)) {
+        if (contentLength > static_cast<int>(m_maxContentLength)) {
             qWarning() << Q_FUNC_INFO << "bad request: message too long";
             return BadRequest;
         }
 
-        QByteArray content = data.mid(header_end + EOH.length(), content_length);
-        if (content.length() < content_length) {
+        QByteArray content = data.mid(headerEnd + EOH.length(), contentLength);
+        if (content.length() < contentLength) {
             qDebug() << Q_FUNC_INFO << "incomplete request";
             return IncompleteRequest;
         }
 
-        if ((content_length > 0) && !parseContent(content)) {
+        if ((contentLength > 0) && !parseContent(content)) {
             qWarning() << Q_FUNC_INFO << "message parsing error";
             return BadRequest;
         }
@@ -102,7 +101,7 @@ RequestParser::ErrorCode RequestParser::parseHttpRequest(const QByteArray& data,
 
     //  qDebug() << Q_FUNC_INFO;
     //  qDebug() << "HTTP Request header:";
-    //  qDebug() << data.left(header_end) << "\n";
+    //  qDebug() << data.left(headerEnd) << "\n";
 
     request = m_request;
     return NoError;
@@ -132,7 +131,7 @@ bool RequestParser::parseStartingLine(const QString &line)
     return false;
 }
 
-bool RequestParser::parseHeaderLine(const QString &line, QPair<QString, QString>& out)
+bool RequestParser::parseHeaderLine(const QString &line, QPair<QString, QString> &out)
 {
     int i = line.indexOf(QLatin1Char(':'));
     if (i == -1) {
@@ -150,7 +149,7 @@ bool RequestParser::parseHttpHeader(const QByteArray &data)
     QStringList lines = str.trimmed().split(EOL);
 
     QStringList headerLines;
-    foreach (const QString& line, lines) {
+    foreach (const QString &line, lines) {
         if (line[0].isSpace()) { // header line continuation
             if (!headerLines.isEmpty()) { // really continuation
                 headerLines.last() += QLatin1Char(' ');
@@ -181,7 +180,7 @@ bool RequestParser::parseHttpHeader(const QByteArray &data)
     return true;
 }
 
-QList<QByteArray> RequestParser::splitMultipartData(const QByteArray& data, const QByteArray& boundary)
+QList<QByteArray> RequestParser::splitMultipartData(const QByteArray &data, const QByteArray &boundary)
 {
     QList<QByteArray> ret;
     QByteArray sep = boundary + EOL;
@@ -205,7 +204,7 @@ QList<QByteArray> RequestParser::splitMultipartData(const QByteArray& data, cons
     return ret;
 }
 
-bool RequestParser::parseContent(const QByteArray& data)
+bool RequestParser::parseContent(const QByteArray &data)
 {
     // Parse message content
     qDebug() << Q_FUNC_INFO << "Content-Length: " << m_request.headers["content-length"];
@@ -243,14 +242,14 @@ Content-Disposition: form-data; name=\"Upload\"
 Submit Query
 --cH2ae0GI3KM7GI3Ij5ae0ei4Ij5Ij5--
 **/
-    QString content_type = m_request.headers["content-type"];
-    if (content_type.startsWith("multipart/form-data")) {
+    QString contentType = m_request.headers["content-type"];
+    if (contentType.startsWith("multipart/form-data")) {
         const QRegExp boundaryRegexQuoted("boundary=\"([ \\w'()+,-\\./:=\\?]+)\"");
         const QRegExp boundaryRegexNotQuoted("boundary=([\\w'()+,-\\./:=\\?]+)");
 
         QByteArray boundary;
-        if (boundaryRegexQuoted.indexIn(content_type) < 0) {
-            if (boundaryRegexNotQuoted.indexIn(content_type) < 0) {
+        if (boundaryRegexQuoted.indexIn(contentType) < 0) {
+            if (boundaryRegexNotQuoted.indexIn(contentType) < 0) {
                 qWarning() << "Could not find boundary in multipart/form-data header!";
                 return false;
             }
@@ -274,21 +273,21 @@ Submit Query
         return true;
     }
 
-    qWarning() << Q_FUNC_INFO << "unknown content type:" << qPrintable(content_type);
+    qWarning() << Q_FUNC_INFO << "unknown content type:" << qPrintable(contentType);
     return false;
 }
 
-bool RequestParser::parseFormData(const QByteArray& data)
+bool RequestParser::parseFormData(const QByteArray &data)
 {
     // Parse form data header
-    const int header_end = data.indexOf(EOH);
-    if (header_end < 0) {
+    const int headerEnd = data.indexOf(EOH);
+    if (headerEnd < 0) {
         qDebug() << "Invalid form data: \n" << data;
         return false;
     }
 
-    QString header_str = QString::fromUtf8(data.left(header_end));
-    QStringList lines = header_str.trimmed().split(EOL);
+    QString headerStr = QString::fromUtf8(data.left(headerEnd));
+    QStringList lines = headerStr.trimmed().split(EOL);
     QStringMap headers;
     foreach (const QString& line, lines) {
         QPair<QString, QString> header;
@@ -302,7 +301,7 @@ bool RequestParser::parseFormData(const QByteArray& data)
     if (!headers.contains("content-disposition")
         || !parseHeaderValue(headers["content-disposition"], disposition)
         || !disposition.contains("name")) {
-        qDebug() << "Invalid form data header: \n" << header_str;
+        qDebug() << "Invalid form data header: \n" << headerStr;
         return false;
     }
 
@@ -310,18 +309,18 @@ bool RequestParser::parseFormData(const QByteArray& data)
         UploadedFile ufile;
         ufile.filename = disposition["filename"];
         ufile.type = disposition["content-type"];
-        ufile.data = data.mid(header_end + EOH.length());
+        ufile.data = data.mid(headerEnd + EOH.length());
 
         m_request.files.append(ufile);
     }
     else {
-        m_request.posts[disposition["name"]] = QString::fromUtf8(data.mid(header_end + EOH.length()));
+        m_request.posts[disposition["name"]] = QString::fromUtf8(data.mid(headerEnd + EOH.length()));
     }
 
     return true;
 }
 
-bool RequestParser::parseHeaderValue(const QString& value, QStringMap& out)
+bool RequestParser::parseHeaderValue(const QString &value, QStringMap &out)
 {
     int pos = value.indexOf(QLatin1Char(';'));
     if (pos == -1) {
diff --git a/src/base/http/requestparser.h b/src/base/http/requestparser.h
index 5ea8e05e4..9642bbf9e 100644
--- a/src/base/http/requestparser.h
+++ b/src/base/http/requestparser.h
@@ -1,7 +1,7 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
  * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
- * Copyright (C) 2006  Ishan Arora and Christophe Dumez
+ * Copyright (C) 2006  Ishan Arora and Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,8 +25,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #ifndef HTTP_REQUESTPARSER_H
diff --git a/src/base/http/responsebuilder.h b/src/base/http/responsebuilder.h
index 53e92c418..4332c06be 100644
--- a/src/base/http/responsebuilder.h
+++ b/src/base/http/responsebuilder.h
@@ -37,7 +37,7 @@ namespace Http
     class ResponseBuilder : public QObject
     {
     public:
-        explicit ResponseBuilder(QObject *parent = 0);
+        explicit ResponseBuilder(QObject *parent = nullptr);
 
     protected:
         void status(uint code = 200, const QString &text = QLatin1String("OK"));
diff --git a/src/base/http/responsegenerator.cpp b/src/base/http/responsegenerator.cpp
index 4ac6cba61..21d9e42c4 100644
--- a/src/base/http/responsegenerator.cpp
+++ b/src/base/http/responsegenerator.cpp
@@ -1,7 +1,7 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
  * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
- * Copyright (C) 2006  Ishan Arora and Christophe Dumez
+ * Copyright (C) 2006  Ishan Arora and Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,8 +25,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #include "responsegenerator.h"
@@ -69,7 +67,7 @@ QByteArray Http::toByteArray(Response response)
 QString Http::httpDate()
 {
     // [RFC 7231] 7.1.1.1. Date/Time Formats
-   // example: "Sun, 06 Nov 1994 08:49:37 GMT"
+    // example: "Sun, 06 Nov 1994 08:49:37 GMT"
 
     return QLocale::c().toString(QDateTime::currentDateTimeUtc(), QLatin1String("ddd, dd MMM yyyy HH:mm:ss"))
         .append(QLatin1String(" GMT"));
diff --git a/src/base/http/responsegenerator.h b/src/base/http/responsegenerator.h
index 7c714e050..b7b8e8985 100644
--- a/src/base/http/responsegenerator.h
+++ b/src/base/http/responsegenerator.h
@@ -1,7 +1,7 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
  * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
- * Copyright (C) 2006  Ishan Arora and Christophe Dumez
+ * Copyright (C) 2006  Ishan Arora and Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,8 +25,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 
diff --git a/src/base/http/server.cpp b/src/base/http/server.cpp
index 5bd96ad56..809f36a3e 100644
--- a/src/base/http/server.cpp
+++ b/src/base/http/server.cpp
@@ -34,7 +34,6 @@
 #include <QNetworkProxy>
 #include <QStringList>
 #include <QTimer>
-
 #ifndef QT_NO_OPENSSL
 #include <QSslSocket>
 #else
@@ -123,15 +122,13 @@ bool Server::setupHttps(const QByteArray &certificates, const QByteArray &key)
     const QList<QSslCertificate> certs = QSslCertificate::fromData(certificates);
     const bool areCertsValid = !certs.empty() && std::all_of(certs.begin(), certs.end(), [](const QSslCertificate &c) { return !c.isNull(); });
 
-    if (!sslKey.isNull() && areCertsValid)
-    {
+    if (!sslKey.isNull() && areCertsValid) {
         m_key = sslKey;
         m_certificates = certs;
         m_https = true;
         return true;
     }
-    else
-    {
+    else {
         disableHttps();
         return false;
     }
@@ -164,4 +161,4 @@ QList<QSslCipher> Server::safeCipherList() const
 
     return safeCiphers;
 }
-#endif
+#endif // QT_NO_OPENSSL
diff --git a/src/base/http/server.h b/src/base/http/server.h
index d9b9ae19e..91dc26dab 100644
--- a/src/base/http/server.h
+++ b/src/base/http/server.h
@@ -25,8 +25,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 
@@ -46,13 +44,13 @@ namespace Http
     class IRequestHandler;
     class Connection;
 
-    class Server: public QTcpServer
+    class Server : public QTcpServer
     {
         Q_OBJECT
         Q_DISABLE_COPY(Server)
 
     public:
-        Server(IRequestHandler *requestHandler, QObject *parent = 0);
+        Server(IRequestHandler *requestHandler, QObject *parent = nullptr);
         ~Server();
 
 #ifndef QT_NO_OPENSSL
@@ -67,7 +65,7 @@ namespace Http
         void incomingConnection(qintptr socketDescriptor);
 
         IRequestHandler *m_requestHandler;
-        QList<Connection *> m_connections;  // for tracking persistence connections
+        QList<Connection *> m_connections;  // for tracking persistent connections
 
 #ifndef QT_NO_OPENSSL
         QList<QSslCipher> safeCipherList() const;
diff --git a/src/base/net/dnsupdater.cpp b/src/base/net/dnsupdater.cpp
index 2a57e1e99..23e9ca579 100644
--- a/src/base/net/dnsupdater.cpp
+++ b/src/base/net/dnsupdater.cpp
@@ -1,6 +1,6 @@
 /*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2011  Christophe Dumez
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2011  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +24,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #include <QDebug>
@@ -34,8 +32,8 @@
 #include <QUrlQuery>
 
 #include "base/logger.h"
-#include "base/net/downloadmanager.h"
 #include "base/net/downloadhandler.h"
+#include "base/net/downloadmanager.h"
 #include "dnsupdater.h"
 
 using namespace Net;
@@ -143,7 +141,7 @@ QString DNSUpdater::getUpdateUrl() const
 
     Q_ASSERT(!m_lastIP.isNull());
     // Service specific
-    switch(m_service) {
+    switch (m_service) {
     case DNS::DYNDNS:
         url.setHost("members.dyndns.org");
         break;
@@ -230,7 +228,6 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
     if (code == "abuse") {
         logger->addMessage(tr("Dynamic DNS error: Your username was blocked due to abuse."), Log::CRITICAL);
         m_state = FATAL;
-        return;
     }
 }
 
@@ -289,7 +286,7 @@ void DNSUpdater::updateCredentials()
 
 QUrl DNSUpdater::getRegistrationUrl(int service)
 {
-    switch(service) {
+    switch (service) {
     case DNS::DYNDNS:
         return QUrl("https://www.dyndns.com/account/services/hosts/add.html");
     case DNS::NOIP:
diff --git a/src/base/net/dnsupdater.h b/src/base/net/dnsupdater.h
index 2c3cb6c38..99002fdc9 100644
--- a/src/base/net/dnsupdater.h
+++ b/src/base/net/dnsupdater.h
@@ -1,6 +1,6 @@
 /*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2011  Christophe Dumez
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2011  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,16 +24,14 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #ifndef DNSUPDATER_H
 #define DNSUPDATER_H
 
-#include <QObject>
-#include <QHostAddress>
 #include <QDateTime>
+#include <QHostAddress>
+#include <QObject>
 #include <QTimer>
 
 #include "base/preferences.h"
@@ -41,12 +39,12 @@
 namespace Net
 {
     // Based on http://www.dyndns.com/developers/specs/
-    class DNSUpdater: public QObject
+    class DNSUpdater : public QObject
     {
         Q_OBJECT
 
     public:
-        explicit DNSUpdater(QObject *parent = 0);
+        explicit DNSUpdater(QObject *parent = nullptr);
         ~DNSUpdater();
 
         static QUrl getRegistrationUrl(int service);
diff --git a/src/base/net/downloadhandler.cpp b/src/base/net/downloadhandler.cpp
index 7baa59164..fcf70e3bb 100644
--- a/src/base/net/downloadhandler.cpp
+++ b/src/base/net/downloadhandler.cpp
@@ -27,20 +27,21 @@
  * exception statement from your version.
  */
 
-#include <QTemporaryFile>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QNetworkProxy>
-#include <QNetworkCookie>
-#include <QUrl>
+#include "downloadhandler.h"
+
 #include <QDebug>
+#include <QNetworkAccessManager>
+#include <QNetworkCookie>
+#include <QNetworkProxy>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QTemporaryFile>
+#include <QUrl>
 
 #include "base/utils/fs.h"
 #include "base/utils/gzip.h"
 #include "base/utils/misc.h"
 #include "downloadmanager.h"
-#include "downloadhandler.h"
 
 static QString errorCodeToString(QNetworkReply::NetworkError status);
 
@@ -192,14 +193,14 @@ void DownloadHandler::handleRedirection(QUrl newUrl)
         m_reply->deleteLater();
         m_reply = tmp->m_reply;
         init();
-        tmp->m_reply = 0;
+        tmp->m_reply = nullptr;
         delete tmp;
     }
 }
 
 QString errorCodeToString(QNetworkReply::NetworkError status)
 {
-    switch(status) {
+    switch (status) {
     case QNetworkReply::HostNotFoundError:
         return QObject::tr("The remote host name was not found (invalid hostname)");
     case QNetworkReply::OperationCanceledError:
diff --git a/src/base/net/downloadhandler.h b/src/base/net/downloadhandler.h
index f4afa7491..5d69f81f2 100644
--- a/src/base/net/downloadhandler.h
+++ b/src/base/net/downloadhandler.h
@@ -32,11 +32,9 @@
 
 #include <QObject>
 
-QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
 class QNetworkReply;
 class QUrl;
-QT_END_NAMESPACE
 
 namespace Net
 {
diff --git a/src/base/net/geoipmanager.cpp b/src/base/net/geoipmanager.cpp
index efa150de9..9f26a6374 100644
--- a/src/base/net/geoipmanager.cpp
+++ b/src/base/net/geoipmanager.cpp
@@ -27,21 +27,22 @@
  * exception statement from your version.
  */
 
-#include <QDebug>
-#include <QFile>
-#include <QDir>
-#include <QHostAddress>
+#include "geoipmanager.h"
+
 #include <QDateTime>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QHostAddress>
 
 #include "base/logger.h"
 #include "base/preferences.h"
 #include "base/profile.h"
 #include "base/utils/fs.h"
 #include "base/utils/gzip.h"
-#include "downloadmanager.h"
 #include "downloadhandler.h"
+#include "downloadmanager.h"
 #include "private/geoipdatabase.h"
-#include "geoipmanager.h"
 
 static const char DATABASE_URL[] = "https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz";
 static const char GEOIP_FOLDER[] = "GeoIP";
@@ -52,11 +53,11 @@ using namespace Net;
 
 // GeoIPManager
 
-GeoIPManager *GeoIPManager::m_instance = 0;
+GeoIPManager *GeoIPManager::m_instance = nullptr;
 
 GeoIPManager::GeoIPManager()
     : m_enabled(false)
-    , m_geoIPDatabase(0)
+    , m_geoIPDatabase(nullptr)
 {
     configure();
     connect(Preferences::instance(), SIGNAL(changed()), SLOT(configure()));
@@ -78,7 +79,7 @@ void GeoIPManager::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 
@@ -91,7 +92,7 @@ void GeoIPManager::loadDatabase()
 {
     if (m_geoIPDatabase) {
         delete m_geoIPDatabase;
-        m_geoIPDatabase = 0;
+        m_geoIPDatabase = nullptr;
     }
 
     QString filepath = Utils::Fs::expandPathAbs(
@@ -407,7 +408,7 @@ void GeoIPManager::configure()
         }
         else if (!m_enabled && m_geoIPDatabase) {
             delete m_geoIPDatabase;
-            m_geoIPDatabase = 0;
+            m_geoIPDatabase = nullptr;
         }
     }
 }
diff --git a/src/base/net/geoipmanager.h b/src/base/net/geoipmanager.h
index ddfb7d25a..b185354e2 100644
--- a/src/base/net/geoipmanager.h
+++ b/src/base/net/geoipmanager.h
@@ -30,8 +30,8 @@
 #ifndef NET_GEOIPMANAGER_H
 #define NET_GEOIPMANAGER_H
 
-#include <QObject>
 #include <QCache>
+#include <QObject>
 
 class QHostAddress;
 class QString;
diff --git a/src/base/net/portforwarder.cpp b/src/base/net/portforwarder.cpp
index 3b7dd5ebc..aaa89d3f0 100644
--- a/src/base/net/portforwarder.cpp
+++ b/src/base/net/portforwarder.cpp
@@ -65,7 +65,7 @@ void PortForwarder::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 
@@ -143,4 +143,4 @@ void PortForwarder::stop()
     Logger::instance()->addMessage(tr("UPnP / NAT-PMP support [OFF]"), Log::INFO);
 }
 
-PortForwarder *PortForwarder::m_instance = 0;
+PortForwarder *PortForwarder::m_instance = nullptr;
diff --git a/src/base/net/portforwarder.h b/src/base/net/portforwarder.h
index 7044e006b..86ce8d028 100644
--- a/src/base/net/portforwarder.h
+++ b/src/base/net/portforwarder.h
@@ -29,8 +29,8 @@
 #ifndef NET_PORTFORWARDER_H
 #define NET_PORTFORWARDER_H
 
-#include <QObject>
 #include <QHash>
+#include <QObject>
 
 namespace libtorrent
 {
@@ -56,7 +56,7 @@ namespace Net
         void deletePort(quint16 port);
 
     private:
-        explicit PortForwarder(libtorrent::session *const provider, QObject *parent = 0);
+        explicit PortForwarder(libtorrent::session *const provider, QObject *parent = nullptr);
         ~PortForwarder();
 
         void start();
diff --git a/src/base/net/smtp.cpp b/src/base/net/smtp.cpp
index 5a9f203cb..8e2831e8f 100644
--- a/src/base/net/smtp.cpp
+++ b/src/base/net/smtp.cpp
@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2011  Christophe Dumez
+ * Copyright (C) 2011  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +24,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 /*
@@ -33,22 +31,23 @@
  */
 
 #include "smtp.h"
-#include "base/preferences.h"
-#include "base/logger.h"
 
+#include <QCryptographicHash>
+#include <QDebug>
+#include <QHostAddress>
+#include <QHostInfo>
+#include <QNetworkInterface>
+#include <QStringList>
+#include <QTextCodec>
 #include <QTextStream>
 #ifndef QT_NO_OPENSSL
 #include <QSslSocket>
 #else
 #include <QTcpSocket>
 #endif
-#include <QTextCodec>
-#include <QDebug>
-#include <QHostAddress>
-#include <QHostInfo>
-#include <QNetworkInterface>
-#include <QCryptographicHash>
-#include <QStringList>
+
+#include "base/logger.h"
+#include "base/preferences.h"
 
 namespace
 {
diff --git a/src/base/net/smtp.h b/src/base/net/smtp.h
index 6c1b9b9ee..f9b159316 100644
--- a/src/base/net/smtp.h
+++ b/src/base/net/smtp.h
@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2011  Christophe Dumez
+ * Copyright (C) 2011  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +24,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 /*
@@ -35,22 +33,20 @@
 #ifndef SMTP_H
 #define SMTP_H
 
-#include <QString>
-#include <QObject>
+#include <QAbstractSocket>
 #include <QByteArray>
 #include <QHash>
-#include <QAbstractSocket>
 #include <QMetaType>
+#include <QObject>
+#include <QString>
 
-QT_BEGIN_NAMESPACE
-class QTextStream;
 #ifndef QT_NO_OPENSSL
 class QSslSocket;
 #else
 class QTcpSocket;
 #endif
 class QTextCodec;
-QT_END_NAMESPACE
+class QTextStream;
 
 namespace Net
 {
@@ -59,7 +55,7 @@ namespace Net
         Q_OBJECT
 
     public:
-        Smtp(QObject *parent = 0);
+        Smtp(QObject *parent = nullptr);
         ~Smtp();
 
         void sendMail(const QString &from, const QString &to, const QString &subject, const QString &body);
@@ -126,4 +122,4 @@ namespace Net
     };
 }
 
-#endif
+#endif // SMTP_H
diff --git a/src/gui/banlistoptions.cpp b/src/gui/banlistoptions.cpp
index 0c4a70657..f6da729d4 100644
--- a/src/gui/banlistoptions.cpp
+++ b/src/gui/banlistoptions.cpp
@@ -27,15 +27,15 @@
  */
 
 #include "banlistoptions.h"
-#include "ui_banlistoptions.h"
 
-#include <QMessageBox>
 #include <QHostAddress>
+#include <QMessageBox>
 #include <QSortFilterProxyModel>
 #include <QStringListModel>
 
 #include "base/bittorrent/session.h"
 #include "base/utils/net.h"
+#include "ui_banlistoptions.h"
 
 BanListOptions::BanListOptions(QWidget *parent)
     : QDialog(parent)
diff --git a/src/gui/banlistoptions.h b/src/gui/banlistoptions.h
index 5c6b10220..50b695030 100644
--- a/src/gui/banlistoptions.h
+++ b/src/gui/banlistoptions.h
@@ -39,12 +39,12 @@ namespace Ui
     class BanListOptions;
 }
 
-class BanListOptions: public QDialog
+class BanListOptions : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit BanListOptions(QWidget *parent = 0);
+    explicit BanListOptions(QWidget *parent = nullptr);
     ~BanListOptions();
 
 private slots:
diff --git a/src/gui/cookiesdialog.cpp b/src/gui/cookiesdialog.cpp
index f030a52b6..ee6004161 100644
--- a/src/gui/cookiesdialog.cpp
+++ b/src/gui/cookiesdialog.cpp
@@ -30,10 +30,10 @@
 
 #include <algorithm>
 
-#include "base/settingsstorage.h"
 #include "base/net/downloadmanager.h"
-#include "guiiconprovider.h"
+#include "base/settingsstorage.h"
 #include "cookiesmodel.h"
+#include "guiiconprovider.h"
 #include "ui_cookiesdialog.h"
 
 #define SETTINGS_KEY(name) "CookiesDialog/" name
diff --git a/src/gui/cookiesdialog.h b/src/gui/cookiesdialog.h
index 39cdf77cf..62558055d 100644
--- a/src/gui/cookiesdialog.h
+++ b/src/gui/cookiesdialog.h
@@ -43,7 +43,7 @@ class CookiesDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit CookiesDialog(QWidget *parent = 0);
+    explicit CookiesDialog(QWidget *parent = nullptr);
     ~CookiesDialog();
 
 public slots:
diff --git a/src/gui/cookiesmodel.cpp b/src/gui/cookiesmodel.cpp
index 7c283a66f..1d9f8b119 100644
--- a/src/gui/cookiesmodel.cpp
+++ b/src/gui/cookiesmodel.cpp
@@ -26,9 +26,10 @@
  * exception statement from your version.
  */
 
-#include <QDateTime>
 #include "cookiesmodel.h"
 
+#include <QDateTime>
+
 CookiesModel::CookiesModel(const QList<QNetworkCookie> &cookies, QObject *parent)
     : QAbstractItemModel(parent)
     , m_cookies(cookies)
@@ -43,8 +44,7 @@ QList<QNetworkCookie> CookiesModel::cookies() const
 QVariant CookiesModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
     if ((role == Qt::DisplayRole) && (orientation == Qt::Horizontal)) {
-        switch (section)
-        {
+        switch (section) {
         case COL_DOMAIN:
             return tr("Domain");
         case COL_PATH:
diff --git a/src/gui/cookiesmodel.h b/src/gui/cookiesmodel.h
index 098596b4e..4e203123d 100644
--- a/src/gui/cookiesmodel.h
+++ b/src/gui/cookiesmodel.h
@@ -49,7 +49,7 @@ public:
         NB_COLUMNS
     };
 
-    explicit CookiesModel(const QList<QNetworkCookie> &cookies, QObject *parent = 0);
+    explicit CookiesModel(const QList<QNetworkCookie> &cookies, QObject *parent = nullptr);
 
     QList<QNetworkCookie> cookies() const;
 
diff --git a/src/gui/previewlistdelegate.h b/src/gui/previewlistdelegate.h
index 9efb1c387..baa469d30 100644
--- a/src/gui/previewlistdelegate.h
+++ b/src/gui/previewlistdelegate.h
@@ -1,6 +1,6 @@
 /*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,73 +24,78 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #ifndef PREVIEWLISTDELEGATE_H
 #define PREVIEWLISTDELEGATE_H
 
+#include <QApplication>
 #include <QItemDelegate>
-#include <QStyleOptionProgressBar>
-#include <QStyleOptionViewItem>
 #include <QModelIndex>
 #include <QPainter>
-#include <QApplication>
+#ifdef Q_OS_WIN
+#include <QProxyStyle>
+#endif
+#include <QStyleOptionProgressBar>
+#include <QStyleOptionViewItem>
+
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
 #include "previewselectdialog.h"
 
-#ifdef Q_OS_WIN
-#include <QProxyStyle>
-#endif
+class PreviewListDelegate : public QItemDelegate
+{
+    Q_OBJECT
 
-class PreviewListDelegate: public QItemDelegate {
-  Q_OBJECT
-
-  public:
-    PreviewListDelegate(QObject *parent=0) : QItemDelegate(parent) {}
+public:
+    PreviewListDelegate(QObject *parent = nullptr)
+        : QItemDelegate(parent)
+    {
+    }
 
     ~PreviewListDelegate() {}
 
-    void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const {
-      painter->save();
-      QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+    {
+        painter->save();
+        QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
 
-      switch(index.column()) {
+        switch (index.column()) {
         case PreviewSelectDialog::SIZE:
-          QItemDelegate::drawBackground(painter, opt, index);
-          QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(index.data().toLongLong()));
-          break;
-        case PreviewSelectDialog::PROGRESS:{
-          QStyleOptionProgressBar newopt;
-          qreal progress = index.data().toDouble()*100.;
-          newopt.rect = opt.rect;
-          newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%");
-          newopt.progress = static_cast<int>(progress);
-          newopt.maximum = 100;
-          newopt.minimum = 0;
-          newopt.state |= QStyle::State_Enabled;
-          newopt.textVisible = true;
+            QItemDelegate::drawBackground(painter, opt, index);
+            QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(index.data().toLongLong()));
+            break;
+        case PreviewSelectDialog::PROGRESS: {
+                QStyleOptionProgressBar newopt;
+                qreal progress = index.data().toDouble() * 100.;
+                newopt.rect = opt.rect;
+                newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%");
+                newopt.progress = static_cast<int>(progress);
+                newopt.maximum = 100;
+                newopt.minimum = 0;
+                newopt.state |= QStyle::State_Enabled;
+                newopt.textVisible = true;
 #ifndef Q_OS_WIN
-          QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
+                QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
 #else
-          // XXX: To avoid having the progress text on the right of the bar
-          QProxyStyle st("fusion");
-          st.drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0);
+                // XXX: To avoid having the progress text on the right of the bar
+                QProxyStyle st("fusion");
+                st.drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0);
 #endif
-          break;
-        }
+            }
+            break;
         default:
-          QItemDelegate::paint(painter, option, index);
-      }
-      painter->restore();
+            QItemDelegate::paint(painter, option, index);
+        }
+
+        painter->restore();
     }
 
-    QWidget* createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const {
-      // No editor here
-      return 0;
+    QWidget *createEditor(QWidget *, const QStyleOptionViewItem &, const QModelIndex &) const
+    {
+        // No editor here
+        return nullptr;
     }
 };
 
-#endif
+#endif // PREVIEWLISTDELEGATE_H
diff --git a/src/gui/properties/peerlistdelegate.h b/src/gui/properties/peerlistdelegate.h
index bfd79bcbc..f1b7d4fb8 100644
--- a/src/gui/properties/peerlistdelegate.h
+++ b/src/gui/properties/peerlistdelegate.h
@@ -1,6 +1,6 @@
 /*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +24,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #ifndef PEERLISTDELEGATE_H
@@ -38,7 +36,7 @@
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
 
-class PeerListDelegate: public QItemDelegate
+class PeerListDelegate : public QItemDelegate
 {
     Q_OBJECT
 
@@ -77,34 +75,33 @@ public:
         QItemDelegate::drawBackground(painter, opt, index);
 
         switch (index.column()) {
-        case PORT: {
+        case PORT:
             opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
             QItemDelegate::drawDisplay(painter, opt, option.rect, index.data().toString());
-            }
             break;
         case TOT_DOWN:
         case TOT_UP: {
-            qlonglong size = index.data().toLongLong();
-            if (hideValues && (size <= 0))
-                break;
-            opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
-            QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(size));
+                qlonglong size = index.data().toLongLong();
+                if (hideValues && (size <= 0))
+                    break;
+                opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
+                QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(size));
             }
             break;
         case DOWN_SPEED:
         case UP_SPEED: {
-            qreal speed = index.data().toDouble();
-            if (speed <= 0.0)
-                break;
-            opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
-            QItemDelegate::drawDisplay(painter, opt, opt.rect, Utils::Misc::friendlyUnit(speed, true));
+                qreal speed = index.data().toDouble();
+                if (speed <= 0.0)
+                    break;
+                opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
+                QItemDelegate::drawDisplay(painter, opt, opt.rect, Utils::Misc::friendlyUnit(speed, true));
             }
             break;
         case PROGRESS:
         case RELEVANCE: {
-            qreal progress = index.data().toDouble();
-            opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
-            QItemDelegate::drawDisplay(painter, opt, opt.rect, Utils::String::fromDouble(progress * 100.0, 1) + "%");
+                qreal progress = index.data().toDouble();
+                opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
+                QItemDelegate::drawDisplay(painter, opt, opt.rect, Utils::String::fromDouble(progress * 100.0, 1) + "%");
             }
             break;
         default:
diff --git a/src/gui/properties/peerlistsortmodel.h b/src/gui/properties/peerlistsortmodel.h
index a19d9f958..77e58f377 100644
--- a/src/gui/properties/peerlistsortmodel.h
+++ b/src/gui/properties/peerlistsortmodel.h
@@ -34,12 +34,12 @@
 
 #include "peerlistdelegate.h"
 
-class PeerListSortModel: public QSortFilterProxyModel
+class PeerListSortModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 
 public:
-    PeerListSortModel(QObject *parent = 0)
+    PeerListSortModel(QObject *parent = nullptr)
         : QSortFilterProxyModel(parent)
     {
     }
diff --git a/src/gui/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp
index 6dfa082c2..2a1ffcf96 100644
--- a/src/gui/properties/peerlistwidget.cpp
+++ b/src/gui/properties/peerlistwidget.cpp
@@ -1,6 +1,6 @@
 /*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,36 +24,34 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #include "peerlistwidget.h"
 
 #include <QApplication>
-#include <QStandardItemModel>
-#include <QSortFilterProxyModel>
-#include <QSet>
+#include <QClipboard>
 #include <QHeaderView>
 #include <QMenu>
-#include <QClipboard>
 #include <QMessageBox>
-#include <QWheelEvent>
+#include <QSet>
+#include <QSortFilterProxyModel>
+#include <QStandardItemModel>
 #include <QTableView>
+#include <QWheelEvent>
 
-#include "base/net/reverseresolution.h"
-#include "base/bittorrent/torrenthandle.h"
 #include "base/bittorrent/peerinfo.h"
-#include "base/preferences.h"
+#include "base/bittorrent/torrenthandle.h"
 #include "base/logger.h"
-#include "base/unicodestrings.h"
-#include "propertieswidget.h"
 #include "base/net/geoipmanager.h"
-#include "peersadditiondlg.h"
-#include "speedlimitdlg.h"
+#include "base/net/reverseresolution.h"
+#include "base/preferences.h"
+#include "base/unicodestrings.h"
 #include "guiiconprovider.h"
 #include "peerlistdelegate.h"
 #include "peerlistsortmodel.h"
+#include "peersadditiondlg.h"
+#include "propertieswidget.h"
+#include "speedlimitdlg.h"
 
 PeerListWidget::PeerListWidget(PropertiesWidget *parent)
     : QTreeView(parent)
diff --git a/src/gui/properties/peerlistwidget.h b/src/gui/properties/peerlistwidget.h
index 3d4a8483b..8053e8859 100644
--- a/src/gui/properties/peerlistwidget.h
+++ b/src/gui/properties/peerlistwidget.h
@@ -1,6 +1,6 @@
 /*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,18 +24,16 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #ifndef PEERLISTWIDGET_H
 #define PEERLISTWIDGET_H
 
-#include <QTreeView>
 #include <QHash>
 #include <QPointer>
 #include <QSet>
 #include <QShortcut>
+#include <QTreeView>
 
 namespace Net
 {
@@ -46,11 +44,9 @@ class PeerListDelegate;
 class PeerListSortModel;
 class PropertiesWidget;
 
-QT_BEGIN_NAMESPACE
 class QSortFilterProxyModel;
 class QStandardItem;
 class QStandardItemModel;
-QT_END_NAMESPACE
 
 namespace BitTorrent
 {
@@ -59,7 +55,7 @@ namespace BitTorrent
     struct PeerAddress;
 }
 
-class PeerListWidget: public QTreeView
+class PeerListWidget : public QTreeView
 {
     Q_OBJECT
 
diff --git a/src/gui/properties/speedplotview.h b/src/gui/properties/speedplotview.h
index 2165110b6..71fcdd19a 100644
--- a/src/gui/properties/speedplotview.h
+++ b/src/gui/properties/speedplotview.h
@@ -35,9 +35,10 @@
 
 #include <QGraphicsView>
 #include <QMap>
+
 class QPen;
 
-class SpeedPlotView: public QGraphicsView
+class SpeedPlotView : public QGraphicsView
 {
     Q_OBJECT
 
@@ -71,7 +72,7 @@ public:
         int y[NB_GRAPHS];
     };
 
-    explicit SpeedPlotView(QWidget *parent = 0);
+    explicit SpeedPlotView(QWidget *parent = nullptr);
 
     void setGraphEnable(GraphID id, bool enable);
     void setViewableLastPoints(TimePeriod period);
diff --git a/src/gui/properties/trackerlist.h b/src/gui/properties/trackerlist.h
index 5271918d8..6596864a9 100644
--- a/src/gui/properties/trackerlist.h
+++ b/src/gui/properties/trackerlist.h
@@ -43,7 +43,7 @@ namespace BitTorrent
     class TorrentHandle;
 }
 
-class TrackerList: public QTreeWidget
+class TrackerList : public QTreeWidget
 {
     Q_OBJECT
     Q_DISABLE_COPY(TrackerList)
diff --git a/src/gui/rss/htmlbrowser.cpp b/src/gui/rss/htmlbrowser.cpp
index e378b0405..8550bbb04 100644
--- a/src/gui/rss/htmlbrowser.cpp
+++ b/src/gui/rss/htmlbrowser.cpp
@@ -1,18 +1,18 @@
 #include "htmlbrowser.h"
 
-#include <QDebug>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QNetworkDiskCache>
-#include <QStyle>
 #include <QApplication>
-#include <QDir>
 #include <QDateTime>
+#include <QDir>
+#include <QDebug>
+#include <QNetworkDiskCache>
+#include <QNetworkReply>
+#include <QNetworkRequest>
 #include <QScrollBar>
+#include <QStyle>
 
 #include "base/profile.h"
 
-HtmlBrowser::HtmlBrowser(QWidget* parent)
+HtmlBrowser::HtmlBrowser(QWidget *parent)
     : QTextBrowser(parent)
 {
     m_netManager = new QNetworkAccessManager(this);
@@ -31,20 +31,20 @@ HtmlBrowser::~HtmlBrowser()
 
 QVariant HtmlBrowser::loadResource(int type, const QUrl &name)
 {
-    if(type == QTextDocument::ImageResource) {
+    if (type == QTextDocument::ImageResource) {
         QUrl url(name);
-        if(url.scheme().isEmpty())
+        if (url.scheme().isEmpty())
             url.setScheme("http");
 
         QIODevice *dev = m_diskCache->data(url);
-        if(dev != 0) {
+        if (dev != nullptr) {
             qDebug() << "HtmlBrowser::loadResource() cache " << url.toString();
             QByteArray res = dev->readAll();
             delete dev;
             return res;
         }
 
-        if(!m_activeRequests.contains(url)) {
+        if (!m_activeRequests.contains(url)) {
             m_activeRequests.insert(url, true);
             qDebug() << "HtmlBrowser::loadResource() get " << url.toString();
             QNetworkRequest req(url);
@@ -62,7 +62,7 @@ void HtmlBrowser::resourceLoaded(QNetworkReply *reply)
 {
     m_activeRequests.remove(reply->request().url());
 
-    if(reply->error() == QNetworkReply::NoError && reply->size() > 0) {
+    if ((reply->error() == QNetworkReply::NoError) && (reply->size() > 0)) {
         qDebug() << "HtmlBrowser::resourceLoaded() save " << reply->request().url().toString();
     }
     else {
@@ -79,8 +79,8 @@ void HtmlBrowser::resourceLoaded(QNetworkReply *reply)
         metaData.setLastModified(QDateTime::currentDateTime());
         metaData.setExpirationDate(QDateTime::currentDateTime().addDays(1));
         QIODevice *dev = m_diskCache->prepare(metaData);
-        if(!dev)
-            return;
+        if (!dev) return;
+
         QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(32, 32).save(dev, "PNG");
         m_diskCache->insert(dev);
     }
diff --git a/src/gui/rss/htmlbrowser.h b/src/gui/rss/htmlbrowser.h
index 8be699552..d15009ac2 100644
--- a/src/gui/rss/htmlbrowser.h
+++ b/src/gui/rss/htmlbrowser.h
@@ -1,19 +1,19 @@
 #ifndef HTMLBROWSER_H
 #define HTMLBROWSER_H
 
-#include <QTextBrowser>
 #include <QHash>
+#include <QTextBrowser>
 
 class QNetworkAccessManager;
 class QNetworkDiskCache;
 class QNetworkReply;
 
-class HtmlBrowser: public QTextBrowser
+class HtmlBrowser : public QTextBrowser
 {
     Q_OBJECT
 
 public:
-    explicit HtmlBrowser(QWidget* parent = 0);
+    explicit HtmlBrowser(QWidget* parent = nullptr);
     ~HtmlBrowser();
 
     virtual QVariant loadResource(int type, const QUrl &name);
diff --git a/src/gui/shutdownconfirmdlg.h b/src/gui/shutdownconfirmdlg.h
index 1c9b70fe1..9cce3fc14 100644
--- a/src/gui/shutdownconfirmdlg.h
+++ b/src/gui/shutdownconfirmdlg.h
@@ -39,7 +39,7 @@ namespace Ui
     class confirmShutdownDlg;
 }
 
-class ShutdownConfirmDlg: public QDialog
+class ShutdownConfirmDlg : public QDialog
 {
     Q_OBJECT
 
diff --git a/src/gui/speedlimitdlg.cpp b/src/gui/speedlimitdlg.cpp
index ef14b152c..a26e8399d 100644
--- a/src/gui/speedlimitdlg.cpp
+++ b/src/gui/speedlimitdlg.cpp
@@ -1,6 +1,6 @@
 /*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,14 +24,12 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #include "speedlimitdlg.h"
 
-#include "ui_bandwidth_limit.h"
 #include "base/unicodestrings.h"
+#include "ui_bandwidth_limit.h"
 
 SpeedLimitDialog::SpeedLimitDialog(QWidget *parent)
     : QDialog(parent)
diff --git a/src/gui/speedlimitdlg.h b/src/gui/speedlimitdlg.h
index 45f62b144..9c8692214 100644
--- a/src/gui/speedlimitdlg.h
+++ b/src/gui/speedlimitdlg.h
@@ -1,6 +1,6 @@
 /*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +24,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #ifndef BANDWIDTH_ALLOCATION_H
@@ -33,16 +31,19 @@
 
 #include <QDialog>
 #include <QList>
-#include "base/utils/misc.h"
+
 #include "base/bittorrent/session.h"
+#include "base/utils/misc.h"
 
 namespace Ui
 {
     class bandwidth_dlg;
 }
 
-class SpeedLimitDialog : public QDialog {
+class SpeedLimitDialog : public QDialog
+{
     Q_OBJECT
+
 public:
     explicit SpeedLimitDialog(QWidget *parent);
     ~SpeedLimitDialog();
@@ -58,4 +59,4 @@ private:
     Ui::bandwidth_dlg *m_ui;
 };
 
-#endif
+#endif // BANDWIDTH_ALLOCATION_H
diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp
index 0e67b5db3..ae8dfd087 100644
--- a/src/gui/transferlistwidget.cpp
+++ b/src/gui/transferlistwidget.cpp
@@ -627,14 +627,18 @@ void TransferListWidget::setMaxRatioSelectedTorrents()
     const QList<BitTorrent::TorrentHandle *> torrents = getSelectedTorrents();
     if (torrents.isEmpty()) return;
 
-    bool useGlobalValue = true;
     qreal currentMaxRatio = BitTorrent::Session::instance()->globalMaxRatio();
     if (torrents.count() == 1)
-        currentMaxRatio = torrents[0]->maxRatio(&useGlobalValue);
+        currentMaxRatio = torrents[0]->maxRatio();
 
     int currentMaxSeedingTime = BitTorrent::Session::instance()->globalMaxSeedingMinutes();
     if (torrents.count() == 1)
-        currentMaxSeedingTime = torrents[0]->maxSeedingTime(&useGlobalValue);
+        currentMaxSeedingTime = torrents[0]->maxSeedingTime();
+
+    bool useGlobalValue = true;
+    if (torrents.count() == 1)
+        useGlobalValue = (torrents[0]->ratioLimit() == BitTorrent::TorrentHandle::USE_GLOBAL_RATIO)
+                && (torrents[0]->seedingTimeLimit() == BitTorrent::TorrentHandle::USE_GLOBAL_SEEDING_TIME);
 
     UpDownRatioDlg dlg(useGlobalValue, currentMaxRatio, BitTorrent::TorrentHandle::MAX_RATIO,
                        currentMaxSeedingTime, BitTorrent::TorrentHandle::MAX_SEEDING_TIME, this);
diff --git a/src/gui/updownratiodlg.cpp b/src/gui/updownratiodlg.cpp
index efd14f523..3c3acfb70 100644
--- a/src/gui/updownratiodlg.cpp
+++ b/src/gui/updownratiodlg.cpp
@@ -1,6 +1,7 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2011  Christian Kandeler, Christophe Dumez
+ * Copyright (C) 2011  Christian Kandeler
+ * Copyright (C) 2011  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +25,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #include "updownratiodlg.h"
@@ -33,53 +32,52 @@
 #include <QMessageBox>
 
 #include "base/bittorrent/session.h"
-
 #include "ui_updownratiodlg.h"
 
 UpDownRatioDlg::UpDownRatioDlg(bool useDefault, qreal initialRatioValue,
                                qreal maxRatioValue, int initialTimeValue,
                                int maxTimeValue, QWidget *parent)
     : QDialog(parent)
-    , ui(new Ui::UpDownRatioDlg)
+    , m_ui(new Ui::UpDownRatioDlg)
 {
-    ui->setupUi(this);
+    m_ui->setupUi(this);
 
     if (useDefault) {
-        ui->useDefaultButton->setChecked(true);
+        m_ui->useDefaultButton->setChecked(true);
     }
-    else if ((initialRatioValue == -1) && (initialTimeValue == -1)) {
-        ui->noLimitButton->setChecked(true);
+    else if ((initialRatioValue == -1.) && (initialTimeValue == -1)) {
+        m_ui->noLimitButton->setChecked(true);
         initialRatioValue = BitTorrent::Session::instance()->globalMaxRatio();
         initialTimeValue = BitTorrent::Session::instance()->globalMaxSeedingMinutes();
     }
     else {
-        ui->torrentLimitButton->setChecked(true);
+        m_ui->torrentLimitButton->setChecked(true);
 
         if (initialRatioValue >= 0)
-            ui->checkMaxRatio->setChecked(true);
+            m_ui->checkMaxRatio->setChecked(true);
 
         if (initialTimeValue >= 0)
-            ui->checkMaxTime->setChecked(true);
+            m_ui->checkMaxTime->setChecked(true);
     }
 
-    ui->ratioSpinBox->setMinimum(0);
-    ui->ratioSpinBox->setMaximum(maxRatioValue);
-    ui->ratioSpinBox->setValue(initialRatioValue);
+    m_ui->ratioSpinBox->setMinimum(0);
+    m_ui->ratioSpinBox->setMaximum(maxRatioValue);
+    m_ui->ratioSpinBox->setValue(initialRatioValue);
 
-    ui->timeSpinBox->setMinimum(0);
-    ui->timeSpinBox->setMaximum(maxTimeValue);
-    ui->timeSpinBox->setValue(initialTimeValue);
+    m_ui->timeSpinBox->setMinimum(0);
+    m_ui->timeSpinBox->setMaximum(maxTimeValue);
+    m_ui->timeSpinBox->setValue(initialTimeValue);
 
-    connect(ui->buttonGroup, SIGNAL(buttonClicked(int)), SLOT(handleRatioTypeChanged()));
-    connect(ui->checkMaxRatio, SIGNAL(toggled(bool)), this, SLOT(enableRatioSpin()));
-    connect(ui->checkMaxTime, SIGNAL(toggled(bool)), this, SLOT(enableTimeSpin()));
+    connect(m_ui->buttonGroup, SIGNAL(buttonClicked(int)), SLOT(handleRatioTypeChanged()));
+    connect(m_ui->checkMaxRatio, SIGNAL(toggled(bool)), this, SLOT(enableRatioSpin()));
+    connect(m_ui->checkMaxTime, SIGNAL(toggled(bool)), this, SLOT(enableTimeSpin()));
 
     handleRatioTypeChanged();
 }
 
 void UpDownRatioDlg::accept()
 {
-    if (ui->torrentLimitButton->isChecked() && !ui->checkMaxRatio->isChecked() && !ui->checkMaxTime->isChecked())
+    if (m_ui->torrentLimitButton->isChecked() && !m_ui->checkMaxRatio->isChecked() && !m_ui->checkMaxTime->isChecked())
         QMessageBox::critical(this, tr("No share limit method selected"),
                               tr("Please select a limit method first"));
     else
@@ -88,40 +86,40 @@ void UpDownRatioDlg::accept()
 
 bool UpDownRatioDlg::useDefault() const
 {
-    return ui->useDefaultButton->isChecked();
+    return m_ui->useDefaultButton->isChecked();
 }
 
 qreal UpDownRatioDlg::ratio() const
 {
-    return (ui->noLimitButton->isChecked() || !ui->checkMaxRatio->isChecked()) ? -1 : ui->ratioSpinBox->value();
+    return (m_ui->noLimitButton->isChecked() || !m_ui->checkMaxRatio->isChecked()) ? -1. : m_ui->ratioSpinBox->value();
 }
 
 int UpDownRatioDlg::seedingTime() const
 {
-    return (ui->noLimitButton->isChecked() || !ui->checkMaxTime->isChecked()) ? -1 : ui->timeSpinBox->value();
+    return (m_ui->noLimitButton->isChecked() || !m_ui->checkMaxTime->isChecked()) ? -1 : m_ui->timeSpinBox->value();
 }
 
 void UpDownRatioDlg::handleRatioTypeChanged()
 {
     // ui->ratioSpinBox->setEnabled(ui->torrentLimitButton->isChecked());
-    ui->checkMaxRatio->setEnabled(ui->torrentLimitButton->isChecked());
-    ui->checkMaxTime->setEnabled(ui->torrentLimitButton->isChecked());
+    m_ui->checkMaxRatio->setEnabled(m_ui->torrentLimitButton->isChecked());
+    m_ui->checkMaxTime->setEnabled(m_ui->torrentLimitButton->isChecked());
 
-    ui->ratioSpinBox->setEnabled(ui->torrentLimitButton->isChecked() && ui->checkMaxRatio->isChecked());
-    ui->timeSpinBox->setEnabled(ui->torrentLimitButton->isChecked() && ui->checkMaxTime->isChecked());
+    m_ui->ratioSpinBox->setEnabled(m_ui->torrentLimitButton->isChecked() && m_ui->checkMaxRatio->isChecked());
+    m_ui->timeSpinBox->setEnabled(m_ui->torrentLimitButton->isChecked() && m_ui->checkMaxTime->isChecked());
 }
 
 void UpDownRatioDlg::enableRatioSpin()
 {
-    ui->ratioSpinBox->setEnabled(ui->checkMaxRatio->isChecked());
+    m_ui->ratioSpinBox->setEnabled(m_ui->checkMaxRatio->isChecked());
 }
 
 void UpDownRatioDlg::enableTimeSpin()
 {
-    ui->timeSpinBox->setEnabled(ui->checkMaxTime->isChecked());
+    m_ui->timeSpinBox->setEnabled(m_ui->checkMaxTime->isChecked());
 }
 
 UpDownRatioDlg::~UpDownRatioDlg()
 {
-    delete ui;
+    delete m_ui;
 }
diff --git a/src/gui/updownratiodlg.h b/src/gui/updownratiodlg.h
index b7a59de81..a4bb6d031 100644
--- a/src/gui/updownratiodlg.h
+++ b/src/gui/updownratiodlg.h
@@ -1,7 +1,7 @@
 /*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2011  Christian Kandeler, Christophe Dumez
- *
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2011  Christian Kandeler
+ * Copyright (C) 2011  Christophe Dumez <chris@qbittorrent.org>
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -24,8 +24,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #ifndef UPDOWNRATIODLG_H
@@ -33,20 +31,19 @@
 
 #include <QDialog>
 
-QT_BEGIN_NAMESPACE
-namespace Ui {
+namespace Ui
+{
     class UpDownRatioDlg;
 }
-QT_END_NAMESPACE
 
 class UpDownRatioDlg : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit UpDownRatioDlg(bool useDefault, qreal initialValue, qreal maxValue,
-        int initialTimeValue, int maxTimeValue,
-        QWidget *parent = 0);
+    UpDownRatioDlg(bool useDefault, qreal initialValue, qreal maxValue,
+            int initialTimeValue, int maxTimeValue,
+            QWidget *parent = nullptr);
     ~UpDownRatioDlg();
 
     bool useDefault() const;
@@ -62,7 +59,7 @@ private slots:
     void enableTimeSpin();
 
 private:
-    Ui::UpDownRatioDlg *ui;
+    Ui::UpDownRatioDlg *m_ui;
 };
 
 #endif // UPDOWNRATIODLG_H
diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp
index d6c38d81a..9923e991a 100644
--- a/src/webui/webapplication.cpp
+++ b/src/webui/webapplication.cpp
@@ -26,15 +26,17 @@
  * exception statement from your version.
  */
 
-#include <QDebug>
-#include <QCoreApplication>
-#include <QTimer>
-#include <QCryptographicHash>
-#include <QRegularExpression>
+#include "webapplication.h"
 
 #include <queue>
 #include <vector>
 
+#include <QCoreApplication>
+#include <QCryptographicHash>
+#include <QDebug>
+#include <QRegularExpression>
+#include <QTimer>
+
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/torrenthandle.h"
 #include "base/bittorrent/torrentinfo.h"
@@ -50,7 +52,6 @@
 #include "btjson.h"
 #include "jsonutils.h"
 #include "prefjson.h"
-#include "webapplication.h"
 #include "websessiondata.h"
 
 static const int API_VERSION = 15;
@@ -203,7 +204,7 @@ void WebApplication::action_public_login()
         return;
     }
 
-    const Preferences* const pref = Preferences::instance();
+    const Preferences *const pref = Preferences::instance();
     QCryptographicHash md5(QCryptographicHash::Md5);
 
     md5.addData(request().posts["password"].toLocal8Bit());
@@ -565,12 +566,12 @@ void WebApplication::action_command_setFilePrio()
     CHECK_URI(0);
     CHECK_PARAMETERS("hash" << "id" << "priority");
     QString hash = request().posts["hash"];
-    int file_id = request().posts["id"].toInt();
+    int fileID = request().posts["id"].toInt();
     int priority = request().posts["priority"].toInt();
     BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash);
 
     if (torrent && torrent->hasMetadata())
-        torrent->setFilePriority(file_id, priority);
+        torrent->setFilePriority(fileID, priority);
 }
 
 void WebApplication::action_command_getGlobalUpLimit()
@@ -801,15 +802,13 @@ void WebApplication::action_command_setLocation()
     QStringList hashes = request().posts["hashes"].split("|");
     QString newLocation = request().posts["location"].trimmed();
 
-    // check location exists
+    // check if the location exists
     if (newLocation.isEmpty() || !QDir(newLocation).exists())
         return;
 
     foreach (const QString &hash, hashes) {
         BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash);
         if (torrent) {
-            // get old location
-            const QString oldLocation = torrent->savePath();
             Logger::instance()->addMessage(tr("WebUI Set location: moving \"%1\", from \"%2\" to \"%3\"").arg(torrent->name()).arg(torrent->savePath()).arg(newLocation));
 
             torrent->move(Utils::Fs::expandPathAbs(newLocation));
@@ -945,7 +944,7 @@ void WebApplication::doProcessRequest()
 
 void WebApplication::parsePath()
 {
-    if(request().path == "/") action_ = WEBUI_ACTION;
+    if (request().path == "/") action_ = WEBUI_ACTION;
 
     // check action for requested path
     QStringList pathItems = request().path.split('/', QString::SkipEmptyParts);
diff --git a/src/webui/webapplication.h b/src/webui/webapplication.h
index 8909268fe..318e1ae7d 100644
--- a/src/webui/webapplication.h
+++ b/src/webui/webapplication.h
@@ -32,12 +32,12 @@
 #include <QStringList>
 #include "abstractwebapplication.h"
 
-class WebApplication: public AbstractWebApplication
+class WebApplication : public AbstractWebApplication
 {
     Q_DISABLE_COPY(WebApplication)
 
 public:
-    explicit WebApplication(QObject* parent = 0);
+    explicit WebApplication(QObject *parent = nullptr);
 
 private:
     // Actions