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

CppTools: Protect SnapshotUpdater getters by mutex

Browse Source 
Task-number: QTCREATORBUG-10282

Change-Id: Ia58359f774c72260956caecd5f63d44b612d1451
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-10-07 11:44:50 +02:00
committed by Erik Verbruggen
parent 56c3d8ffab
commit 802b67ff04
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/cpptools/cppsnapshotupdater.cpp
View File

@@ -182,28 +182,42 @@ void SnapshotUpdater::update(CppModelManager::WorkingCopy workingCopy)
Document::Ptr SnapshotUpdater::document() const
{
QMutexLocker locker(&m_mutex);
return m_snapshot.document(m_fileInEditor);
}
Snapshot SnapshotUpdater::snapshot() const
{
QMutexLocker locker(&m_mutex);
return m_snapshot;
}
QStringList SnapshotUpdater::includePaths() const
{
QMutexLocker locker(&m_mutex);
return m_includePaths;
}
QStringList SnapshotUpdater::frameworkPaths() const
{
QMutexLocker locker(&m_mutex);
return m_frameworkPaths;
}
ProjectPart::Ptr SnapshotUpdater::currentProjectPart() const
{
QMutexLocker locker(&m_mutex);
return m_projectPart;
}
void SnapshotUpdater::setProjectPart(ProjectPart::Ptr projectPart)
{
QMutexLocker locker(&m_mutex);
m_manuallySetProjectPart = projectPart;
}
void SnapshotUpdater::setUsePrecompiledHeaders(bool usePrecompiledHeaders)
{
QMutexLocker locker(&m_mutex);
m_usePrecompiledHeaders = usePrecompiledHeaders;
}

14
src/plugins/cpptools/cppsnapshotupdater.h
View File

@@ -54,15 +54,9 @@ public:
void update(CppModelManagerInterface::WorkingCopy workingCopy);
CPlusPlus::Document::Ptr document() const;
CPlusPlus::Snapshot snapshot() const
{ return m_snapshot; }
QStringList includePaths() const
{ return m_includePaths; }
QStringList frameworkPaths() const
{ return m_frameworkPaths; }
CPlusPlus::Snapshot snapshot() const;
QStringList includePaths() const;
QStringList frameworkPaths() const;
ProjectPart::Ptr currentProjectPart() const;
void setProjectPart(ProjectPart::Ptr projectPart);
@@ -76,7 +70,7 @@ private:
private:
mutable QMutex m_mutex;
QString m_fileInEditor;
const QString m_fileInEditor;
ProjectPart::Ptr m_projectPart, m_manuallySetProjectPart;
QByteArray m_configFile;
bool m_editorDefinesChangedSinceLastUpdate;