feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJSInspector: Remove dependency to QmlJSEditor

Browse Source 
Change-Id: I6f90bff623437b25887bdd288987c013a45029be
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2012-04-13 11:57:34 +02:00
parent 04ef376637
commit aca66125de
11 changed files with 80 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -457,12 +457,9 @@ QmlJSTextEditorWidget::QmlJSTextEditorWidget(QWidget *parent) :
m_modelManager(0),
m_futureSemanticInfoRevision(0),
m_contextPane(0),
m_updateSelectedElements(false),
m_findReferences(new FindReferences(this)),
m_semanticHighlighter(new SemanticHighlighter(this))
{
qRegisterMetaType<QmlJSTools::SemanticInfo>("QmlJSTools::SemanticInfo");
m_semanticInfoUpdater = new SemanticInfoUpdater(this);
m_semanticInfoUpdater->start();
@@ -850,15 +847,6 @@ void QmlJSTextEditorWidget::updateUses()
m_updateUsesTimer->start();
}
bool QmlJSTextEditorWidget::updateSelectedElements() const
{
return m_updateSelectedElements;
}
void QmlJSTextEditorWidget::setUpdateSelectedElements(bool value)
{
m_updateSelectedElements = value;
}
void QmlJSTextEditorWidget::updateUsesNow()
{
@@ -977,7 +965,7 @@ protected:
void QmlJSTextEditorWidget::setSelectedElements()
{
if (!m_updateSelectedElements)
if (!receivers(SIGNAL(selectedElementsChanged(QList<int>,QString))))
return;
QTextCursor tc = textCursor();

7
src/plugins/qmljseditor/qmljseditor.h
View File

@@ -92,6 +92,9 @@ class QMLJSEDITOR_EXPORT QmlJSTextEditorWidget : public TextEditor::BaseTextEdit
{
Q_OBJECT
// used e.g. in qmljsprofiler
Q_PROPERTY(QmlJSTools::SemanticInfo semanticInfo READ semanticInfo)
public:
QmlJSTextEditorWidget(QWidget *parent = 0);
~QmlJSTextEditorWidget();
@@ -105,9 +108,6 @@ public:
Internal::QmlOutlineModel *outlineModel() const;
QModelIndex outlineModelIndex();
bool updateSelectedElements() const;
void setUpdateSelectedElements(bool value);
static QVector<QString> highlighterFormatCategories();
TextEditor::IAssistInterface *createAssistInterface(TextEditor::AssistKind assistKind,
@@ -193,7 +193,6 @@ private:
QmlJS::IContextPane *m_contextPane;
int m_oldCursorPosition;
bool m_updateSelectedElements;
FindReferences *m_findReferences;
Internal::SemanticHighlighter *m_semanticHighlighter;