From 712c7e212e357b7ff9e0e842941480a774e3d162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Mon, 19 Apr 2010 16:42:02 +0200
Subject: [PATCH] Make TextEditorPlugin internal again

The TextEditorSettings class already provides the appropriate signal.
---
 src/plugins/debugger/debuggerplugin.cpp     |  4 ++--
 src/plugins/texteditor/texteditorplugin.cpp |  3 ---
 src/plugins/texteditor/texteditorplugin.h   | 15 +++++----------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 7f93ba2f3e3..64a433e9df9 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -76,7 +76,7 @@
 #include <texteditor/basetextmark.h>
 #include <texteditor/itexteditor.h>
 #include <texteditor/texteditorconstants.h>
-#include <texteditor/texteditorplugin.h>
+#include <texteditor/texteditorsettings.h>
 
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>
@@ -958,7 +958,7 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
     //
 
     // TextEditor
-    connect(TextEditorPlugin::instance(),
+    connect(TextEditorSettings::instance(),
         SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),
         manager, SLOT(fontSettingsChanged(TextEditor::FontSettings)));
 
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 69bfd073e9f..410325dbab9 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -140,9 +140,6 @@ bool TextEditorPlugin::initialize(const QStringList &arguments, QString *errorMe
     quickFixCommand->setDefaultKeySequence(QKeySequence(tr("Alt+Return")));
     connect(quickFixShortcut, SIGNAL(activated()), this, SLOT(invokeQuickFix()));
 
-    connect(m_settings, SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),
-        this, SIGNAL(fontSettingsChanged(TextEditor::FontSettings)));
-
     return true;
 }
 
diff --git a/src/plugins/texteditor/texteditorplugin.h b/src/plugins/texteditor/texteditorplugin.h
index 7c782548123..1fc4c10be77 100644
--- a/src/plugins/texteditor/texteditorplugin.h
+++ b/src/plugins/texteditor/texteditorplugin.h
@@ -30,7 +30,6 @@
 #ifndef TEXTEDITORPLUGIN_H
 #define TEXTEDITORPLUGIN_H
 
-#include "texteditor_global.h"
 #include <extensionsystem/iplugin.h>
 
 namespace Find {
@@ -49,9 +48,7 @@ namespace Internal {
 class LineNumberFilter;
 class PlainTextEditorFactory;
 
-} // namespace Internal
-
-class TEXTEDITOR_EXPORT TextEditorPlugin : public ExtensionSystem::IPlugin
+class TextEditorPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
 
@@ -67,10 +64,7 @@ public:
 
     void initializeEditor(PlainTextEditor *editor);
 
-    Internal::LineNumberFilter *lineNumberFilter() { return m_lineNumberFilter; }
-
-signals:
-    void fontSettingsChanged(const TextEditor::FontSettings &);
+    LineNumberFilter *lineNumberFilter() { return m_lineNumberFilter; }
 
 private slots:
     void invokeCompletion();
@@ -81,11 +75,12 @@ private:
     static TextEditorPlugin *m_instance;
     TextEditorSettings *m_settings;
     TextFileWizard *m_wizard;
-    Internal::PlainTextEditorFactory *m_editorFactory;
-    Internal::LineNumberFilter *m_lineNumberFilter;
+    PlainTextEditorFactory *m_editorFactory;
+    LineNumberFilter *m_lineNumberFilter;
     Find::SearchResultWindow *m_searchResultWindow;
 };
 
+} // namespace Internal
 } // namespace TextEditor
 
 #endif // TEXTEDITORPLUGIN_H