in addLayer() Removed superfluous check for OGR plug-in since that's …

…now handled elsewhere. git-svn-id: http://svn.osgeo.org/qgis/trunk@4284 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 1, 2005 · deae1bd · deae1bd
1 parent 76dddcb
commit deae1bd
Showing 1 changed file with 14 additions and 32 deletions.
diff --git a/src/qgisapp.cpp b/src/qgisapp.cpp
@@ -1110,44 +1110,26 @@ static void openFilesRememberingFilter_(QString const &filterName,
 */
 void QgisApp::addLayer()
 {
+    mMapCanvas->freeze();
 
-
-    //qDebug( "vector file filters: " + fileFilters );
-
-    // XXX pOgr is subsequently never used; so why do we do this?
-    QString pOgr = mProviderRegistry->library("ogr");
-
-    if (pOgr.isEmpty())
-    {
-#ifdef QGSDEBUG
-        qDebug("unable to get OGR registry");
-#endif
-
-        return;
-    }
-    else
-    {
-        mMapCanvas->freeze();
-
-        QStringList selectedFiles;
+    QStringList selectedFiles;
 #ifdef QGISDEBUG
-        std::cerr << "Vector file filters: " << mVectorFileFilter.toLocal8Bit().data() << std::endl;
+    std::cerr << "Vector file filters: " << mVectorFileFilter.toLocal8Bit().data() << std::endl;
 #endif
 
-        QString enc;
-        QString title = tr("Open an OGR Supported Vector Layer");
-        openFilesRememberingFilter_("lastVectorFileFilter", mVectorFileFilter, selectedFiles, enc,
-                                    title);
-        if (selectedFiles.isEmpty())
-        {
-            // no files were selected, so just bail
-            mMapCanvas->freeze(false);
+    QString enc;
+    QString title = tr("Open an OGR Supported Vector Layer");
+    openFilesRememberingFilter_("lastVectorFileFilter", mVectorFileFilter, selectedFiles, enc,
+                                title);
+    if (selectedFiles.isEmpty())
+    {
+        // no files were selected, so just bail
+        mMapCanvas->freeze(false);
 
-            return;
-        }
-
-        addLayer(selectedFiles, enc);
+        return;
     }
+
+    addLayer(selectedFiles, enc);
 } // QgisApp::addLayer()