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

Use the fully qualified name when registering the SemanticInfos.

Browse Source 
Both for CppEditor::Internal::SemanticInfo and QmlJSEditor::Internal::
SemanticInfo.
This commit is contained in:
Christian Kamm
2010-02-16 15:26:58 +01:00
parent 69e141c32f
commit ced28c7090
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -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();

4
src/plugins/cppeditor/cppeditor.h
View File

@@ -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);

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

@@ -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()

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

@@ -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);