DiffEditor: Cleanup includes

Change-Id: Id8127b9b0c99ee2a0d5d367cb551a1d5779c5d38
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

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)

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>

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"
 

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>

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 <cpaster/codepasterservice.h>
-#include <texteditor/textdocument.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>

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,
+static void handleLine(const QStringList &newLines, int line, QList<TextLineData> *lines,
-                       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,
+static void handleDifference(const QString &text, QList<TextLineData> *lines, int *lineNumber)
-                             QList<TextLineData> *lines,
-                             int *lineNumber)
 {
     const QStringList newLines = text.split('\n');
     for (int line = 0; line < newLines.size(); ++line) {

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>

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>
 

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

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>

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>

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>

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>