Skip to content

Commit fae015c

Browse files
jef-njef-n
committed
fix cpt-city-archive on windows (fixes #9794)
1 parent 88bbe38 commit fae015c

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎src/core/symbology-ng/qgscptcityarchive.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ QgsCptCityArchive::QgsCptCityArchive( QString archiveName, QString baseDir )
6363

6464
// make selection items
6565
QgsCptCitySelectionItem* selItem = 0;
66-
QDir seldir( mBaseDir + QDir::separator() + "selections" );
66+
QDir seldir( mBaseDir + "/" + "selections" );
6767
QgsDebugMsg( "populating selection from " + seldir.path() );
6868
foreach ( QString selfile, seldir.entryList( QStringList( "*.xml" ), QDir::Files ) )
6969
{
7070
QgsDebugMsg( "file= " + seldir.path() + "/" + selfile );
7171
selItem = new QgsCptCitySelectionItem( NULL, QFileInfo( selfile ).baseName(),
72-
seldir.dirName() + QDir::separator() + selfile );
72+
seldir.dirName() + "/" + selfile );
7373
//TODO remove item if there are no children (e.g. esri in qgis-sel)
7474
if ( selItem->isValid() )
7575
mSelectionItems << selItem;
@@ -129,7 +129,7 @@ QString QgsCptCityArchive::defaultBaseDir()
129129
// sub-dir defaults to cpt-city
130130
archiveName = settings.value( "CptCity/archiveName", DEFAULT_CPTCITY_ARCHIVE ).toString();
131131

132-
return baseDir + QDir::separator() + archiveName;
132+
return baseDir + "/" + archiveName;
133133
}
134134

135135

@@ -150,20 +150,20 @@ QString QgsCptCityArchive::findFileName( const QString & target, const QString &
150150
if ( ! dir.exists( target ) )
151151
return QString();
152152
else
153-
return dir.path() + QDir::separator() + target;
153+
return dir.path() + "/" + target;
154154
}
155155

156156

157157
QString QgsCptCityArchive::copyingFileName( const QString& path ) const
158158
{
159159
return QgsCptCityArchive::findFileName( "COPYING.xml",
160-
baseDir() + QDir::separator() + path, baseDir() );
160+
baseDir() + "/" + path, baseDir() );
161161
}
162162

163163
QString QgsCptCityArchive::descFileName( const QString& path ) const
164164
{
165165
return QgsCptCityArchive::findFileName( "DESC.xml",
166-
baseDir() + QDir::separator() + path, baseDir() );
166+
baseDir() + "/" + path, baseDir() );
167167
}
168168

169169
QgsStringMap QgsCptCityArchive::copyingInfo( const QString& fileName )
@@ -439,7 +439,7 @@ void QgsCptCityArchive::initDefaultArchive()
439439
QString defArchiveName = settings.value( "CptCity/archiveName", DEFAULT_CPTCITY_ARCHIVE ).toString();
440440

441441
if ( ! mArchiveRegistry.contains( defArchiveName ) )
442-
initArchive( defArchiveName, baseDir + QDir::separator() + defArchiveName );
442+
initArchive( defArchiveName, baseDir + "/" + defArchiveName );
443443
}
444444

445445
void QgsCptCityArchive::initArchives( bool loadAll )
@@ -460,13 +460,13 @@ void QgsCptCityArchive::initArchives( bool loadAll )
460460
QDir dir( baseDir );
461461
foreach ( QString entry, dir.entryList( QStringList( "cpt-city*" ), QDir::Dirs ) )
462462
{
463-
if ( QFile::exists( baseDir + QDir::separator() + entry + "/VERSION.xml" ) )
464-
archivesMap[ entry ] = baseDir + QDir::separator() + entry;
463+
if ( QFile::exists( baseDir + "/" + entry + "/VERSION.xml" ) )
464+
archivesMap[ entry ] = baseDir + "/" + entry;
465465
}
466466
}
467467
else
468468
{
469-
archivesMap[ defArchiveName ] = baseDir + QDir::separator() + defArchiveName;
469+
archivesMap[ defArchiveName ] = baseDir + "/" + defArchiveName;
470470
}
471471

472472
for ( QgsStringMap::iterator it = archivesMap.begin();
@@ -900,17 +900,17 @@ QgsCptCityDirectoryItem::QgsCptCityDirectoryItem( QgsCptCityDataItem* parent,
900900
: QgsCptCityCollectionItem( parent, name, path )
901901
{
902902
mType = Directory;
903-
mValid = QDir( QgsCptCityArchive::defaultBaseDir() + QDir::separator() + mPath ).exists();
903+
mValid = QDir( QgsCptCityArchive::defaultBaseDir() + "/" + mPath ).exists();
904904
if ( ! mValid )
905905
{
906906
QgsDebugMsg( "created invalid dir item, path = " + QgsCptCityArchive::defaultBaseDir()
907-
+ QDir::separator() + mPath );
907+
+ "/" + mPath );
908908
}
909909

910910
// parse DESC.xml to get mInfo
911911
mInfo = "";
912-
QString fileName = QgsCptCityArchive::defaultBaseDir() + QDir::separator() + \
913-
mPath + QDir::separator() + "DESC.xml";
912+
QString fileName = QgsCptCityArchive::defaultBaseDir() + "/" +
913+
mPath + "/" + "DESC.xml";
914914
QgsStringMap descMap = QgsCptCityArchive::description( fileName );
915915
if ( descMap.contains( "name" ) )
916916
mInfo = descMap.value( "name" );
@@ -947,7 +947,7 @@ QVector<QgsCptCityDataItem*> QgsCptCityDirectoryItem::createChildren()
947947
foreach ( QString childPath, dirEntries() )
948948
{
949949
QgsCptCityDataItem* childItem =
950-
QgsCptCityDirectoryItem::dataItem( this, childPath, mPath + QDir::separator() + childPath );
950+
QgsCptCityDirectoryItem::dataItem( this, childPath, mPath + "/" + childPath );
951951
if ( childItem )
952952
children << childItem;
953953
}
@@ -968,7 +968,7 @@ QMap< QString, QStringList > QgsCptCityDirectoryItem::rampsMap()
968968
int num;
969969
bool ok, prevAdd, curAdd;
970970

971-
QDir dir( QgsCptCityArchive::defaultBaseDir() + QDir::separator() + mPath );
971+
QDir dir( QgsCptCityArchive::defaultBaseDir() + "/" + mPath );
972972
schemeNamesAll = dir.entryList( QStringList( "*.svg" ), QDir::Files, QDir::Name );
973973

974974
// TODO detect if there are duplicate names with different variant counts, combine in 1
@@ -1062,7 +1062,7 @@ QMap< QString, QStringList > QgsCptCityDirectoryItem::rampsMap()
10621062
// set num colors=-1 to parse file on request only
10631063
// mSchemeNumColors[ prevName ] = -1;
10641064
schemeNames << prevName;
1065-
mRampsMap[ mPath + QDir::separator() + prevName ] = QStringList();
1065+
mRampsMap[ mPath + "/" + prevName ] = QStringList();
10661066
}
10671067
else if ( listVariant.count() <= 3 )
10681068
{
@@ -1071,13 +1071,13 @@ QMap< QString, QStringList > QgsCptCityDirectoryItem::rampsMap()
10711071
{
10721072
// mSchemeNumColors[ prevName + listVariant[j] ] = -1;
10731073
schemeNames << prevName + listVariant[j];
1074-
mRampsMap[ mPath + QDir::separator() + prevName + listVariant[j] ] = QStringList();
1074+
mRampsMap[ mPath + "/" + prevName + listVariant[j] ] = QStringList();
10751075
}
10761076
}
10771077
else
10781078
{
1079-
// mSchemeVariants[ path + QDir::separator() + prevName ] = listVariant;
1080-
mRampsMap[ mPath + QDir::separator() + prevName ] = listVariant;
1079+
// mSchemeVariants[ path + "/" + prevName ] = listVariant;
1080+
mRampsMap[ mPath + "/" + prevName ] = listVariant;
10811081
schemeNames << prevName;
10821082
}
10831083
listVariant.clear();
@@ -1087,7 +1087,7 @@ QMap< QString, QStringList > QgsCptCityDirectoryItem::rampsMap()
10871087
if ( curVariant != "" )
10881088
curName += curVariant;
10891089
schemeNames << curName;
1090-
mRampsMap[ mPath + QDir::separator() + curName ] = QStringList();
1090+
mRampsMap[ mPath + "/" + curName ] = QStringList();
10911091
}
10921092
// save current to compare next
10931093
if ( prevAdd || curAdd )
@@ -1110,8 +1110,8 @@ QMap< QString, QStringList > QgsCptCityDirectoryItem::rampsMap()
11101110

11111111
QStringList QgsCptCityDirectoryItem::dirEntries() const
11121112
{
1113-
return QDir( QgsCptCityArchive::defaultBaseDir() + \
1114-
QDir::separator() + mPath ).entryList( QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name );
1113+
return QDir( QgsCptCityArchive::defaultBaseDir() +
1114+
"/" + mPath ).entryList( QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name );
11151115
}
11161116

11171117
bool QgsCptCityDirectoryItem::equal( const QgsCptCityDataItem *other )
@@ -1234,7 +1234,7 @@ QVector<QgsCptCityDataItem*> QgsCptCitySelectionItem::createChildren()
12341234

12351235
void QgsCptCitySelectionItem::parseXML()
12361236
{
1237-
QString filename = QgsCptCityArchive::defaultBaseDir() + QDir::separator() + mPath;
1237+
QString filename = QgsCptCityArchive::defaultBaseDir() + "/" + mPath;
12381238

12391239
QgsDebugMsg( "reading file " + filename );
12401240

0 commit comments

Comments
 (0)