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

ClearCase: Rename activityMutex -> m_activityMutex

Browse Source 
Change-Id: I6bf87d313e5466ad782ed06662d5fe0039a79491
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-09-02 10:18:56 +03:00
committed by Orgad Shaneh
parent b844181b39
commit e371008cd1
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -181,18 +181,18 @@ ClearCasePlugin::ClearCasePlugin() :
m_submitUndoAction(0), m_submitUndoAction(0),
m_submitRedoAction(0), m_submitRedoAction(0),
m_menuAction(0), m_menuAction(0),
m_submitActionTriggered(false) m_submitActionTriggered(false),
m_activityMutex(new QMutex)
{ {
activityMutex = new QMutex;
} }
ClearCasePlugin::~ClearCasePlugin() ClearCasePlugin::~ClearCasePlugin()
{ {
cleanCheckInMessageFile(); cleanCheckInMessageFile();
// wait for sync thread to finish reading activities // wait for sync thread to finish reading activities
activityMutex->lock(); m_activityMutex->lock();
activityMutex->unlock(); m_activityMutex->unlock();
delete activityMutex; delete m_activityMutex;
} }
void ClearCasePlugin::cleanCheckInMessageFile() void ClearCasePlugin::cleanCheckInMessageFile()
@@ -1574,7 +1574,7 @@ QList<QStringPair> ClearCasePlugin::ccGetActivities() const
void ClearCasePlugin::refreshActivities() void ClearCasePlugin::refreshActivities()
{ {
QMutexLocker locker(activityMutex); QMutexLocker locker(m_activityMutex);
m_activity = ccGetCurrentActivity(); m_activity = ccGetCurrentActivity();
m_activities = ccGetActivities(); m_activities = ccGetActivities();
} }
@@ -1585,7 +1585,7 @@ QList<QStringPair> ClearCasePlugin::activities(int *current) const
QString curActivity; QString curActivity;
const VcsBase::VcsBasePluginState state = currentState(); const VcsBase::VcsBasePluginState state = currentState();
if (state.topLevel() == state.currentProjectTopLevel()) { if (state.topLevel() == state.currentProjectTopLevel()) {
QMutexLocker locker(activityMutex); QMutexLocker locker(m_activityMutex);
activitiesList = m_activities; activitiesList = m_activities;
curActivity = m_activity; curActivity = m_activity;
} else { } else {
@@ -1952,7 +1952,7 @@ void ClearCasePlugin::sync(QFutureInterface<void> &future, QString topLevel, QSt
process.waitForFinished(); process.waitForFinished();
} }
} // namespace ClearCase
} // namespace Internal } // namespace Internal
} // namespace ClearCase
Q_EXPORT_PLUGIN(ClearCase::Internal::ClearCasePlugin) Q_EXPORT_PLUGIN(ClearCase::Internal::ClearCasePlugin)

2
src/plugins/clearcase/clearcaseplugin.h
View File

@@ -249,7 +249,7 @@ private:
QAction *m_submitRedoAction; QAction *m_submitRedoAction;
QAction *m_menuAction; QAction *m_menuAction;
bool m_submitActionTriggered; bool m_submitActionTriggered;
QMutex *activityMutex; QMutex *m_activityMutex;
QList<QStringPair> m_activities; QList<QStringPair> m_activities;
static ClearCasePlugin *m_clearcasePluginInstance; static ClearCasePlugin *m_clearcasePluginInstance;