From 961ce7007d98cb54d24190c5e4e5593d348bc895 Mon Sep 17 00:00:00 2001 From: Stanislaw Jaroszynski Date: Mon, 22 Jun 2020 16:48:00 -0600 Subject: [PATCH] Casper fix --- CMakeLists.txt | 2 +- apps/vaporgui/PRegionSelector.cpp | 1 + apps/vaporgui/PWidget.cpp | 1 + apps/vaporgui/PythonVariablesGUI.ui | 3 --- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f8f9f5f3..abae2e6cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ endif() # compiler warning flags if (NOT WIN32) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-sign-compare -Wno-overloaded-virtual") + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-sign-compare -Wno-overloaded-virtual -Wno-parentheses") SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-sign-compare") else () # Enable multithread compiling on Visual Studio diff --git a/apps/vaporgui/PRegionSelector.cpp b/apps/vaporgui/PRegionSelector.cpp index 4a38dc021..51b982e19 100644 --- a/apps/vaporgui/PRegionSelector.cpp +++ b/apps/vaporgui/PRegionSelector.cpp @@ -3,6 +3,7 @@ #include "VLineItem.h" #include #include +#include PRegionSelector::PRegionSelector(const std::string &tag, const std::string &label) : PWidget(tag, _container = new QWidget) diff --git a/apps/vaporgui/PWidget.cpp b/apps/vaporgui/PWidget.cpp index 885c827ab..72d5b8cfc 100644 --- a/apps/vaporgui/PWidget.cpp +++ b/apps/vaporgui/PWidget.cpp @@ -1,4 +1,5 @@ #include "PWidget.h" +#include #include #include #include diff --git a/apps/vaporgui/PythonVariablesGUI.ui b/apps/vaporgui/PythonVariablesGUI.ui index fa1e1d907..f0ca7035c 100644 --- a/apps/vaporgui/PythonVariablesGUI.ui +++ b/apps/vaporgui/PythonVariablesGUI.ui @@ -1120,9 +1120,6 @@ QTextEdit::NoWrap - - 40 -