diff options
author | Eike Ziller <eike.ziller@digia.com> | 2014-02-07 14:21:58 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2014-02-10 12:43:46 +0100 |
commit | deb1a742e1954f842ee6efeae88b9005be2c53a9 (patch) | |
tree | b90d0d481411b39ac0d813713b2105c529f96bca /src/plugins/qmljseditor | |
parent | 6944dc7af86c898a41871977b4dbca26012b757a (diff) | |
download | qt-creator-deb1a742e1954f842ee6efeae88b9005be2c53a9.tar.gz |
Make QmlJSEditor and QmlJSEditorWidget internal
Change-Id: I5afe67db927d735727beafe972965855bde39faa
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/plugins/qmljseditor')
-rw-r--r-- | src/plugins/qmljseditor/qmljseditor.cpp | 6 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljseditor.h | 7 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljseditoreditable.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljseditoreditable.h | 5 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljshoverhandler.h | 3 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmltaskmanager.h | 4 |
6 files changed, 19 insertions, 8 deletions
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; |