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

Fix build on Windows

Browse Source 
For some reason it doesn't like signals with QFutures. Going back to
pointers, but copying the future from there when it's used.

Change-Id: I8dea0817b4e59ede6874ab8be01f22a92e7402a0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Eike Ziller
2014-02-06 10:22:38 +01:00
parent 0f9827e4a5
commit db897f8146
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -549,8 +549,8 @@ void CPPEditorWidget::ctor()
this, SLOT(onDocumentUpdated())); this, SLOT(onDocumentUpdated()));
connect(editorSupport, SIGNAL(semanticInfoUpdated(CppTools::SemanticInfo)), connect(editorSupport, SIGNAL(semanticInfoUpdated(CppTools::SemanticInfo)),
this, SLOT(updateSemanticInfo(CppTools::SemanticInfo))); this, SLOT(updateSemanticInfo(CppTools::SemanticInfo)));
connect(editorSupport, SIGNAL(highlighterStarted(QFuture<TextEditor::HighlightingResult>,uint)), connect(editorSupport, SIGNAL(highlighterStarted(QFuture<TextEditor::HighlightingResult>*,uint)),
this, SLOT(highlighterStarted(QFuture<TextEditor::HighlightingResult>,uint))); this, SLOT(highlighterStarted(QFuture<TextEditor::HighlightingResult>*,uint)));
} }
m_highlightRevision = 0; m_highlightRevision = 0;
@@ -1608,7 +1608,7 @@ void CPPEditorWidget::semanticRehighlight(bool force)
m_modelManager->cppEditorSupport(editor())->recalculateSemanticInfoDetached(force); m_modelManager->cppEditorSupport(editor())->recalculateSemanticInfoDetached(force);
} }
void CPPEditorWidget::highlighterStarted(QFuture<TextEditor::HighlightingResult> highlighter, void CPPEditorWidget::highlighterStarted(QFuture<TextEditor::HighlightingResult> *highlighter,
unsigned revision) unsigned revision)
{ {
m_highlightRevision = revision; m_highlightRevision = revision;
@@ -1619,7 +1619,7 @@ void CPPEditorWidget::highlighterStarted(QFuture<TextEditor::HighlightingResult>
connect(m_highlightWatcher.data(), SIGNAL(finished()), connect(m_highlightWatcher.data(), SIGNAL(finished()),
SLOT(finishHighlightSymbolUsages())); SLOT(finishHighlightSymbolUsages()));
m_highlightWatcher->setFuture(highlighter); m_highlightWatcher->setFuture(QFuture<TextEditor::HighlightingResult>(*highlighter));
} }
void CPPEditorWidget::updateSemanticInfo(const SemanticInfo &semanticInfo) void CPPEditorWidget::updateSemanticInfo(const SemanticInfo &semanticInfo)

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

@@ -156,7 +156,7 @@ public slots:
void showPreProcessorWidget(); void showPreProcessorWidget();
void renameUsagesNow(const QString &replacement = QString()); void renameUsagesNow(const QString &replacement = QString());
void semanticRehighlight(bool force = false); void semanticRehighlight(bool force = false);
void highlighterStarted(QFuture<TextEditor::HighlightingResult> highlighter, void highlighterStarted(QFuture<TextEditor::HighlightingResult> *highlighter,
unsigned revision); unsigned revision);
protected: protected:

4
src/plugins/cpptools/cpptoolseditorsupport.cpp
View File

@@ -390,7 +390,7 @@ void CppEditorSupport::startHighlighting()
m_highlighter = m_highlightingSupport->highlightingFuture(doc, snapshot); m_highlighter = m_highlightingSupport->highlightingFuture(doc, snapshot);
m_lastHighlightRevision = revision; m_lastHighlightRevision = revision;
emit highlighterStarted(m_highlighter, m_lastHighlightRevision); emit highlighterStarted(&m_highlighter, m_lastHighlightRevision);
} else { } else {
const unsigned revision = currentSource(false).revision; const unsigned revision = currentSource(false).revision;
if (m_lastHighlightRevision == revision) if (m_lastHighlightRevision == revision)
@@ -400,7 +400,7 @@ void CppEditorSupport::startHighlighting()
static const Document::Ptr dummyDoc; static const Document::Ptr dummyDoc;
static const Snapshot dummySnapshot; static const Snapshot dummySnapshot;
m_highlighter = m_highlightingSupport->highlightingFuture(dummyDoc, dummySnapshot); m_highlighter = m_highlightingSupport->highlightingFuture(dummyDoc, dummySnapshot);
emit highlighterStarted(m_highlighter, m_lastHighlightRevision); emit highlighterStarted(&m_highlighter, m_lastHighlightRevision);
} }
} }

2
src/plugins/cpptools/cpptoolseditorsupport.h
View File

@@ -132,7 +132,7 @@ signals:
void documentUpdated(); void documentUpdated();
void diagnosticsChanged(); void diagnosticsChanged();
void semanticInfoUpdated(CppTools::SemanticInfo); void semanticInfoUpdated(CppTools::SemanticInfo);
void highlighterStarted(QFuture<TextEditor::HighlightingResult>, unsigned revision); void highlighterStarted(QFuture<TextEditor::HighlightingResult> *, unsigned revision);
private slots: private slots:
void onMimeTypeChanged(); void onMimeTypeChanged();