From 9293ecabc3ec16de0a38c3cfc98fde3e4f7330b2 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 7 Oct 2010 15:42:03 +0200
Subject: [PATCH] Git: Show native pathes to repositories
---
src/plugins/git/changeselectiondialog.cpp | 2 +-
src/plugins/git/gitplugin.cpp | 2 +-
src/plugins/git/stashdialog.cpp | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index b762369b4fd..654ac5dcf84 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -55,7 +55,7 @@ QString ChangeSelectionDialog::repository() const
void ChangeSelectionDialog::setRepository(const QString &s)
{
- m_ui.repositoryEdit->setText(s);
+ m_ui.repositoryEdit->setText(QDir::toNativeSeparators(s));
}
void ChangeSelectionDialog::selectWorkingDirectory()
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index eee8c5236cb..211353b944b 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -593,7 +593,7 @@ void GitPlugin::undoRepositoryChanges()
{
const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return)
- const QString msg = tr("Would you like to revert all pending changes to the repository\n%1?").arg(state.topLevel());
+ const QString msg = tr("Would you like to revert all pending changes to the repository\n%1?").arg(QDir::toNativeSeparators(state.topLevel()));
const QMessageBox::StandardButton answer
= QMessageBox::question(m_core->mainWindow(),
tr("Revert"), msg,
diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp
index 59ab1cadaae..f7c2123db7c 100644
--- a/src/plugins/git/stashdialog.cpp
+++ b/src/plugins/git/stashdialog.cpp
@@ -37,6 +37,7 @@
#include <vcsbase/vcsbaseoutputwindow.h>
#include <QtCore/QDebug>
+#include <QtCore/QDir>
#include <QtCore/QModelIndex>
#include <QtCore/QDateTime>
#include <QtGui/QStandardItemModel>
@@ -167,7 +168,7 @@ QString StashDialog::msgRepositoryLabel(const QString &repository)
{
return repository.isEmpty() ?
tr("<No repository>") :
- tr("Repository: %1").arg(repository);
+ tr("Repository: %1").arg(QDir::toNativeSeparators(repository));
}
void StashDialog::refresh(const QString &repository, bool force)
--
GitLab