sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo in variable name in new stuff mark committed.

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4004 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux 2005-09-29 00:27:03 +00:00
parent 771970e931
commit d243ac8b75
1 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
src/qgsproviderregistry.cpp
View File

@ -58,16 +58,16 @@ QgsProviderRegistry *QgsProviderRegistry::instance(const char *pluginPath)
QgsProviderRegistry::QgsProviderRegistry(const char *pluginPath)
{
// At startup, examine the libs in the qgis/lib dir and store those that
// are a provider shared lib
// check all libs in the current plugin directory and get name and descriptions
//TODO figure out how to register and identify data source plugin for a specific
//TODO layer type
/* char **argv = qApp->argv();
QString appDir = argv[0];
int bin = appDir.findRev("/bin", -1, false);
QString baseDir = appDir.left(bin);
QString mLibraryDirectory = baseDir + "/lib"; */
// At startup, examine the libs in the qgis/lib dir and store those that
// are a provider shared lib
// check all libs in the current plugin directory and get name and descriptions
//TODO figure out how to register and identify data source plugin for a specific
//TODO layer type
/* char **argv = qApp->argv();
QString appDir = argv[0];
int bin = appDir.findRev("/bin", -1, false);
QString baseDir = appDir.left(bin);
QString mLibraryDirectory = baseDir + "/lib"; */
mLibraryDirectory = pluginPath;
mLibraryDirectory.setSorting( QDir::Name | QDir::IgnoreCase );
@ -85,87 +85,87 @@ QString mLibraryDirectory = baseDir + "/lib"; */
if (mLibraryDirectory.count() == 0)
{
QString msg = QObject::tr("No Data Provider Plugins",
"No QGIS data provider plugins found in:");
msg += "\n" + mLibraryDirectory.path() + "\n\n";
msg += QObject::tr("No vector layers can be loaded. Check your QGIS installation");
QMessageBox::critical(0, QObject::tr("No Data Providers"), msg);
QString msg = QObject::tr("No Data Provider Plugins",
"No QGIS data provider plugins found in:");
msg += "\n" + mLibraryDirectory.path() + "\n\n";
msg += QObject::tr("No vector layers can be loaded. Check your QGIS installation");
QMessageBox::critical(0, QObject::tr("No Data Providers"), msg);
}
else
{
const QFileInfoList *list = mLibraryDirectory.entryInfoList();
QFileInfoListIterator it( *list );
QFileInfo *fi;
const QFileInfoList *list = mLibraryDirectory.entryInfoList();
QFileInfoListIterator it( *list );
QFileInfo *fi;
while ( (fi = it.current()) != 0 )
while ( (fi = it.current()) != 0 )
{
QLibrary *myLib = new QLibrary( fi->filePath() );
bool loaded = myLib->load();
if (loaded)
{
QLibrary *myLib = new QLibrary( fi->filePath() );
#ifdef QGISDEBUG
std::cout << "Checking " << myLib->library().local8Bit() << std::endl;
#endif
// get the description and the key for the provider plugin
isprovider_t *isProvider = (isprovider_t *) myLib->resolve("isProvider");
bool loaded = myLib->load();
if (loaded)
if (isProvider)
{
// check to see if this is a provider plugin
if (isProvider())
{
// looks like a provider. get the key and description
description_t *pDesc = (description_t *) myLib->resolve("description");
providerkey_t *pKey = (providerkey_t *) myLib->resolve("providerKey");
if (pDesc && pKey)
{
const char *foo = pKey();
// add this provider to the provider map
mProviders[pKey()] =
new QgsProviderMetadata(pKey(), pDesc(), myLib->library());
#ifdef QGISDEBUG
std::cout << "Checking " << myLib->library().local8Bit() << std::endl;
std::cout << "Loaded " << pDesc().local8Bit() << std::endl;
#endif
// get the description and the key for the provider plugin
isprovider_t *isProvider = (isprovider_t *) myLib->resolve("isProvider");
if (isProvider)
// now get vector file filters, if any
fileVectorFilters_t *pFileVectorFilters =
(fileVectorFilters_t *) myLib->resolve("fileVectorFilters");
if ( pFileVectorFilters )
{
// check to see if this is a provider plugin
if (isProvider())
{
// looks like a provider. get the key and description
description_t *pDesc = (description_t *) myLib->resolve("description");
providerkey_t *pKey = (providerkey_t *) myLib->resolve("providerKey");
if (pDesc && pKey)
{
const char *foo = pKey();
// add this provider to the provider map
mProviders[pKey()] =
new QgsProviderMetadata(pKey(), pDesc(), myLib->library());
#ifdef QGISDEBUG
std::cout << "Loaded " << pDesc().local8Bit() << std::endl;
#endif
QString vectorFileFilters = pFileVectorFilters();
// now get vector file filters, if any
fileVectorFilters_t *pFileVectorFilters =
(fileVectorFilters_t *) myLib->resolve("fileVectorFilters");
if ( pVectorFileFilters )
{
QString vectorFileFilters = pVectorFileFilters();
if ( ! vectorFileFilters.isEmpty() )
{
mVectorFileFilters += vectorFileFilters;
}
else
{
QgsDebug( QString("No vector file filters for " + pKey()).ascii() );
}
}
else
{
QgsDebug( "Unable to invoke fileVectorFilters()" );
}
}
else
{
cout << myLib->library()
<< " Unable to find one of the required provider functions:\n\tproviderKey() or description()"
<< endl;
}
}
if ( ! vectorFileFilters.isEmpty() )
{
mVectorFileFilters += vectorFileFilters;
}
else
{
QgsDebug( QString("No vector file filters for " + pKey()).ascii() );
}
}
else
{
QgsDebug( "Unable to invoke fileVectorFilters()" );
}
}
else
{
cout << myLib->library()
<< " Unable to find one of the required provider functions:\n\tproviderKey() or description()"
<< endl;
}
}
delete myLib;
++it;
}
}
delete myLib;
++it;
}
}
} // QgsProviderRegistry ctor