Address PR comments

qgis · Sep 21, 2020 · 6d866e3 · 6d866e3
1 parent 3e5be25
commit 6d866e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/python/plugins/db_manager/dlg_sql_window.py b/python/plugins/db_manager/dlg_sql_window.py
@@ -381,7 +381,7 @@ def updateUiWhileSqlExecution(self, status):
 
     def executeSqlCanceled(self):
         self.btnCancel.setEnabled(False)
-        self.btnCancel.setText(self.tr("Canceling, please wait ..."))
+        self.btnCancel.setText(self.tr("Canceling…"))
         self.modelAsync.cancel()
 
     def executeSqlCompleted(self):

diff --git a/src/providers/postgres/qgspostgresproviderconnection.cpp b/src/providers/postgres/qgspostgresproviderconnection.cpp
@@ -223,10 +223,10 @@ QList<QVariantList> QgsPostgresProviderConnection::executeSqlPrivate( const QStr
     }
 
     // This is gross but I tried with both conn and a context QObject without success: the lambda is never called.
-    QMetaObject::Connection moConn;
+    QMetaObject::Connection qtConnection;
     if ( feedback )
     {
-      moConn = QObject::connect( feedback, &QgsFeedback::canceled, [ &conn ]
+      qtConnection = QObject::connect( feedback, &QgsFeedback::canceled, [ &conn ]
       {
         conn->PQCancel();
       } );
@@ -235,7 +235,7 @@ QList<QVariantList> QgsPostgresProviderConnection::executeSqlPrivate( const QStr
     QgsPostgresResult res( conn->PQexec( sql ) );
     if ( feedback )
     {
-      QObject::disconnect( moConn );
+      QObject::disconnect( qtConnection );
     }
 
     QString errCause;