From c31055b54c9f9eef4dbedae81411226e8dfbf19d Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 12 Feb 2010 14:24:46 +0100
Subject: [PATCH] texteditor: add missing parts to previous commit
---
src/plugins/texteditor/texteditorplugin.cpp | 3 +++
src/plugins/texteditor/texteditorplugin.h | 15 ++++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index ffcb7d4be35..76e1d5c27e9 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -140,6 +140,9 @@ 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 14d9cc208fa..f7ddc34e88a 100644
--- a/src/plugins/texteditor/texteditorplugin.h
+++ b/src/plugins/texteditor/texteditorplugin.h
@@ -30,6 +30,7 @@
#ifndef TEXTEDITORPLUGIN_H
#define TEXTEDITORPLUGIN_H
+#include "texteditor_global.h"
#include <extensionsystem/iplugin.h>
namespace Find {
@@ -48,7 +49,9 @@ namespace Internal {
class LineNumberFilter;
class PlainTextEditorFactory;
-class TextEditorPlugin : public ExtensionSystem::IPlugin
+} // namespace Internal
+
+class TEXTEDITOR_EXPORT TextEditorPlugin : public ExtensionSystem::IPlugin
{
Q_OBJECT
@@ -64,7 +67,10 @@ public:
void initializeEditor(PlainTextEditor *editor);
- LineNumberFilter *lineNumberFilter() { return m_lineNumberFilter; }
+ Internal::LineNumberFilter *lineNumberFilter() { return m_lineNumberFilter; }
+
+signals:
+ void fontSettingsChanged(const TextEditor::FontSettings &);
private slots:
void invokeCompletion();
@@ -75,12 +81,11 @@ private:
static TextEditorPlugin *m_instance;
TextEditorSettings *m_settings;
TextFileWizard *m_wizard;
- PlainTextEditorFactory *m_editorFactory;
- LineNumberFilter *m_lineNumberFilter;
+ Internal::PlainTextEditorFactory *m_editorFactory;
+ Internal::LineNumberFilter *m_lineNumberFilter;
Find::SearchResultWindow *m_searchResultWindow;
};
-} // namespace Internal
} // namespace TextEditor
#endif // TEXTEDITORPLUGIN_H
--
GitLab