remove get from QgsProviderRegistry::getProviderCapabilities() (follo…

…wup 2e943c9)
qgis · Oct 14, 2014 · 2cef8d5 · 2cef8d5
1 parent e0df5d4
commit 2cef8d5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/python/core/qgsproviderregistry.sip b/python/core/qgsproviderregistry.sip
@@ -43,7 +43,7 @@ class QgsProviderRegistry
         @param providerKey identificator of the provider
         @note Added in 2.6
     */
-    int getProviderCapabilities( const QString& providerKey ) const;
+    int providerCapabilities( const QString& providerKey ) const;
 
     QWidget *selectWidget( const QString & providerKey,
                            QWidget * parent = 0, Qt::WindowFlags fl = 0 );

diff --git a/src/app/qgshandlebadlayers.cpp b/src/app/qgshandlebadlayers.cpp
@@ -97,7 +97,7 @@ QgsHandleBadLayers::QgsHandleBadLayers( const QList<QDomNode> &layers, const QDo
     QString datasource = node.namedItem( "datasource" ).toElement().text();
     QString provider = node.namedItem( "provider" ).toElement().text();
     QString vectorProvider = type == "vector" ? provider : tr( "none" );
-    bool providerFileBased = ( QgsProviderRegistry::instance()->getProviderCapabilities( provider ) & QgsDataProvider::File ) != 0;
+    bool providerFileBased = ( QgsProviderRegistry::instance()->providerCapabilities( provider ) & QgsDataProvider::File ) != 0;
 
     QgsDebugMsg( QString( "name=%1 type=%2 provider=%3 datasource='%4'" )
                  .arg( name )

diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -371,18 +371,20 @@ QgsDataProvider *QgsProviderRegistry::provider( QString const & providerKey, QSt
   return dataProvider;
 } // QgsProviderRegistry::setDataProvider
 
-int QgsProviderRegistry::getProviderCapabilities( const QString &providerKey ) const
+int QgsProviderRegistry::providerCapabilities( const QString &providerKey ) const
 {
   QLibrary *library = providerLibrary( providerKey );
   if ( !library )
   {
     return QgsDataProvider::NoDataCapabilities;
   }
+
   dataCapabilities_t * dataCapabilities = ( dataCapabilities_t * ) cast_to_fptr( library->resolve( "dataCapabilities" ) );
   if ( !dataCapabilities )
   {
     return QgsDataProvider::NoDataCapabilities;
   }
+
   return dataCapabilities();
 }
 
@@ -489,12 +491,3 @@ const QgsProviderMetadata* QgsProviderRegistry::providerMetadata( const QString&
 {
   return findMetadata_( mProviders, providerKey );
 }
-
-
-#if 0
-QgsDataProvider *
-QgsProviderRegistry::openVector( QString const & dataSource, QString const & providerKey )
-{
-  return getProvider( providerKey, dataSource );
-} // QgsProviderRegistry::openVector
-#endif
diff --git a/src/core/qgsproviderregistry.h b/src/core/qgsproviderregistry.h
@@ -72,7 +72,7 @@ class CORE_EXPORT QgsProviderRegistry
         @param providerKey identificator of the provider
         @note Added in 2.6
     */
-    int getProviderCapabilities( const QString& providerKey ) const;
+    int providerCapabilities( const QString& providerKey ) const;
 
     QWidget *selectWidget( const QString & providerKey,
                            QWidget * parent = 0, Qt::WindowFlags fl = 0 );