Mercurial Repositories > eric / file diff

--- a/eric6/SqlBrowser/SqlBrowserWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/SqlBrowser/SqlBrowserWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -113,7 +113,8 @@
         """
         model = QStandardItemModel(self.table)
         self.table.setModel(model)
-        self.table.setEditTriggers(QAbstractItemView.NoEditTriggers)
+        self.table.setEditTriggers(
+            QAbstractItemView.EditTrigger.NoEditTriggers)
         
         self.updateActions()
     
@@ -153,12 +154,12 @@
         """
         from .SqlConnectionDialog import SqlConnectionDialog
         dlg = SqlConnectionDialog(self)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             driver, dbName, user, password, host, port = dlg.getData()
             err = self.addConnection(
                 driver, dbName, user, password, host, port)
             
-            if err.type() != QSqlError.NoError:
+            if err.type() != QSqlError.ErrorType.NoError:
                 E5MessageBox.warning(
                     self,
                     self.tr("Unable to open database"),
@@ -172,14 +173,15 @@
         @param table name of the table to be shown (string)
         """
         model = QSqlTableModel(self.table, self.connections.currentDatabase())
-        model.setEditStrategy(QSqlTableModel.OnRowChange)
+        model.setEditStrategy(QSqlTableModel.EditStrategy.OnRowChange)
         model.setTable(table)
         model.select()
-        if model.lastError().type() != QSqlError.NoError:
+        if model.lastError().type() != QSqlError.ErrorType.NoError:
             self.statusMessage.emit(model.lastError().text())
         self.table.setModel(model)
         self.table.setEditTriggers(
-            QAbstractItemView.DoubleClicked | QAbstractItemView.EditKeyPressed)
+            QAbstractItemView.EditTrigger.DoubleClicked |
+            QAbstractItemView.EditTrigger.EditKeyPressed)
         
         self.table.resizeColumnsToContents()
         
@@ -200,13 +202,13 @@
         model.insertRows(0, rec.count())
         model.insertColumns(0, 7)
         
-        model.setHeaderData(0, Qt.Horizontal, "Fieldname")
-        model.setHeaderData(1, Qt.Horizontal, "Type")
-        model.setHeaderData(2, Qt.Horizontal, "Length")
-        model.setHeaderData(3, Qt.Horizontal, "Precision")
-        model.setHeaderData(4, Qt.Horizontal, "Required")
-        model.setHeaderData(5, Qt.Horizontal, "Auto Value")
-        model.setHeaderData(6, Qt.Horizontal, "Default Value")
+        model.setHeaderData(0, Qt.Orientation.Horizontal, "Fieldname")
+        model.setHeaderData(1, Qt.Orientation.Horizontal, "Type")
+        model.setHeaderData(2, Qt.Orientation.Horizontal, "Length")
+        model.setHeaderData(3, Qt.Orientation.Horizontal, "Precision")
+        model.setHeaderData(4, Qt.Orientation.Horizontal, "Required")
+        model.setHeaderData(5, Qt.Orientation.Horizontal, "Auto Value")
+        model.setHeaderData(6, Qt.Orientation.Horizontal, "Default Value")
         
         for i in range(rec.count()):
             fld = rec.field(i)
@@ -234,7 +236,8 @@
             model.setData(model.index(i, 6), fld.defaultValue())
         
         self.table.setModel(model)
-        self.table.setEditTriggers(QAbstractItemView.NoEditTriggers)
+        self.table.setEditTriggers(
+            QAbstractItemView.EditTrigger.NoEditTriggers)
         
         self.table.resizeColumnsToContents()
         
@@ -276,7 +279,7 @@
         if not isinstance(model, QSqlTableModel):
             return
         
-        model.setEditStrategy(QSqlTableModel.OnManualSubmit)
+        model.setEditStrategy(QSqlTableModel.EditStrategy.OnManualSubmit)
         
         currentSelection = self.table.selectionModel().selectedIndexes()
         for selectedIndex in currentSelection:
@@ -285,7 +288,7 @@
             model.removeRow(selectedIndex.row())
         
         model.submitAll()
-        model.setEditStrategy(QSqlTableModel.OnRowChange)
+        model.setEditStrategy(QSqlTableModel.EditStrategy.OnRowChange)
         
         self.updateActions()
     
@@ -298,7 +301,7 @@
             self.sqlEdit.toPlainText(), self.connections.currentDatabase()))
         self.table.setModel(model)
         
-        if model.lastError().type() != QSqlError.NoError:
+        if model.lastError().type() != QSqlError.ErrorType.NoError:
             self.statusMessage.emit(model.lastError().text())
         elif model.query().isSelect():
             self.statusMessage.emit(self.tr("Query OK."))