Make QmlJSEditor and QmlJSEditorWidget internal

Change-Id: I5afe67db927d735727beafe972965855bde39faa
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

7 files changed, 20 insertions, 9 deletions

diff --git a/src/plugins/debugger/qml/qmllivetextpreview.cpp b/src/plugins/debugger/qml/qmllivetextpreview.cpp
index 82956531ce..c98bebe848 100644
--- a/src/plugins/debugger/qml/qmllivetextpreview.cpp
+++ b/src/plugins/debugger/qml/qmllivetextpreview.cpp
@@ -387,7 +387,7 @@ void QmlLiveTextPreview::associateEditor(Core::IEditor *editor)
     using namespace TextEditor;
     if (editor->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID) {
         QTC_ASSERT(QLatin1String(editor->widget()->metaObject()->className()) ==
-                   QLatin1String("QmlJSEditor::QmlJSTextEditorWidget"),
+                   QLatin1String("QmlJSEditor::Internal::QmlJSTextEditorWidget"),
                    return);
 
         BaseTextEditorWidget *editWidget
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 7b830fe2e5..6967362ad9 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -96,7 +96,7 @@ using namespace QmlJS::AST;
 using namespace QmlJSTools;
 
 namespace QmlJSEditor {
-using namespace Internal;
+namespace Internal {
 
 QmlJSTextEditorWidget::QmlJSTextEditorWidget(QWidget *parent) :
     TextEditor::BaseTextEditorWidget(new QmlJSEditorDocument, parent)
@@ -293,13 +293,14 @@ void QmlJSTextEditorWidget::updateOutlineIndexNow()
         m_outlineCombo->blockSignals(blocked);
     }
 }
-
+} // namespace Internal
 } // namespace QmlJSEditor
 
 class QtQuickToolbarMarker {};
 Q_DECLARE_METATYPE(QtQuickToolbarMarker)
 
 namespace QmlJSEditor {
+namespace Internal {
 
 template <class T>
 static QList<TextEditor::RefactorMarker> removeMarkersOfType(const QList<TextEditor::RefactorMarker> &markers)
@@ -900,4 +901,5 @@ QString QmlJSTextEditorWidget::foldReplacementText(const QTextBlock &block) cons
     return TextEditor::BaseTextEditorWidget::foldReplacementText(block);
 }
 
+} // namespace Internal
 } // namespace QmlJSEditor
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index eac388b066..96bc6cecc5 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -65,15 +65,15 @@ namespace AST {
     The top-level namespace of the QmlJSEditor plug-in.
  */
 namespace QmlJSEditor {
-class QmlJSEditor;
 class QmlJSEditorDocument;
 class FindReferences;
 
 namespace Internal {
+
+class QmlJSEditor;
 class QmlOutlineModel;
-} // namespace Internal
 
-class QMLJSEDITOR_EXPORT QmlJSTextEditorWidget : public TextEditor::BaseTextEditorWidget
+class QmlJSTextEditorWidget : public TextEditor::BaseTextEditorWidget
 {
     Q_OBJECT
 
@@ -156,6 +156,7 @@ private:
     FindReferences *m_findReferences;
 };
 
+} // namespace Internal
 } // namespace QmlJSEditor
 
 #endif // QMLJSEDITOR_H
diff --git a/src/plugins/qmljseditor/qmljseditoreditable.cpp b/src/plugins/qmljseditor/qmljseditoreditable.cpp
index 37d24311e6..aba39538c7 100644
--- a/src/plugins/qmljseditor/qmljseditoreditable.cpp
+++ b/src/plugins/qmljseditor/qmljseditoreditable.cpp
@@ -45,6 +45,7 @@
 #include <extensionsystem/pluginmanager.h>
 
 namespace QmlJSEditor {
+namespace Internal {
 
 QmlJSEditor::QmlJSEditor(QmlJSTextEditorWidget *editor)
     : BaseTextEditor(editor)
@@ -73,4 +74,5 @@ TextEditor::CompletionAssistProvider *QmlJSEditor::completionAssistProvider()
     return ExtensionSystem::PluginManager::getObject<Internal::QmlJSCompletionAssistProvider>();
 }
 
+} // namespace Internal
 } // namespace QmlJSEditor
diff --git a/src/plugins/qmljseditor/qmljseditoreditable.h b/src/plugins/qmljseditor/qmljseditoreditable.h
index 13cc7ff00a..bafdfd01e7 100644
--- a/src/plugins/qmljseditor/qmljseditoreditable.h
+++ b/src/plugins/qmljseditor/qmljseditoreditable.h
@@ -35,9 +35,11 @@
 #include <texteditor/basetexteditor.h>
 
 namespace QmlJSEditor {
+namespace Internal {
+
 class QmlJSTextEditorWidget;
 
-class QMLJSEDITOR_EXPORT QmlJSEditor : public TextEditor::BaseTextEditor
+class QmlJSEditor : public TextEditor::BaseTextEditor
 {
     Q_OBJECT
 
@@ -57,6 +59,7 @@ private:
     Utils::CommentDefinition m_commentDefinition;
 };
 
+} // namespace Internal
 } // namespace QmlJSEditor
 
 #endif // QMLJSEDITOREDITABLE_H
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.h b/src/plugins/qmljseditor/qmljshoverhandler.h
index 25b1450b9f..e2cbf63533 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.h
+++ b/src/plugins/qmljseditor/qmljshoverhandler.h
@@ -56,10 +56,11 @@ class ObjectValue;
 }
 
 namespace QmlJSEditor {
-class QmlJSTextEditorWidget;
 
 namespace Internal {
 
+class QmlJSTextEditorWidget;
+
 class HoverHandler : public TextEditor::BaseHoverHandler
 {
     Q_OBJECT
diff --git a/src/plugins/qmljseditor/qmltaskmanager.h b/src/plugins/qmljseditor/qmltaskmanager.h
index f55d13b7b6..951e54dd4d 100644
--- a/src/plugins/qmljseditor/qmltaskmanager.h
+++ b/src/plugins/qmljseditor/qmltaskmanager.h
@@ -42,8 +42,10 @@
 #include <QTimer>
 
 namespace QmlJSEditor {
+namespace Internal {
 class QmlJSTextEditorWidget;
-}
+} // Internal
+} // QmlJSEditor
 
 namespace ProjectExplorer {
 class TaskHub;