From f996959ba1ede30554db68a5ff8d1e0fd698097d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 12 Nov 2020 10:23:38 +0100
Subject: [PATCH] replace deprecated QFlags(0); patch 3rd-party widgets
---
GUI/coregui/Views/AccordionWidget/ClickableFrame.h | 4 +++-
GUI/coregui/Views/widgetbox/formwindowbase_p.h | 4 +++-
GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h | 4 +++-
GUI/coregui/Views/widgetbox/widgetbox.h | 4 +++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
index 524a1e58aff..8893d07c8f4 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 c255618daf3..ba7e283ceae 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 946646d7c3f..79abc1e3250 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 e6239155b68..105f04487ca 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;
--
GitLab