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
c275b35d48
commit
f48f0f69be
@@ -119,7 +119,7 @@ private:
|
||||
};
|
||||
}
|
||||
|
||||
CrossSections::CrossSections(const Base::BoundBox3d& bb, QWidget* parent, Qt::WFlags fl)
|
||||
CrossSections::CrossSections(const Base::BoundBox3d& bb, QWidget* parent, Qt::WindowFlags fl)
|
||||
: QDialog(parent, fl), bbox(bb)
|
||||
{
|
||||
ui = new Ui_CrossSections();
|
||||
|
||||
@@ -44,7 +44,7 @@ class CrossSections : public QDialog
|
||||
enum Plane { XY, XZ, YZ };
|
||||
|
||||
public:
|
||||
CrossSections(const Base::BoundBox3d& bb, QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
CrossSections(const Base::BoundBox3d& bb, QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~CrossSections();
|
||||
void accept();
|
||||
void apply();
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
using namespace PartGui;
|
||||
|
||||
DlgExtrusion::DlgExtrusion(QWidget* parent, Qt::WFlags fl)
|
||||
DlgExtrusion::DlgExtrusion(QWidget* parent, Qt::WindowFlags fl)
|
||||
: QDialog(parent, fl), ui(new Ui_DlgExtrusion)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
@@ -37,7 +37,7 @@ class DlgExtrusion : public QDialog
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DlgExtrusion(QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
DlgExtrusion(QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~DlgExtrusion();
|
||||
void accept();
|
||||
void apply();
|
||||
|
||||
@@ -201,7 +201,7 @@ namespace PartGui {
|
||||
|
||||
/* TRANSLATOR PartGui::DlgFilletEdges */
|
||||
|
||||
DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidget* parent, Qt::WFlags fl)
|
||||
DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidget* parent, Qt::WindowFlags fl)
|
||||
: QWidget(parent, fl), ui(new Ui_DlgFilletEdges()), d(new Private())
|
||||
{
|
||||
ui->setupUi(this);
|
||||
@@ -888,7 +888,7 @@ bool DlgFilletEdges::accept()
|
||||
|
||||
// ---------------------------------------
|
||||
|
||||
FilletEdgesDialog::FilletEdgesDialog(DlgFilletEdges::FilletType type, Part::FilletBase* fillet, QWidget* parent, Qt::WFlags fl)
|
||||
FilletEdgesDialog::FilletEdgesDialog(DlgFilletEdges::FilletType type, Part::FilletBase* fillet, QWidget* parent, Qt::WindowFlags fl)
|
||||
: QDialog(parent, fl)
|
||||
{
|
||||
widget = new DlgFilletEdges(type, fillet, this);
|
||||
@@ -958,7 +958,7 @@ bool TaskFilletEdges::reject()
|
||||
|
||||
/* TRANSLATOR PartGui::DlgChamferEdges */
|
||||
|
||||
DlgChamferEdges::DlgChamferEdges(Part::FilletBase* chamfer, QWidget* parent, Qt::WFlags fl)
|
||||
DlgChamferEdges::DlgChamferEdges(Part::FilletBase* chamfer, QWidget* parent, Qt::WindowFlags fl)
|
||||
: DlgFilletEdges(DlgFilletEdges::CHAMFER, chamfer, parent, fl)
|
||||
{
|
||||
this->setWindowTitle(tr("Chamfer Edges"));
|
||||
|
||||
@@ -80,7 +80,7 @@ class DlgFilletEdges : public QWidget, public Gui::SelectionObserver
|
||||
public:
|
||||
enum FilletType { FILLET, CHAMFER };
|
||||
|
||||
DlgFilletEdges(FilletType type, Part::FilletBase*, QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
DlgFilletEdges(FilletType type, Part::FilletBase*, QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~DlgFilletEdges();
|
||||
bool accept();
|
||||
|
||||
@@ -120,7 +120,7 @@ class FilletEdgesDialog : public QDialog
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
FilletEdgesDialog(DlgFilletEdges::FilletType type, Part::FilletBase* fillet, QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
FilletEdgesDialog(DlgFilletEdges::FilletType type, Part::FilletBase* fillet, QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~FilletEdgesDialog();
|
||||
void accept();
|
||||
|
||||
@@ -133,7 +133,7 @@ class DlgChamferEdges : public DlgFilletEdges
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DlgChamferEdges(Part::FilletBase*, QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
DlgChamferEdges(Part::FilletBase*, QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~DlgChamferEdges();
|
||||
|
||||
protected:
|
||||
|
||||
@@ -36,7 +36,7 @@ using namespace PartGui;
|
||||
* The dialog will by default be modeless, unless you set 'modal' to
|
||||
* TRUE to construct a modal dialog.
|
||||
*/
|
||||
DlgPartBoxImp::DlgPartBoxImp(QWidget* parent, Qt::WFlags fl)
|
||||
DlgPartBoxImp::DlgPartBoxImp(QWidget* parent, Qt::WindowFlags fl)
|
||||
: Gui::LocationInterface<Ui_DlgPartBox>(parent, fl)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ class DlgPartBoxImp : public Gui::LocationInterface<Ui_DlgPartBox>
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DlgPartBoxImp(QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
DlgPartBoxImp(QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~DlgPartBoxImp();
|
||||
};
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ using namespace PartGui;
|
||||
* The dialog will by default be modeless, unless you set 'modal' to
|
||||
* TRUE to construct a modal dialog.
|
||||
*/
|
||||
DlgPartCylinderImp::DlgPartCylinderImp(QWidget* parent, Qt::WFlags fl)
|
||||
DlgPartCylinderImp::DlgPartCylinderImp(QWidget* parent, Qt::WindowFlags fl)
|
||||
: Gui::LocationInterface<Ui_DlgPartCylinder>(parent, fl)
|
||||
{
|
||||
QList<QDoubleSpinBox*> list = this->findChildren<QDoubleSpinBox*>();
|
||||
|
||||
@@ -33,7 +33,7 @@ class DlgPartCylinderImp : public Gui::LocationInterface<Ui_DlgPartCylinder>
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DlgPartCylinderImp(QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
DlgPartCylinderImp(QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~DlgPartCylinderImp();
|
||||
};
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ using namespace PartGui;
|
||||
* The dialog will by default be modeless, unless you set 'modal' to
|
||||
* TRUE to construct a modal dialog.
|
||||
*/
|
||||
DlgPartImportIgesImp::DlgPartImportIgesImp(QWidget* parent, Qt::WFlags fl)
|
||||
DlgPartImportIgesImp::DlgPartImportIgesImp(QWidget* parent, Qt::WindowFlags fl)
|
||||
: QDialog(parent, fl)
|
||||
{
|
||||
this->setupUi(this);
|
||||
|
||||
@@ -33,7 +33,7 @@ class DlgPartImportIgesImp : public QDialog, public Ui_DlgPartImportIges
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DlgPartImportIgesImp( QWidget* parent = 0, Qt::WFlags fl = 0 );
|
||||
DlgPartImportIgesImp( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
|
||||
~DlgPartImportIgesImp();
|
||||
|
||||
public Q_SLOTS:
|
||||
|
||||
@@ -41,7 +41,7 @@ using namespace PartGui;
|
||||
* The dialog will by default be modeless, unless you set 'modal' to
|
||||
* TRUE to construct a modal dialog.
|
||||
*/
|
||||
DlgPartImportStepImp::DlgPartImportStepImp( QWidget* parent, Qt::WFlags fl )
|
||||
DlgPartImportStepImp::DlgPartImportStepImp( QWidget* parent, Qt::WindowFlags fl )
|
||||
: QDialog( parent, fl )
|
||||
{
|
||||
this->setupUi(this);
|
||||
|
||||
@@ -33,7 +33,7 @@ class DlgPartImportStepImp : public QDialog, public Ui_DlgPartImportStep
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DlgPartImportStepImp( QWidget* parent = 0, Qt::WFlags fl = 0 );
|
||||
DlgPartImportStepImp( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
|
||||
~DlgPartImportStepImp();
|
||||
|
||||
public Q_SLOTS:
|
||||
|
||||
@@ -97,7 +97,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
DlgRevolution::DlgRevolution(QWidget* parent, Qt::WFlags fl)
|
||||
DlgRevolution::DlgRevolution(QWidget* parent, Qt::WindowFlags fl)
|
||||
: Gui::LocationDialog(parent, fl), filter(0)
|
||||
{
|
||||
ui = new Ui_RevolutionComp(this);
|
||||
|
||||
@@ -36,7 +36,7 @@ class DlgRevolution : public Gui::LocationDialog, public Gui::SelectionObserver
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DlgRevolution(QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
DlgRevolution(QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~DlgRevolution();
|
||||
void accept();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user