Qt::WFlags is obsolete in Qt5. Replace it with Qt::WindowFlags.

This change is Qt4/Qt5 neutral.
This commit is contained in:
Mateusz Skowroński
2015-12-15 07:01:09 +01:00
committed by wmayer
parent c275b35d48
commit f48f0f69be
93 changed files with 111 additions and 111 deletions

View File

@@ -45,7 +45,7 @@ using namespace Gui::Dialog;
/* TRANSLATOR Gui::Dialog::DemoMode */
DemoMode::DemoMode(QWidget* parent, Qt::WFlags fl)
DemoMode::DemoMode(QWidget* parent, Qt::WindowFlags fl)
: QDialog(0, fl|Qt::WindowStaysOnTopHint), viewAxis(0,0,-1), ui(new Ui_DemoMode)
{
// create widgets

View File

@@ -44,7 +44,7 @@ class GuiExport DemoMode : public QDialog
Q_OBJECT
public:
DemoMode(QWidget* parent = 0, Qt::WFlags fl = 0);
DemoMode(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~DemoMode();
void accept();

View File

@@ -44,7 +44,7 @@ using namespace Gui::Dialog;
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DlgActivateWindowImp::DlgActivateWindowImp(QWidget* parent, Qt::WFlags fl)
DlgActivateWindowImp::DlgActivateWindowImp(QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl), ui(new Ui_DlgActivateWindow)
{
// create widgets

View File

@@ -40,7 +40,7 @@ class DlgActivateWindowImp : public QDialog
Q_OBJECT
public:
DlgActivateWindowImp(QWidget* parent = 0, Qt::WFlags fl = 0);
DlgActivateWindowImp(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~DlgActivateWindowImp();
protected:

View File

@@ -46,7 +46,7 @@ QList<QByteArray> DlgCustomizeImp::_pages;
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DlgCustomizeImp::DlgCustomizeImp(QWidget* parent, Qt::WFlags fl)
DlgCustomizeImp::DlgCustomizeImp(QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl)
{
setModal(false);

View File

@@ -51,7 +51,7 @@ class DlgCustomizeImp : public QDialog
Q_OBJECT
public:
DlgCustomizeImp(QWidget* parent = 0, Qt::WFlags fl = 0);
DlgCustomizeImp(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~DlgCustomizeImp();
static void addPage(const char* className);

View File

@@ -64,7 +64,7 @@ using namespace std;
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DlgDisplayPropertiesImp::DlgDisplayPropertiesImp( QWidget* parent, Qt::WFlags fl )
DlgDisplayPropertiesImp::DlgDisplayPropertiesImp( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
{
this->setupUi(this);

View File

@@ -55,7 +55,7 @@ class DlgDisplayPropertiesImp : public QDialog, public Ui_DlgDisplayProperties,
Q_OBJECT
public:
DlgDisplayPropertiesImp( QWidget* parent = 0, Qt::WFlags fl = 0 );
DlgDisplayPropertiesImp( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~DlgDisplayPropertiesImp();
/// Observer message from the Selection
void OnChange(Gui::SelectionSingleton::SubjectType &rCaller,

View File

@@ -45,7 +45,7 @@ using namespace Gui::Dialog;
*/
DlgEditFileIncludePropertyExternal::
DlgEditFileIncludePropertyExternal(App::PropertyFileIncluded& Prop,
QWidget* parent, Qt::WFlags fl)
QWidget* parent, Qt::WindowFlags fl)
: DlgRunExternal(parent, fl), Prop(Prop)
{

View File

@@ -39,7 +39,7 @@ class GuiExport DlgEditFileIncludePropertyExternal : public DlgRunExternal
Q_OBJECT
public:
DlgEditFileIncludePropertyExternal( App::PropertyFileIncluded& Prop, QWidget* parent = 0, Qt::WFlags fl = 0 );
DlgEditFileIncludePropertyExternal( App::PropertyFileIncluded& Prop, QWidget* parent = 0, Qt::WindowFlags fl = 0 );
virtual ~DlgEditFileIncludePropertyExternal();
int Do(void);

View File

@@ -54,7 +54,7 @@ using namespace Gui::Dialog;
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DlgMacroExecuteImp::DlgMacroExecuteImp( QWidget* parent, Qt::WFlags fl )
DlgMacroExecuteImp::DlgMacroExecuteImp( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl ), WindowParameter( "Macro" )
{
this->setupUi(this);

View File

@@ -40,7 +40,7 @@ class DlgMacroExecuteImp : public QDialog, public Ui_DlgMacroExecute, public Gui
Q_OBJECT
public:
DlgMacroExecuteImp( QWidget* parent = 0, Qt::WFlags fl = 0 );
DlgMacroExecuteImp( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~DlgMacroExecuteImp();
void accept();

View File

@@ -47,7 +47,7 @@ using namespace Gui::Dialog;
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DlgMacroRecordImp::DlgMacroRecordImp( QWidget* parent, Qt::WFlags fl )
DlgMacroRecordImp::DlgMacroRecordImp( QWidget* parent, Qt::WindowFlags fl )
: QDialog(parent, fl), WindowParameter("Macro")
{
this->setupUi(this);

View File

@@ -41,7 +41,7 @@ class DlgMacroRecordImp : public QDialog, public Ui_DlgMacroRecord, public Gui::
Q_OBJECT
public:
DlgMacroRecordImp( QWidget* parent = 0, Qt::WFlags fl = 0 );
DlgMacroRecordImp( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
virtual ~DlgMacroRecordImp();
protected Q_SLOTS:

View File

@@ -43,7 +43,7 @@ using namespace Gui::Dialog;
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DlgMaterialPropertiesImp::DlgMaterialPropertiesImp(const std::string& mat, QWidget* parent, Qt::WFlags fl)
DlgMaterialPropertiesImp::DlgMaterialPropertiesImp(const std::string& mat, QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl), material(mat)
{
this->setupUi(this);

View File

@@ -37,7 +37,7 @@ class DlgMaterialPropertiesImp : public QDialog, public Ui_DlgMaterialProperties
Q_OBJECT
public:
DlgMaterialPropertiesImp(const std::string& mat, QWidget* parent = 0, Qt::WFlags fl = 0);
DlgMaterialPropertiesImp(const std::string& mat, QWidget* parent = 0, Qt::WindowFlags fl = 0);
~DlgMaterialPropertiesImp();
void setViewProviders(const std::vector<Gui::ViewProvider*>&);

View File

@@ -56,7 +56,7 @@ using namespace Gui::Dialog;
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DlgParameterImp::DlgParameterImp( QWidget* parent, Qt::WFlags fl )
DlgParameterImp::DlgParameterImp( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl|Qt::WindowMinMaxButtonsHint )
{
this->setupUi(this);

View File

@@ -42,7 +42,7 @@ class DlgParameterImp : public QDialog, public Ui_DlgParameter
Q_OBJECT
public:
DlgParameterImp( QWidget* parent = 0, Qt::WFlags fl = 0 );
DlgParameterImp( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~DlgParameterImp();
void accept();

View File

@@ -58,7 +58,7 @@ std::list<DlgPreferencesImp::TGroupPages> DlgPreferencesImp::_pages;
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DlgPreferencesImp::DlgPreferencesImp( QWidget* parent, Qt::WFlags fl )
DlgPreferencesImp::DlgPreferencesImp( QWidget* parent, Qt::WindowFlags fl )
: QDialog(parent, fl), ui(new Ui_DlgPreferences), canEmbedScrollArea(true)
{
ui->setupUi(this);

View File

@@ -112,7 +112,7 @@ public:
static void addPage(const std::string& className, const std::string& group);
static void removePage(const std::string& className, const std::string& group);
DlgPreferencesImp(QWidget* parent = 0, Qt::WFlags fl = 0);
DlgPreferencesImp(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~DlgPreferencesImp();
void accept();

View File

@@ -46,7 +46,7 @@ using namespace Gui::Dialog;
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DlgProjectInformationImp::DlgProjectInformationImp(App::Document* doc, QWidget* parent, Qt::WFlags fl)
DlgProjectInformationImp::DlgProjectInformationImp(App::Document* doc, QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl), _doc(doc), ui(new Ui_DlgProjectInformation)
{
ui->setupUi(this);

View File

@@ -40,7 +40,7 @@ class DlgProjectInformationImp : public QDialog
Q_OBJECT
public:
DlgProjectInformationImp(App::Document* doc, QWidget* parent = 0, Qt::WFlags fl = 0);
DlgProjectInformationImp(App::Document* doc, QWidget* parent = 0, Qt::WindowFlags fl = 0);
~DlgProjectInformationImp();
void accept();

View File

@@ -108,7 +108,7 @@ std::string DlgProjectUtility::doctools =
/* TRANSLATOR Gui::Dialog::DlgProjectUtility */
DlgProjectUtility::DlgProjectUtility(QWidget* parent, Qt::WFlags fl)
DlgProjectUtility::DlgProjectUtility(QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl), ui(new Ui_DlgProjectUtility)
{
ui->setupUi(this);

View File

@@ -35,7 +35,7 @@ class DlgProjectUtility : public QDialog
Q_OBJECT
public:
DlgProjectUtility(QWidget* parent = 0, Qt::WFlags fl = 0);
DlgProjectUtility(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~DlgProjectUtility();
private Q_SLOTS:

View File

@@ -44,7 +44,7 @@ using namespace Gui::Dialog;
/* TRANSLATOR Gui::Dialog::DlgPropertyLink */
DlgPropertyLink::DlgPropertyLink(const QStringList& list, QWidget* parent, Qt::WFlags fl)
DlgPropertyLink::DlgPropertyLink(const QStringList& list, QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl), link(list), ui(new Ui_DlgPropertyLink)
{
#ifdef FC_DEBUG

View File

@@ -34,7 +34,7 @@ class DlgPropertyLink : public QDialog
Q_OBJECT
public:
DlgPropertyLink(const QStringList& list, QWidget* parent = 0, Qt::WFlags fl = 0);
DlgPropertyLink(const QStringList& list, QWidget* parent = 0, Qt::WindowFlags fl = 0);
~DlgPropertyLink();
void accept();

View File

@@ -46,7 +46,7 @@ using namespace Gui::Dialog;
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DlgRunExternal::DlgRunExternal( QWidget* parent, Qt::WFlags fl )
DlgRunExternal::DlgRunExternal( QWidget* parent, Qt::WindowFlags fl )
: QDialog(parent, fl),process(this),advancedHidden(true)
{
ui = new Ui_DlgRunExternal();

View File

@@ -41,7 +41,7 @@ class GuiExport DlgRunExternal : public QDialog
Q_OBJECT
public:
DlgRunExternal(QWidget* parent = 0, Qt::WFlags fl = 0);
DlgRunExternal(QWidget* parent = 0, Qt::WindowFlags fl = 0);
virtual ~DlgRunExternal();
int Do(void);

View File

@@ -43,7 +43,7 @@ using namespace Gui::Dialog;
* Constructs a DlgSettingsColorGradientImp as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
DlgSettingsColorGradientImp::DlgSettingsColorGradientImp( QWidget* parent, Qt::WFlags fl )
DlgSettingsColorGradientImp::DlgSettingsColorGradientImp( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
{
this->setupUi(this);

View File

@@ -41,7 +41,7 @@ class DlgSettingsColorGradientImp : public QDialog, public Ui_DlgSettingsColorGr
Q_OBJECT
public:
DlgSettingsColorGradientImp( QWidget* parent = 0, Qt::WFlags fl = 0 );
DlgSettingsColorGradientImp( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~DlgSettingsColorGradientImp();
void accept();

View File

@@ -50,7 +50,7 @@ using namespace Gui::Dialog;
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DlgTipOfTheDayImp::DlgTipOfTheDayImp( QWidget* parent, Qt::WFlags fl )
DlgTipOfTheDayImp::DlgTipOfTheDayImp( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl | Qt::WindowTitleHint | Qt::WindowSystemMenuHint ),
WindowParameter("General")
{

View File

@@ -55,7 +55,7 @@ class DlgTipOfTheDayImp : public QDialog, public Ui_DlgTipOfTheDay, public Windo
Q_OBJECT
public:
DlgTipOfTheDayImp( QWidget* parent = 0, Qt::WFlags fl = 0 );
DlgTipOfTheDayImp( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~DlgTipOfTheDayImp();
void reload();

View File

@@ -42,7 +42,7 @@ using namespace Gui::Dialog;
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DlgUnitsCalculator::DlgUnitsCalculator( QWidget* parent, Qt::WFlags fl )
DlgUnitsCalculator::DlgUnitsCalculator( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
{
// create widgets

View File

@@ -38,7 +38,7 @@ class DlgUnitsCalculator : public QDialog, public Ui_DlgUnitCalculator
Q_OBJECT
public:
DlgUnitsCalculator( QWidget* parent = 0, Qt::WFlags fl = 0 );
DlgUnitsCalculator( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~DlgUnitsCalculator();
protected:

View File

@@ -366,7 +366,7 @@ void FileDialog::setWorkingDirectory(const QString& dir)
/* TRANSLATOR Gui::FileOptionsDialog */
FileOptionsDialog::FileOptionsDialog( QWidget* parent, Qt::WFlags fl )
FileOptionsDialog::FileOptionsDialog( QWidget* parent, Qt::WindowFlags fl )
: QFileDialog( parent, fl )
{
extensionButton = new QPushButton( this );

View File

@@ -88,7 +88,7 @@ public:
ExtensionBottom = 1
};
FileOptionsDialog ( QWidget* parent, Qt::WFlags );
FileOptionsDialog ( QWidget* parent, Qt::WindowFlags );
virtual ~FileOptionsDialog();
void accept();

View File

@@ -219,7 +219,7 @@ void LocationWidget::on_direction_activated(int index)
// ----------------------------------------------------------------------------
LocationDialog::LocationDialog(QWidget* parent, Qt::WFlags fl)
LocationDialog::LocationDialog(QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl)
{
}

View File

@@ -80,7 +80,7 @@ class GuiExport LocationDialog : public QDialog
Q_OBJECT
protected:
LocationDialog(QWidget* parent = 0, Qt::WFlags fl = 0);
LocationDialog(QWidget* parent = 0, Qt::WindowFlags fl = 0);
virtual ~LocationDialog();
protected:
@@ -113,7 +113,7 @@ template <class Ui>
class LocationInterface : public LocationDialog, public Ui
{
public:
LocationInterface(QWidget* parent = 0, Qt::WFlags fl = 0) : LocationDialog(parent, fl)
LocationInterface(QWidget* parent = 0, Qt::WindowFlags fl = 0) : LocationDialog(parent, fl)
{
this->setupUi(this);
this->retranslate();
@@ -359,7 +359,7 @@ template <class Ui>
class LocationDialogComp : public LocationDialog
{
public:
LocationDialogComp(QWidget* parent = 0, Qt::WFlags fl = 0)
LocationDialogComp(QWidget* parent = 0, Qt::WindowFlags fl = 0)
: LocationDialog(parent, fl), ui(this)
{
}

View File

@@ -44,7 +44,7 @@ using namespace Gui;
TYPESYSTEM_SOURCE_ABSTRACT(Gui::MDIView,Gui::BaseView);
MDIView::MDIView(Gui::Document* pcDocument,QWidget* parent, Qt::WFlags wflags)
MDIView::MDIView(Gui::Document* pcDocument,QWidget* parent, Qt::WindowFlags wflags)
: QMainWindow(parent, wflags), BaseView(pcDocument),currentMode(Child), wstate(Qt::WindowNoState)
{
setAttribute(Qt::WA_DeleteOnClose);

View File

@@ -60,7 +60,7 @@ public:
* the view will attach to the active document. Be aware, there isn't
* always an active document.
*/
MDIView(Gui::Document* pcDocument, QWidget* parent, Qt::WFlags wflags=0);
MDIView(Gui::Document* pcDocument, QWidget* parent, Qt::WindowFlags wflags=0);
/** View destructor
* Detach the view from the document, if attached.
*/

View File

@@ -236,7 +236,7 @@ protected:
/* TRANSLATOR Gui::MainWindow */
MainWindow::MainWindow(QWidget * parent, Qt::WFlags f)
MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f)
: QMainWindow( parent, f/*WDestructiveClose*/ )
{
d = new MainWindowP;

View File

@@ -68,7 +68,7 @@ public:
* Constructs an empty main window. For default \a parent is 0, as there usually is
* no toplevel window there.
*/
MainWindow(QWidget * parent = 0, Qt::WFlags f = Qt::Window);
MainWindow(QWidget * parent = 0, Qt::WindowFlags f = Qt::Window);
/** Destroys the object and frees any allocated resources. */
~MainWindow();
/**

View File

@@ -332,7 +332,7 @@ class AlignmentView : public Gui::AbstractSplitView
public:
QLabel* myLabel;
AlignmentView(Gui::Document* pcDocument, QWidget* parent, QGLWidget* shareWidget=0, Qt::WFlags wflags=0)
AlignmentView(Gui::Document* pcDocument, QWidget* parent, QGLWidget* shareWidget=0, Qt::WindowFlags wflags=0)
: AbstractSplitView(pcDocument, parent, wflags)
{
QSplitter* mainSplitter=0;

View File

@@ -76,7 +76,7 @@ public:
/* TRANSLATOR Gui::Dialog::Placement */
Placement::Placement(QWidget* parent, Qt::WFlags fl)
Placement::Placement(QWidget* parent, Qt::WindowFlags fl)
: Gui::LocationDialog(parent, fl)
{
propertyName = "Placement"; // default name
@@ -492,7 +492,7 @@ void Placement::changeEvent(QEvent *e)
/* TRANSLATOR Gui::Dialog::DockablePlacement */
DockablePlacement::DockablePlacement(QWidget* parent, Qt::WFlags fl) : Placement(parent, fl)
DockablePlacement::DockablePlacement(QWidget* parent, Qt::WindowFlags fl) : Placement(parent, fl)
{
Gui::DockWindowManager* pDockMgr = Gui::DockWindowManager::instance();
QDockWidget* dw = pDockMgr->addDockWindow(QT_TR_NOOP("Placement"),

View File

@@ -45,7 +45,7 @@ class GuiExport Placement : public Gui::LocationDialog
Q_OBJECT
public:
Placement(QWidget* parent = 0, Qt::WFlags fl = 0);
Placement(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~Placement();
void accept();
void reject();
@@ -98,7 +98,7 @@ class GuiExport DockablePlacement : public Placement
Q_OBJECT
public:
DockablePlacement(QWidget* parent = 0, Qt::WFlags fl = 0);
DockablePlacement(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~DockablePlacement();
void accept();

View File

@@ -106,7 +106,7 @@ void SceneModel::setNode(QModelIndex index, SoNode* node)
/* TRANSLATOR Gui::Dialog::DlgInspector */
DlgInspector::DlgInspector(QWidget* parent, Qt::WFlags fl)
DlgInspector::DlgInspector(QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl), ui(new Ui_SceneInspector())
{
ui->setupUi(this);

View File

@@ -66,7 +66,7 @@ class DlgInspector : public QDialog
Q_OBJECT
public:
DlgInspector(QWidget* parent = 0, Qt::WFlags fl = 0);
DlgInspector(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~DlgInspector();
void setNode(SoNode* node);

View File

@@ -150,7 +150,7 @@ private:
/**
* Constructs a splash screen that will display the pixmap.
*/
SplashScreen::SplashScreen( const QPixmap & pixmap , Qt::WFlags f )
SplashScreen::SplashScreen( const QPixmap & pixmap , Qt::WindowFlags f )
: QSplashScreen(pixmap, f)
{
// write the messages to splasher

View File

@@ -40,7 +40,7 @@ class SplashScreen : public QSplashScreen
Q_OBJECT
public:
SplashScreen( const QPixmap & pixmap = QPixmap ( ), Qt::WFlags f = 0 );
SplashScreen( const QPixmap & pixmap = QPixmap ( ), Qt::WindowFlags f = 0 );
~SplashScreen();
protected:

View File

@@ -43,7 +43,7 @@ using namespace Gui;
TYPESYSTEM_SOURCE_ABSTRACT(Gui::AbstractSplitView,Gui::MDIView);
AbstractSplitView::AbstractSplitView(Gui::Document* pcDocument, QWidget* parent, Qt::WFlags wflags)
AbstractSplitView::AbstractSplitView(Gui::Document* pcDocument, QWidget* parent, Qt::WindowFlags wflags)
: MDIView(pcDocument,parent, wflags)
{
// important for highlighting
@@ -371,7 +371,7 @@ void AbstractSplitView::setOverrideCursor(const QCursor& aCursor)
TYPESYSTEM_SOURCE_ABSTRACT(Gui::SplitView3DInventor, Gui::AbstractSplitView);
SplitView3DInventor::SplitView3DInventor(int views, Gui::Document* pcDocument, QWidget* parent, Qt::WFlags wflags)
SplitView3DInventor::SplitView3DInventor(int views, Gui::Document* pcDocument, QWidget* parent, Qt::WindowFlags wflags)
: AbstractSplitView(pcDocument,parent, wflags)
{
QSplitter* mainSplitter=0;

View File

@@ -41,7 +41,7 @@ class GuiExport AbstractSplitView : public MDIView, public ParameterGrp::Observe
TYPESYSTEM_HEADER();
public:
AbstractSplitView(Gui::Document* pcDocument, QWidget* parent, Qt::WFlags wflags=0);
AbstractSplitView(Gui::Document* pcDocument, QWidget* parent, Qt::WindowFlags wflags=0);
~AbstractSplitView();
virtual const char *getName(void) const;
@@ -74,7 +74,7 @@ class GuiExport SplitView3DInventor : public AbstractSplitView
TYPESYSTEM_HEADER();
public:
SplitView3DInventor(int views, Gui::Document* pcDocument, QWidget* parent, Qt::WFlags wflags=0);
SplitView3DInventor(int views, Gui::Document* pcDocument, QWidget* parent, Qt::WindowFlags wflags=0);
~SplitView3DInventor();
};

View File

@@ -48,7 +48,7 @@ using namespace Gui::Dialog;
/* TRANSLATOR Gui::Dialog::TextureMapping */
TextureMapping::TextureMapping(QWidget* parent, Qt::WFlags fl)
TextureMapping::TextureMapping(QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl), grp(0), tex(0), env(0)
{
ui = new Ui_TextureMapping();

View File

@@ -39,7 +39,7 @@ class GuiExport TextureMapping : public QDialog
Q_OBJECT
public:
TextureMapping(QWidget* parent = 0, Qt::WFlags fl = 0);
TextureMapping(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~TextureMapping();
void accept();
void reject();

View File

@@ -301,7 +301,7 @@ void DefaultTransformStrategy::onSelectionChanged(const Gui::SelectionChanges& m
/* TRANSLATOR Gui::Dialog::Transform */
Transform::Transform(QWidget* parent, Qt::WFlags fl)
Transform::Transform(QWidget* parent, Qt::WindowFlags fl)
: Gui::LocationDialog(parent, fl), strategy(0)
{
ui = new Ui_TransformComp(this);

View File

@@ -71,7 +71,7 @@ class GuiExport Transform : public Gui::LocationDialog
Q_OBJECT
public:
Transform(QWidget* parent = 0, Qt::WFlags fl = 0);
Transform(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~Transform();
void accept();
void reject();

View File

@@ -105,7 +105,7 @@ void GLOverlayWidget::paintEvent(QPaintEvent* ev)
TYPESYSTEM_SOURCE_ABSTRACT(Gui::View3DInventor,Gui::MDIView);
View3DInventor::View3DInventor(Gui::Document* pcDocument, QWidget* parent,
const QGLWidget* sharewidget, Qt::WFlags wflags)
const QGLWidget* sharewidget, Qt::WindowFlags wflags)
: MDIView(pcDocument, parent, wflags), _viewerPy(0)
{
stack = new QStackedWidget(this);

View File

@@ -68,7 +68,7 @@ class GuiExport View3DInventor : public MDIView, public ParameterGrp::ObserverTy
TYPESYSTEM_HEADER();
public:
View3DInventor(Gui::Document* pcDocument, QWidget* parent, const QGLWidget* sharewidget = 0, Qt::WFlags wflags=0);
View3DInventor(Gui::Document* pcDocument, QWidget* parent, const QGLWidget* sharewidget = 0, Qt::WindowFlags wflags=0);
~View3DInventor();
/// Message handler

View File

@@ -446,7 +446,7 @@ void AccelLineEdit::keyPressEvent ( QKeyEvent * e)
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
CheckListDialog::CheckListDialog( QWidget* parent, Qt::WFlags fl )
CheckListDialog::CheckListDialog( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
{
ui.setupUi(this);
@@ -709,7 +709,7 @@ void ColorButton::onRejected()
// ------------------------------------------------------------------------------
UrlLabel::UrlLabel(QWidget * parent, Qt::WFlags f)
UrlLabel::UrlLabel(QWidget * parent, Qt::WindowFlags f)
: QLabel(parent, f)
{
_url = QString::fromLatin1("http://localhost");

View File

@@ -147,7 +147,7 @@ class GuiExport CheckListDialog : public QDialog
Q_OBJECT
public:
CheckListDialog( QWidget* parent = 0, Qt::WFlags fl = 0 );
CheckListDialog( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~CheckListDialog();
void setCheckableItems( const QStringList& items );
@@ -225,7 +225,7 @@ class GuiExport UrlLabel : public QLabel
Q_PROPERTY( QString url READ url WRITE setUrl)
public:
UrlLabel ( QWidget * parent = 0, Qt::WFlags f = 0 );
UrlLabel ( QWidget * parent = 0, Qt::WindowFlags f = 0 );
virtual ~UrlLabel();
QString url() const;

View File

@@ -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

View File

@@ -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; }

View File

@@ -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);

View File

@@ -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();

View File

@@ -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

View File

@@ -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);

View File

@@ -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)
{
}

View File

@@ -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:

View File

@@ -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);

View File

@@ -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

View File

@@ -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);

View File

@@ -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();

View File

@@ -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;

View File

@@ -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();

View File

@@ -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();

View File

@@ -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();

View File

@@ -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);

View File

@@ -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();

View File

@@ -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"));

View File

@@ -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:

View File

@@ -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)
{
}

View File

@@ -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();
};

View File

@@ -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*>();

View File

@@ -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();
};

View File

@@ -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);

View File

@@ -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:

View File

@@ -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);

View File

@@ -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:

View File

@@ -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);

View File

@@ -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();

View File

@@ -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;

View File

@@ -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:

View File

@@ -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);

View File

@@ -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);