From f48f0f69bebc78b5caff84dc3a6e994ac9bc6cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Skowro=C5=84ski?= <skowri@gmail.com>
Date: Tue, 15 Dec 2015 07:01:09 +0100
Subject: [PATCH] Qt::WFlags is obsolete in Qt5. Replace it with
 Qt::WindowFlags.

This change is Qt4/Qt5 neutral.
---
 src/Gui/DemoMode.cpp                            | 2 +-
 src/Gui/DemoMode.h                              | 2 +-
 src/Gui/DlgActivateWindowImp.cpp                | 2 +-
 src/Gui/DlgActivateWindowImp.h                  | 2 +-
 src/Gui/DlgCustomizeImp.cpp                     | 2 +-
 src/Gui/DlgCustomizeImp.h                       | 2 +-
 src/Gui/DlgDisplayPropertiesImp.cpp             | 2 +-
 src/Gui/DlgDisplayPropertiesImp.h               | 2 +-
 src/Gui/DlgEditFileIncludeProptertyExternal.cpp | 2 +-
 src/Gui/DlgEditFileIncludeProptertyExternal.h   | 2 +-
 src/Gui/DlgMacroExecuteImp.cpp                  | 2 +-
 src/Gui/DlgMacroExecuteImp.h                    | 2 +-
 src/Gui/DlgMacroRecordImp.cpp                   | 2 +-
 src/Gui/DlgMacroRecordImp.h                     | 2 +-
 src/Gui/DlgMaterialPropertiesImp.cpp            | 2 +-
 src/Gui/DlgMaterialPropertiesImp.h              | 2 +-
 src/Gui/DlgParameterImp.cpp                     | 2 +-
 src/Gui/DlgParameterImp.h                       | 2 +-
 src/Gui/DlgPreferencesImp.cpp                   | 2 +-
 src/Gui/DlgPreferencesImp.h                     | 2 +-
 src/Gui/DlgProjectInformationImp.cpp            | 2 +-
 src/Gui/DlgProjectInformationImp.h              | 2 +-
 src/Gui/DlgProjectUtility.cpp                   | 2 +-
 src/Gui/DlgProjectUtility.h                     | 2 +-
 src/Gui/DlgPropertyLink.cpp                     | 2 +-
 src/Gui/DlgPropertyLink.h                       | 2 +-
 src/Gui/DlgRunExternal.cpp                      | 2 +-
 src/Gui/DlgRunExternal.h                        | 2 +-
 src/Gui/DlgSettingsColorGradientImp.cpp         | 2 +-
 src/Gui/DlgSettingsColorGradientImp.h           | 2 +-
 src/Gui/DlgTipOfTheDayImp.cpp                   | 2 +-
 src/Gui/DlgTipOfTheDayImp.h                     | 2 +-
 src/Gui/DlgUnitsCalculatorImp.cpp               | 2 +-
 src/Gui/DlgUnitsCalculatorImp.h                 | 2 +-
 src/Gui/FileDialog.cpp                          | 2 +-
 src/Gui/FileDialog.h                            | 2 +-
 src/Gui/InputVector.cpp                         | 2 +-
 src/Gui/InputVector.h                           | 6 +++---
 src/Gui/MDIView.cpp                             | 2 +-
 src/Gui/MDIView.h                               | 2 +-
 src/Gui/MainWindow.cpp                          | 2 +-
 src/Gui/MainWindow.h                            | 2 +-
 src/Gui/ManualAlignment.cpp                     | 2 +-
 src/Gui/Placement.cpp                           | 4 ++--
 src/Gui/Placement.h                             | 4 ++--
 src/Gui/SceneInspector.cpp                      | 2 +-
 src/Gui/SceneInspector.h                        | 2 +-
 src/Gui/Splashscreen.cpp                        | 2 +-
 src/Gui/Splashscreen.h                          | 2 +-
 src/Gui/SplitView3DInventor.cpp                 | 4 ++--
 src/Gui/SplitView3DInventor.h                   | 4 ++--
 src/Gui/TextureMapping.cpp                      | 2 +-
 src/Gui/TextureMapping.h                        | 2 +-
 src/Gui/Transform.cpp                           | 2 +-
 src/Gui/Transform.h                             | 2 +-
 src/Gui/View3DInventor.cpp                      | 2 +-
 src/Gui/View3DInventor.h                        | 2 +-
 src/Gui/Widgets.cpp                             | 4 ++--
 src/Gui/Widgets.h                               | 4 ++--
 src/Mod/Image/Gui/GLImageBox.cpp                | 2 +-
 src/Mod/Image/Gui/GLImageBox.h                  | 2 +-
 src/Mod/Inspection/Gui/VisualInspection.cpp     | 2 +-
 src/Mod/Inspection/Gui/VisualInspection.h       | 2 +-
 src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp         | 4 ++--
 src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h           | 4 ++--
 src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp         | 4 ++--
 src/Mod/Mesh/Gui/DlgRegularSolidImp.h           | 4 ++--
 src/Mod/Mesh/Gui/DlgSmoothing.cpp               | 2 +-
 src/Mod/Mesh/Gui/DlgSmoothing.h                 | 2 +-
 src/Mod/Mesh/Gui/RemoveComponents.cpp           | 4 ++--
 src/Mod/Mesh/Gui/RemoveComponents.h             | 4 ++--
 src/Mod/Mesh/Gui/Segmentation.cpp               | 2 +-
 src/Mod/Mesh/Gui/Segmentation.h                 | 2 +-
 src/Mod/Part/Gui/CrossSections.cpp              | 2 +-
 src/Mod/Part/Gui/CrossSections.h                | 2 +-
 src/Mod/Part/Gui/DlgExtrusion.cpp               | 2 +-
 src/Mod/Part/Gui/DlgExtrusion.h                 | 2 +-
 src/Mod/Part/Gui/DlgFilletEdges.cpp             | 6 +++---
 src/Mod/Part/Gui/DlgFilletEdges.h               | 6 +++---
 src/Mod/Part/Gui/DlgPartBoxImp.cpp              | 2 +-
 src/Mod/Part/Gui/DlgPartBoxImp.h                | 2 +-
 src/Mod/Part/Gui/DlgPartCylinderImp.cpp         | 2 +-
 src/Mod/Part/Gui/DlgPartCylinderImp.h           | 2 +-
 src/Mod/Part/Gui/DlgPartImportIgesImp.cpp       | 2 +-
 src/Mod/Part/Gui/DlgPartImportIgesImp.h         | 2 +-
 src/Mod/Part/Gui/DlgPartImportStepImp.cpp       | 2 +-
 src/Mod/Part/Gui/DlgPartImportStepImp.h         | 2 +-
 src/Mod/Part/Gui/DlgRevolution.cpp              | 2 +-
 src/Mod/Part/Gui/DlgRevolution.h                | 2 +-
 src/Mod/Points/Gui/DlgPointsReadImp.cpp         | 2 +-
 src/Mod/Points/Gui/DlgPointsReadImp.h           | 2 +-
 src/Mod/Test/Gui/UnitTestImp.cpp                | 2 +-
 src/Mod/Test/Gui/UnitTestImp.h                  | 2 +-
 93 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/src/Gui/DemoMode.cpp b/src/Gui/DemoMode.cpp
index f877d1a814..901992ebd2 100644
--- a/src/Gui/DemoMode.cpp
+++ b/src/Gui/DemoMode.cpp
@@ -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
diff --git a/src/Gui/DemoMode.h b/src/Gui/DemoMode.h
index 1f4fb67ead..e08c91926e 100644
--- a/src/Gui/DemoMode.h
+++ b/src/Gui/DemoMode.h
@@ -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();
diff --git a/src/Gui/DlgActivateWindowImp.cpp b/src/Gui/DlgActivateWindowImp.cpp
index cdd0054577..80460d7ae9 100644
--- a/src/Gui/DlgActivateWindowImp.cpp
+++ b/src/Gui/DlgActivateWindowImp.cpp
@@ -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
diff --git a/src/Gui/DlgActivateWindowImp.h b/src/Gui/DlgActivateWindowImp.h
index 454f1ed6ea..6017394a31 100644
--- a/src/Gui/DlgActivateWindowImp.h
+++ b/src/Gui/DlgActivateWindowImp.h
@@ -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:
diff --git a/src/Gui/DlgCustomizeImp.cpp b/src/Gui/DlgCustomizeImp.cpp
index 54284f36f8..7fd9ed9114 100644
--- a/src/Gui/DlgCustomizeImp.cpp
+++ b/src/Gui/DlgCustomizeImp.cpp
@@ -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);
diff --git a/src/Gui/DlgCustomizeImp.h b/src/Gui/DlgCustomizeImp.h
index 41a04752dc..a5e2454037 100644
--- a/src/Gui/DlgCustomizeImp.h
+++ b/src/Gui/DlgCustomizeImp.h
@@ -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);
diff --git a/src/Gui/DlgDisplayPropertiesImp.cpp b/src/Gui/DlgDisplayPropertiesImp.cpp
index 6510a18feb..7dbf655bc3 100644
--- a/src/Gui/DlgDisplayPropertiesImp.cpp
+++ b/src/Gui/DlgDisplayPropertiesImp.cpp
@@ -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);
diff --git a/src/Gui/DlgDisplayPropertiesImp.h b/src/Gui/DlgDisplayPropertiesImp.h
index 76a7ce8b4f..0bdda40b9a 100644
--- a/src/Gui/DlgDisplayPropertiesImp.h
+++ b/src/Gui/DlgDisplayPropertiesImp.h
@@ -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,
diff --git a/src/Gui/DlgEditFileIncludeProptertyExternal.cpp b/src/Gui/DlgEditFileIncludeProptertyExternal.cpp
index 9d62ec5d56..e53eba94c3 100644
--- a/src/Gui/DlgEditFileIncludeProptertyExternal.cpp
+++ b/src/Gui/DlgEditFileIncludeProptertyExternal.cpp
@@ -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)
 {
 
diff --git a/src/Gui/DlgEditFileIncludeProptertyExternal.h b/src/Gui/DlgEditFileIncludeProptertyExternal.h
index 33449e4a3d..4823682839 100644
--- a/src/Gui/DlgEditFileIncludeProptertyExternal.h
+++ b/src/Gui/DlgEditFileIncludeProptertyExternal.h
@@ -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);
diff --git a/src/Gui/DlgMacroExecuteImp.cpp b/src/Gui/DlgMacroExecuteImp.cpp
index fa256ce242..a7c109a222 100644
--- a/src/Gui/DlgMacroExecuteImp.cpp
+++ b/src/Gui/DlgMacroExecuteImp.cpp
@@ -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);
diff --git a/src/Gui/DlgMacroExecuteImp.h b/src/Gui/DlgMacroExecuteImp.h
index 6a8dac4dcc..a8561d7f31 100644
--- a/src/Gui/DlgMacroExecuteImp.h
+++ b/src/Gui/DlgMacroExecuteImp.h
@@ -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();
diff --git a/src/Gui/DlgMacroRecordImp.cpp b/src/Gui/DlgMacroRecordImp.cpp
index af40b1ed96..471461ef0f 100644
--- a/src/Gui/DlgMacroRecordImp.cpp
+++ b/src/Gui/DlgMacroRecordImp.cpp
@@ -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);
diff --git a/src/Gui/DlgMacroRecordImp.h b/src/Gui/DlgMacroRecordImp.h
index a7f9f8b2a1..e9a95eb57f 100644
--- a/src/Gui/DlgMacroRecordImp.h
+++ b/src/Gui/DlgMacroRecordImp.h
@@ -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:
diff --git a/src/Gui/DlgMaterialPropertiesImp.cpp b/src/Gui/DlgMaterialPropertiesImp.cpp
index 5dcf0dfddf..fc991dfcc8 100644
--- a/src/Gui/DlgMaterialPropertiesImp.cpp
+++ b/src/Gui/DlgMaterialPropertiesImp.cpp
@@ -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);
diff --git a/src/Gui/DlgMaterialPropertiesImp.h b/src/Gui/DlgMaterialPropertiesImp.h
index 9d921b652a..f4413602d2 100644
--- a/src/Gui/DlgMaterialPropertiesImp.h
+++ b/src/Gui/DlgMaterialPropertiesImp.h
@@ -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*>&);
 
diff --git a/src/Gui/DlgParameterImp.cpp b/src/Gui/DlgParameterImp.cpp
index d5c0492ae2..8bdb07bf9b 100644
--- a/src/Gui/DlgParameterImp.cpp
+++ b/src/Gui/DlgParameterImp.cpp
@@ -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);
diff --git a/src/Gui/DlgParameterImp.h b/src/Gui/DlgParameterImp.h
index b4f2631d06..42ae8f4adc 100644
--- a/src/Gui/DlgParameterImp.h
+++ b/src/Gui/DlgParameterImp.h
@@ -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();
diff --git a/src/Gui/DlgPreferencesImp.cpp b/src/Gui/DlgPreferencesImp.cpp
index 6449f1324e..869f8ced38 100644
--- a/src/Gui/DlgPreferencesImp.cpp
+++ b/src/Gui/DlgPreferencesImp.cpp
@@ -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);
diff --git a/src/Gui/DlgPreferencesImp.h b/src/Gui/DlgPreferencesImp.h
index 23b7ae4fd8..d5c1578f8f 100644
--- a/src/Gui/DlgPreferencesImp.h
+++ b/src/Gui/DlgPreferencesImp.h
@@ -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();
diff --git a/src/Gui/DlgProjectInformationImp.cpp b/src/Gui/DlgProjectInformationImp.cpp
index a7fe51d5bc..7d25f7b519 100644
--- a/src/Gui/DlgProjectInformationImp.cpp
+++ b/src/Gui/DlgProjectInformationImp.cpp
@@ -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);
diff --git a/src/Gui/DlgProjectInformationImp.h b/src/Gui/DlgProjectInformationImp.h
index 016ea8ae78..452121bdb4 100644
--- a/src/Gui/DlgProjectInformationImp.h
+++ b/src/Gui/DlgProjectInformationImp.h
@@ -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();
 
diff --git a/src/Gui/DlgProjectUtility.cpp b/src/Gui/DlgProjectUtility.cpp
index 70cd3dcf79..aeb6902e60 100644
--- a/src/Gui/DlgProjectUtility.cpp
+++ b/src/Gui/DlgProjectUtility.cpp
@@ -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);
diff --git a/src/Gui/DlgProjectUtility.h b/src/Gui/DlgProjectUtility.h
index 40373f81a9..6721b8f776 100644
--- a/src/Gui/DlgProjectUtility.h
+++ b/src/Gui/DlgProjectUtility.h
@@ -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:
diff --git a/src/Gui/DlgPropertyLink.cpp b/src/Gui/DlgPropertyLink.cpp
index b246a47a8b..3c21e93ca8 100644
--- a/src/Gui/DlgPropertyLink.cpp
+++ b/src/Gui/DlgPropertyLink.cpp
@@ -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
diff --git a/src/Gui/DlgPropertyLink.h b/src/Gui/DlgPropertyLink.h
index 0a9fca65b1..baf0b59be9 100644
--- a/src/Gui/DlgPropertyLink.h
+++ b/src/Gui/DlgPropertyLink.h
@@ -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();
diff --git a/src/Gui/DlgRunExternal.cpp b/src/Gui/DlgRunExternal.cpp
index d11f2870ce..607a16df7b 100644
--- a/src/Gui/DlgRunExternal.cpp
+++ b/src/Gui/DlgRunExternal.cpp
@@ -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();
diff --git a/src/Gui/DlgRunExternal.h b/src/Gui/DlgRunExternal.h
index 232b854596..d75c1149d5 100644
--- a/src/Gui/DlgRunExternal.h
+++ b/src/Gui/DlgRunExternal.h
@@ -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);
diff --git a/src/Gui/DlgSettingsColorGradientImp.cpp b/src/Gui/DlgSettingsColorGradientImp.cpp
index bf272fda63..1665652869 100644
--- a/src/Gui/DlgSettingsColorGradientImp.cpp
+++ b/src/Gui/DlgSettingsColorGradientImp.cpp
@@ -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);
diff --git a/src/Gui/DlgSettingsColorGradientImp.h b/src/Gui/DlgSettingsColorGradientImp.h
index 10f0ee875a..562a1dbdcf 100644
--- a/src/Gui/DlgSettingsColorGradientImp.h
+++ b/src/Gui/DlgSettingsColorGradientImp.h
@@ -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();
diff --git a/src/Gui/DlgTipOfTheDayImp.cpp b/src/Gui/DlgTipOfTheDayImp.cpp
index 8c1640ff94..919945a93e 100644
--- a/src/Gui/DlgTipOfTheDayImp.cpp
+++ b/src/Gui/DlgTipOfTheDayImp.cpp
@@ -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")
 {
diff --git a/src/Gui/DlgTipOfTheDayImp.h b/src/Gui/DlgTipOfTheDayImp.h
index 8329069733..70860fba03 100644
--- a/src/Gui/DlgTipOfTheDayImp.h
+++ b/src/Gui/DlgTipOfTheDayImp.h
@@ -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();
diff --git a/src/Gui/DlgUnitsCalculatorImp.cpp b/src/Gui/DlgUnitsCalculatorImp.cpp
index 3584f6f225..dd281a0e8e 100644
--- a/src/Gui/DlgUnitsCalculatorImp.cpp
+++ b/src/Gui/DlgUnitsCalculatorImp.cpp
@@ -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
diff --git a/src/Gui/DlgUnitsCalculatorImp.h b/src/Gui/DlgUnitsCalculatorImp.h
index 32fe80debd..6afbc66ce0 100644
--- a/src/Gui/DlgUnitsCalculatorImp.h
+++ b/src/Gui/DlgUnitsCalculatorImp.h
@@ -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:
diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp
index cf22c8238d..81ac72747a 100644
--- a/src/Gui/FileDialog.cpp
+++ b/src/Gui/FileDialog.cpp
@@ -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 );
diff --git a/src/Gui/FileDialog.h b/src/Gui/FileDialog.h
index 4d2c119b7c..ca98b14be9 100644
--- a/src/Gui/FileDialog.h
+++ b/src/Gui/FileDialog.h
@@ -88,7 +88,7 @@ public:
         ExtensionBottom   = 1
     };
 
-    FileOptionsDialog ( QWidget* parent, Qt::WFlags );
+    FileOptionsDialog ( QWidget* parent, Qt::WindowFlags );
     virtual ~FileOptionsDialog();
 
     void accept();
diff --git a/src/Gui/InputVector.cpp b/src/Gui/InputVector.cpp
index 51e6f5c192..ca267b405a 100644
--- a/src/Gui/InputVector.cpp
+++ b/src/Gui/InputVector.cpp
@@ -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)
 {
 }
diff --git a/src/Gui/InputVector.h b/src/Gui/InputVector.h
index 0e2b9480d5..484c2c2dd1 100644
--- a/src/Gui/InputVector.h
+++ b/src/Gui/InputVector.h
@@ -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)
     {
     }
diff --git a/src/Gui/MDIView.cpp b/src/Gui/MDIView.cpp
index 122ea7b22f..9bf3cb0d5d 100644
--- a/src/Gui/MDIView.cpp
+++ b/src/Gui/MDIView.cpp
@@ -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);
diff --git a/src/Gui/MDIView.h b/src/Gui/MDIView.h
index 4012f1e06e..5892169c10 100644
--- a/src/Gui/MDIView.h
+++ b/src/Gui/MDIView.h
@@ -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.
      */
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 878c42c31c..2c6649f65d 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -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;
diff --git a/src/Gui/MainWindow.h b/src/Gui/MainWindow.h
index 1c0fc6904e..0409a78e19 100644
--- a/src/Gui/MainWindow.h
+++ b/src/Gui/MainWindow.h
@@ -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();
     /**
diff --git a/src/Gui/ManualAlignment.cpp b/src/Gui/ManualAlignment.cpp
index b673aeddb6..bb590df711 100644
--- a/src/Gui/ManualAlignment.cpp
+++ b/src/Gui/ManualAlignment.cpp
@@ -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;
diff --git a/src/Gui/Placement.cpp b/src/Gui/Placement.cpp
index 7c39968c64..e4faec97ba 100644
--- a/src/Gui/Placement.cpp
+++ b/src/Gui/Placement.cpp
@@ -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"),
diff --git a/src/Gui/Placement.h b/src/Gui/Placement.h
index fd14919779..ec2d19e6c0 100644
--- a/src/Gui/Placement.h
+++ b/src/Gui/Placement.h
@@ -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();
diff --git a/src/Gui/SceneInspector.cpp b/src/Gui/SceneInspector.cpp
index a28eeaa128..e36a91f736 100644
--- a/src/Gui/SceneInspector.cpp
+++ b/src/Gui/SceneInspector.cpp
@@ -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);
diff --git a/src/Gui/SceneInspector.h b/src/Gui/SceneInspector.h
index 8298ed6a8b..a7b187c71d 100644
--- a/src/Gui/SceneInspector.h
+++ b/src/Gui/SceneInspector.h
@@ -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);
diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp
index 218fc38796..ed5390a38e 100644
--- a/src/Gui/Splashscreen.cpp
+++ b/src/Gui/Splashscreen.cpp
@@ -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
diff --git a/src/Gui/Splashscreen.h b/src/Gui/Splashscreen.h
index 0f07e8d2be..006efccbed 100644
--- a/src/Gui/Splashscreen.h
+++ b/src/Gui/Splashscreen.h
@@ -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:
diff --git a/src/Gui/SplitView3DInventor.cpp b/src/Gui/SplitView3DInventor.cpp
index 041d942646..5b7bfe8314 100644
--- a/src/Gui/SplitView3DInventor.cpp
+++ b/src/Gui/SplitView3DInventor.cpp
@@ -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;
diff --git a/src/Gui/SplitView3DInventor.h b/src/Gui/SplitView3DInventor.h
index 2a3373e946..bb01c76279 100644
--- a/src/Gui/SplitView3DInventor.h
+++ b/src/Gui/SplitView3DInventor.h
@@ -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();
 };
 
diff --git a/src/Gui/TextureMapping.cpp b/src/Gui/TextureMapping.cpp
index a77435ca2a..1d1cc02f93 100644
--- a/src/Gui/TextureMapping.cpp
+++ b/src/Gui/TextureMapping.cpp
@@ -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();
diff --git a/src/Gui/TextureMapping.h b/src/Gui/TextureMapping.h
index 77f32f1d2d..58927f6434 100644
--- a/src/Gui/TextureMapping.h
+++ b/src/Gui/TextureMapping.h
@@ -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();
diff --git a/src/Gui/Transform.cpp b/src/Gui/Transform.cpp
index 9500741b6e..299a67f1b9 100644
--- a/src/Gui/Transform.cpp
+++ b/src/Gui/Transform.cpp
@@ -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);
diff --git a/src/Gui/Transform.h b/src/Gui/Transform.h
index 042d4f6919..f73b1a9059 100644
--- a/src/Gui/Transform.h
+++ b/src/Gui/Transform.h
@@ -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();
diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp
index bf2c1f6396..3b229c1f44 100644
--- a/src/Gui/View3DInventor.cpp
+++ b/src/Gui/View3DInventor.cpp
@@ -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);
diff --git a/src/Gui/View3DInventor.h b/src/Gui/View3DInventor.h
index b0053e9063..1af621d8cc 100644
--- a/src/Gui/View3DInventor.h
+++ b/src/Gui/View3DInventor.h
@@ -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
diff --git a/src/Gui/Widgets.cpp b/src/Gui/Widgets.cpp
index bd53097a26..9ace1fac1a 100644
--- a/src/Gui/Widgets.cpp
+++ b/src/Gui/Widgets.cpp
@@ -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");
diff --git a/src/Gui/Widgets.h b/src/Gui/Widgets.h
index 6f9fe35c2a..097034a4e0 100644
--- a/src/Gui/Widgets.h
+++ b/src/Gui/Widgets.h
@@ -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;
diff --git a/src/Mod/Image/Gui/GLImageBox.cpp b/src/Mod/Image/Gui/GLImageBox.cpp
index a8aa492d7a..dd0403d473 100644
--- a/src/Mod/Image/Gui/GLImageBox.cpp
+++ b/src/Mod/Image/Gui/GLImageBox.cpp
@@ -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
diff --git a/src/Mod/Image/Gui/GLImageBox.h b/src/Mod/Image/Gui/GLImageBox.h
index 0aeb5121bf..32a50644a8 100644
--- a/src/Mod/Image/Gui/GLImageBox.h
+++ b/src/Mod/Image/Gui/GLImageBox.h
@@ -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; }
diff --git a/src/Mod/Inspection/Gui/VisualInspection.cpp b/src/Mod/Inspection/Gui/VisualInspection.cpp
index e385e86bd8..8ad9580362 100644
--- a/src/Mod/Inspection/Gui/VisualInspection.cpp
+++ b/src/Mod/Inspection/Gui/VisualInspection.cpp
@@ -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);
diff --git a/src/Mod/Inspection/Gui/VisualInspection.h b/src/Mod/Inspection/Gui/VisualInspection.h
index 8057244a23..9c6716c5f0 100644
--- a/src/Mod/Inspection/Gui/VisualInspection.h
+++ b/src/Mod/Inspection/Gui/VisualInspection.h
@@ -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();
diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
index 9411529ec9..71b48f236a 100644
--- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
+++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
@@ -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
diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h
index ca67891a0a..db6b55105d 100644
--- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h
+++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h
@@ -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);
 
diff --git a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
index ca555e17ab..940cd03447 100644
--- a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
+++ b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
@@ -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)
 {
 }
diff --git a/src/Mod/Mesh/Gui/DlgRegularSolidImp.h b/src/Mod/Mesh/Gui/DlgRegularSolidImp.h
index 52ee6d92c8..cec7fedff4 100644
--- a/src/Mod/Mesh/Gui/DlgRegularSolidImp.h
+++ b/src/Mod/Mesh/Gui/DlgRegularSolidImp.h
@@ -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:
diff --git a/src/Mod/Mesh/Gui/DlgSmoothing.cpp b/src/Mod/Mesh/Gui/DlgSmoothing.cpp
index c369e772d6..eed3829b43 100644
--- a/src/Mod/Mesh/Gui/DlgSmoothing.cpp
+++ b/src/Mod/Mesh/Gui/DlgSmoothing.cpp
@@ -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);
diff --git a/src/Mod/Mesh/Gui/DlgSmoothing.h b/src/Mod/Mesh/Gui/DlgSmoothing.h
index fafccd3e13..7b035e5475 100644
--- a/src/Mod/Mesh/Gui/DlgSmoothing.h
+++ b/src/Mod/Mesh/Gui/DlgSmoothing.h
@@ -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
diff --git a/src/Mod/Mesh/Gui/RemoveComponents.cpp b/src/Mod/Mesh/Gui/RemoveComponents.cpp
index a9d869e694..8867c445a4 100644
--- a/src/Mod/Mesh/Gui/RemoveComponents.cpp
+++ b/src/Mod/Mesh/Gui/RemoveComponents.cpp
@@ -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);
diff --git a/src/Mod/Mesh/Gui/RemoveComponents.h b/src/Mod/Mesh/Gui/RemoveComponents.h
index 57801811a4..874e21e192 100644
--- a/src/Mod/Mesh/Gui/RemoveComponents.h
+++ b/src/Mod/Mesh/Gui/RemoveComponents.h
@@ -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();
 
diff --git a/src/Mod/Mesh/Gui/Segmentation.cpp b/src/Mod/Mesh/Gui/Segmentation.cpp
index de2b81d48e..04a4a0be6d 100644
--- a/src/Mod/Mesh/Gui/Segmentation.cpp
+++ b/src/Mod/Mesh/Gui/Segmentation.cpp
@@ -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;
diff --git a/src/Mod/Mesh/Gui/Segmentation.h b/src/Mod/Mesh/Gui/Segmentation.h
index 95d1411635..23e691c9e9 100644
--- a/src/Mod/Mesh/Gui/Segmentation.h
+++ b/src/Mod/Mesh/Gui/Segmentation.h
@@ -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();
 
diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp
index bfed4e6b30..85bd2e7cc1 100644
--- a/src/Mod/Part/Gui/CrossSections.cpp
+++ b/src/Mod/Part/Gui/CrossSections.cpp
@@ -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();
diff --git a/src/Mod/Part/Gui/CrossSections.h b/src/Mod/Part/Gui/CrossSections.h
index b0879b20fa..379d1981d5 100644
--- a/src/Mod/Part/Gui/CrossSections.h
+++ b/src/Mod/Part/Gui/CrossSections.h
@@ -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();
diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp
index 81cd5c036f..632b07bbcf 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.cpp
+++ b/src/Mod/Part/Gui/DlgExtrusion.cpp
@@ -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);
diff --git a/src/Mod/Part/Gui/DlgExtrusion.h b/src/Mod/Part/Gui/DlgExtrusion.h
index 38423de6dd..33380d23e3 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.h
+++ b/src/Mod/Part/Gui/DlgExtrusion.h
@@ -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();
diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp
index 8f3eb370cd..11fe911189 100644
--- a/src/Mod/Part/Gui/DlgFilletEdges.cpp
+++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp
@@ -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"));
diff --git a/src/Mod/Part/Gui/DlgFilletEdges.h b/src/Mod/Part/Gui/DlgFilletEdges.h
index c18cedbcf0..a92c37231e 100644
--- a/src/Mod/Part/Gui/DlgFilletEdges.h
+++ b/src/Mod/Part/Gui/DlgFilletEdges.h
@@ -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:
diff --git a/src/Mod/Part/Gui/DlgPartBoxImp.cpp b/src/Mod/Part/Gui/DlgPartBoxImp.cpp
index 528e574464..19803c4d6e 100644
--- a/src/Mod/Part/Gui/DlgPartBoxImp.cpp
+++ b/src/Mod/Part/Gui/DlgPartBoxImp.cpp
@@ -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)
 {
 }
diff --git a/src/Mod/Part/Gui/DlgPartBoxImp.h b/src/Mod/Part/Gui/DlgPartBoxImp.h
index 0890d1669b..4f175b0d5d 100644
--- a/src/Mod/Part/Gui/DlgPartBoxImp.h
+++ b/src/Mod/Part/Gui/DlgPartBoxImp.h
@@ -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();
 };
 
diff --git a/src/Mod/Part/Gui/DlgPartCylinderImp.cpp b/src/Mod/Part/Gui/DlgPartCylinderImp.cpp
index c168a1ee5d..b80a59e37f 100644
--- a/src/Mod/Part/Gui/DlgPartCylinderImp.cpp
+++ b/src/Mod/Part/Gui/DlgPartCylinderImp.cpp
@@ -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*>();
diff --git a/src/Mod/Part/Gui/DlgPartCylinderImp.h b/src/Mod/Part/Gui/DlgPartCylinderImp.h
index ba835763c5..8924b73e42 100644
--- a/src/Mod/Part/Gui/DlgPartCylinderImp.h
+++ b/src/Mod/Part/Gui/DlgPartCylinderImp.h
@@ -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();
 };
 
diff --git a/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp b/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp
index 4ddd84e9af..2e189df362 100644
--- a/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp
+++ b/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp
@@ -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);
diff --git a/src/Mod/Part/Gui/DlgPartImportIgesImp.h b/src/Mod/Part/Gui/DlgPartImportIgesImp.h
index b81480ce55..91eadb68bf 100644
--- a/src/Mod/Part/Gui/DlgPartImportIgesImp.h
+++ b/src/Mod/Part/Gui/DlgPartImportIgesImp.h
@@ -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:
diff --git a/src/Mod/Part/Gui/DlgPartImportStepImp.cpp b/src/Mod/Part/Gui/DlgPartImportStepImp.cpp
index 3740a043d0..4f19ec8d1b 100644
--- a/src/Mod/Part/Gui/DlgPartImportStepImp.cpp
+++ b/src/Mod/Part/Gui/DlgPartImportStepImp.cpp
@@ -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);
diff --git a/src/Mod/Part/Gui/DlgPartImportStepImp.h b/src/Mod/Part/Gui/DlgPartImportStepImp.h
index 3302aa5040..46afb81c63 100644
--- a/src/Mod/Part/Gui/DlgPartImportStepImp.h
+++ b/src/Mod/Part/Gui/DlgPartImportStepImp.h
@@ -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:
diff --git a/src/Mod/Part/Gui/DlgRevolution.cpp b/src/Mod/Part/Gui/DlgRevolution.cpp
index 5759a67c22..0bd98f11a4 100644
--- a/src/Mod/Part/Gui/DlgRevolution.cpp
+++ b/src/Mod/Part/Gui/DlgRevolution.cpp
@@ -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);
diff --git a/src/Mod/Part/Gui/DlgRevolution.h b/src/Mod/Part/Gui/DlgRevolution.h
index 7f3d648b83..f88b35210c 100644
--- a/src/Mod/Part/Gui/DlgRevolution.h
+++ b/src/Mod/Part/Gui/DlgRevolution.h
@@ -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();
 
diff --git a/src/Mod/Points/Gui/DlgPointsReadImp.cpp b/src/Mod/Points/Gui/DlgPointsReadImp.cpp
index 64d1af703d..7a06dc627f 100644
--- a/src/Mod/Points/Gui/DlgPointsReadImp.cpp
+++ b/src/Mod/Points/Gui/DlgPointsReadImp.cpp
@@ -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;
diff --git a/src/Mod/Points/Gui/DlgPointsReadImp.h b/src/Mod/Points/Gui/DlgPointsReadImp.h
index 4d9020778b..0e8d0ebc41 100644
--- a/src/Mod/Points/Gui/DlgPointsReadImp.h
+++ b/src/Mod/Points/Gui/DlgPointsReadImp.h
@@ -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:
diff --git a/src/Mod/Test/Gui/UnitTestImp.cpp b/src/Mod/Test/Gui/UnitTestImp.cpp
index d12facfe5a..dac76cd900 100644
--- a/src/Mod/Test/Gui/UnitTestImp.cpp
+++ b/src/Mod/Test/Gui/UnitTestImp.cpp
@@ -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);
diff --git a/src/Mod/Test/Gui/UnitTestImp.h b/src/Mod/Test/Gui/UnitTestImp.h
index ad7e6daef5..284c6986b2 100644
--- a/src/Mod/Test/Gui/UnitTestImp.h
+++ b/src/Mod/Test/Gui/UnitTestImp.h
@@ -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);