aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorFriedemann Kleint <[email protected]>2009-09-25 12:41:13 +0200
committerFriedemann Kleint <[email protected]>2009-09-25 12:41:13 +0200
commit77fc7441af3228fc7b5fc97aa81849c43458f996 (patch)
treebd1ab241f7c81d213c83dd64cf19699f3f0dbc5a /src/plugins
parente7a477b3a01b54a78b753f48398fec63fbd6316f (diff)
Git: Remove dpulicate slot revert(), move to UndoFileChanges.
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/git/gitplugin.cpp19
-rw-r--r--src/plugins/git/gitplugin.h1
2 files changed, 2 insertions, 18 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 9ca3e82c1f1..b0741ce867a 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -511,17 +511,11 @@ void GitPlugin::logProject()
void GitPlugin::undoFileChanges()
{
- QFileInfo fileInfo = currentFile();
- QString fileName = fileInfo.fileName();
- QString workingDirectory = fileInfo.absolutePath();
-
+ const QFileInfo fileInfo = currentFile();
Core::FileChangeBlocker fcb(fileInfo.filePath());
fcb.setModifiedReload(true);
- QString errorMessage;
- if (!m_gitClient->synchronousCheckout(workingDirectory, QStringList() << fileName, &errorMessage))
- VCSBase::VCSBaseOutputWindow::instance()->append(errorMessage);
-
+ m_gitClient->revert(QStringList(fileInfo.absoluteFilePath()));
}
void GitPlugin::undoProjectChanges()
@@ -556,15 +550,6 @@ void GitPlugin::unstageFile()
m_gitClient->synchronousReset(workingDirectory, QStringList(fileName));
}
-void GitPlugin::revertFile()
-{
- const QFileInfo fileInfo = currentFile();
- Core::FileChangeBlocker fcb(fileInfo.filePath());
- fcb.setModifiedReload(true);
-
- m_gitClient->revert(QStringList(fileInfo.absoluteFilePath()));
-}
-
void GitPlugin::startCommit()
{
if (VCSBase::VCSBaseSubmitEditor::raiseSubmitEditor())
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 2970b6f32c0..bf3eb3e28ff 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -115,7 +115,6 @@ private slots:
void undoProjectChanges();
void stageFile();
void unstageFile();
- void revertFile();
void showCommit();
void startCommit();