Use native OS directory separators in browser dock

nyalldawson · nyalldawson · commit 97d5d58398d3 · 2017-09-20T09:31:48.000+10:00
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -670,7 +670,7 @@ QgsDataCollectionItem::~QgsDataCollectionItem()
 //-----------------------------------------------------------------------
 
 QgsDirectoryItem::QgsDirectoryItem( QgsDataItem *parent, const QString &name, const QString &path )
-  : QgsDataCollectionItem( parent, name, path )
+  : QgsDataCollectionItem( parent, QDir::toNativeSeparators( name ), path )
   , mDirPath( path )
   , mRefreshLater( false )
 {
@@ -679,7 +679,7 @@ QgsDirectoryItem::QgsDirectoryItem( QgsDataItem *parent, const QString &name, co
 }
 
 QgsDirectoryItem::QgsDirectoryItem( QgsDataItem *parent, const QString &name, const QString &dirPath, const QString &path )
-  : QgsDataCollectionItem( parent, name, path )
+  : QgsDataCollectionItem( parent, QDir::toNativeSeparators( name ), path )
   , mDirPath( dirPath )
   , mRefreshLater( false )
 {
diff --git a/src/gui/qgsbrowserdockwidget_p.cpp b/src/gui/qgsbrowserdockwidget_p.cpp
@@ -234,7 +234,7 @@ void QgsBrowserDirectoryProperties::setItem( QgsDataItem *item )
   if ( !item )
     return;
 
-  mPathLabel->setText( directoryItem->dirPath() );
+  mPathLabel->setText( QDir::toNativeSeparators( directoryItem->dirPath() ) );
   mDirectoryWidget = new QgsDirectoryParamWidget( directoryItem->dirPath(), this );
   mLayout->addWidget( mDirectoryWidget );
 }

Original file line number	Diff line number	Diff line change
`@@ -670,7 +670,7 @@ QgsDataCollectionItem::~QgsDataCollectionItem()`
`670`	`670`	`//-----------------------------------------------------------------------`
`671`	`671`
`672`	`672`	`QgsDirectoryItem::QgsDirectoryItem( QgsDataItem *parent, const QString &name, const QString &path )`
`673`		`- : QgsDataCollectionItem( parent, name, path )`
	`673`	`+ : QgsDataCollectionItem( parent, QDir::toNativeSeparators( name ), path )`
`674`	`674`	`, mDirPath( path )`
`675`	`675`	`, mRefreshLater( false )`
`676`	`676`	`{`
`@@ -679,7 +679,7 @@ QgsDirectoryItem::QgsDirectoryItem( QgsDataItem *parent, const QString &name, co`
`679`	`679`	`}`
`680`	`680`
`681`	`681`	`QgsDirectoryItem::QgsDirectoryItem( QgsDataItem *parent, const QString &name, const QString &dirPath, const QString &path )`
`682`		`- : QgsDataCollectionItem( parent, name, path )`
	`682`	`+ : QgsDataCollectionItem( parent, QDir::toNativeSeparators( name ), path )`
`683`	`683`	`, mDirPath( dirPath )`
`684`	`684`	`, mRefreshLater( false )`
`685`	`685`	`{`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ void QgsBrowserDirectoryProperties::setItem( QgsDataItem *item )`
`234`	`234`	`if ( !item )`
`235`	`235`	`return;`
`236`	`236`
`237`		`- mPathLabel->setText( directoryItem->dirPath() );`
	`237`	`+ mPathLabel->setText( QDir::toNativeSeparators( directoryItem->dirPath() ) );`
`238`	`238`	`mDirectoryWidget = new QgsDirectoryParamWidget( directoryItem->dirPath(), this );`
`239`	`239`	`mLayout->addWidget( mDirectoryWidget );`
`240`	`240`	`}`