diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-09-20 00:57:48 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2018-09-20 07:03:14 +0000 |
commit | 8a472bb0ad95944bdcb41855a57dc507dfedb444 (patch) | |
tree | 7fac73d4bc34db5c5c2733a0280c5b009e39c55c | |
parent | 17fdb595a0d39da7aa64df7871086c73f50ce035 (diff) |
Subversion: Modernize
override, auto, nullptr
Change-Id: If8a0d438299eecb876ec5a5ab2bea3d21a5256d8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
-rw-r--r-- | src/plugins/subversion/annotationhighlighter.h | 4 | ||||
-rw-r--r-- | src/plugins/subversion/settingspage.h | 6 | ||||
-rw-r--r-- | src/plugins/subversion/subversionclient.cpp | 2 | ||||
-rw-r--r-- | src/plugins/subversion/subversioncontrol.cpp | 4 | ||||
-rw-r--r-- | src/plugins/subversion/subversioncontrol.h | 2 | ||||
-rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 19 | ||||
-rw-r--r-- | src/plugins/subversion/subversionsettings.h | 2 |
7 files changed, 20 insertions, 19 deletions
diff --git a/src/plugins/subversion/annotationhighlighter.h b/src/plugins/subversion/annotationhighlighter.h index 44cbeff72f..128d8c1d76 100644 --- a/src/plugins/subversion/annotationhighlighter.h +++ b/src/plugins/subversion/annotationhighlighter.h @@ -36,10 +36,10 @@ class SubversionAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighte Q_OBJECT public: explicit SubversionAnnotationHighlighter(const ChangeNumbers &changeNumbers, - QTextDocument *document = 0); + QTextDocument *document = nullptr); private: - QString changeNumber(const QString &block) const; + QString changeNumber(const QString &block) const override; const QChar m_blank; }; diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h index e23e4176ff..23ec7548c7 100644 --- a/src/plugins/subversion/settingspage.h +++ b/src/plugins/subversion/settingspage.h @@ -41,10 +41,10 @@ class SettingsPageWidget : public VcsBase::VcsClientOptionsPageWidget Q_OBJECT public: - explicit SettingsPageWidget(QWidget *parent = 0); + explicit SettingsPageWidget(QWidget *parent = nullptr); - VcsBase::VcsBaseClientSettings settings() const; - void setSettings(const VcsBase::VcsBaseClientSettings &s); + VcsBase::VcsBaseClientSettings settings() const override; + void setSettings(const VcsBase::VcsBaseClientSettings &s) override; private: Ui::SettingsPage m_ui; diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp index 185a76c1a5..e5b0a35640 100644 --- a/src/plugins/subversion/subversionclient.cpp +++ b/src/plugins/subversion/subversionclient.cpp @@ -275,7 +275,7 @@ SubversionDiffEditorController *SubversionClient::findOrCreateDiffEditor(const Q const QString &workingDirectory) const { IDocument *document = DiffEditorController::findOrCreateDocument(documentId, title); - SubversionDiffEditorController *controller = qobject_cast<SubversionDiffEditorController *>( + auto controller = qobject_cast<SubversionDiffEditorController *>( DiffEditorController::controller(document)); if (!controller) controller = new SubversionDiffEditorController(document, workingDirectory); diff --git a/src/plugins/subversion/subversioncontrol.cpp b/src/plugins/subversion/subversioncontrol.cpp index 8bd9e36f37..461bac97fd 100644 --- a/src/plugins/subversion/subversioncontrol.cpp +++ b/src/plugins/subversion/subversioncontrol.cpp @@ -49,12 +49,12 @@ public: { } protected: - QString trackFile(const QString &repository) + QString trackFile(const QString &repository) override { return m_plugin->monitorFile(repository); } - QString refreshTopic(const QString &repository) + QString refreshTopic(const QString &repository) override { return m_plugin->synchronousTopic(repository); } diff --git a/src/plugins/subversion/subversioncontrol.h b/src/plugins/subversion/subversioncontrol.h index 8e63be6427..9a8f9ff0e6 100644 --- a/src/plugins/subversion/subversioncontrol.h +++ b/src/plugins/subversion/subversioncontrol.h @@ -42,7 +42,7 @@ public: Core::Id id() const final; bool isVcsFileOrDirectory(const Utils::FileName &fileName) const final; - bool managesDirectory(const QString &directory, QString *topLevel = 0) const final; + bool managesDirectory(const QString &directory, QString *topLevel = nullptr) const final; bool managesFile(const QString &workingDirectory, const QString &fileName) const final; bool isConfigured() const final; diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 37166b6450..66b671d136 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -123,8 +123,9 @@ const VcsBaseEditorParameters editorParameters[] = { // Utility to find a parameter set by type static const VcsBaseEditorParameters *findType(int ie) { - const EditorContentType et = static_cast<EditorContentType>(ie); - return VcsBaseEditor::findType(editorParameters, sizeof(editorParameters)/sizeof(editorParameters[0]), et); + return VcsBaseEditor::findType(editorParameters, + sizeof(editorParameters)/sizeof(*editorParameters), + static_cast<EditorContentType>(ie)); } static inline QString debugCodec(const QTextCodec *c) @@ -168,7 +169,7 @@ static inline QStringList svnDirectories() } // ------------- SubversionPlugin -SubversionPlugin *SubversionPlugin::m_subversionPluginInstance = 0; +SubversionPlugin *SubversionPlugin::m_subversionPluginInstance = nullptr; SubversionPlugin::SubversionPlugin() : m_svnDirectories(svnDirectories()) @@ -409,7 +410,7 @@ bool SubversionPlugin::submitEditorAboutToClose() if (!isCommitEditorOpen()) return true; - SubversionSubmitEditor *editor = qobject_cast<SubversionSubmitEditor *>(submitEditor()); + auto editor = qobject_cast<SubversionSubmitEditor *>(submitEditor()); QTC_ASSERT(editor, return true); IDocument *editorDocument = editor->document(); QTC_ASSERT(editorDocument, return true); @@ -465,8 +466,8 @@ void SubversionPlugin::diffCommitFiles(const QStringList &files) SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QString &fileName) { IEditor *editor = EditorManager::openEditor(fileName, Constants::SUBVERSION_COMMIT_EDITOR_ID); - SubversionSubmitEditor *submitEditor = qobject_cast<SubversionSubmitEditor*>(editor); - QTC_ASSERT(submitEditor, return 0); + auto submitEditor = qobject_cast<SubversionSubmitEditor*>(editor); + QTC_ASSERT(submitEditor, return nullptr); setSubmitEditor(submitEditor); connect(submitEditor, &VcsBaseSubmitEditor::diffSelectedFiles, this, &SubversionPlugin::diffCommitFiles); @@ -884,16 +885,16 @@ IEditor *SubversionPlugin::showOutputInEditor(const QString &title, const QStrin QTextCodec *codec) { const VcsBaseEditorParameters *params = findType(editorType); - QTC_ASSERT(params, return 0); + QTC_ASSERT(params, return nullptr); const Id id = params->id; if (Subversion::Constants::debug) qDebug() << "SubversionPlugin::showOutputInEditor" << title << id.name() << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec); QString s = title; IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8()); - SubversionEditorWidget *e = qobject_cast<SubversionEditorWidget*>(editor->widget()); + auto e = qobject_cast<SubversionEditorWidget*>(editor->widget()); if (!e) - return 0; + return nullptr; connect(e, &VcsBaseEditorWidget::annotateRevisionRequested, this, &SubversionPlugin::vcsAnnotate); e->setForceReadOnly(true); s.replace(QLatin1Char(' '), QLatin1Char('_')); diff --git a/src/plugins/subversion/subversionsettings.h b/src/plugins/subversion/subversionsettings.h index 81dbeb15f8..40deb8d997 100644 --- a/src/plugins/subversion/subversionsettings.h +++ b/src/plugins/subversion/subversionsettings.h @@ -44,7 +44,7 @@ public: bool hasAuthentication() const; protected: - void readLegacySettings(const QSettings *settings); + void readLegacySettings(const QSettings *settings) override; }; } // namespace Internal |