From 5927137d13163b13f12a89a04c97b149e4319b65 Mon Sep 17 00:00:00 2001 From: Christian Kamm <christian.d.kamm@nokia.com> Date: Thu, 25 Nov 2010 15:10:25 +0100 Subject: [PATCH] Export QmlJSEditorEditable. Rubber-stamped-by: Friedemann Kleint --- src/plugins/qmljseditor/qmljseditor.h | 4 ++-- src/plugins/qmljseditor/qmljseditoreditable.cpp | 2 -- src/plugins/qmljseditor/qmljseditoreditable.h | 6 ++---- src/plugins/qmljseditor/qmljseditorfactory.cpp | 1 + 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h index 6392036444f..f40ce7e6525 100644 --- a/src/plugins/qmljseditor/qmljseditor.h +++ b/src/plugins/qmljseditor/qmljseditor.h @@ -60,11 +60,11 @@ namespace QmlJS { The top-level namespace of the QmlJSEditor plug-in. */ namespace QmlJSEditor { +class QmlJSEditorEditable; class FindReferences; namespace Internal { class QmlOutlineModel; -class QmlJSEditorEditable; class SemanticHighlighter; struct SemanticHighlighterSource; } // namespace Internal @@ -199,7 +199,7 @@ protected: void resizeEvent(QResizeEvent *event); void scrollContentsBy(int dx, int dy); TextEditor::BaseTextEditorEditable *createEditableInterface(); - void createToolBar(Internal::QmlJSEditorEditable *editable); + void createToolBar(QmlJSEditorEditable *editable); TextEditor::BaseTextEditor::Link findLinkAt(const QTextCursor &cursor, bool resolveTarget = true); private: diff --git a/src/plugins/qmljseditor/qmljseditoreditable.cpp b/src/plugins/qmljseditor/qmljseditoreditable.cpp index c1168a9e034..aabb07c1d47 100644 --- a/src/plugins/qmljseditor/qmljseditoreditable.cpp +++ b/src/plugins/qmljseditor/qmljseditoreditable.cpp @@ -42,7 +42,6 @@ #include <coreplugin/coreconstants.h> namespace QmlJSEditor { -namespace Internal { QmlJSEditorEditable::QmlJSEditorEditable(QmlJSTextEditor *editor) : BaseTextEditorEditable(editor) @@ -90,5 +89,4 @@ QString QmlJSEditorEditable::preferredModeType() const return QString(); } -} // namespace Internal } // namespace QmlJSEditor diff --git a/src/plugins/qmljseditor/qmljseditoreditable.h b/src/plugins/qmljseditor/qmljseditoreditable.h index 86253b5c995..c30433ea96a 100644 --- a/src/plugins/qmljseditor/qmljseditoreditable.h +++ b/src/plugins/qmljseditor/qmljseditoreditable.h @@ -30,14 +30,13 @@ #ifndef QMLJSEDITOREDITABLE_H #define QMLJSEDITOREDITABLE_H +#include "qmljseditor_global.h" #include <texteditor/basetexteditor.h> namespace QmlJSEditor { class QmlJSTextEditor; -namespace Internal { - -class QmlJSEditorEditable : public TextEditor::BaseTextEditorEditable +class QMLJSEDITOR_EXPORT QmlJSEditorEditable : public TextEditor::BaseTextEditorEditable { Q_OBJECT @@ -56,7 +55,6 @@ private: Core::Context m_context; }; -} // namespace Internal } // namespace QmlJSEditor #endif // QMLJSEDITOREDITABLE_H diff --git a/src/plugins/qmljseditor/qmljseditorfactory.cpp b/src/plugins/qmljseditor/qmljseditorfactory.cpp index dbdafac4975..1db1ec66a16 100644 --- a/src/plugins/qmljseditor/qmljseditorfactory.cpp +++ b/src/plugins/qmljseditor/qmljseditorfactory.cpp @@ -78,6 +78,7 @@ namespace { } } +using namespace QmlJSEditor; using namespace QmlJSEditor::Internal; using namespace QmlJSEditor::Constants; -- GitLab