aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/clearcase/clearcaseplugin.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <[email protected]>2012-09-02 10:18:56 +0300
committerOrgad Shaneh <[email protected]>2012-09-03 12:22:45 +0200
commite371008cd1c092600118cc02b2109550e9edfa05 (patch)
treef405cd216683925b30988c6d29379136af21d561 /src/plugins/clearcase/clearcaseplugin.cpp
parentb844181b39fbeafb5bc30f1f2ed6cbab7916c008 (diff)
ClearCase: Rename activityMutex -> m_activityMutex
Change-Id: I6bf87d313e5466ad782ed06662d5fe0039a79491 Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/clearcase/clearcaseplugin.cpp')
-rw-r--r--src/plugins/clearcase/clearcaseplugin.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 79f5662297f..d71392779f2 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -181,18 +181,18 @@ ClearCasePlugin::ClearCasePlugin() :
m_submitUndoAction(0),
m_submitRedoAction(0),
m_menuAction(0),
- m_submitActionTriggered(false)
+ m_submitActionTriggered(false),
+ m_activityMutex(new QMutex)
{
- activityMutex = new QMutex;
}
ClearCasePlugin::~ClearCasePlugin()
{
cleanCheckInMessageFile();
// wait for sync thread to finish reading activities
- activityMutex->lock();
- activityMutex->unlock();
- delete activityMutex;
+ m_activityMutex->lock();
+ m_activityMutex->unlock();
+ delete m_activityMutex;
}
void ClearCasePlugin::cleanCheckInMessageFile()
@@ -1574,7 +1574,7 @@ QList<QStringPair> ClearCasePlugin::ccGetActivities() const
void ClearCasePlugin::refreshActivities()
{
- QMutexLocker locker(activityMutex);
+ QMutexLocker locker(m_activityMutex);
m_activity = ccGetCurrentActivity();
m_activities = ccGetActivities();
}
@@ -1585,7 +1585,7 @@ QList<QStringPair> ClearCasePlugin::activities(int *current) const
QString curActivity;
const VcsBase::VcsBasePluginState state = currentState();
if (state.topLevel() == state.currentProjectTopLevel()) {
- QMutexLocker locker(activityMutex);
+ QMutexLocker locker(m_activityMutex);
activitiesList = m_activities;
curActivity = m_activity;
} else {
@@ -1952,7 +1952,7 @@ void ClearCasePlugin::sync(QFutureInterface<void> &future, QString topLevel, QSt
process.waitForFinished();
}
-} // namespace ClearCase
} // namespace Internal
+} // namespace ClearCase
Q_EXPORT_PLUGIN(ClearCase::Internal::ClearCasePlugin)