From 0116951cd78bc4da10a7096fa84c772325ca3b72 Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@linfiniti.com>
Date: Wed, 23 Nov 2011 11:49:44 +0200
Subject: [PATCH] Further updates to places provider registry called pluginPath
 to make it use providerPath now

---
 src/core/qgsproviderregistry.cpp | 8 ++++----
 src/core/qgsproviderregistry.h   | 4 ++--
 src/mapserver/qgis_map_serv.cpp  | 6 +++---
 tests/bench/main.cpp             | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
index 7d3123c9809..a69ad25a405 100644
--- a/src/core/qgsproviderregistry.cpp
+++ b/src/core/qgsproviderregistry.cpp
@@ -46,11 +46,11 @@ typedef QString protocolDrivers_t();
 
 QgsProviderRegistry *QgsProviderRegistry::_instance = 0;
 
-QgsProviderRegistry *QgsProviderRegistry::instance( QString pluginPath )
+QgsProviderRegistry *QgsProviderRegistry::instance( QString providerPath )
 {
   if ( _instance == 0 )
   {
-    _instance = new QgsProviderRegistry( pluginPath );
+    _instance = new QgsProviderRegistry( providerPath );
   }
 
   return _instance;
@@ -59,7 +59,7 @@ QgsProviderRegistry *QgsProviderRegistry::instance( QString pluginPath )
 
 
 
-QgsProviderRegistry::QgsProviderRegistry( QString pluginPath )
+QgsProviderRegistry::QgsProviderRegistry( QString providerPath )
 {
   // At startup, examine the libs in the qgis/lib dir and store those that
   // are a provider shared lib
@@ -71,7 +71,7 @@ QgsProviderRegistry::QgsProviderRegistry( QString pluginPath )
      int bin = appDir.findRev("/bin", -1, false);
      QString baseDir = appDir.left(bin);
      QString mLibraryDirectory = baseDir + "/lib"; */
-  mLibraryDirectory = pluginPath;
+  mLibraryDirectory = providerPath;
 
   mLibraryDirectory.setSorting( QDir::Name | QDir::IgnoreCase );
   mLibraryDirectory.setFilter( QDir::Files | QDir::NoSymLinks );
diff --git a/src/core/qgsproviderregistry.h b/src/core/qgsproviderregistry.h
index 264e0b949d3..62a3418c50f 100644
--- a/src/core/qgsproviderregistry.h
+++ b/src/core/qgsproviderregistry.h
@@ -43,7 +43,7 @@ class CORE_EXPORT QgsProviderRegistry
   public:
 
     /** means of accessing canonical single instance  */
-    static QgsProviderRegistry* instance( QString pluginPath = QString::null );
+    static QgsProviderRegistry* instance( QString providerPath = QString::null );
 
     /** Virtual dectructor */
     virtual ~QgsProviderRegistry();
@@ -143,7 +143,7 @@ class CORE_EXPORT QgsProviderRegistry
   private:
 
     /** ctor private since instance() creates it */
-    QgsProviderRegistry( QString pluginPath );
+    QgsProviderRegistry( QString providerPath );
 
     /** pointer to canonical Singleton object */
     static QgsProviderRegistry* _instance;
diff --git a/src/mapserver/qgis_map_serv.cpp b/src/mapserver/qgis_map_serv.cpp
index 7dae543cf89..4f989c2e6a9 100644
--- a/src/mapserver/qgis_map_serv.cpp
+++ b/src/mapserver/qgis_map_serv.cpp
@@ -164,10 +164,10 @@ int main( int argc, char * argv[] )
   }
 #endif
 
-  // Instantiate the plugin directory so that providers are loaded
-  QgsProviderRegistry::instance( QgsApplication::pluginPath() );
+  // Instantiate the provider directory so that providers are loaded
+  QgsProviderRegistry::instance( QgsApplication::providerPath() );
   QgsDebugMsg( "Prefix  PATH: " + QgsApplication::prefixPath() );
-  QgsDebugMsg( "Plugin  PATH: " + QgsApplication::pluginPath() );
+  QgsDebugMsg( "Provider PATH: " + QgsApplication::providerPath() );
   QgsDebugMsg( "PkgData PATH: " + QgsApplication::pkgDataPath() );
   QgsDebugMsg( "User DB PATH: " + QgsApplication::qgisUserDbFilePath() );
 
diff --git a/tests/bench/main.cpp b/tests/bench/main.cpp
index 2f50a6b2f4a..f145611859e 100644
--- a/tests/bench/main.cpp
+++ b/tests/bench/main.cpp
@@ -367,7 +367,7 @@ int main( int argc, char *argv[] )
   QgsApplication::setOrganizationDomain( "qgis.org" );
   QgsApplication::setApplicationName( "QGIS" );
 
-  QgsProviderRegistry::instance( QgsApplication::pluginPath() );
+  QgsProviderRegistry::instance( QgsApplication::providerPath() );
 
 #ifdef Q_OS_MACX
   // If the GDAL plugins are bundled with the application and GDAL_DRIVER_PATH