forked from qt-creator/qt-creator
Make QmlJSEditor and QmlJSEditorWidget internal
Change-Id: I5afe67db927d735727beafe972965855bde39faa Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 QmlOutlineModel;
|
||||
} // namespace Internal
|
||||
|
||||
class QMLJSEDITOR_EXPORT QmlJSTextEditorWidget : public TextEditor::BaseTextEditorWidget
|
||||
class QmlJSEditor;
|
||||
class QmlOutlineModel;
|
||||
|
||||
class QmlJSTextEditorWidget : public TextEditor::BaseTextEditorWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@@ -156,6 +156,7 @@ private:
|
||||
FindReferences *m_findReferences;
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace QmlJSEditor
|
||||
|
||||
#endif // QMLJSEDITOR_H
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -56,10 +56,11 @@ class ObjectValue;
|
||||
}
|
||||
|
||||
namespace QmlJSEditor {
|
||||
class QmlJSTextEditorWidget;
|
||||
|
||||
namespace Internal {
|
||||
|
||||
class QmlJSTextEditorWidget;
|
||||
|
||||
class HoverHandler : public TextEditor::BaseHoverHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@@ -42,8 +42,10 @@
|
||||
#include <QTimer>
|
||||
|
||||
namespace QmlJSEditor {
|
||||
namespace Internal {
|
||||
class QmlJSTextEditorWidget;
|
||||
}
|
||||
} // Internal
|
||||
} // QmlJSEditor
|
||||
|
||||
namespace ProjectExplorer {
|
||||
class TaskHub;
|
||||
|
||||
Reference in New Issue
Block a user