Commit ced28c70 authored by Christian Kamm's avatar Christian Kamm

Use the fully qualified name when registering the SemanticInfos.

Both for CppEditor::Internal::SemanticInfo and QmlJSEditor::Internal::
SemanticInfo.
parent 69e141c3
......@@ -610,7 +610,7 @@ CPPEditor::CPPEditor(QWidget *parent)
, m_firstRenameChange(false)
{
m_initialized = false;
qRegisterMetaType<SemanticInfo>("SemanticInfo");
qRegisterMetaType<CppEditor::Internal::SemanticInfo>("CppEditor::Internal::SemanticInfo");
m_semanticHighlighter = new SemanticHighlighter(this);
m_semanticHighlighter->start();
......@@ -700,8 +700,8 @@ void CPPEditor::createToolBar(CPPEditorEditable *editable)
connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(updateUses()));
connect(this, SIGNAL(textChanged()), this, SLOT(updateUses()));
connect(m_semanticHighlighter, SIGNAL(changed(SemanticInfo)),
this, SLOT(updateSemanticInfo(SemanticInfo)));
connect(m_semanticHighlighter, SIGNAL(changed(CppEditor::Internal::SemanticInfo)),
this, SLOT(updateSemanticInfo(CppEditor::Internal::SemanticInfo)));
QToolBar *toolBar = static_cast<QToolBar*>(editable->toolBar());
QList<QAction*> actions = toolBar->actions();
......
......@@ -141,7 +141,7 @@ public:
void rehighlight(const Source &source);
Q_SIGNALS:
void changed(const SemanticInfo &semanticInfo);
void changed(const CppEditor::Internal::SemanticInfo &semanticInfo);
protected:
virtual void run();
......@@ -242,7 +242,7 @@ private Q_SLOTS:
void onContentsChanged(int position, int charsRemoved, int charsAdded);
void semanticRehighlight();
void updateSemanticInfo(const SemanticInfo &semanticInfo);
void updateSemanticInfo(const CppEditor::Internal::SemanticInfo &semanticInfo);
void performQuickFix(int index);
......
......@@ -564,7 +564,7 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) :
m_methodCombo(0),
m_modelManager(0)
{
qRegisterMetaType<SemanticInfo>("SemanticInfo");
qRegisterMetaType<QmlJSEditor::Internal::SemanticInfo>("QmlJSEditor::Internal::SemanticInfo");
m_semanticHighlighter = new SemanticHighlighter(this);
m_semanticHighlighter->start();
......@@ -596,8 +596,8 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) :
this, SLOT(onDocumentUpdated(QmlJS::Document::Ptr)));
}
connect(m_semanticHighlighter, SIGNAL(changed(SemanticInfo)),
this, SLOT(updateSemanticInfo(SemanticInfo)));
connect(m_semanticHighlighter, SIGNAL(changed(QmlJSEditor::Internal::SemanticInfo)),
this, SLOT(updateSemanticInfo(QmlJSEditor::Internal::SemanticInfo)));
}
QmlJSTextEditor::~QmlJSTextEditor()
......
......@@ -175,7 +175,7 @@ public:
void rehighlight(const Source &source);
Q_SIGNALS:
void changed(const SemanticInfo &semanticInfo);
void changed(const QmlJSEditor::Internal::SemanticInfo &semanticInfo);
protected:
virtual void run();
......@@ -228,7 +228,7 @@ private slots:
void renameIdUnderCursor();
void semanticRehighlight();
void updateSemanticInfo(const SemanticInfo &semanticInfo);
void updateSemanticInfo(const QmlJSEditor::Internal::SemanticInfo &semanticInfo);
protected:
void contextMenuEvent(QContextMenuEvent *e);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment