remove unused files, code cleanup

qgis · Jul 9, 2014 · c33007f · c33007f
1 parent a9216c7
commit c33007f
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 2,076 deletions.
diff --git a/python/plugins/processing/algs/gdal/CMakeLists.txt b/python/plugins/processing/algs/gdal/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB PY_FILES *.py)
 
-ADD_SUBDIRECTORY(pyogr)
-
-PLUGIN_INSTALL(processing ./algs/gdal ${PY_FILES})
+PLUGIN_INSTALL(processing ./algs/gdal ${PY_FILES})
diff --git a/python/plugins/processing/algs/gdal/OgrAlgorithm.py b/python/plugins/processing/algs/gdal/OgrAlgorithm.py
@@ -66,16 +66,3 @@ def ogrConnectionString(self, uri):
         else:
             ogrstr = str(layer.source())
         return ogrstr
-
-    def drivers(self):
-        list = []
-        if ogrAvailable:
-            for iDriver in range(ogr.GetDriverCount()):
-                list.append('%s' % ogr.GetDriver(iDriver).GetName())
-        return list
-
-    def failure(self, pszDataSource):
-        out = 'FAILURE: Unable to open datasource %s with the following \
-              drivers.' % pszDataSource
-        out = out + string.join(map(lambda d: '->' + d, self.drivers()), '\n')
-        return out
diff --git a/python/plugins/processing/algs/gdal/ogr2ogr.py b/python/plugins/processing/algs/gdal/ogr2ogr.py
@@ -112,9 +112,6 @@ def defineCharacteristics(self):
 
         self.addOutput(OutputVector(self.OUTPUT_LAYER, 'Output layer'))
 
-    def commandLineName(self):
-        return "gdalogr:ogr2ogr"
-
     def processAlgorithm(self, progress):
         inLayer = self.getParameterValue(self.INPUT_LAYER)
         ogrLayer = self.ogrConnectionString(inLayer)

diff --git a/python/plugins/processing/algs/gdal/pyogr/CMakeLists.txt b/python/plugins/processing/algs/gdal/pyogr/CMakeLists.txt
diff --git a/python/plugins/processing/algs/gdal/pyogr/__init__.py b/python/plugins/processing/algs/gdal/pyogr/__init__.py