summaryrefslogtreecommitdiff
path: root/src/plugins/vcsbase/nicknamedialog.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-07-05 09:52:32 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-07-05 09:52:32 +0200
commitc3eb4b661100ba3ff28bee1d66e185b2062638eb (patch)
tree23a88e9bdf332d4da07513451aab0a8ecfa0f495 /src/plugins/vcsbase/nicknamedialog.cpp
parent87794fb3308f89d0be300cfbb23ebf7e89e87ea4 (diff)
downloadqt-creator-c3eb4b661100ba3ff28bee1d66e185b2062638eb.tar.gz
VCS: Windows slash display fixing spree.
Task-number: QTCREATORBUG-1795
Diffstat (limited to 'src/plugins/vcsbase/nicknamedialog.cpp')
-rw-r--r--src/plugins/vcsbase/nicknamedialog.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/vcsbase/nicknamedialog.cpp b/src/plugins/vcsbase/nicknamedialog.cpp
index 3d3d33266b..84251e639b 100644
--- a/src/plugins/vcsbase/nicknamedialog.cpp
+++ b/src/plugins/vcsbase/nicknamedialog.cpp
@@ -32,6 +32,7 @@
#include <QtCore/QDebug>
#include <QtCore/QFile>
+#include <QtCore/QDir>
#include <QtGui/QPushButton>
#include <QtGui/QStandardItemModel>
#include <QtGui/QSortFilterProxyModel>
@@ -230,7 +231,8 @@ bool NickNameDialog::populateModelFromMailCapFile(const QString &fileName,
return true;
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly|QIODevice::Text)) {
- *errorMessage = tr("Cannot open '%1': %2").arg(fileName, file.errorString());
+ *errorMessage = tr("Cannot open '%1': %2").
+ arg(QDir::toNativeSeparators(fileName), file.errorString());
return false;
}
// Split into lines and read
@@ -241,7 +243,9 @@ bool NickNameDialog::populateModelFromMailCapFile(const QString &fileName,
if (entry.parse(lines.at(i))) {
model->appendRow(entry.toModelRow());
} else {
- qWarning("%s: Invalid mail cap entry at line %d: '%s'\n", qPrintable(fileName), i + 1, qPrintable(lines.at(i)));
+ qWarning("%s: Invalid mail cap entry at line %d: '%s'\n",
+ qPrintable(QDir::toNativeSeparators(fileName)),
+ i + 1, qPrintable(lines.at(i)));
}
}
model->sort(0);