Commit 3d360653 authored by Tobias Hunger's avatar Tobias Hunger

Clean headers of the DiffEditor plugin.

Change-Id: I1c49527f010acbece31849127fc4d182678b6f37
Reviewed-by: default avatarJarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>
parent 478a2e86
......@@ -36,9 +36,12 @@
#include <QObject>
QT_FORWARD_DECLARE_CLASS(QMenu)
namespace Core { class IDocument; }
namespace DiffEditor {
namespace Internal { class DiffEditorDocument; }
class DIFFEDITOR_EXPORT DiffEditorController : public QObject
......
......@@ -35,6 +35,8 @@
#include <coreplugin/textdocument.h>
QT_FORWARD_DECLARE_CLASS(QMenu)
namespace DiffEditor {
class DiffEditorController;
......
......@@ -33,8 +33,6 @@
#include "diffeditor_global.h"
#include <QStringList>
#include <coreplugin/editormanager/ieditorfactory.h>
namespace DiffEditor {
......
......@@ -36,6 +36,9 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/documentmodel.h>
#include <coreplugin/id.h>
#include <coreplugin/idocument.h>
#include <coreplugin/editormanager/ieditor.h>
#include <utils/qtcassert.h>
namespace DiffEditor {
......
......@@ -33,12 +33,13 @@
#include "diffeditor_global.h"
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/idocument.h>
#include <QMap>
#include <QObject>
namespace Core { class IDocument; }
namespace Core {
class IDocument;
class IEditor;
}
namespace DiffEditor {
......
......@@ -35,9 +35,6 @@
#include <QString>
#include <QMap>
#include <QTextEdit>
#include "texteditor/texteditorconstants.h"
namespace TextEditor { class FontSettings; }
......
......@@ -36,7 +36,8 @@
#include <QIcon>
#include <QString>
#include <QObject>
#include <QWidget>
QT_FORWARD_DECLARE_CLASS(QWidget)
namespace DiffEditor {
......
......@@ -30,34 +30,29 @@
#include "sidebysidediffeditorwidget.h"
#include "selectabletexteditorwidget.h"
#include "diffeditordocument.h"
#include "diffutils.h"
#include "diffeditorcontroller.h"
#include "diffeditorconstants.h"
#include <coreplugin/editormanager/editormanager.h>
#include <QPlainTextEdit>
#include <QVBoxLayout>
#include <QPlainTextDocumentLayout>
#include <QTextBlock>
#include <QTextCodec>
#include <QScrollBar>
#include <QPainter>
#include <QDir>
#include <QToolButton>
#include <QTextCodec>
#include <QMessageBox>
#include <QMenu>
#include <QVBoxLayout>
#include <texteditor/texteditor.h>
#include <texteditor/textdocumentlayout.h>
#include <texteditor/syntaxhighlighter.h>
#include <texteditor/textdocument.h>
#include <texteditor/texteditorsettings.h>
#include <texteditor/fontsettings.h>
#include <texteditor/displaysettings.h>
#include <texteditor/highlighterutils.h>
#include <coreplugin/icore.h>
#include <coreplugin/minisplitter.h>
#include <coreplugin/patchtool.h>
......
......@@ -31,28 +31,26 @@
#ifndef SIDEBYSIDEDIFFEDITORWIDGET_H
#define SIDEBYSIDEDIFFEDITORWIDGET_H
#include "differ.h"
#include "diffeditordocument.h"
#include "diffutils.h"
#include <QWidget>
#include <QTextCharFormat>
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
{
......
......@@ -29,35 +29,28 @@
****************************************************************************/
#include "unifieddiffeditorwidget.h"
#include "diffeditorcontroller.h"
#include "diffutils.h"
#include "diffeditorconstants.h"
#include "diffeditordocument.h"
#include "diffutils.h"
#include <QPlainTextEdit>
#include <QVBoxLayout>
#include <QMenu>
#include <QPlainTextDocumentLayout>
#include <QTextBlock>
#include <QScrollBar>
#include <QTextCodec>
#include <QPainter>
#include <QDir>
#include <QToolButton>
#include <QTextCodec>
#include <QMessageBox>
#include <texteditor/texteditor.h>
#include <texteditor/textdocument.h>
#include <texteditor/textdocumentlayout.h>
#include <texteditor/syntaxhighlighter.h>
#include <texteditor/textdocument.h>
#include <texteditor/texteditorsettings.h>
#include <texteditor/fontsettings.h>
#include <texteditor/displaysettings.h>
#include <texteditor/highlighterutils.h>
#include <coreplugin/icore.h>
#include <coreplugin/minisplitter.h>
#include <coreplugin/patchtool.h>
#include <coreplugin/editormanager/editormanager.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
......
......@@ -45,6 +45,7 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/idocument.h>
#include <coreplugin/vcsmanager.h>
#include <coreplugin/id.h>
#include <coreplugin/iversioncontrol.h>
......@@ -535,8 +536,6 @@ private:
QRegExp m_progressExp;
};
IEditor *locateEditor(const char *property, const QString &entry)
{
foreach (IDocument *document, DocumentModel::openedDocuments())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment