Qt::WFlags is obsolete in Qt5. Replace it with Qt::WindowFlags.
This change is Qt4/Qt5 neutral.
This commit is contained in:
committed by
wmayer
parent
cd2db00f22
commit
3b463f2138
@@ -172,7 +172,7 @@ void DlgEvaluateMeshImp::slotDeletedDocument(const App::Document& Doc)
|
||||
* The dialog will by default be modeless, unless you set 'modal' to
|
||||
* TRUE to construct a modal dialog.
|
||||
*/
|
||||
DlgEvaluateMeshImp::DlgEvaluateMeshImp(QWidget* parent, Qt::WFlags fl)
|
||||
DlgEvaluateMeshImp::DlgEvaluateMeshImp(QWidget* parent, Qt::WindowFlags fl)
|
||||
: QDialog(parent, fl), d(new Private())
|
||||
{
|
||||
this->setupUi(this);
|
||||
@@ -1166,7 +1166,7 @@ bool DockEvaluateMeshImp::hasInstance()
|
||||
* Constructs a DockEvaluateMeshImp which is a child of 'parent', with the
|
||||
* name 'name' and widget flags set to 'f'
|
||||
*/
|
||||
DockEvaluateMeshImp::DockEvaluateMeshImp( QWidget* parent, Qt::WFlags fl )
|
||||
DockEvaluateMeshImp::DockEvaluateMeshImp( QWidget* parent, Qt::WindowFlags fl )
|
||||
: DlgEvaluateMeshImp( parent, fl )
|
||||
{
|
||||
// embed this dialog into a dockable widget container
|
||||
|
||||
@@ -66,7 +66,7 @@ class DlgEvaluateMeshImp : public QDialog, public Ui_DlgEvaluateMesh, public App
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DlgEvaluateMeshImp( QWidget* parent = 0, Qt::WFlags fl = 0 );
|
||||
DlgEvaluateMeshImp( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
|
||||
~DlgEvaluateMeshImp();
|
||||
|
||||
void setMesh( Mesh::Feature* );
|
||||
@@ -143,7 +143,7 @@ class DockEvaluateMeshImp : public DlgEvaluateMeshImp
|
||||
Q_OBJECT
|
||||
|
||||
protected:
|
||||
DockEvaluateMeshImp( QWidget* parent = 0, Qt::WFlags fl = 0 );
|
||||
DockEvaluateMeshImp( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
|
||||
~DockEvaluateMeshImp();
|
||||
void closeEvent(QCloseEvent* e);
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ using namespace MeshGui;
|
||||
* The dialog will by default be modeless, unless you set 'modal' to
|
||||
* TRUE to construct a modal dialog.
|
||||
*/
|
||||
MeshGui::DlgRegularSolidImp::DlgRegularSolidImp(QWidget* parent, Qt::WFlags fl)
|
||||
MeshGui::DlgRegularSolidImp::DlgRegularSolidImp(QWidget* parent, Qt::WindowFlags fl)
|
||||
: QDialog( parent, fl )
|
||||
{
|
||||
this->setupUi(this);
|
||||
@@ -246,7 +246,7 @@ bool SingleDlgRegularSolidImp::hasInstance()
|
||||
* Constructs a SingleDlgRegularSolidImp which is a child of 'parent', with the
|
||||
* name 'name' and widget flags set to 'f'
|
||||
*/
|
||||
SingleDlgRegularSolidImp::SingleDlgRegularSolidImp(QWidget* parent, Qt::WFlags fl)
|
||||
SingleDlgRegularSolidImp::SingleDlgRegularSolidImp(QWidget* parent, Qt::WindowFlags fl)
|
||||
: DlgRegularSolidImp(parent, fl)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ class DlgRegularSolidImp : public QDialog, public Ui_DlgRegularSolid
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DlgRegularSolidImp(QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
DlgRegularSolidImp(QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~DlgRegularSolidImp();
|
||||
|
||||
public Q_SLOTS:
|
||||
@@ -49,7 +49,7 @@ protected:
|
||||
class SingleDlgRegularSolidImp : public DlgRegularSolidImp
|
||||
{
|
||||
protected:
|
||||
SingleDlgRegularSolidImp(QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
SingleDlgRegularSolidImp(QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~SingleDlgRegularSolidImp();
|
||||
|
||||
public:
|
||||
|
||||
@@ -112,7 +112,7 @@ void DlgSmoothing::on_checkBoxSelection_toggled(bool on)
|
||||
|
||||
// ------------------------------------------------
|
||||
|
||||
SmoothingDialog::SmoothingDialog(QWidget* parent, Qt::WFlags fl)
|
||||
SmoothingDialog::SmoothingDialog(QWidget* parent, Qt::WindowFlags fl)
|
||||
: QDialog(parent, fl)
|
||||
{
|
||||
widget = new DlgSmoothing(this);
|
||||
|
||||
@@ -73,7 +73,7 @@ class MeshGuiExport SmoothingDialog : public QDialog
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
SmoothingDialog(QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
SmoothingDialog(QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~SmoothingDialog();
|
||||
|
||||
int iterations() const
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
using namespace MeshGui;
|
||||
|
||||
|
||||
RemoveComponents::RemoveComponents(QWidget* parent, Qt::WFlags fl)
|
||||
RemoveComponents::RemoveComponents(QWidget* parent, Qt::WindowFlags fl)
|
||||
: QWidget(parent, fl)
|
||||
{
|
||||
ui = new Ui_RemoveComponents;
|
||||
@@ -157,7 +157,7 @@ void RemoveComponents::reject()
|
||||
|
||||
// -------------------------------------------------
|
||||
|
||||
RemoveComponentsDialog::RemoveComponentsDialog(QWidget* parent, Qt::WFlags fl)
|
||||
RemoveComponentsDialog::RemoveComponentsDialog(QWidget* parent, Qt::WindowFlags fl)
|
||||
: QDialog(parent, fl)
|
||||
{
|
||||
widget = new RemoveComponents(this);
|
||||
|
||||
@@ -42,7 +42,7 @@ class MeshGuiExport RemoveComponents : public QWidget
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
RemoveComponents(QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
RemoveComponents(QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~RemoveComponents();
|
||||
void reject();
|
||||
void deleteSelection();
|
||||
@@ -78,7 +78,7 @@ class MeshGuiExport RemoveComponentsDialog : public QDialog
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
RemoveComponentsDialog(QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
RemoveComponentsDialog(QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~RemoveComponentsDialog();
|
||||
void reject();
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
using namespace MeshGui;
|
||||
|
||||
Segmentation::Segmentation(Mesh::Feature* mesh, QWidget* parent, Qt::WFlags fl)
|
||||
Segmentation::Segmentation(Mesh::Feature* mesh, QWidget* parent, Qt::WindowFlags fl)
|
||||
: QWidget(parent, fl), myMesh(mesh)
|
||||
{
|
||||
ui = new Ui_Segmentation;
|
||||
|
||||
@@ -37,7 +37,7 @@ class Ui_Segmentation;
|
||||
class MeshGuiExport Segmentation : public QWidget
|
||||
{
|
||||
public:
|
||||
Segmentation(Mesh::Feature* mesh, QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
Segmentation(Mesh::Feature* mesh, QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~Segmentation();
|
||||
void accept();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user