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

Merge "Merge remote-tracking branch 'origin/4.6'"

Browse Source
This commit is contained in:
Eike Ziller
2018-04-26 12:28:00 +00:00
committed by The Qt Project
parent e0c4da30a6 62050437c3
commit c1bfc9d0a4
12 changed files with 119 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/clangcodemodel/clangrefactoringengine.cpp
View File

@@ -51,10 +51,14 @@ void RefactoringEngine::startLocalRenaming(const CppTools::CursorInEditor &data,
if (cursorFuture.isCanceled())
return defaultCallback();
QObject::connect(&m_watcher, &FutureCursorWatcher::finished, [=]() {
if (m_watcher.isCanceled())
if (m_watcher)
m_watcher->cancel();
m_watcher.reset(new FutureCursorWatcher());
QObject::connect(m_watcher.get(), &FutureCursorWatcher::finished, [=]() {
if (m_watcher->isCanceled())
return defaultCallback();
const CppTools::CursorInfo info = m_watcher.result();
const CppTools::CursorInfo info = m_watcher->result();
if (info.useRanges.empty())
return defaultCallback();
@@ -72,7 +76,7 @@ void RefactoringEngine::startLocalRenaming(const CppTools::CursorInEditor &data,
renameSymbolsCallback(symbolName, container, data.cursor().document()->revision());
});
m_watcher.setFuture(cursorFuture);
m_watcher->setFuture(cursorFuture);
}
}

2
src/plugins/clangcodemodel/clangrefactoringengine.h
View File

@@ -57,7 +57,7 @@ public:
private:
using FutureCursorWatcher = QFutureWatcher<CppTools::CursorInfo>;
FutureCursorWatcher m_watcher;
std::unique_ptr<FutureCursorWatcher> m_watcher;
};
} // namespace ClangRefactoring