use directory path and not item path (fixes #11871)

jef-n · jef-n · commit ba4948e4416e · 2015-01-16T21:25:50.000+01:00
diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
@@ -29,7 +29,7 @@
 
 #include <QSettings>
 
-QgsBrowserWatcher::QgsBrowserWatcher( QgsDataItem * item )
+QgsBrowserWatcher::QgsBrowserWatcher( QgsDataItem *item )
     : mItem( item )
 {
 }
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -768,7 +768,7 @@ QVector<QgsDataItem*> QgsDirectoryItem::createChildren()
     QString subdirPath = dir.absoluteFilePath( subdir );
     QgsDebugMsgLevel( QString( "creating subdir: %1" ).arg( subdirPath ), 2 );
 
-    QString path = mPath + "/" + subdir; // may differ from subdirPath
+    QString path = mDirPath + "/" + subdir; // may differ from subdirPath
     QgsDirectoryItem *item = new QgsDirectoryItem( this, subdir, subdirPath, path );
     // propagate signals up to top
 
@@ -1443,7 +1443,7 @@ QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString dirPath, QSt
   return 0;
 }
 
-const QStringList & QgsZipItem::getZipFileList()
+const QStringList &QgsZipItem::getZipFileList()
 {
   if ( ! mZipFileList.isEmpty() )
     return mZipFileList;
@@ -1452,7 +1452,7 @@ const QStringList & QgsZipItem::getZipFileList()
   QSettings settings;
   QString scanZipSetting = settings.value( "/qgis/scanZipInBrowser2", "basic" ).toString();
 
-  QgsDebugMsgLevel( QString( "mFIlePath = %1 name= %2 scanZipSetting= %3 vsiPrefix= %4" ).arg( mFilePath ).arg( name() ).arg( scanZipSetting ).arg( mVsiPrefix ), 3 );
+  QgsDebugMsgLevel( QString( "mFilePath = %1 name= %2 scanZipSetting= %3 vsiPrefix= %4" ).arg( mFilePath ).arg( name() ).arg( scanZipSetting ).arg( mVsiPrefix ), 3 );
 
   // if scanZipBrowser == no: skip to the next file
   if ( scanZipSetting == "no" )
@@ -1461,7 +1461,7 @@ const QStringList & QgsZipItem::getZipFileList()
   }
 
   // get list of files inside zip file
-  QgsDebugMsgLevel( QString( "Open file %1 with gdal vsi" ).arg( mVsiPrefix + path() ), 3 );
+  QgsDebugMsgLevel( QString( "Open file %1 with gdal vsi" ).arg( mVsiPrefix + mFilePath ), 3 );
   char **papszSiblingFiles = VSIReadDirRecursive1( QString( mVsiPrefix + mFilePath ).toLocal8Bit().constData() );
   if ( papszSiblingFiles )
   {
diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -431,7 +431,7 @@ class CORE_EXPORT QgsZipItem : public QgsDataCollectionItem
 
   public:
     QgsZipItem( QgsDataItem* parent, QString name, QString path );
-    QgsZipItem( QgsDataItem* parent, QString name, QString dirPath, QString path );
+    QgsZipItem( QgsDataItem* parent, QString name, QString filePath, QString path );
     ~QgsZipItem();
 
     QVector<QgsDataItem*> createChildren() override;

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`
`30`	`30`	`#include <QSettings>`
`31`	`31`
`32`		`-QgsBrowserWatcher::QgsBrowserWatcher( QgsDataItem * item )`
	`32`	`+QgsBrowserWatcher::QgsBrowserWatcher( QgsDataItem *item )`
`33`	`33`	`: mItem( item )`
`34`	`34`	`{`
`35`	`35`	`}`