Avoid duplicate SVG paths

wonder · wonder · commit 224874958b68 · 2011-03-27T14:09:00.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15613 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -74,7 +74,6 @@ QgsApplication::QgsApplication( int & argc, char ** argv, bool GUIenabled, QStri
     mConfigPath = customConfigPath + "/"; // make sure trailing slash is included
   }
 
-  mDefaultSvgPaths << mPkgDataPath + QString( "/svg/" );
   mDefaultSvgPaths << qgisSettingsDirPath() + QString( "svg/" );
 }
 
@@ -174,7 +173,10 @@ void QgsApplication::setPluginPath( const QString thePluginPath )
 void QgsApplication::setPkgDataPath( const QString thePkgDataPath )
 {
   mPkgDataPath = thePkgDataPath;
-  mDefaultSvgPaths << mPkgDataPath + QString( "/svg/" );
+  QString svgPath = mPkgDataPath + QString( "/svg/" );
+  // avoid duplicate entries
+  if ( !mDefaultSvgPaths.contains( svgPath ) )
+    mDefaultSvgPaths << svgPath;
 }
 
 void QgsApplication::setDefaultSvgPaths( const QStringList& pathList )

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ QgsApplication::QgsApplication( int & argc, char ** argv, bool GUIenabled, QStri`
`74`	`74`	`mConfigPath = customConfigPath + "/"; // make sure trailing slash is included`
`75`	`75`	`}`
`76`	`76`
`77`		`- mDefaultSvgPaths << mPkgDataPath + QString( "/svg/" );`
`78`	`77`	`mDefaultSvgPaths << qgisSettingsDirPath() + QString( "svg/" );`
`79`	`78`	`}`
`80`	`79`
`@@ -174,7 +173,10 @@ void QgsApplication::setPluginPath( const QString thePluginPath )`
`174`	`173`	`void QgsApplication::setPkgDataPath( const QString thePkgDataPath )`
`175`	`174`	`{`
`176`	`175`	`mPkgDataPath = thePkgDataPath;`
`177`		`- mDefaultSvgPaths << mPkgDataPath + QString( "/svg/" );`
	`176`	`+ QString svgPath = mPkgDataPath + QString( "/svg/" );`
	`177`	`+ // avoid duplicate entries`
	`178`	`+ if ( !mDefaultSvgPaths.contains( svgPath ) )`
	`179`	`+ mDefaultSvgPaths << svgPath;`
`178`	`180`	`}`
`179`	`181`
`180`	`182`	`void QgsApplication::setDefaultSvgPaths( const QStringList& pathList )`