diff options
author | hjk <qtc-committer@nokia.com> | 2011-02-21 16:02:26 +0100 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2011-02-22 11:23:53 +0100 |
commit | f576ad9f2c169bfa4d336ba2b3b1918f03df6916 (patch) | |
tree | f9e708ea1972b10d5465c915e7b9d0f7572f671f /src/plugins/qmljseditor/quicktoolbar.h | |
parent | e32cf192f7ba34dda96b61507b440c6a17b51a0c (diff) | |
download | qt-creator-f576ad9f2c169bfa4d336ba2b3b1918f03df6916.tar.gz |
texteditor: merge ITextEditable into ITextEditor
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
Diffstat (limited to 'src/plugins/qmljseditor/quicktoolbar.h')
-rw-r--r-- | src/plugins/qmljseditor/quicktoolbar.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmljseditor/quicktoolbar.h b/src/plugins/qmljseditor/quicktoolbar.h index 4ecffcb05e..8387af365e 100644 --- a/src/plugins/qmljseditor/quicktoolbar.h +++ b/src/plugins/qmljseditor/quicktoolbar.h @@ -37,7 +37,7 @@ #include <qmljs/qmljsicontextpane.h> namespace TextEditor { -class BaseTextEditorEditable; +class BaseTextEditor; } namespace QmlEditorWidgets { @@ -53,8 +53,8 @@ class QuickToolBar : public QmlJS::IContextPane public: QuickToolBar(QObject *parent = 0); ~QuickToolBar(); - void apply(TextEditor::BaseTextEditorEditable *editor, QmlJS::Document::Ptr document, QmlJS::LookupContext::Ptr lookupContext, QmlJS::AST::Node *node, bool update, bool force = false); - bool isAvailable(TextEditor::BaseTextEditorEditable *editor, QmlJS::Document::Ptr document, QmlJS::AST::Node *node); + void apply(TextEditor::BaseTextEditor *editor, QmlJS::Document::Ptr document, QmlJS::LookupContext::Ptr lookupContext, QmlJS::AST::Node *node, bool update, bool force = false); + bool isAvailable(TextEditor::BaseTextEditor *editor, QmlJS::Document::Ptr document, QmlJS::AST::Node *node); void setProperty(const QString &propertyName, const QVariant &value); void removeProperty(const QString &propertyName); void setEnabled(bool); @@ -72,7 +72,7 @@ private: QWeakPointer<QmlEditorWidgets::ContextPaneWidget> m_widget; QmlJS::Document::Ptr m_doc; QmlJS::AST::Node *m_node; - TextEditor::BaseTextEditorEditable *m_editor; + TextEditor::BaseTextEditor *m_editor; bool m_blockWriting; QStringList m_propertyOrder; QStringList m_prototypes; |