diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2018-11-07 23:22:59 +0100 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2018-11-09 05:40:27 +0000 |
commit | cce6975fd87935c555a323d9d4fbec8fbb9eb2e8 (patch) | |
tree | fea23f4ca0efc116b52e445e9bbcbcb7ebe85558 /src/plugins/diffeditor | |
parent | df1f9752529b92fc8ffa114f58c43adf52132189 (diff) | |
download | qt-creator-cce6975fd87935c555a323d9d4fbec8fbb9eb2e8.tar.gz |
DiffEditor: Modernize
modernize-use-auto
modernize-use-override
modernize-use-equals-default
Change-Id: I4e70550ed2962781b62661a405517b5c79126bad
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor')
-rw-r--r-- | src/plugins/diffeditor/descriptionwidgetwatcher.cpp | 2 | ||||
-rw-r--r-- | src/plugins/diffeditor/diffeditor.cpp | 2 | ||||
-rw-r--r-- | src/plugins/diffeditor/diffeditorfactory.h | 2 | ||||
-rw-r--r-- | src/plugins/diffeditor/diffeditorplugin.cpp | 8 | ||||
-rw-r--r-- | src/plugins/diffeditor/diffeditorplugin.h | 4 | ||||
-rw-r--r-- | src/plugins/diffeditor/diffeditorwidgetcontroller.cpp | 2 | ||||
-rw-r--r-- | src/plugins/diffeditor/diffutils.h | 2 | ||||
-rw-r--r-- | src/plugins/diffeditor/diffview.h | 28 | ||||
-rw-r--r-- | src/plugins/diffeditor/selectabletexteditorwidget.cpp | 4 | ||||
-rw-r--r-- | src/plugins/diffeditor/selectabletexteditorwidget.h | 2 | ||||
-rw-r--r-- | src/plugins/diffeditor/sidebysidediffeditorwidget.cpp | 4 | ||||
-rw-r--r-- | src/plugins/diffeditor/sidebysidediffeditorwidget.h | 2 |
12 files changed, 30 insertions, 32 deletions
diff --git a/src/plugins/diffeditor/descriptionwidgetwatcher.cpp b/src/plugins/diffeditor/descriptionwidgetwatcher.cpp index 5b266ebe74..0279fdcdb9 100644 --- a/src/plugins/diffeditor/descriptionwidgetwatcher.cpp +++ b/src/plugins/diffeditor/descriptionwidgetwatcher.cpp @@ -68,7 +68,7 @@ QList<TextEditor::TextEditorWidget *> DescriptionWidgetWatcher::descriptionWidge 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) return diffEditor->descriptionWidget(); } diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index ca860beb37..3e86febfab 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -258,7 +258,7 @@ DiffEditor::~DiffEditor() Core::IEditor *DiffEditor::duplicate() { - DiffEditor *editor = new DiffEditor(); + auto editor = new DiffEditor(); Utils::GuardLocker guard(editor->m_ignoreChanges); editor->setDocument(m_document); diff --git a/src/plugins/diffeditor/diffeditorfactory.h b/src/plugins/diffeditor/diffeditorfactory.h index bea963632e..2f89ac6ba3 100644 --- a/src/plugins/diffeditor/diffeditorfactory.h +++ b/src/plugins/diffeditor/diffeditorfactory.h @@ -40,7 +40,7 @@ class DiffEditorFactory : public Core::IEditorFactory public: explicit DiffEditorFactory(QObject *parent); - Core::IEditor *createEditor(); + Core::IEditor *createEditor() override; }; } // namespace Internal diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 6d3ba8858d..0c52b55a9e 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -129,7 +129,7 @@ class DiffFilesController : public DiffEditorController Q_OBJECT public: DiffFilesController(IDocument *document); - ~DiffFilesController(); + ~DiffFilesController() override; protected: void reload() final; @@ -203,7 +203,7 @@ QList<ReloadInput> DiffCurrentFileController::reloadInputList() const { QList<ReloadInput> result; - TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>( + auto textDocument = qobject_cast<TextEditor::TextDocument *>( DocumentModel::documentForFilePath(m_fileName)); if (textDocument && textDocument->isModified()) { @@ -259,7 +259,7 @@ QList<ReloadInput> DiffOpenFilesController::reloadInputList() const const QList<IDocument *> openedDocuments = DocumentModel::openedDocuments(); for (IDocument *doc : openedDocuments) { - TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(doc); + auto textDocument = qobject_cast<TextEditor::TextDocument *>(doc); if (textDocument && textDocument->isModified()) { QString errorString; @@ -317,7 +317,7 @@ QList<ReloadInput> DiffModifiedFilesController::reloadInputList() const QList<ReloadInput> result; for (const QString &fileName : m_fileNames) { - TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>( + auto textDocument = qobject_cast<TextEditor::TextDocument *>( DocumentModel::documentForFilePath(fileName)); if (textDocument && textDocument->isModified()) { diff --git a/src/plugins/diffeditor/diffeditorplugin.h b/src/plugins/diffeditor/diffeditorplugin.h index 2865421015..84d642b9f3 100644 --- a/src/plugins/diffeditor/diffeditorplugin.h +++ b/src/plugins/diffeditor/diffeditorplugin.h @@ -54,8 +54,8 @@ class DiffEditorPlugin : public ExtensionSystem::IPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "DiffEditor.json") public: - bool initialize(const QStringList &arguments, QString *errorMessage = nullptr); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorMessage = nullptr) override; + void extensionsInitialized() override; private: void updateDiffCurrentFileAction(); diff --git a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp index 834c320a52..e1c656d5c7 100644 --- a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp +++ b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp @@ -168,7 +168,7 @@ void DiffEditorWidgetController::patch(bool revert, int fileIndex, int chunkInde workingDirectory, strip, revert)) m_document->reload(); } else { // PatchEditor - TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>( + auto textDocument = qobject_cast<TextEditor::TextDocument *>( DocumentModel::documentForFilePath(absFileName)); if (!textDocument) return; diff --git a/src/plugins/diffeditor/diffutils.h b/src/plugins/diffeditor/diffutils.h index 31956e6296..605266a0ef 100644 --- a/src/plugins/diffeditor/diffutils.h +++ b/src/plugins/diffeditor/diffutils.h @@ -47,7 +47,7 @@ public: PatchEditor }; - DiffFileInfo() {} + DiffFileInfo() = default; DiffFileInfo(const QString &file) : fileName(file) {} DiffFileInfo(const QString &file, const QString &type) : fileName(file), typeInfo(type) {} diff --git a/src/plugins/diffeditor/diffview.h b/src/plugins/diffeditor/diffview.h index 93405a0423..1f760d82c4 100644 --- a/src/plugins/diffeditor/diffview.h +++ b/src/plugins/diffeditor/diffview.h @@ -93,17 +93,17 @@ class UnifiedView : public IDiffView public: UnifiedView(); - QWidget *widget(); + QWidget *widget() override; TextEditor::TextEditorWidget *textEditorWidget(); - void setDocument(DiffEditorDocument *document); + void setDocument(DiffEditorDocument *document) override; - void beginOperation(); - void setCurrentDiffFileIndex(int index); - void setDiff(const QList<FileData> &diffFileList, const QString &workingDirectory); - void endOperation(bool success); + void beginOperation() override; + void setCurrentDiffFileIndex(int index) override; + void setDiff(const QList<FileData> &diffFileList, const QString &workingDirectory) override; + void endOperation(bool success) override; - void setSync(bool sync); + void setSync(bool sync) override; private: UnifiedDiffEditorWidget *m_widget = nullptr; @@ -116,18 +116,18 @@ class SideBySideView : public IDiffView public: SideBySideView(); - QWidget *widget(); + QWidget *widget() override; TextEditor::TextEditorWidget *leftEditorWidget(); TextEditor::TextEditorWidget *rightEditorWidget(); - void setDocument(DiffEditorDocument *document); + void setDocument(DiffEditorDocument *document) override; - void beginOperation(); - void setCurrentDiffFileIndex(int index); - void setDiff(const QList<FileData> &diffFileList, const QString &workingDirectory); - void endOperation(bool success); + void beginOperation() override; + void setCurrentDiffFileIndex(int index) override; + void setDiff(const QList<FileData> &diffFileList, const QString &workingDirectory) override; + void endOperation(bool success) override; - void setSync(bool sync); + void setSync(bool sync) override; private: SideBySideDiffEditorWidget *m_widget; diff --git a/src/plugins/diffeditor/selectabletexteditorwidget.cpp b/src/plugins/diffeditor/selectabletexteditorwidget.cpp index 68158fdf44..5d35b06e56 100644 --- a/src/plugins/diffeditor/selectabletexteditorwidget.cpp +++ b/src/plugins/diffeditor/selectabletexteditorwidget.cpp @@ -40,9 +40,7 @@ SelectableTextEditorWidget::SelectableTextEditorWidget(Core::Id id, QWidget *par setupFallBackEditor(id); } -SelectableTextEditorWidget::~SelectableTextEditorWidget() -{ -} +SelectableTextEditorWidget::~SelectableTextEditorWidget() = default; static QList<DiffSelection> subtractSelection( const DiffSelection &minuendSelection, diff --git a/src/plugins/diffeditor/selectabletexteditorwidget.h b/src/plugins/diffeditor/selectabletexteditorwidget.h index e8df6fed7b..7059177f64 100644 --- a/src/plugins/diffeditor/selectabletexteditorwidget.h +++ b/src/plugins/diffeditor/selectabletexteditorwidget.h @@ -33,7 +33,7 @@ namespace Internal { class DiffSelection { public: - DiffSelection() {} + DiffSelection() = default; DiffSelection(QTextCharFormat *f) : format(f) {} DiffSelection(int s, int e, QTextCharFormat *f) : start(s), end(e), format(f) {} diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index f1e893cd1f..3e9a72050b 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -174,7 +174,7 @@ SideDiffEditorWidget::SideDiffEditorWidget(QWidget *parent) ToolTip::hide(); }); - TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(document()->documentLayout()); + auto documentLayout = qobject_cast<TextDocumentLayout*>(document()->documentLayout()); if (documentLayout) connect(documentLayout, &TextDocumentLayout::foldChanged, this, &SideDiffEditorWidget::foldChanged); @@ -210,7 +210,7 @@ void SideDiffEditorWidget::setFolded(int blockNumber, bool folded) TextDocumentLayout::doFoldOrUnfold(block, !folded); - TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(document()->documentLayout()); + auto documentLayout = qobject_cast<TextDocumentLayout*>(document()->documentLayout()); documentLayout->requestUpdate(); documentLayout->emitDocumentSizeChanged(); } diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.h b/src/plugins/diffeditor/sidebysidediffeditorwidget.h index ee6f5f0eb7..1750a13ba8 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.h +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.h @@ -57,7 +57,7 @@ class SideBySideDiffEditorWidget : public QWidget Q_OBJECT public: explicit SideBySideDiffEditorWidget(QWidget *parent = nullptr); - ~SideBySideDiffEditorWidget(); + ~SideBySideDiffEditorWidget() override; TextEditor::TextEditorWidget *leftEditorWidget() const; TextEditor::TextEditorWidget *rightEditorWidget() const; |