Skip to content
Snippets Groups Projects
Commit f996959b authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

replace deprecated QFlags(0); patch 3rd-party widgets

parent 4648eab3
No related branches found
No related tags found
No related merge requests found
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // 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 #ifndef BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_CLICKABLEFRAME_H
#define BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_CLICKABLEFRAME_H #define BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_CLICKABLEFRAME_H
...@@ -71,7 +73,7 @@ public: ...@@ -71,7 +73,7 @@ public:
* @param parent Parent widget or 0 * @param parent Parent widget or 0
* @param f Qt::WindowFlags * @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 // TODO: Expose this function to the ContentPane api
/** /**
......
...@@ -50,6 +50,8 @@ ...@@ -50,6 +50,8 @@
// We mean it. // We mean it.
// //
// Patched JWu 12nov20 because QFlags(0) was deprecated
#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_FORMWINDOWBASE_P_H #ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_FORMWINDOWBASE_P_H
#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_FORMWINDOWBASE_P_H #define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_FORMWINDOWBASE_P_H
...@@ -85,7 +87,7 @@ public: ...@@ -85,7 +87,7 @@ public:
enum HighlightMode { Restore, Highlight }; enum HighlightMode { Restore, Highlight };
explicit FormWindowBase(QDesignerFormEditorInterface* core, QWidget* parent = 0, explicit FormWindowBase(QDesignerFormEditorInterface* core, QWidget* parent = 0,
Qt::WindowFlags flags = 0); Qt::WindowFlags flags = {});
virtual ~FormWindowBase(); virtual ~FormWindowBase();
QVariantMap formData(); QVariantMap formData();
......
...@@ -50,6 +50,8 @@ ...@@ -50,6 +50,8 @@
// We mean it. // We mean it.
// //
// Patched JWu 12nov20 because QFlags(0) was deprecated
#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_WIDGETBOX_P_H #ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_WIDGETBOX_P_H
#define 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 ...@@ -71,7 +73,7 @@ class QDESIGNER_SHARED_EXPORT QDesignerWidgetBox : public QDesignerWidgetBoxInte
public: public:
enum LoadMode { LoadMerge, LoadReplace, LoadCustomWidgetsOnly }; 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; LoadMode loadMode() const;
void setLoadMode(LoadMode lm); void setLoadMode(LoadMode lm);
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
** **
****************************************************************************/ ****************************************************************************/
// Patched JWu 12nov20 because QFlags(0) was deprecated
#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOX_H #ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOX_H
#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOX_H #define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOX_H
...@@ -64,7 +66,7 @@ public: ...@@ -64,7 +66,7 @@ public:
// explicit WidgetBox(QDesignerFormEditorInterface *core, QWidget *parent = 0, // explicit WidgetBox(QDesignerFormEditorInterface *core, QWidget *parent = 0,
// Qt::WindowFlags flags = 0); // Qt::WindowFlags flags = 0);
explicit WidgetBox(SampleDesignerInterface* core, QWidget* parent = nullptr, explicit WidgetBox(SampleDesignerInterface* core, QWidget* parent = nullptr,
Qt::WindowFlags flags = nullptr); Qt::WindowFlags flags = {});
virtual ~WidgetBox(); virtual ~WidgetBox();
// QDesignerFormEditorInterface *core() const; // QDesignerFormEditorInterface *core() const;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment