From 38b19bfae6e28b9035f4239aa92a9c2a0fb927d8 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 29 Sep 2022 17:02:04 +0200
Subject: [PATCH] DiffEditor: Cleanup includes

Change-Id: Id8127b9b0c99ee2a0d5d367cb551a1d5779c5d38
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/diffeditor/diffeditorcontroller.h      |  2 ++
 src/plugins/diffeditor/diffeditordocument.cpp      |  1 -
 src/plugins/diffeditor/diffeditorfactory.cpp       |  1 -
 src/plugins/diffeditor/diffeditorplugin.cpp        |  2 --
 .../diffeditor/diffeditorwidgetcontroller.cpp      |  8 +++-----
 src/plugins/diffeditor/diffutils.cpp               |  8 ++------
 src/plugins/diffeditor/diffutils.h                 |  1 -
 .../diffeditor/sidebysidediffeditorwidget.cpp      | 14 +++++++-------
 .../diffeditor/sidebysidediffeditorwidget.h        |  2 --
 src/plugins/diffeditor/unifieddiffeditorwidget.cpp |  5 ++---
 src/plugins/git/gitclient.cpp                      |  2 --
 src/plugins/subversion/subversionclient.cpp        |  3 ---
 .../vcsbase/vcsbasediffeditorcontroller.cpp        |  2 --
 13 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/src/plugins/diffeditor/diffeditorcontroller.h b/src/plugins/diffeditor/diffeditorcontroller.h
index f5654c6c09c..efa89824403 100644
--- a/src/plugins/diffeditor/diffeditorcontroller.h
+++ b/src/plugins/diffeditor/diffeditorcontroller.h
@@ -6,6 +6,8 @@
 #include "diffeditor_global.h"
 #include "diffutils.h"
 
+#include <utils/filepath.h>
+
 #include <QObject>
 
 QT_FORWARD_DECLARE_CLASS(QMenu)
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp
index 19f1f01bb1b..f69f19573dc 100644
--- a/src/plugins/diffeditor/diffeditordocument.cpp
+++ b/src/plugins/diffeditor/diffeditordocument.cpp
@@ -4,7 +4,6 @@
 #include "diffeditordocument.h"
 #include "diffeditorconstants.h"
 #include "diffeditorcontroller.h"
-#include "diffutils.h"
 
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/diffeditor/diffeditorfactory.cpp b/src/plugins/diffeditor/diffeditorfactory.cpp
index 04b50704d67..e9d5405da64 100644
--- a/src/plugins/diffeditor/diffeditorfactory.cpp
+++ b/src/plugins/diffeditor/diffeditorfactory.cpp
@@ -5,7 +5,6 @@
 #include "diffeditorconstants.h"
 #include "diffeditordocument.h"
 #include "diffeditorfactory.h"
-#include "sidebysidediffeditorwidget.h"
 
 #include "texteditor/texteditoractionhandler.h"
 
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp
index c84b8a9133e..bb9d3259e38 100644
--- a/src/plugins/diffeditor/diffeditorplugin.cpp
+++ b/src/plugins/diffeditor/diffeditorplugin.cpp
@@ -8,10 +8,8 @@
 #include "diffeditorfactory.h"
 
 #include <QAction>
-#include <QFileDialog>
 #include <QFutureWatcher>
 #include <QMenu>
-#include <QTextCodec>
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
diff --git a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
index 854433f807d..fcfd6233f8f 100644
--- a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
+++ b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
@@ -8,21 +8,19 @@
 
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/patchtool.h>
 
-#include <texteditor/fontsettings.h>
-#include <texteditor/textdocument.h>
+#include <cpaster/codepasterservice.h>
 
 #include <extensionsystem/pluginmanager.h>
 
-#include <cpaster/codepasterservice.h>
+#include <texteditor/fontsettings.h>
+#include <texteditor/textdocument.h>
 
 #include <utils/infobar.h>
 #include <utils/progressindicator.h>
 #include <utils/qtcassert.h>
 #include <utils/temporaryfile.h>
 
-#include <QDir>
 #include <QMenu>
 #include <QMessageBox>
 #include <QTextCodec>
diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp
index 6d65f23a470..44006e46fbe 100644
--- a/src/plugins/diffeditor/diffutils.cpp
+++ b/src/plugins/diffeditor/diffutils.cpp
@@ -43,9 +43,7 @@ static bool lastLinesEqual(const QList<TextLineData> &leftLines,
     return leftLineEqual && rightLineEqual;
 }
 
-static void handleLine(const QStringList &newLines,
-                       int line,
-                       QList<TextLineData> *lines,
+static void handleLine(const QStringList &newLines, int line, QList<TextLineData> *lines,
                        int *lineNumber)
 {
     if (line < newLines.size()) {
@@ -60,9 +58,7 @@ static void handleLine(const QStringList &newLines,
     }
 }
 
-static void handleDifference(const QString &text,
-                             QList<TextLineData> *lines,
-                             int *lineNumber)
+static void handleDifference(const QString &text, QList<TextLineData> *lines, int *lineNumber)
 {
     const QStringList newLines = text.split('\n');
     for (int line = 0; line < newLines.size(); ++line) {
diff --git a/src/plugins/diffeditor/diffutils.h b/src/plugins/diffeditor/diffutils.h
index d99d55eb96e..b9bb1809204 100644
--- a/src/plugins/diffeditor/diffutils.h
+++ b/src/plugins/diffeditor/diffutils.h
@@ -6,7 +6,6 @@
 #include "diffeditor_global.h"
 
 #include <utils/algorithm.h>
-#include <utils/filepath.h>
 
 #include <QMap>
 #include <QString>
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index 1922f8867ee..255b2ee8102 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "sidebysidediffeditorwidget.h"
-#include "selectabletexteditorwidget.h"
+
 #include "diffeditorconstants.h"
 #include "diffeditordocument.h"
 #include "diffeditorplugin.h"
@@ -14,17 +14,17 @@
 #include <QTextBlock>
 #include <QVBoxLayout>
 
-#include <texteditor/textdocument.h>
-#include <texteditor/textdocumentlayout.h>
-#include <texteditor/texteditorsettings.h>
-#include <texteditor/fontsettings.h>
-#include <texteditor/displaysettings.h>
-
 #include <coreplugin/icore.h>
 #include <coreplugin/find/highlightscrollbarcontroller.h>
 #include <coreplugin/minisplitter.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
+#include <texteditor/displaysettings.h>
+#include <texteditor/fontsettings.h>
+#include <texteditor/textdocument.h>
+#include <texteditor/textdocumentlayout.h>
+#include <texteditor/texteditorsettings.h>
+
 #include <utils/runextensions.h>
 #include <utils/tooltip/tooltip.h>
 
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.h b/src/plugins/diffeditor/sidebysidediffeditorwidget.h
index 12facfa7c3e..36559f73bcc 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.h
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.h
@@ -7,7 +7,6 @@
 #include "selectabletexteditorwidget.h" // TODO: we need DiffSelections here only
 
 #include <QFutureWatcher>
-#include <QTextCharFormat>
 #include <QWidget>
 
 namespace Core { class IContext; }
@@ -88,7 +87,6 @@ public:
     QHash<int, int> foldingIndent;
 };
 
-
 class SideBySideDiffEditorWidget : public QWidget
 {
     Q_OBJECT
diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
index ff1db604c1a..5e4886dfbbe 100644
--- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
+++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
@@ -8,7 +8,6 @@
 #include "diffeditorplugin.h"
 #include "diffutils.h"
 
-#include <QHash>
 #include <QMenu>
 #include <QPainter>
 #include <QScrollBar>
@@ -17,11 +16,11 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
+#include <texteditor/displaysettings.h>
+#include <texteditor/fontsettings.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/textdocumentlayout.h>
 #include <texteditor/texteditorsettings.h>
-#include <texteditor/fontsettings.h>
-#include <texteditor/displaysettings.h>
 
 #include <utils/qtcassert.h>
 #include <utils/runextensions.h>
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 7e4ceee5124..d018c2b60bc 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -42,8 +42,6 @@
 
 #include <diffeditor/descriptionwidgetwatcher.h>
 #include <diffeditor/diffeditorconstants.h>
-#include <diffeditor/diffeditorcontroller.h>
-#include <diffeditor/diffutils.h>
 
 #include <texteditor/fontsettings.h>
 #include <texteditor/texteditorsettings.h>
diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index 8db5e2543fe..8e614c0430a 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -7,9 +7,6 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 
-#include <diffeditor/diffeditorcontroller.h>
-#include <diffeditor/diffutils.h>
-
 #include <utils/algorithm.h>
 #include <utils/commandline.h>
 #include <utils/environment.h>
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
index f04e902ed07..ebb3d8ca407 100644
--- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
+++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
@@ -8,8 +8,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
-#include <diffeditor/diffutils.h>
-
 #include <utils/commandline.h>
 #include <utils/environment.h>
 #include <utils/qtcassert.h>