Move defines into separate file

ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp

@@ -26,6 +26,7 @@
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
 #include "RigEclipseResultAddress.h"
+#include "RigFlowDiagSolverInterface.h"
 #include "RigGridBase.h"
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
@@ -37,8 +38,6 @@
 #include "RimEclipseView.h"
 #include "RimExtrudedCurveIntersection.h"
 
-// #include "cvfTrace.h"
-
 #include <cmath>
 
 //==================================================================================================
@@ -105,7 +104,7 @@ bool RiuRelativePermeabilityPlotUpdater::queryDataAndUpdatePlot( const RimEclips
         {
             // cvf::Trace::show("Updating RelPerm plot for active cell index: %d", static_cast<int>(activeCellIndex));
 
-            std::vector<RigFlowDiagSolverInterface::RelPermCurve> relPermCurveArr =
+            std::vector<RigFlowDiagDefines::RelPermCurve> relPermCurveArr =
                 eclipseResultCase->flowDiagSolverInterface()->calculateRelPermCurves( activeCellIndex );
 
             // Make sure we load the results that we'll query below