Exported header cleanup.

8 files changed, 19 insertions, 18 deletions

diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h
index 7b14c65204..9a084c9150 100644
--- a/src/plugins/texteditor/basefilefind.h
+++ b/src/plugins/texteditor/basefilefind.h
@@ -47,8 +47,6 @@
 QT_BEGIN_NAMESPACE
 class QLabel;
 class QComboBox;
-class QCheckBox;
-class QStringListModel;
 QT_END_NAMESPACE
 
 namespace Find {
diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp
index 8d850b930d..c551167a40 100644
--- a/src/plugins/texteditor/fontsettings.cpp
+++ b/src/plugins/texteditor/fontsettings.cpp
@@ -42,6 +42,7 @@
 #include <QtCore/QSettings>
 #include <QtCore/QCoreApplication>
 #include <QtGui/QTextCharFormat>
+#include <QtGui/QFont>
 
 static const char *fontFamilyKey = "FontFamily";
 static const char *fontSizeKey = "FontSize";
@@ -242,6 +243,11 @@ void FontSettings::setFontZoom(int zoom)
     m_fontZoom = zoom;
 }
 
+QFont FontSettings::font() const
+{
+    return QFont(family(), fontSize());
+}
+
 /**
  * Returns the configured antialiasing behavior.
  */
diff --git a/src/plugins/texteditor/fontsettings.h b/src/plugins/texteditor/fontsettings.h
index 51ff040116..3695281fb4 100644
--- a/src/plugins/texteditor/fontsettings.h
+++ b/src/plugins/texteditor/fontsettings.h
@@ -40,14 +40,12 @@
 
 #include <QtCore/QString>
 #include <QtCore/QList>
-#include <QtCore/QMap>
 #include <QtCore/QVector>
-#include <QtGui/QFont>
 
 QT_BEGIN_NAMESPACE
 class QTextCharFormat;
 class QSettings;
-
+class QFont;
 QT_END_NAMESPACE
 
 namespace TextEditor {
@@ -85,8 +83,7 @@ public:
     int fontZoom() const;
     void setFontZoom(int zoom);
 
-    QFont font() const
-    { return QFont(family(), fontSize()); }
+    QFont font() const;
 
     bool antialias() const;
     void setAntialias(bool antialias);
diff --git a/src/plugins/texteditor/indenter.h b/src/plugins/texteditor/indenter.h
index d472906c9f..8e29c3d865 100644
--- a/src/plugins/texteditor/indenter.h
+++ b/src/plugins/texteditor/indenter.h
@@ -36,12 +36,13 @@
 
 #include "texteditor_global.h"
 
-#include <QtCore/QChar>
-#include <QtGui/QTextBlock>
+#include <QtCore/QtGlobal>
 
 QT_BEGIN_NAMESPACE
 class QTextDocument;
 class QTextCursor;
+class QTextBlock;
+class QChar;
 QT_END_NAMESPACE
 
 namespace TextEditor {
diff --git a/src/plugins/texteditor/quickfix.h b/src/plugins/texteditor/quickfix.h
index 5bbcb62cdd..6e38ec3154 100644
--- a/src/plugins/texteditor/quickfix.h
+++ b/src/plugins/texteditor/quickfix.h
@@ -37,10 +37,7 @@
 #include "texteditor_global.h"
 #include "icompletioncollector.h"
 
-#include <utils/changeset.h>
-
 #include <QtCore/QSharedPointer>
-#include <QtGui/QTextCursor>
 
 namespace TextEditor {
 
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index 911f90e6e4..66900174c4 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -32,6 +32,7 @@
 **************************************************************************/
 
 #include "refactoringchanges.h"
+#include "basetexteditor.h"
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <extensionsystem/pluginmanager.h>
@@ -39,6 +40,8 @@
 #include <QtCore/QFile>
 #include <QtCore/QSet>
 #include <QtGui/QTextBlock>
+#include <QtGui/QTextCursor>
+#include <QtGui/QTextDocument>
 #include <QtCore/QDebug>
 
 using namespace TextEditor;
diff --git a/src/plugins/texteditor/refactoringchanges.h b/src/plugins/texteditor/refactoringchanges.h
index 4af97d8ed2..87e8a355dc 100644
--- a/src/plugins/texteditor/refactoringchanges.h
+++ b/src/plugins/texteditor/refactoringchanges.h
@@ -35,15 +35,15 @@
 #define REFACTORINGCHANGES_H
 
 #include <utils/changeset.h>
-#include <texteditor/basetexteditor.h>
 #include <texteditor/texteditor_global.h>
 
 #include <QtCore/QList>
-#include <QtCore/QMap>
 #include <QtCore/QString>
 
-namespace TextEditor {
+QT_FORWARD_DECLARE_CLASS(QTextDocument)
 
+namespace TextEditor {
+class BaseTextEditor;
 class RefactoringChanges;
 
 class TEXTEDITOR_EXPORT RefactoringFile
diff --git a/src/plugins/texteditor/syntaxhighlighter.h b/src/plugins/texteditor/syntaxhighlighter.h
index 1c7a3a8e88..25c8b35b14 100644
--- a/src/plugins/texteditor/syntaxhighlighter.h
+++ b/src/plugins/texteditor/syntaxhighlighter.h
@@ -43,9 +43,8 @@
 #define TEXTEDITOR_SYNTAXHIGHLIGHTER_H
 
 #include "texteditor_global.h"
-#include <QtCore/qglobal.h>
-#include <QtCore/qobject.h>
-#include <QtGui/qtextobject.h>
+
+#include <QtCore/QObject>
 #include <QtGui/QTextLayout>
 
 QT_BEGIN_NAMESPACE