More cleaning

Author: pblottiere

python/plugins/db_manager/db_plugins/data_model.py

@@ -152,19 +152,16 @@ class SqlResultModelAsync(QObject):
 
     done = pyqtSignal()
 
-    def __init__(self, db, sql, parent=None):
+    def __init__(self):
         QObject.__init__(self)
-        self.db = db
-        self.sql = sql
-        self.parent = parent
         self.error = BaseError('')
         self.status = None
         self.model = None
         self.task = None
 
     def cancel(self):
         if self.task:
-            self.task.cancelQuery()
+            self.task.cancel()
 
     def modelDone(self):
         if self.task:

python/plugins/db_manager/db_plugins/postgis/data_model.py

@@ -97,15 +97,15 @@ def run(self):
             return False
         return True
 
-    def cancelQuery(self):
+    def cancel(self):
         self.db.connector.cancel()
-        self.cancel()
+        SqlResultModelTask.cancel(self)
 
 
 class PGSqlResultModelAsync(SqlResultModelAsync):
 
     def __init__(self, db, sql, parent):
-        SqlResultModelAsync.__init__(self, db, sql, parent)
+        SqlResultModelAsync.__init__(self)
 
         self.task = PGSqlResultModelTask(db, sql, parent)
         self.task.taskCompleted.connect(self.modelDone)

python/plugins/db_manager/db_plugins/spatialite/data_model.py

@@ -87,16 +87,16 @@ def run(self):
 
         return True
 
-    def cancelQuery(self):
+    def cancel(self):
         if self.clone:
             self.clone.connector.cancel()
-        self.cancel()
+        SqlResultModelTask.cancel(self)
 
 
 class SLSqlResultModelAsync(SqlResultModelAsync):
 
     def __init__(self, db, sql, parent):
-        SqlResultModelAsync.__init__(self, db, sql, parent)
+        SqlResultModelAsync.__init__(self)
 
         self.task = SLSqlResultModelTask(db, sql, parent)
         self.task.taskCompleted.connect(self.modelDone)

python/plugins/db_manager/db_plugins/vlayers/data_model.py

@@ -97,15 +97,15 @@ def run(self):
             return False
         return True
 
-    def cancelQuery(self):
+    def cancel(self):
         self.subtask.cancel()
-        self.cancel()
+        SqlResultModelTask.cancel(self)
 
 
 class LSqlResultModelAsync(SqlResultModelAsync):
 
     def __init__(self, db, sql, parent=None):
-        SqlResultModelAsync.__init__(self, db, sql, parent)
+        SqlResultModelAsync.__init__(self)
 
         self.task = LSqlResultModelTask(db, sql, parent)
         self.task.taskCompleted.connect(self.modelDone)

python/plugins/db_manager/dlg_cancel_task_query.py

@@ -58,8 +58,8 @@ def show(self):
         self.mGif.start()
         self.mCancelButton.setEnabled(True)
         self.mLabel.setText("Executing SQL...")
-        super(QDialog, self).show()
+        QDialog.show(self)
 
     def hide(self):
         self.mGif.stop()
-        super(QDialog, self).hide()
+        QDialog.hide(self)