From 3d360653cf2d47b48cb467bcfb624f9a0d6fabc0 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 10 Mar 2015 14:19:38 +0100 Subject: [PATCH] Clean headers of the DiffEditor plugin. Change-Id: I1c49527f010acbece31849127fc4d182678b6f37 Reviewed-by: Jarek Kobus Reviewed-by: Friedemann Kleint --- src/plugins/diffeditor/diffeditorcontroller.h | 3 +++ src/plugins/diffeditor/diffeditordocument.h | 2 ++ src/plugins/diffeditor/diffeditorfactory.h | 2 -- src/plugins/diffeditor/diffeditormanager.cpp | 3 +++ src/plugins/diffeditor/diffeditormanager.h | 9 +++++---- src/plugins/diffeditor/diffutils.h | 3 --- src/plugins/diffeditor/diffview.h | 3 ++- .../diffeditor/sidebysidediffeditorwidget.cpp | 11 +++-------- src/plugins/diffeditor/sidebysidediffeditorwidget.h | 12 +++++------- src/plugins/diffeditor/unifieddiffeditorwidget.cpp | 13 +++---------- src/plugins/diffeditor/unifieddiffeditorwidget.h | 6 +++--- src/plugins/git/gitclient.cpp | 3 +-- 12 files changed, 30 insertions(+), 40 deletions(-) diff --git a/src/plugins/diffeditor/diffeditorcontroller.h b/src/plugins/diffeditor/diffeditorcontroller.h index e54016eefb..b21946fff2 100644 --- a/src/plugins/diffeditor/diffeditorcontroller.h +++ b/src/plugins/diffeditor/diffeditorcontroller.h @@ -36,9 +36,12 @@ #include +QT_FORWARD_DECLARE_CLASS(QMenu) + namespace Core { class IDocument; } namespace DiffEditor { + namespace Internal { class DiffEditorDocument; } class DIFFEDITOR_EXPORT DiffEditorController : public QObject diff --git a/src/plugins/diffeditor/diffeditordocument.h b/src/plugins/diffeditor/diffeditordocument.h index 3efa024ddc..911f4f49ac 100644 --- a/src/plugins/diffeditor/diffeditordocument.h +++ b/src/plugins/diffeditor/diffeditordocument.h @@ -35,6 +35,8 @@ #include +QT_FORWARD_DECLARE_CLASS(QMenu) + namespace DiffEditor { class DiffEditorController; diff --git a/src/plugins/diffeditor/diffeditorfactory.h b/src/plugins/diffeditor/diffeditorfactory.h index 45455e95ee..3af9ea001c 100644 --- a/src/plugins/diffeditor/diffeditorfactory.h +++ b/src/plugins/diffeditor/diffeditorfactory.h @@ -33,8 +33,6 @@ #include "diffeditor_global.h" -#include - #include namespace DiffEditor { diff --git a/src/plugins/diffeditor/diffeditormanager.cpp b/src/plugins/diffeditor/diffeditormanager.cpp index 41f6dc4ab0..d594441819 100644 --- a/src/plugins/diffeditor/diffeditormanager.cpp +++ b/src/plugins/diffeditor/diffeditormanager.cpp @@ -36,6 +36,9 @@ #include #include #include +#include +#include + #include namespace DiffEditor { diff --git a/src/plugins/diffeditor/diffeditormanager.h b/src/plugins/diffeditor/diffeditormanager.h index 30f7be0368..80f50b4ec7 100644 --- a/src/plugins/diffeditor/diffeditormanager.h +++ b/src/plugins/diffeditor/diffeditormanager.h @@ -33,12 +33,13 @@ #include "diffeditor_global.h" -#include -#include - #include +#include -namespace Core { class IDocument; } +namespace Core { +class IDocument; +class IEditor; +} namespace DiffEditor { diff --git a/src/plugins/diffeditor/diffutils.h b/src/plugins/diffeditor/diffutils.h index f5f969c6d2..02b2d8d1c3 100644 --- a/src/plugins/diffeditor/diffutils.h +++ b/src/plugins/diffeditor/diffutils.h @@ -35,9 +35,6 @@ #include #include -#include - -#include "texteditor/texteditorconstants.h" namespace TextEditor { class FontSettings; } diff --git a/src/plugins/diffeditor/diffview.h b/src/plugins/diffeditor/diffview.h index 1a972f3e40..4f5f58a3a2 100644 --- a/src/plugins/diffeditor/diffview.h +++ b/src/plugins/diffeditor/diffview.h @@ -36,7 +36,8 @@ #include #include #include -#include + +QT_FORWARD_DECLARE_CLASS(QWidget) namespace DiffEditor { diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index e40de03d93..76a989c42c 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -30,34 +30,29 @@ #include "sidebysidediffeditorwidget.h" #include "selectabletexteditorwidget.h" +#include "diffeditordocument.h" #include "diffutils.h" -#include "diffeditorcontroller.h" #include "diffeditorconstants.h" #include -#include -#include -#include #include +#include #include #include #include -#include -#include #include #include +#include #include #include -#include #include #include #include #include #include -#include #include #include diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.h b/src/plugins/diffeditor/sidebysidediffeditorwidget.h index abfd25b9b2..54386f8970 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.h +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.h @@ -31,28 +31,26 @@ #ifndef SIDEBYSIDEDIFFEDITORWIDGET_H #define SIDEBYSIDEDIFFEDITORWIDGET_H -#include "differ.h" -#include "diffeditordocument.h" +#include "diffutils.h" + #include #include namespace TextEditor { class FontSettings; } QT_BEGIN_NAMESPACE -class QSplitter; class QMenu; +class QSplitter; QT_END_NAMESPACE - namespace DiffEditor { -class ChunkData; -class FileData; +class DiffEditorController; namespace Internal { +class DiffEditorDocument; class SideDiffEditorWidget; -class DiffEditorGuiController; class SideBySideDiffEditorWidget : public QWidget { diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index 458fb16286..22ef037c3d 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp @@ -29,35 +29,28 @@ ****************************************************************************/ #include "unifieddiffeditorwidget.h" - +#include "diffeditorcontroller.h" +#include "diffutils.h" #include "diffeditorconstants.h" #include "diffeditordocument.h" -#include "diffutils.h" #include -#include #include #include #include -#include +#include #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include -#include -#include #include #include diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.h b/src/plugins/diffeditor/unifieddiffeditorwidget.h index 1366314930..19582e7249 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.h +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.h @@ -31,8 +31,7 @@ #ifndef UNIFIEDDIFFEDITORWIDGET_H #define UNIFIEDDIFFEDITORWIDGET_H -#include "differ.h" -#include "diffeditorcontroller.h" +#include "diffutils.h" #include "selectabletexteditorwidget.h" namespace TextEditor { @@ -48,11 +47,12 @@ QT_END_NAMESPACE namespace DiffEditor { class ChunkData; -class DiffEditorController; class FileData; namespace Internal { +class DiffEditorDocument; + class UnifiedDiffEditorWidget : public SelectableTextEditorWidget { Q_OBJECT diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 39e4c83baf..58a9ead1b0 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -45,6 +45,7 @@ #include #include +#include #include #include #include @@ -535,8 +536,6 @@ private: QRegExp m_progressExp; }; - - IEditor *locateEditor(const char *property, const QString &entry) { foreach (IDocument *document, DocumentModel::openedDocuments()) -- GitLab