Replace the zeroing of pointers with nullptr

src/base/bittorrent/session.cpp

@@ -1005,7 +1005,7 @@ void Session::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 

src/base/bittorrent/session.h

@@ -562,7 +562,7 @@ namespace BitTorrent
             bool requestedFileDeletion;
         };
 
-        explicit Session(QObject *parent = 0);
+        explicit Session(QObject *parent = nullptr);
         ~Session();
 
         bool hasPerTorrentRatioLimit() const;

src/base/bittorrent/torrenthandle.cpp

@@ -1639,7 +1639,7 @@ void TorrentHandle::handleSaveResumeDataFailedAlert(libtorrent::save_resume_data
     // if torrent has no metadata we should save dummy fastresume data
     // containing Magnet URI and qBittorrent own resume data only
     if (p->error.value() == libt::errors::no_metadata)
-        handleSaveResumeDataAlert(0);
+        handleSaveResumeDataAlert(nullptr);
     else
         m_session->handleTorrentResumeDataFailed(this);
 }

src/base/http/connection.h

@@ -50,7 +50,7 @@ namespace Http
         Q_DISABLE_COPY(Connection)
 
     public:
-        Connection(QTcpSocket *socket, IRequestHandler *requestHandler, QObject *parent = 0);
+        Connection(QTcpSocket *socket, IRequestHandler *requestHandler, QObject *parent = nullptr);
         ~Connection();
 
         bool hasExpired(qint64 timeout) const;

src/base/iconprovider.cpp

@@ -47,7 +47,7 @@ void IconProvider::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 
@@ -61,4 +61,4 @@ QString IconProvider::getIconPath(const QString &iconId)
     return ":/icons/qbt-theme/" + iconId + ".png";
 }
 
-IconProvider *IconProvider::m_instance = 0;
+IconProvider *IconProvider::m_instance = nullptr;

src/base/iconprovider.h

@@ -46,7 +46,7 @@ public:
     virtual QString getIconPath(const QString &iconId);
 
 protected:
-    explicit IconProvider(QObject *parent = 0);
+    explicit IconProvider(QObject *parent = nullptr);
     ~IconProvider();
 
     static IconProvider *m_instance;

src/base/logger.cpp

@@ -3,7 +3,7 @@
 #include <QDateTime>
 #include "base/utils/string.h"
 
-Logger* Logger::m_instance = 0;
+Logger* Logger::m_instance = nullptr;
 
 Logger::Logger()
     : lock(QReadWriteLock::Recursive)
@@ -29,7 +29,7 @@ void Logger::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 

src/base/net/downloadmanager.cpp

@@ -51,7 +51,7 @@ namespace
     class NetworkCookieJar: public QNetworkCookieJar
     {
     public:
-        explicit NetworkCookieJar(QObject *parent = 0)
+        explicit NetworkCookieJar(QObject *parent = nullptr)
             : QNetworkCookieJar(parent)
         {
             QDateTime now = QDateTime::currentDateTime();
@@ -107,7 +107,7 @@ namespace
 
 using namespace Net;
 
-DownloadManager *DownloadManager::m_instance = 0;
+DownloadManager *DownloadManager::m_instance = nullptr;
 
 DownloadManager::DownloadManager(QObject *parent)
     : QObject(parent)
@@ -128,7 +128,7 @@ void DownloadManager::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 

src/base/net/downloadmanager.h

@@ -64,7 +64,7 @@ namespace Net
     #endif
 
     private:
-        explicit DownloadManager(QObject *parent = 0);
+        explicit DownloadManager(QObject *parent = nullptr);
 
         void applyProxySettings();
 

src/base/net/private/geoipdatabase.cpp

@@ -91,7 +91,7 @@ GeoIPDatabase::GeoIPDatabase(quint32 size)
 
 GeoIPDatabase *GeoIPDatabase::load(const QString &filename, QString &error)
 {
-    GeoIPDatabase *db = 0;
+    GeoIPDatabase *db = nullptr;
     QFile file(filename);
     if (file.size() > MAX_FILE_SIZE) {
         error = tr("Unsupported database file size.");
@@ -122,7 +122,7 @@ GeoIPDatabase *GeoIPDatabase::load(const QString &filename, QString &error)
 
 GeoIPDatabase *GeoIPDatabase::load(const QByteArray &data, QString &error)
 {
-    GeoIPDatabase *db = 0;
+    GeoIPDatabase *db = nullptr;
     if (data.size() > MAX_FILE_SIZE) {
         error = tr("Unsupported database file size.");
         return 0;

src/base/net/proxyconfigurationmanager.cpp

@@ -80,7 +80,7 @@ void ProxyConfigurationManager::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 

src/base/net/reverseresolution.h

@@ -47,7 +47,7 @@ namespace Net
         Q_DISABLE_COPY(ReverseResolution)
 
     public:
-        explicit ReverseResolution(QObject *parent = 0);
+        explicit ReverseResolution(QObject *parent = nullptr);
         ~ReverseResolution();
 
         void resolve(const QString &ip);

src/base/preferences.cpp

@@ -59,7 +59,7 @@
 #include "utils/fs.h"
 #include "utils/misc.h"
 
-Preferences *Preferences::m_instance = 0;
+Preferences *Preferences::m_instance = nullptr;
 
 Preferences::Preferences() = default;
 
@@ -78,7 +78,7 @@ void Preferences::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 

src/base/scanfoldersmodel.cpp

@@ -56,7 +56,7 @@ struct ScanFoldersModel::PathData
     QString downloadPath; // valid for CUSTOM_LOCATION
 };
 
-ScanFoldersModel *ScanFoldersModel::m_instance = 0;
+ScanFoldersModel *ScanFoldersModel::m_instance = nullptr;
 
 bool ScanFoldersModel::initInstance(QObject *parent)
 {
@@ -72,7 +72,7 @@ void ScanFoldersModel::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 
@@ -83,7 +83,7 @@ ScanFoldersModel *ScanFoldersModel::instance()
 
 ScanFoldersModel::ScanFoldersModel(QObject *parent)
     : QAbstractListModel(parent)
-    , m_fsWatcher(0)
+    , m_fsWatcher(nullptr)
 {
     configure();
     connect(Preferences::instance(), SIGNAL(changed()), SLOT(configure()));

src/base/scanfoldersmodel.h

@@ -66,7 +66,7 @@ public:
         CUSTOM_LOCATION
     };
 
-    static bool initInstance(QObject *parent = 0);
+    static bool initInstance(QObject *parent = nullptr);
     static void freeInstance();
     static ScanFoldersModel* instance();
 
@@ -97,7 +97,7 @@ private slots:
     void addTorrentsToSession(const QStringList &pathList);
 
 private:
-    explicit ScanFoldersModel(QObject *parent = 0);
+    explicit ScanFoldersModel(QObject *parent = nullptr);
     ~ScanFoldersModel();
 
     virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);

src/base/utils/fs.h

@@ -52,7 +52,7 @@ namespace Utils
                 , const QString &pad = QLatin1String(" "));
         bool isValidFileSystemName(const QString &name, bool allowSeparators = false);
         qint64 freeDiskSpaceOnPath(const QString &path);
-        QString branchPath(const QString &filePath, QString *removed = 0);
+        QString branchPath(const QString &filePath, QString *removed = nullptr);
         bool sameFileNames(const QString &first, const QString &second);
         QString expandPath(const QString &path);
         QString expandPathAbs(const QString &path);