GUI: Show native path separators.

kimmov · kimmov · commit 1c4e9c662b3c · 2011-02-28T17:18:14.000+02:00
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).
diff --git 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ void ProjectFileDialog::AddIncludeDir(const QString &dir)`
`53`	`53`	`if (dir.isNull() \|\| dir.isEmpty())`
`54`	`54`	`return;`
`55`	`55`
`56`		`- QListWidgetItem *item = new QListWidgetItem(dir);`
	`56`	`+ const QString newdir = QDir::toNativeSeparators(dir);`
	`57`	`+ QListWidgetItem *item = new QListWidgetItem(newdir);`
`57`	`58`	`item->setFlags(item->flags() \| Qt::ItemIsEditable);`
`58`	`59`	`mUI.mListIncludeDirs->addItem(item);`
`59`	`60`	`}`
`@@ -63,7 +64,8 @@ void ProjectFileDialog::AddPath(const QString &path)`
`63`	`64`	`if (path.isNull() \|\| path.isEmpty())`
`64`	`65`	`return;`
`65`	`66`
`66`		`- QListWidgetItem *item = new QListWidgetItem(path);`
	`67`	`+ const QString newpath = QDir::toNativeSeparators(path);`
	`68`	`+ QListWidgetItem *item = new QListWidgetItem(newpath);`
`67`	`69`	`item->setFlags(item->flags() \| Qt::ItemIsEditable);`
`68`	`70`	`mUI.mListPaths->addItem(item);`
`69`	`71`	`}`
`@@ -73,7 +75,8 @@ void ProjectFileDialog::AddIgnorePath(const QString &path)`
`73`	`75`	`if (path.isNull() \|\| path.isEmpty())`
`74`	`76`	`return;`
`75`	`77`
`76`		`- QListWidgetItem *item = new QListWidgetItem(path);`
	`78`	`+ const QString newpath = QDir::toNativeSeparators(path);`
	`79`	`+ QListWidgetItem *item = new QListWidgetItem(newpath);`
`77`	`80`	`item->setFlags(item->flags() \| Qt::ItemIsEditable);`
`78`	`81`	`mUI.mListIgnoredPaths->addItem(item);`
`79`	`82`	`}`
`@@ -82,6 +85,7 @@ QString ProjectFileDialog::GetRootPath() const`
`82`	`85`	`{`
`83`	`86`	`QString root = mUI.mEditProjectRoot->text();`
`84`	`87`	`root = root.trimmed();`
	`88`	`+ root = QDir::fromNativeSeparators(root);`
`85`	`89`	`return root;`
`86`	`90`	`}`
`87`	`91`
`@@ -92,9 +96,9 @@ QStringList ProjectFileDialog::GetIncludePaths() const`
`92`	`96`	`for (int i = 0; i < count; i++)`
`93`	`97`	`{`
`94`	`98`	`QListWidgetItem *item = mUI.mListIncludeDirs->item(i);`
`95`		`- includePaths << item->text();`
	`99`	`+ includePaths << QDir::fromNativeSeparators((item->text());`
`96`	`100`	`}`
`97`		`- return includePaths;`
	`101`	`+ return includePaths;`
`98`	`102`	`}`
`99`	`103`
`100`	`104`	`QStringList ProjectFileDialog::GetDefines() const`
`@@ -119,7 +123,7 @@ QStringList ProjectFileDialog::GetPaths() const`
`119`	`123`	`for (int i = 0; i < count; i++)`
`120`	`124`	`{`
`121`	`125`	`QListWidgetItem *item = mUI.mListPaths->item(i);`
`122`		`- paths << item->text();`
	`126`	`+ paths << QDir::fromNativeSeparators(item->text());`
`123`	`127`	`}`
`124`	`128`	`return paths;`
`125`	`129`	`}`
`@@ -131,14 +135,15 @@ QStringList ProjectFileDialog::GetIgnorePaths() const`
`131`	`135`	`for (int i = 0; i < count; i++)`
`132`	`136`	`{`
`133`	`137`	`QListWidgetItem *item = mUI.mListIgnoredPaths->item(i);`
`134`		`- paths << item->text();`
	`138`	`+ paths << QDir::fromNativeSeparators(item->text());`
`135`	`139`	`}`
`136`	`140`	`return paths;`
`137`	`141`	`}`
`138`	`142`
`139`	`143`	`void ProjectFileDialog::SetRootPath(const QString &root)`
`140`	`144`	`{`
`141`		`- mUI.mEditProjectRoot->setText(root);`
	`145`	`+ QString newroot = QDir::toNativeSeparators(root);`
	`146`	`+ mUI.mEditProjectRoot->setText(newroot);`
`142`	`147`	`}`
`143`	`148`
`144`	`149`	`void ProjectFileDialog::SetIncludepaths(const QStringList &includes)`