From 1ef673cb2e0748bfc2d9fe191fc3e40333bda9ba Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 12 Jan 2023 13:13:09 +0100 Subject: [PATCH] DiffEditorPlugin: Remove unused includes Some includes are not needed anymore after recent refactorings. Inline simple constructors. Change-Id: I1a4b192b8e6014a6af9ce9f87015fa10ee0ea33f Reviewed-by: Orgad Shaneh --- src/plugins/diffeditor/diffeditorplugin.cpp | 75 ++++++++------------- 1 file changed, 28 insertions(+), 47 deletions(-) diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 69d39f030f6..f6de25d441d 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -7,28 +7,22 @@ #include "diffeditordocument.h" #include "diffeditorfactory.h" -#include -#include -#include - #include #include -#include #include #include -#include -#include #include -#include -#include #include #include +#include #include -#include #include +#include +#include + using namespace Core; using namespace TextEditor; using namespace Utils; @@ -158,7 +152,9 @@ class DiffCurrentFileController : public DiffFilesController { Q_OBJECT public: - DiffCurrentFileController(IDocument *document, const QString &fileName); + DiffCurrentFileController(IDocument *document, const QString &fileName) + : DiffFilesController(document) + , m_fileName(fileName) {} protected: QList reloadInputList() const final; @@ -167,15 +163,11 @@ private: const QString m_fileName; }; -DiffCurrentFileController::DiffCurrentFileController(IDocument *document, const QString &fileName) : - DiffFilesController(document), m_fileName(fileName) -{ } - QList DiffCurrentFileController::reloadInputList() const { QList result; - auto textDocument = qobject_cast( + auto textDocument = qobject_cast( DocumentModel::documentForFilePath(FilePath::fromString(m_fileName))); if (textDocument && textDocument->isModified()) { @@ -183,9 +175,8 @@ QList DiffCurrentFileController::reloadInputList() const TextFileFormat format = textDocument->format(); QString leftText; - const TextFileFormat::ReadResult leftResult - = TextFileFormat::readFile(FilePath::fromString(m_fileName), format.codec, - &leftText, &format, &errorString); + const TextFileFormat::ReadResult leftResult = TextFileFormat::readFile( + FilePath::fromString(m_fileName), format.codec, &leftText, &format, &errorString); const QString rightText = textDocument->plainText(); @@ -211,16 +202,12 @@ class DiffOpenFilesController : public DiffFilesController { Q_OBJECT public: - DiffOpenFilesController(IDocument *document); + DiffOpenFilesController(IDocument *document) : DiffFilesController(document) {} protected: QList reloadInputList() const final; }; -DiffOpenFilesController::DiffOpenFilesController(IDocument *document) : - DiffFilesController(document) -{ } - QList DiffOpenFilesController::reloadInputList() const { QList result; @@ -229,7 +216,7 @@ QList DiffOpenFilesController::reloadInputList() const for (IDocument *doc : openedDocuments) { QTC_ASSERT(doc, continue); - auto textDocument = qobject_cast(doc); + auto textDocument = qobject_cast(doc); if (textDocument && textDocument->isModified()) { QString errorString; @@ -265,7 +252,9 @@ class DiffModifiedFilesController : public DiffFilesController { Q_OBJECT public: - DiffModifiedFilesController(IDocument *document, const QStringList &fileNames); + DiffModifiedFilesController(IDocument *document, const QStringList &fileNames) + : DiffFilesController(document) + , m_fileNames(fileNames) {} protected: QList reloadInputList() const final; @@ -274,16 +263,12 @@ private: const QStringList m_fileNames; }; -DiffModifiedFilesController::DiffModifiedFilesController(IDocument *document, const QStringList &fileNames) : - DiffFilesController(document), m_fileNames(fileNames) -{ } - QList DiffModifiedFilesController::reloadInputList() const { QList result; for (const QString &fileName : m_fileNames) { - auto textDocument = qobject_cast( + auto textDocument = qobject_cast( DocumentModel::documentForFilePath(FilePath::fromString(fileName))); if (textDocument && textDocument->isModified()) { @@ -321,7 +306,10 @@ class DiffExternalFilesController : public DiffFilesController Q_OBJECT public: DiffExternalFilesController(IDocument *document, const QString &leftFileName, - const QString &rightFileName); + const QString &rightFileName) + : DiffFilesController(document) + , m_leftFileName(leftFileName) + , m_rightFileName(rightFileName) {} protected: QList reloadInputList() const final; @@ -331,11 +319,6 @@ private: const QString m_rightFileName; }; -DiffExternalFilesController::DiffExternalFilesController(IDocument *document, const QString &leftFileName, - const QString &rightFileName) : - DiffFilesController(document), m_leftFileName(leftFileName), m_rightFileName(rightFileName) -{ } - QList DiffExternalFilesController::reloadInputList() const { QString errorString; @@ -374,10 +357,9 @@ QList DiffExternalFilesController::reloadInputList() const ///////////////// -static TextEditor::TextDocument *currentTextDocument() +static TextDocument *currentTextDocument() { - return qobject_cast( - EditorManager::currentDocument()); + return qobject_cast(EditorManager::currentDocument()); } DiffEditorServiceImpl::DiffEditorServiceImpl() = default; @@ -439,8 +421,7 @@ DiffEditorPluginPrivate::DiffEditorPluginPrivate() { m_futureSynchronizer.setCancelOnWait(true); //register actions - ActionContainer *toolsContainer - = ActionManager::actionContainer(Core::Constants::M_TOOLS); + ActionContainer *toolsContainer = ActionManager::actionContainer(Core::Constants::M_TOOLS); toolsContainer->insertGroup(Core::Constants::G_TOOLS_DEBUG, Constants::G_TOOLS_DIFF); ActionContainer *diffContainer = ActionManager::createMenu("Diff"); diffContainer->menu()->setTitle(tr("&Diff")); @@ -466,13 +447,13 @@ DiffEditorPluginPrivate::DiffEditorPluginPrivate() connect(EditorManager::instance(), &EditorManager::currentEditorChanged, this, &DiffEditorPluginPrivate::updateDiffCurrentFileAction); connect(EditorManager::instance(), &EditorManager::currentDocumentStateChanged, - this, &DiffEditorPluginPrivate::updateDiffCurrentFileAction); + this, &DiffEditorPluginPrivate::updateDiffCurrentFileAction); connect(EditorManager::instance(), &EditorManager::editorOpened, - this, &DiffEditorPluginPrivate::updateDiffOpenFilesAction); + this, &DiffEditorPluginPrivate::updateDiffOpenFilesAction); connect(EditorManager::instance(), &EditorManager::editorsClosed, - this, &DiffEditorPluginPrivate::updateDiffOpenFilesAction); + this, &DiffEditorPluginPrivate::updateDiffOpenFilesAction); connect(EditorManager::instance(), &EditorManager::documentStateChanged, - this, &DiffEditorPluginPrivate::updateDiffOpenFilesAction); + this, &DiffEditorPluginPrivate::updateDiffOpenFilesAction); updateDiffCurrentFileAction(); updateDiffOpenFilesAction(); @@ -489,7 +470,7 @@ void DiffEditorPluginPrivate::updateDiffOpenFilesAction() { const bool enabled = anyOf(DocumentModel::openedDocuments(), [](IDocument *doc) { QTC_ASSERT(doc, return false); - return doc->isModified() && qobject_cast(doc); + return doc->isModified() && qobject_cast(doc); }); m_diffOpenFilesAction->setEnabled(enabled); }