#1755 Use namespace RiaDefines instead of class

ApplicationCode/Application/RiaDefines.cpp

@@ -100,3 +100,211 @@ bool RiaDefines::isPerCellFaceResult(const QString& resultName)
 
     return false;
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::undefinedResultName()
+{
+    return "None";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::undefinedGridFaultName()
+{
+    return "Undefined Grid Faults";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::undefinedGridFaultWithInactiveName()
+{
+    return "Undefined Grid Faults With Inactive";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::combinedTransmissibilityResultName()
+{
+    return "TRANXYZ";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::ternarySaturationResultName()
+{
+    return "TERNARY";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::combinedMultResultName()
+{
+    return "MULTXYZ";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riTranXResultName()
+{
+    return "riTRANX";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riTranYResultName()
+{
+    return "riTRANY";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riTranZResultName()
+{
+    return "riTRANZ";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::combinedRiTranResultName()
+{
+    return "riTRANXYZ";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riMultXResultName()
+{
+    return "riMULTX";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riMultYResultName()
+{
+    return "riMULTY";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riMultZResultName()
+{
+    return "riMULTZ";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::combinedRiMultResultName()
+{
+    return "riMULTXYZ";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riAreaNormTranXResultName()
+{
+    return "riTRANXbyArea";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riAreaNormTranYResultName()
+{
+    return "riTRANYbyArea";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riAreaNormTranZResultName()
+{
+    return "riTRANZbyArea";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::combinedRiAreaNormTranResultName()
+{
+    return "riTRANXYZbyArea";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::completionTypeResultName()
+{
+    return "Completion Type";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::mockModelBasic()
+{
+    return "Result Mock Debug Model Simple";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::mockModelBasicWithResults()
+{
+    return "Result Mock Debug Model With Results";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::mockModelLargeWithResults()
+{
+    return "Result Mock Debug Model Large With Results";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::mockModelCustomized()
+{
+    return "Result Mock Debug Model Customized";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::mockModelBasicInputCase()
+{
+    return "Input Mock Debug Model Simple";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double RiaDefines::minimumDefaultValuePlot()
+{
+    return -10.0;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double RiaDefines::maximumDefaultValuePlot()
+{
+    return  100.0;
+}

ApplicationCode/Application/RiaDefines.h

@@ -22,10 +22,8 @@
 
 #include <QString>
 
-class RiaDefines
+namespace RiaDefines
 {
-
-public:
     enum ResultCatType
     {
         DYNAMIC_NATIVE,
@@ -43,38 +41,38 @@ public:
         FISHBONES
     };
 
-    static bool isPerCellFaceResult(const QString& resultName);
+    bool isPerCellFaceResult(const QString& resultName);
 
-    static QString undefinedResultName()                { return "None"; }
-    static QString undefinedGridFaultName()             { return "Undefined Grid Faults"; }
-    static QString undefinedGridFaultWithInactiveName() { return "Undefined Grid Faults With Inactive"; }
-    static QString combinedTransmissibilityResultName() { return "TRANXYZ"; }
-    static QString ternarySaturationResultName()        { return "TERNARY"; }
-    static QString combinedMultResultName()             { return "MULTXYZ"; }
+    QString undefinedResultName();
+    QString undefinedGridFaultName();
+    QString undefinedGridFaultWithInactiveName();
+    QString combinedTransmissibilityResultName();
+    QString ternarySaturationResultName();
+    QString combinedMultResultName();
 
-    static QString riTranXResultName()                  { return "riTRANX"; }
-    static QString riTranYResultName()                  { return "riTRANY"; }
-    static QString riTranZResultName()                  { return "riTRANZ"; }
-    static QString combinedRiTranResultName()           { return "riTRANXYZ"; }
+    QString riTranXResultName();
+    QString riTranYResultName();
+    QString riTranZResultName();
+    QString combinedRiTranResultName();
 
-    static QString riMultXResultName()                  { return "riMULTX"; }
-    static QString riMultYResultName()                  { return "riMULTY"; }
-    static QString riMultZResultName()                  { return "riMULTZ"; }
-    static QString combinedRiMultResultName()           { return "riMULTXYZ"; }
+    QString riMultXResultName();
+    QString riMultYResultName();
+    QString riMultZResultName();
+    QString combinedRiMultResultName();
 
-    static QString riAreaNormTranXResultName()         { return "riTRANXbyArea"; }
-    static QString riAreaNormTranYResultName()         { return "riTRANYbyArea"; }
-    static QString riAreaNormTranZResultName()         { return "riTRANZbyArea"; }
-    static QString combinedRiAreaNormTranResultName()  { return "riTRANXYZbyArea"; }
+    QString riAreaNormTranXResultName();
+    QString riAreaNormTranYResultName();
+    QString riAreaNormTranZResultName();
+    QString combinedRiAreaNormTranResultName();
 
-    static QString completionTypeResultName()          { return "Completion Type"; }
+    QString completionTypeResultName();
 
     // Mock model text identifiers
-    static QString mockModelBasic()                    { return "Result Mock Debug Model Simple"; }
-    static QString mockModelBasicWithResults()         { return "Result Mock Debug Model With Results"; }
-    static QString mockModelLargeWithResults()         { return "Result Mock Debug Model Large With Results"; }
-    static QString mockModelCustomized()               { return "Result Mock Debug Model Customized"; }
-    static QString mockModelBasicInputCase()           { return "Input Mock Debug Model Simple"; }
+    QString mockModelBasic();
+    QString mockModelBasicWithResults();
+    QString mockModelLargeWithResults();
+    QString mockModelCustomized();
+    QString mockModelBasicInputCase();
 
 
     //Units and conversions
@@ -94,7 +92,7 @@ public:
         PLOT_AXIS_RIGHT
     };
 
-    static double minimumDefaultValuePlot()         { return - 10.0; }
-    static double maximumDefaultValuePlot()         { return  100.0; }
+    double minimumDefaultValuePlot();
+    double maximumDefaultValuePlot();
 };
 

ApplicationCode/Application/RiaPorosityModel.cpp

@@ -22,10 +22,10 @@
 
 
 template<>
-void caf::AppEnum< RiaPorosityModel::PorosityModelType >::setUp()
+void caf::AppEnum< RiaDefines::PorosityModelType >::setUp()
 {
-    addItem(RiaPorosityModel::MATRIX_MODEL,   "MATRIX_MODEL",     "Matrix");
-    addItem(RiaPorosityModel::FRACTURE_MODEL, "FRACTURE_MODEL",   "Fracture");
+    addItem(RiaDefines::MATRIX_MODEL,   "MATRIX_MODEL",     "Matrix");
+    addItem(RiaDefines::FRACTURE_MODEL, "FRACTURE_MODEL",   "Fracture");
 
-    setDefault(RiaPorosityModel::MATRIX_MODEL);
+    setDefault(RiaDefines::MATRIX_MODEL);
 }

ApplicationCode/Application/RiaPorosityModel.h

@@ -21,9 +21,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-class RiaPorosityModel
-{
-public:
+namespace RiaDefines {
     enum PorosityModelType
     {
         MATRIX_MODEL,