diff options
Diffstat (limited to 'src/plugins/clearcase/activityselector.cpp')
| -rw-r--r-- | src/plugins/clearcase/activityselector.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/clearcase/activityselector.cpp b/src/plugins/clearcase/activityselector.cpp index 99d15c1c799..ad7644d3946 100644 --- a/src/plugins/clearcase/activityselector.cpp +++ b/src/plugins/clearcase/activityselector.cpp @@ -38,10 +38,9 @@ using namespace ClearCase; using namespace ClearCase::Internal; -ActivitySelector::ActivitySelector(QWidget *parent) : QWidget(parent), - m_plugin(ClearCasePluginPrivate::instance()) +ActivitySelector::ActivitySelector(QWidget *parent) : QWidget(parent) { - QTC_ASSERT(m_plugin->isUcm(), return); + QTC_ASSERT(ClearCasePlugin::viewData().isUcm, return); auto hboxLayout = new QHBoxLayout(this); hboxLayout->setContentsMargins(0, 0, 0, 0); @@ -55,7 +54,7 @@ ActivitySelector::ActivitySelector(QWidget *parent) : QWidget(parent), hboxLayout->addWidget(m_cmbActivity); QString addText = tr("Add"); - if (!m_plugin->settings().autoAssignActivityName) + if (!ClearCasePlugin::settings().autoAssignActivityName) addText.append(QLatin1String("...")); auto btnAdd = new QToolButton; btnAdd->setText(addText); @@ -78,7 +77,7 @@ void ActivitySelector::userChanged() bool ActivitySelector::refresh() { int current; - QList<QStringPair> activities = m_plugin->activities(¤t); + QList<QStringPair> activities = ClearCasePlugin::activities(¤t); m_cmbActivity->clear(); foreach (const QStringPair &activity, activities) m_cmbActivity->addItem(activity.second, activity.first); @@ -113,6 +112,6 @@ void ActivitySelector::setActivity(const QString &act) void ActivitySelector::newActivity() { - if (m_plugin->newActivity()) + if (ClearCasePlugin::newActivity()) refresh(); } |