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
@@ -50,7 +50,7 @@ bool GLImageBox::haveMesa = false;
|
||||
/* TRANSLATOR ImageGui::GLImageBox */
|
||||
|
||||
// Constructor
|
||||
GLImageBox::GLImageBox(QWidget * parent, const QGLWidget * shareWidget, Qt::WFlags f)
|
||||
GLImageBox::GLImageBox(QWidget * parent, const QGLWidget * shareWidget, Qt::WindowFlags f)
|
||||
: QGLWidget(parent, shareWidget, f)
|
||||
{
|
||||
// uses default display format for the OpenGL rendering context
|
||||
|
||||
@@ -35,7 +35,7 @@ class ImageGuiExport GLImageBox : public QGLWidget
|
||||
|
||||
public:
|
||||
|
||||
GLImageBox(QWidget * parent = 0, const QGLWidget * shareWidget = 0, Qt::WFlags f = 0);
|
||||
GLImageBox(QWidget * parent = 0, const QGLWidget * shareWidget = 0, Qt::WindowFlags f = 0);
|
||||
~GLImageBox();
|
||||
|
||||
Image::ImageBase *getImageBasePtr() { return &_image; }
|
||||
|
||||
@@ -76,7 +76,7 @@ private:
|
||||
* Constructs a VisualInspection as a child of 'parent', with the
|
||||
* name 'name' and widget flags set to 'f'.
|
||||
*/
|
||||
VisualInspection::VisualInspection(QWidget* parent, Qt::WFlags fl)
|
||||
VisualInspection::VisualInspection(QWidget* parent, Qt::WindowFlags fl)
|
||||
: QDialog(parent, fl), ui(new Ui_VisualInspection)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
@@ -37,7 +37,7 @@ class VisualInspection : public QDialog
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
VisualInspection(QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
VisualInspection(QWidget* parent = 0, Qt::WindowFlags fl = 0);
|
||||
~ VisualInspection();
|
||||
|
||||
void accept();
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ using namespace PointsGui;
|
||||
|
||||
|
||||
|
||||
DlgPointsReadImp::DlgPointsReadImp(const char *FileName, QWidget* parent, Qt::WFlags fl )
|
||||
DlgPointsReadImp::DlgPointsReadImp(const char *FileName, QWidget* parent, Qt::WindowFlags fl )
|
||||
: QDialog( parent, fl )
|
||||
{
|
||||
_FileName = FileName;
|
||||
|
||||
@@ -36,7 +36,7 @@ class DlgPointsReadImp : public QDialog, public Ui_DlgPointsRead
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DlgPointsReadImp(const char *FileName, QWidget* parent = 0, Qt::WFlags fl = 0 );
|
||||
DlgPointsReadImp(const char *FileName, QWidget* parent = 0, Qt::WindowFlags fl = 0 );
|
||||
~DlgPointsReadImp();
|
||||
|
||||
private:
|
||||
|
||||
@@ -79,7 +79,7 @@ bool UnitTestDialog::hasInstance()
|
||||
* The dialog will by default be modeless, unless you set 'modal' to
|
||||
* TRUE to construct a modal dialog.
|
||||
*/
|
||||
UnitTestDialog::UnitTestDialog(QWidget* parent, Qt::WFlags f)
|
||||
UnitTestDialog::UnitTestDialog(QWidget* parent, Qt::WindowFlags f)
|
||||
: QDialog(parent, f)
|
||||
{
|
||||
this->setupUi(this);
|
||||
|
||||
@@ -56,7 +56,7 @@ public:
|
||||
static bool hasInstance();
|
||||
|
||||
protected:
|
||||
UnitTestDialog(QWidget* parent = 0, Qt::WFlags f = 0);
|
||||
UnitTestDialog(QWidget* parent = 0, Qt::WindowFlags f = 0);
|
||||
~UnitTestDialog();
|
||||
void setProgressColor(const QColor& col);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user