diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h index 524a1e58aff405604bef0e0c0f454714788beec2..8893d07c8f475cf2b368dfd30b40dbd123e3c1aa 100644 --- a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h +++ b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h @@ -28,6 +28,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see <http://www.gnu.org/licenses/>. +// Patched JWu 12nov20 because QFlags(0) was deprecated + #ifndef BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_CLICKABLEFRAME_H #define BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_CLICKABLEFRAME_H @@ -71,7 +73,7 @@ public: * @param parent Parent widget or 0 * @param f Qt::WindowFlags */ - explicit ClickableFrame(QString header, QWidget* parent = 0, Qt::WindowFlags f = 0); + explicit ClickableFrame(QString header, QWidget* parent = 0, Qt::WindowFlags f = {}); // TODO: Expose this function to the ContentPane api /** diff --git a/GUI/coregui/Views/widgetbox/formwindowbase_p.h b/GUI/coregui/Views/widgetbox/formwindowbase_p.h index c255618daf38d75b96b2828b191c6e5a33ce0756..ba7e283ceaeac5160f1718c7590973ad4542d8f4 100644 --- a/GUI/coregui/Views/widgetbox/formwindowbase_p.h +++ b/GUI/coregui/Views/widgetbox/formwindowbase_p.h @@ -50,6 +50,8 @@ // We mean it. // +// Patched JWu 12nov20 because QFlags(0) was deprecated + #ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_FORMWINDOWBASE_P_H #define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_FORMWINDOWBASE_P_H @@ -85,7 +87,7 @@ public: enum HighlightMode { Restore, Highlight }; explicit FormWindowBase(QDesignerFormEditorInterface* core, QWidget* parent = 0, - Qt::WindowFlags flags = 0); + Qt::WindowFlags flags = {}); virtual ~FormWindowBase(); QVariantMap formData(); diff --git a/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h b/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h index 946646d7c3f807e064c15e36b140d840aaf579f3..79abc1e3250f8acb1ea6986e6d4fb65ceadaa33e 100644 --- a/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h +++ b/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h @@ -50,6 +50,8 @@ // We mean it. // +// Patched JWu 12nov20 because QFlags(0) was deprecated + #ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_WIDGETBOX_P_H #define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_WIDGETBOX_P_H @@ -71,7 +73,7 @@ class QDESIGNER_SHARED_EXPORT QDesignerWidgetBox : public QDesignerWidgetBoxInte public: enum LoadMode { LoadMerge, LoadReplace, LoadCustomWidgetsOnly }; - explicit QDesignerWidgetBox(QWidget* parent = 0, Qt::WindowFlags flags = 0); + explicit QDesignerWidgetBox(QWidget* parent = 0, Qt::WindowFlags flags = {}); LoadMode loadMode() const; void setLoadMode(LoadMode lm); diff --git a/GUI/coregui/Views/widgetbox/widgetbox.h b/GUI/coregui/Views/widgetbox/widgetbox.h index e6239155b6876fb4fcd1a39a100b1cd5ca715dac..105f04487ca6f6d86890548a899ac80d3a17b07a 100644 --- a/GUI/coregui/Views/widgetbox/widgetbox.h +++ b/GUI/coregui/Views/widgetbox/widgetbox.h @@ -39,6 +39,8 @@ ** ****************************************************************************/ +// Patched JWu 12nov20 because QFlags(0) was deprecated + #ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOX_H #define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOX_H @@ -64,7 +66,7 @@ public: // explicit WidgetBox(QDesignerFormEditorInterface *core, QWidget *parent = 0, // Qt::WindowFlags flags = 0); explicit WidgetBox(SampleDesignerInterface* core, QWidget* parent = nullptr, - Qt::WindowFlags flags = nullptr); + Qt::WindowFlags flags = {}); virtual ~WidgetBox(); // QDesignerFormEditorInterface *core() const;