Casper fix

NCAR · Jun 22, 2020 · 961ce70 · 961ce70
1 parent ac1c64b
commit 961ce70
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -3,6 +3,7 @@
 #include "VLineItem.h"
 #include <vapor/ParamsBase.h>
 #include <QVBoxLayout>
+#include <assert.h>
 
 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
@@ -1,4 +1,5 @@
 #include "PWidget.h"
+#include <assert.h>
 #include <vapor/VAssert.h>
 #include <vapor/ParamsBase.h>
 #include <vapor/ParamsMgr.h>

diff --git a/apps/vaporgui/PythonVariablesGUI.ui b/apps/vaporgui/PythonVariablesGUI.ui
@@ -1120,9 +1120,6 @@
      <property name="lineWrapMode">
       <enum>QTextEdit::NoWrap</enum>
      </property>
-     <property name="tabStopDistance">
-      <number>40</number>
-     </property>
     </widget>
    </item>
    <item>