1 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index 52f8c4762f..7e79778396 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -52,7 +52,7 @@ using namespace Utils;
 namespace Git {
 namespace Internal {
 
-ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Core::Id id,
+ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Utils::Id id,
                                              QWidget *parent) :
     QDialog(parent), m_ui(new Ui::ChangeSelectionDialog)
 {
@@ -74,15 +74,15 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Co
     connect(m_ui->selectFromHistoryButton, &QPushButton::clicked,
             this, &ChangeSelectionDialog::selectCommitFromRecentHistory);
     connect(m_ui->showButton, &QPushButton::clicked,
-            this, std::bind(&ChangeSelectionDialog::accept, this, Show));
+            this, std::bind(&ChangeSelectionDialog::acceptCommand, this, Show));
     connect(m_ui->cherryPickButton, &QPushButton::clicked,
-            this, std::bind(&ChangeSelectionDialog::accept, this, CherryPick));
+            this, std::bind(&ChangeSelectionDialog::acceptCommand, this, CherryPick));
     connect(m_ui->revertButton, &QPushButton::clicked,
-            this, std::bind(&ChangeSelectionDialog::accept, this, Revert));
+            this, std::bind(&ChangeSelectionDialog::acceptCommand, this, Revert));
     connect(m_ui->checkoutButton, &QPushButton::clicked,
-            this, std::bind(&ChangeSelectionDialog::accept, this, Checkout));
+            this, std::bind(&ChangeSelectionDialog::acceptCommand, this, Checkout));
     connect(m_ui->archiveButton, &QPushButton::clicked,
-            this, std::bind(&ChangeSelectionDialog::accept, this, Archive));
+            this, std::bind(&ChangeSelectionDialog::acceptCommand, this, Archive));
 
     if (id == "Git.Revert")
         m_ui->revertButton->setDefault(true);
@@ -137,7 +137,7 @@ void ChangeSelectionDialog::selectCommitFromRecentHistory()
 
 QString ChangeSelectionDialog::workingDirectory() const
 {
-    const QString workingDir = m_ui->workingDirectoryChooser->path();
+    const QString workingDir = m_ui->workingDirectoryChooser->filePath().toString();
     if (workingDir.isEmpty() || !QDir(workingDir).exists())
         return QString();
 
@@ -149,7 +149,7 @@ ChangeCommand ChangeSelectionDialog::command() const
     return m_command;
 }
 
-void ChangeSelectionDialog::accept(ChangeCommand command)
+void ChangeSelectionDialog::acceptCommand(ChangeCommand command)
 {
     m_command = command;
     QDialog::accept();