diff options
Diffstat (limited to 'src/views/versioncontrol')
5 files changed, 16 insertions, 16 deletions
diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h index 1696f975c..a3be381f3 100644 --- a/src/views/versioncontrol/kversioncontrolplugin.h +++ b/src/views/versioncontrol/kversioncontrolplugin.h @@ -144,8 +144,8 @@ public: MissingVersion }; - KVersionControlPlugin(QObject* parent = 0); - virtual ~KVersionControlPlugin(); + KVersionControlPlugin(QObject* parent = nullptr); + ~KVersionControlPlugin() override; /** * Returns the name of the file which stores diff --git a/src/views/versioncontrol/updateitemstatesthread.cpp b/src/views/versioncontrol/updateitemstatesthread.cpp index e4413fabf..574402dcd 100644 --- a/src/views/versioncontrol/updateitemstatesthread.cpp +++ b/src/views/versioncontrol/updateitemstatesthread.cpp @@ -25,7 +25,7 @@ UpdateItemStatesThread::UpdateItemStatesThread(KVersionControlPlugin* plugin, const QMap<QString, QVector<VersionControlObserver::ItemState> >& itemStates) : QThread(), - m_globalPluginMutex(0), + m_globalPluginMutex(nullptr), m_plugin(plugin), m_itemStates(itemStates) { diff --git a/src/views/versioncontrol/updateitemstatesthread.h b/src/views/versioncontrol/updateitemstatesthread.h index 3dc03fc75..d33a64cc7 100644 --- a/src/views/versioncontrol/updateitemstatesthread.h +++ b/src/views/versioncontrol/updateitemstatesthread.h @@ -46,12 +46,12 @@ public: */ UpdateItemStatesThread(KVersionControlPlugin* plugin, const QMap<QString, QVector<VersionControlObserver::ItemState> >& itemStates); - virtual ~UpdateItemStatesThread(); + ~UpdateItemStatesThread() override; QMap<QString, QVector<VersionControlObserver::ItemState> > itemStates() const; protected: - virtual void run() Q_DECL_OVERRIDE; + void run() override; private: QMutex* m_globalPluginMutex; // Protects the m_plugin globally diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index c79440882..44dffac45 100644 --- a/src/views/versioncontrol/versioncontrolobserver.cpp +++ b/src/views/versioncontrol/versioncontrolobserver.cpp @@ -37,10 +37,10 @@ VersionControlObserver::VersionControlObserver(QObject* parent) : m_pendingItemStatesUpdate(false), m_versionedDirectory(false), m_silentUpdate(false), - m_model(0), - m_dirVerificationTimer(0), - m_plugin(0), - m_updateItemStatesThread(0) + m_model(nullptr), + m_dirVerificationTimer(nullptr), + m_plugin(nullptr), + m_updateItemStatesThread(nullptr) { // The verification timer specifies the timeout until the shown directory // is checked whether it is versioned. Per default it is assumed that users @@ -58,7 +58,7 @@ VersionControlObserver::~VersionControlObserver() { if (m_plugin) { m_plugin->disconnect(this); - m_plugin = 0; + m_plugin = nullptr; } } @@ -163,7 +163,7 @@ void VersionControlObserver::verifyDirectory() void VersionControlObserver::slotThreadFinished() { UpdateItemStatesThread* thread = m_updateItemStatesThread; - m_updateItemStatesThread = 0; // The thread deletes itself automatically (see updateItemStates()) + m_updateItemStatesThread = nullptr; // The thread deletes itself automatically (see updateItemStates()) if (!m_plugin || !thread) { return; @@ -266,7 +266,7 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director if (!pluginsAvailable) { // A searching for plugins has already been done, but no // plugins are installed - return 0; + return nullptr; } if (plugins.isEmpty()) { @@ -285,13 +285,13 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director } if (plugins.isEmpty()) { pluginsAvailable = false; - return 0; + return nullptr; } } // We use the number of upUrl() calls to find the best matching plugin // for the given directory. The smaller value, the better it is (0 is best). - KVersionControlPlugin* bestPlugin = 0; + KVersionControlPlugin* bestPlugin = nullptr; int bestScore = INT_MAX; // Verify whether the current directory contains revision information diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h index c817c2187..2c2fe2940 100644 --- a/src/views/versioncontrol/versioncontrolobserver.h +++ b/src/views/versioncontrol/versioncontrolobserver.h @@ -50,8 +50,8 @@ class DOLPHIN_EXPORT VersionControlObserver : public QObject Q_OBJECT public: - explicit VersionControlObserver(QObject* parent = 0); - virtual ~VersionControlObserver(); + explicit VersionControlObserver(QObject* parent = nullptr); + ~VersionControlObserver() override; void setModel(KFileItemModel* model); KFileItemModel* model() const; |
