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

DiffEditor: Modernize

Browse Source 
modernize-use-auto
modernize-use-override
modernize-use-equals-default

Change-Id: I4e70550ed2962781b62661a405517b5c79126bad
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Alessandro Portale
2018-11-07 23:22:59 +01:00
parent df1f975252
commit cce6975fd8
12 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/diffeditor/descriptionwidgetwatcher.cpp
View File

@@ -68,7 +68,7 @@ QList<TextEditor::TextEditorWidget *> DescriptionWidgetWatcher::descriptionWidge
TextEditor::TextEditorWidget *DescriptionWidgetWatcher::descriptionWidget(Core::IEditor *editor) const TextEditor::TextEditorWidget *DescriptionWidgetWatcher::descriptionWidget(Core::IEditor *editor) const
{ {
if (Internal::DiffEditor *diffEditor = qobject_cast<Internal::DiffEditor *>(editor)) { if (auto diffEditor = qobject_cast<const Internal::DiffEditor *>(editor)) {
if (diffEditor->document() == m_document) if (diffEditor->document() == m_document)
return diffEditor->descriptionWidget(); return diffEditor->descriptionWidget();
} }

2
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -258,7 +258,7 @@ DiffEditor::~DiffEditor()
Core::IEditor *DiffEditor::duplicate() Core::IEditor *DiffEditor::duplicate()
{ {
DiffEditor *editor = new DiffEditor(); auto editor = new DiffEditor();
Utils::GuardLocker guard(editor->m_ignoreChanges); Utils::GuardLocker guard(editor->m_ignoreChanges);
editor->setDocument(m_document); editor->setDocument(m_document);

2
src/plugins/diffeditor/diffeditorfactory.h
View File

@@ -40,7 +40,7 @@ class DiffEditorFactory : public Core::IEditorFactory
public: public:
explicit DiffEditorFactory(QObject *parent); explicit DiffEditorFactory(QObject *parent);
Core::IEditor *createEditor(); Core::IEditor *createEditor() override;
}; };
} // namespace Internal } // namespace Internal

8
src/plugins/diffeditor/diffeditorplugin.cpp
View File

@@ -129,7 +129,7 @@ class DiffFilesController : public DiffEditorController
Q_OBJECT Q_OBJECT
public: public:
DiffFilesController(IDocument *document); DiffFilesController(IDocument *document);
~DiffFilesController(); ~DiffFilesController() override;
protected: protected:
void reload() final; void reload() final;
@@ -203,7 +203,7 @@ QList<ReloadInput> DiffCurrentFileController::reloadInputList() const
{ {
QList<ReloadInput> result; QList<ReloadInput> result;
TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>( auto textDocument = qobject_cast<TextEditor::TextDocument *>(
DocumentModel::documentForFilePath(m_fileName)); DocumentModel::documentForFilePath(m_fileName));
if (textDocument && textDocument->isModified()) { if (textDocument && textDocument->isModified()) {
@@ -259,7 +259,7 @@ QList<ReloadInput> DiffOpenFilesController::reloadInputList() const
const QList<IDocument *> openedDocuments = DocumentModel::openedDocuments(); const QList<IDocument *> openedDocuments = DocumentModel::openedDocuments();
for (IDocument *doc : openedDocuments) { for (IDocument *doc : openedDocuments) {
TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(doc); auto textDocument = qobject_cast<TextEditor::TextDocument *>(doc);
if (textDocument && textDocument->isModified()) { if (textDocument && textDocument->isModified()) {
QString errorString; QString errorString;
@@ -317,7 +317,7 @@ QList<ReloadInput> DiffModifiedFilesController::reloadInputList() const
QList<ReloadInput> result; QList<ReloadInput> result;
for (const QString &fileName : m_fileNames) { for (const QString &fileName : m_fileNames) {
TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>( auto textDocument = qobject_cast<TextEditor::TextDocument *>(
DocumentModel::documentForFilePath(fileName)); DocumentModel::documentForFilePath(fileName));
if (textDocument && textDocument->isModified()) { if (textDocument && textDocument->isModified()) {

4
src/plugins/diffeditor/diffeditorplugin.h
View File

@@ -54,8 +54,8 @@ class DiffEditorPlugin : public ExtensionSystem::IPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "DiffEditor.json") Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "DiffEditor.json")
public: public:
bool initialize(const QStringList &arguments, QString *errorMessage = nullptr); bool initialize(const QStringList &arguments, QString *errorMessage = nullptr) override;
void extensionsInitialized(); void extensionsInitialized() override;
private: private:
void updateDiffCurrentFileAction(); void updateDiffCurrentFileAction();

2
src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
View File

@@ -168,7 +168,7 @@ void DiffEditorWidgetController::patch(bool revert, int fileIndex, int chunkInde
workingDirectory, strip, revert)) workingDirectory, strip, revert))
m_document->reload(); m_document->reload();
} else { // PatchEditor } else { // PatchEditor
TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>( auto textDocument = qobject_cast<TextEditor::TextDocument *>(
DocumentModel::documentForFilePath(absFileName)); DocumentModel::documentForFilePath(absFileName));
if (!textDocument) if (!textDocument)
return; return;

2
src/plugins/diffeditor/diffutils.h
View File

@@ -47,7 +47,7 @@ public:
PatchEditor PatchEditor
}; };
DiffFileInfo() {} DiffFileInfo() = default;
DiffFileInfo(const QString &file) : fileName(file) {} DiffFileInfo(const QString &file) : fileName(file) {}
DiffFileInfo(const QString &file, const QString &type) DiffFileInfo(const QString &file, const QString &type)
: fileName(file), typeInfo(type) {} : fileName(file), typeInfo(type) {}

28
src/plugins/diffeditor/diffview.h
View File

@@ -93,17 +93,17 @@ class UnifiedView : public IDiffView
public: public:
UnifiedView(); UnifiedView();
QWidget *widget(); QWidget *widget() override;
TextEditor::TextEditorWidget *textEditorWidget(); TextEditor::TextEditorWidget *textEditorWidget();
void setDocument(DiffEditorDocument *document); void setDocument(DiffEditorDocument *document) override;
void beginOperation(); void beginOperation() override;
void setCurrentDiffFileIndex(int index); void setCurrentDiffFileIndex(int index) override;
void setDiff(const QList<FileData> &diffFileList, const QString &workingDirectory); void setDiff(const QList<FileData> &diffFileList, const QString &workingDirectory) override;
void endOperation(bool success); void endOperation(bool success) override;
void setSync(bool sync); void setSync(bool sync) override;
private: private:
UnifiedDiffEditorWidget *m_widget = nullptr; UnifiedDiffEditorWidget *m_widget = nullptr;
@@ -116,18 +116,18 @@ class SideBySideView : public IDiffView
public: public:
SideBySideView(); SideBySideView();
QWidget *widget(); QWidget *widget() override;
TextEditor::TextEditorWidget *leftEditorWidget(); TextEditor::TextEditorWidget *leftEditorWidget();
TextEditor::TextEditorWidget *rightEditorWidget(); TextEditor::TextEditorWidget *rightEditorWidget();
void setDocument(DiffEditorDocument *document); void setDocument(DiffEditorDocument *document) override;
void beginOperation(); void beginOperation() override;
void setCurrentDiffFileIndex(int index); void setCurrentDiffFileIndex(int index) override;
void setDiff(const QList<FileData> &diffFileList, const QString &workingDirectory); void setDiff(const QList<FileData> &diffFileList, const QString &workingDirectory) override;
void endOperation(bool success); void endOperation(bool success) override;
void setSync(bool sync); void setSync(bool sync) override;
private: private:
SideBySideDiffEditorWidget *m_widget; SideBySideDiffEditorWidget *m_widget;

4
src/plugins/diffeditor/selectabletexteditorwidget.cpp
View File

@@ -40,9 +40,7 @@ SelectableTextEditorWidget::SelectableTextEditorWidget(Core::Id id, QWidget *par
setupFallBackEditor(id); setupFallBackEditor(id);
} }
SelectableTextEditorWidget::~SelectableTextEditorWidget() SelectableTextEditorWidget::~SelectableTextEditorWidget() = default;
{
}
static QList<DiffSelection> subtractSelection( static QList<DiffSelection> subtractSelection(
const DiffSelection &minuendSelection, const DiffSelection &minuendSelection,

2
src/plugins/diffeditor/selectabletexteditorwidget.h
View File

@@ -33,7 +33,7 @@ namespace Internal {
class DiffSelection class DiffSelection
{ {
public: public:
DiffSelection() {} DiffSelection() = default;
DiffSelection(QTextCharFormat *f) : format(f) {} DiffSelection(QTextCharFormat *f) : format(f) {}
DiffSelection(int s, int e, QTextCharFormat *f) : start(s), end(e), format(f) {} DiffSelection(int s, int e, QTextCharFormat *f) : start(s), end(e), format(f) {}

4
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -174,7 +174,7 @@ SideDiffEditorWidget::SideDiffEditorWidget(QWidget *parent)
ToolTip::hide(); ToolTip::hide();
}); });
TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(document()->documentLayout()); auto documentLayout = qobject_cast<TextDocumentLayout*>(document()->documentLayout());
if (documentLayout) if (documentLayout)
connect(documentLayout, &TextDocumentLayout::foldChanged, connect(documentLayout, &TextDocumentLayout::foldChanged,
this, &SideDiffEditorWidget::foldChanged); this, &SideDiffEditorWidget::foldChanged);
@@ -210,7 +210,7 @@ void SideDiffEditorWidget::setFolded(int blockNumber, bool folded)
TextDocumentLayout::doFoldOrUnfold(block, !folded); TextDocumentLayout::doFoldOrUnfold(block, !folded);
TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(document()->documentLayout()); auto documentLayout = qobject_cast<TextDocumentLayout*>(document()->documentLayout());
documentLayout->requestUpdate(); documentLayout->requestUpdate();
documentLayout->emitDocumentSizeChanged(); documentLayout->emitDocumentSizeChanged();
} }

2
src/plugins/diffeditor/sidebysidediffeditorwidget.h
View File

@@ -57,7 +57,7 @@ class SideBySideDiffEditorWidget : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit SideBySideDiffEditorWidget(QWidget *parent = nullptr); explicit SideBySideDiffEditorWidget(QWidget *parent = nullptr);
~SideBySideDiffEditorWidget(); ~SideBySideDiffEditorWidget() override;
TextEditor::TextEditorWidget *leftEditorWidget() const; TextEditor::TextEditorWidget *leftEditorWidget() const;
TextEditor::TextEditorWidget *rightEditorWidget() const; TextEditor::TextEditorWidget *rightEditorWidget() const;