From 1c4e9c662b3c73074347c97f151b0b32a89a5d74 Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Mon, 28 Feb 2011 17:18:14 +0200
Subject: [PATCH] GUI: Show native path separators.

Show native path separators in project file-dialog. Convert paths
to internal separators when reading from project file and when
reading from the dialog. Convert to native separators when adding
to the dialog (for the user).
---
 gui/projectfile.cpp       | 22 +++++++++++++++++++---
 gui/projectfiledialog.cpp | 21 +++++++++++++--------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp
index 71a7180ed..f227cdfa4 100644
--- a/gui/projectfile.cpp
+++ b/gui/projectfile.cpp
@@ -21,6 +21,7 @@
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 #include <QFile>
+#include <QDir>
 #include "projectfile.h"
 
 static const char ProjectElementName[] = "project";
@@ -124,7 +125,12 @@ bool ProjectFile::Read(const QString &filename)
 
 QStringList ProjectFile::GetIncludeDirs() const
 {
-    return mIncludeDirs;
+    QStringList dirs;
+    foreach(QString path, mIncludeDirs)
+    {
+        dirs << QDir::fromNativeSeparators(path);
+    }
+    return dirs;
 }
 
 QStringList ProjectFile::GetDefines() const
@@ -134,12 +140,22 @@ QStringList ProjectFile::GetDefines() const
 
 QStringList ProjectFile::GetCheckPaths() const
 {
-    return mPaths;
+    QStringList paths;
+    foreach(QString path, mPaths)
+    {
+        paths << QDir::fromNativeSeparators(path);
+    }
+    return paths;
 }
 
 QStringList ProjectFile::GetIgnoredPaths() const
 {
-    return mIgnoredPaths;
+    QStringList paths;
+    foreach(QString path, mIgnoredPaths)
+    {
+        paths << QDir::fromNativeSeparators(path);
+    }
+    return paths;
 }
 
 void ProjectFile::ReadRootPath(QXmlStreamReader &reader)
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
index 3b2195221..c67d2a989 100644
--- a/gui/projectfiledialog.cpp
+++ b/gui/projectfiledialog.cpp
@@ -53,7 +53,8 @@ void ProjectFileDialog::AddIncludeDir(const QString &dir)
     if (dir.isNull() || dir.isEmpty())
         return;
 
-    QListWidgetItem *item = new QListWidgetItem(dir);
+    const QString newdir = QDir::toNativeSeparators(dir);
+    QListWidgetItem *item = new QListWidgetItem(newdir);
     item->setFlags(item->flags() | Qt::ItemIsEditable);
     mUI.mListIncludeDirs->addItem(item);
 }
@@ -63,7 +64,8 @@ void ProjectFileDialog::AddPath(const QString &path)
     if (path.isNull() || path.isEmpty())
         return;
 
-    QListWidgetItem *item = new QListWidgetItem(path);
+    const QString newpath = QDir::toNativeSeparators(path);
+    QListWidgetItem *item = new QListWidgetItem(newpath);
     item->setFlags(item->flags() | Qt::ItemIsEditable);
     mUI.mListPaths->addItem(item);
 }
@@ -73,7 +75,8 @@ void ProjectFileDialog::AddIgnorePath(const QString &path)
     if (path.isNull() || path.isEmpty())
         return;
 
-    QListWidgetItem *item = new QListWidgetItem(path);
+    const QString newpath = QDir::toNativeSeparators(path);
+    QListWidgetItem *item = new QListWidgetItem(newpath);
     item->setFlags(item->flags() | Qt::ItemIsEditable);
     mUI.mListIgnoredPaths->addItem(item);
 }
@@ -82,6 +85,7 @@ QString ProjectFileDialog::GetRootPath() const
 {
     QString root = mUI.mEditProjectRoot->text();
     root = root.trimmed();
+    root = QDir::fromNativeSeparators(root);
     return root;
 }
 
@@ -92,9 +96,9 @@ QStringList ProjectFileDialog::GetIncludePaths() const
     for (int i = 0; i < count; i++)
     {
         QListWidgetItem *item = mUI.mListIncludeDirs->item(i);
-        includePaths << item->text();
+        includePaths << QDir::fromNativeSeparators((item->text());
     }
-    return includePaths;
+                 return includePaths;
 }
 
 QStringList ProjectFileDialog::GetDefines() const
@@ -119,7 +123,7 @@ QStringList ProjectFileDialog::GetPaths() const
     for (int i = 0; i < count; i++)
     {
         QListWidgetItem *item = mUI.mListPaths->item(i);
-        paths << item->text();
+        paths << QDir::fromNativeSeparators(item->text());
     }
     return paths;
 }
@@ -131,14 +135,15 @@ QStringList ProjectFileDialog::GetIgnorePaths() const
     for (int i = 0; i < count; i++)
     {
         QListWidgetItem *item = mUI.mListIgnoredPaths->item(i);
-        paths << item->text();
+        paths << QDir::fromNativeSeparators(item->text());
     }
     return paths;
 }
 
 void ProjectFileDialog::SetRootPath(const QString &root)
 {
-    mUI.mEditProjectRoot->setText(root);
+    QString newroot = QDir::toNativeSeparators(root);
+    mUI.mEditProjectRoot->setText(newroot);
 }
 
 void ProjectFileDialog::SetIncludepaths(const QStringList &includes)