From bbacecb3975dad2cd1bf6a34f7291cf2543be178 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 1 Dec 2021 23:45:26 +0100 Subject: [PATCH] Gui: fix C++20 warning: bitwise operation between different enumeration types [-Wdeprecated-enum-enum-conversion] --- src/Gui/EditorView.cpp | 3 ++- src/Gui/PythonConsole.cpp | 3 ++- src/Gui/TextEdit.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Gui/EditorView.cpp b/src/Gui/EditorView.cpp index 9f41a88e60..8180a66253 100644 --- a/src/Gui/EditorView.cpp +++ b/src/Gui/EditorView.cpp @@ -116,7 +116,8 @@ EditorView::EditorView(QPlainTextEdit* editor, QWidget* parent) // Create the layout containing the workspace and a tab bar QFrame* hbox = new QFrame(this); - hbox->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); + hbox->setFrameShape(QFrame::StyledPanel); + hbox->setFrameShadow(QFrame::Sunken); QVBoxLayout* layout = new QVBoxLayout(); layout->setMargin(1); layout->addWidget(d->textEdit); diff --git a/src/Gui/PythonConsole.cpp b/src/Gui/PythonConsole.cpp index 3eacfdacfa..1173484427 100644 --- a/src/Gui/PythonConsole.cpp +++ b/src/Gui/PythonConsole.cpp @@ -431,7 +431,8 @@ PythonConsole::PythonConsole(QWidget *parent) // create the window for call tips d->callTipsList = new CallTipsList(this); - d->callTipsList->setFrameStyle(QFrame::Box|QFrame::Raised); + d->callTipsList->setFrameStyle(QFrame::Box); + d->callTipsList->setFrameShadow(QFrame::Raised); d->callTipsList->setLineWidth(2); installEventFilter(d->callTipsList); viewport()->installEventFilter(d->callTipsList); diff --git a/src/Gui/TextEdit.cpp b/src/Gui/TextEdit.cpp index 219a3d72fc..e3dea6ae07 100644 --- a/src/Gui/TextEdit.cpp +++ b/src/Gui/TextEdit.cpp @@ -178,7 +178,8 @@ void TextEdit::complete() void TextEdit::createListBox() { listBox = new CompletionList(this); - listBox->setFrameStyle(QFrame::Box|QFrame::Raised); + listBox->setFrameStyle(QFrame::Box); + listBox->setFrameShadow(QFrame::Raised); listBox->setLineWidth(2); installEventFilter(listBox); viewport()->installEventFilter(listBox);