summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitplugin.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2009-12-08 16:50:27 +0100
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2009-12-08 16:50:27 +0100
commitff1054fc8d65af8d297c1072a1021a8d0f4ac00c (patch)
tree0dabc7685d4336b43636040f2e367cfc61bcbc45 /src/plugins/git/gitplugin.cpp
parent168813e9b153330563715730b8a8f558d5c5db13 (diff)
downloadqt-creator-ff1054fc8d65af8d297c1072a1021a8d0f4ac00c.tar.gz
Subversion: Adapt to new VCSBasePlugin.
Remove logic handling several repositories.
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
-rw-r--r--src/plugins/git/gitplugin.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 5c0954b263..aa09dd376f 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -115,7 +115,7 @@ GitPlugin::GitPlugin() :
m_blameAction(0),
m_logProjectAction(0),
m_undoFileAction(0),
- m_undoProjectAction(0),
+ m_undoRepositoryAction(0),
m_showAction(0),
m_stageAction(0),
m_unstageAction(0),
@@ -282,10 +282,10 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
connect(m_logProjectAction, SIGNAL(triggered()), this, SLOT(logProject()));
gitContainer->addAction(command);
- m_undoProjectAction = new QAction(tr("Undo Project Changes"), this);
- command = actionManager->registerAction(m_undoProjectAction, "Git.UndoProject", globalcontext);
+ m_undoRepositoryAction = new QAction(tr("Undo Repository Changes"), this);
+ command = actionManager->registerAction(m_undoRepositoryAction, "Git.UndoRepository", globalcontext);
command->setAttribute(Core::Command::CA_UpdateText);
- connect(m_undoProjectAction, SIGNAL(triggered()), this, SLOT(undoProjectChanges()));
+ connect(m_undoRepositoryAction, SIGNAL(triggered()), this, SLOT(undoRepositoryChanges()));
gitContainer->addAction(command);
gitContainer->addAction(createSeparator(actionManager, globalcontext, QLatin1String("Git.Sep.Global"), this));
@@ -428,7 +428,7 @@ void GitPlugin::undoFileChanges()
m_gitClient->revert(QStringList(state.currentFile()));
}
-void GitPlugin::undoProjectChanges()
+void GitPlugin::undoRepositoryChanges()
{
const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return)
@@ -669,7 +669,7 @@ void GitPlugin::updateActions(VCSBase::VCSBasePlugin::ActionState as)
m_diffProjectAction->setParameter(projectName);
m_logProjectAction->setEnabled(projectEnabled);
m_logProjectAction->setParameter(projectName);
- m_undoProjectAction->setEnabled(projectEnabled);
+ m_undoRepositoryAction->setEnabled(projectEnabled);
const bool repositoryEnabled = currentState().hasTopLevel();
m_statusRepositoryAction->setEnabled(repositoryEnabled);