feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Subversion: Modernize

Browse Source 
override, auto, nullptr

Change-Id: If8a0d438299eecb876ec5a5ab2bea3d21a5256d8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Orgad Shaneh
2018-09-20 00:57:48 +03:00
committed by Orgad Shaneh
parent 17fdb595a0
commit 8a472bb0ad
7 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/subversion/annotationhighlighter.h
View File

@@ -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;
};

6
src/plugins/subversion/settingspage.h
View File

@@ -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;

2
src/plugins/subversion/subversionclient.cpp
View File

@@ -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);

4
src/plugins/subversion/subversioncontrol.cpp
View File

@@ -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);
}

2
src/plugins/subversion/subversioncontrol.h
View File

@@ -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;

19
src/plugins/subversion/subversionplugin.cpp
View File

@@ -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('_'));

2
src/plugins/subversion/subversionsettings.h
View File

@@ -44,7 +44,7 @@ public:
bool hasAuthentication() const;
protected:
void readLegacySettings(const QSettings *settings);
void readLegacySettings(const QSettings *settings) override;
};
} // namespace Internal