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

Clang: Renaming fixes

Browse Source 
Change-Id: Ied593e31acdcb234e7376858404fb82e45fad2c1
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-09-09 08:58:40 +02:00
parent 11363fafd5
commit 920ff1062d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/clangbackend/ipcsource/clangcodemodelserver.cpp
View File

@@ -113,12 +113,12 @@ void ClangCodeModelServer::registerTranslationUnitsForEditor(const ClangBackEnd:
TIME_SCOPE_DURATION("ClangCodeModelServer::registerTranslationUnitsForEditor"); TIME_SCOPE_DURATION("ClangCodeModelServer::registerTranslationUnitsForEditor");
try { try {
auto createdTranslationUnits = documents.create(message.fileContainers()); auto createdDocuments = documents.create(message.fileContainers());
unsavedFiles.createOrUpdate(message.fileContainers()); unsavedFiles.createOrUpdate(message.fileContainers());
documents.setUsedByCurrentEditor(message.currentEditorFilePath()); documents.setUsedByCurrentEditor(message.currentEditorFilePath());
documents.setVisibleInEditors(message.visibleEditorFilePaths()); documents.setVisibleInEditors(message.visibleEditorFilePaths());
processInitialJobsForDocuments(createdTranslationUnits); processInitialJobsForDocuments(createdDocuments);
} catch (const ProjectPartDoNotExistException &exception) { } catch (const ProjectPartDoNotExistException &exception) {
client()->projectPartsDoNotExist(ProjectPartsDoNotExistMessage(exception.projectPartIds())); client()->projectPartsDoNotExist(ProjectPartsDoNotExistMessage(exception.projectPartIds()));
} catch (const std::exception &exception) { } catch (const std::exception &exception) {

6
src/tools/clangbackend/ipcsource/clangdocuments.cpp
View File

@@ -62,12 +62,12 @@ std::vector<Document> Documents::create(const QVector<FileContainer> &fileContai
{ {
checkIfDocumentsDoNotExist(fileContainers); checkIfDocumentsDoNotExist(fileContainers);
std::vector<Document> createdTranslationUnits; std::vector<Document> createdDocuments;
for (const FileContainer &fileContainer : fileContainers) for (const FileContainer &fileContainer : fileContainers)
createdTranslationUnits.push_back(createDocument(fileContainer)); createdDocuments.push_back(createDocument(fileContainer));
return createdTranslationUnits; return createdDocuments;
} }
void Documents::update(const QVector<FileContainer> &fileContainers) void Documents::update(const QVector<FileContainer> &fileContainers)

4
src/tools/clangbackend/ipcsource/clangfilesystemwatcher.cpp
View File

@@ -70,7 +70,7 @@ ClangFileSystemWatcher::ClangFileSystemWatcher(Documents &documents)
connect(&watcher, connect(&watcher,
&QFileSystemWatcher::fileChanged, &QFileSystemWatcher::fileChanged,
this, this,
&ClangFileSystemWatcher::updateTranslationUnitsWithChangedDependencies); &ClangFileSystemWatcher::updateDocumentsWithChangedDependencies);
} }
void ClangFileSystemWatcher::addFiles(const QSet<Utf8String> &filePaths) void ClangFileSystemWatcher::addFiles(const QSet<Utf8String> &filePaths)
@@ -81,7 +81,7 @@ void ClangFileSystemWatcher::addFiles(const QSet<Utf8String> &filePaths)
watcher.addPaths(existingFiles); watcher.addPaths(existingFiles);
} }
void ClangFileSystemWatcher::updateTranslationUnitsWithChangedDependencies(const QString &filePath) void ClangFileSystemWatcher::updateDocumentsWithChangedDependencies(const QString &filePath)
{ {
documents.updateDocumentsWithChangedDependency(filePath); documents.updateDocumentsWithChangedDependency(filePath);

2
src/tools/clangbackend/ipcsource/clangfilesystemwatcher.h
View File

@@ -47,7 +47,7 @@ signals:
void fileChanged(const Utf8String &filePath); void fileChanged(const Utf8String &filePath);
private: private:
void updateTranslationUnitsWithChangedDependencies(const QString &filePath); void updateDocumentsWithChangedDependencies(const QString &filePath);
private: private:
QFileSystemWatcher watcher; QFileSystemWatcher watcher;