Merge pull request #2704 from SebDieBln/FixFieldCalcDialogParent

NathanW2 · NathanW2 · commit 80e3f8fc749e · 2016-01-27T21:10:46.000+10:00
[Bugfix] Construct the QgsFieldCalculator dialog with the correct parent
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5474,7 +5474,7 @@ void QgisApp::fieldCalculator()
     return;
   }
 
-  QgsFieldCalculator calc( myLayer );
+  QgsFieldCalculator calc( myLayer, this );
   if ( calc.exec() )
   {
     mMapCanvas->refresh();
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -551,7 +551,7 @@ void QgsAttributeTableDialog::on_mOpenFieldCalculator_clicked()
 {
   QgsAttributeTableModel* masterModel = mMainView->masterModel();
 
-  QgsFieldCalculator calc( mLayer );
+  QgsFieldCalculator calc( mLayer, this );
   if ( calc.exec() == QDialog::Accepted )
   {
     int col = masterModel->fieldCol( calc.changedAttributeId() );
diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -27,8 +27,8 @@
 #include <QMessageBox>
 #include <QSettings>
 
-QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl )
-    : QDialog()
+QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl, QWidget* parent )
+    : QDialog( parent )
     , mVectorLayer( vl )
     , mAttributeId( -1 )
 {
diff --git a/src/app/qgsfieldcalculator.h b/src/app/qgsfieldcalculator.h
@@ -26,7 +26,7 @@ class APP_EXPORT QgsFieldCalculator: public QDialog, private Ui::QgsFieldCalcula
 {
     Q_OBJECT
   public:
-    QgsFieldCalculator( QgsVectorLayer* vl );
+    QgsFieldCalculator( QgsVectorLayer* vl, QWidget* parent = nullptr );
     ~QgsFieldCalculator();
 
     int changedAttributeId() const { return mAttributeId; }
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -762,7 +762,7 @@ void QgsFieldsProperties::on_mCalculateFieldButton_clicked()
     return;
   }
 
-  QgsFieldCalculator calc( mLayer );
+  QgsFieldCalculator calc( mLayer, this );
   calc.exec();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5474,7 +5474,7 @@ void QgisApp::fieldCalculator()`
`5474`	`5474`	`return;`
`5475`	`5475`	`}`
`5476`	`5476`
`5477`		`- QgsFieldCalculator calc( myLayer );`
	`5477`	`+ QgsFieldCalculator calc( myLayer, this );`
`5478`	`5478`	`if ( calc.exec() )`
`5479`	`5479`	`{`
`5480`	`5480`	`mMapCanvas->refresh();`
Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,7 @@ void QgsAttributeTableDialog::on_mOpenFieldCalculator_clicked()`
`551`	`551`	`{`
`552`	`552`	`QgsAttributeTableModel* masterModel = mMainView->masterModel();`
`553`	`553`
`554`		`- QgsFieldCalculator calc( mLayer );`
	`554`	`+ QgsFieldCalculator calc( mLayer, this );`
`555`	`555`	`if ( calc.exec() == QDialog::Accepted )`
`556`	`556`	`{`
`557`	`557`	`int col = masterModel->fieldCol( calc.changedAttributeId() );`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class APP_EXPORT QgsFieldCalculator: public QDialog, private Ui::QgsFieldCalcula`
`26`	`26`	`{`
`27`	`27`	`Q_OBJECT`
`28`	`28`	`public:`
`29`		`- QgsFieldCalculator( QgsVectorLayer* vl );`
	`29`	`+ QgsFieldCalculator( QgsVectorLayer* vl, QWidget* parent = nullptr );`
`30`	`30`	`~QgsFieldCalculator();`
`31`	`31`
`32`	`32`	`int changedAttributeId() const { return mAttributeId; }`
Original file line number	Diff line number	Diff line change
`@@ -762,7 +762,7 @@ void QgsFieldsProperties::on_mCalculateFieldButton_clicked()`
`762`	`762`	`return;`
`763`	`763`	`}`
`764`	`764`
`765`		`- QgsFieldCalculator calc( mLayer );`
	`765`	`+ QgsFieldCalculator calc( mLayer, this );`
`766`	`766`	`calc.exec();`
`767`	`767`	`}`
`768`	`768`