#8250 Use variadic macros and remove obsolete parameters

ApplicationLibCode/Application/RiaPreferences.cpp

@@ -93,9 +93,9 @@ RiaPreferences::RiaPreferences()
                        "",
                        "Remote Procedure Call Scripting Engine",
                        "" );
-    CAF_PDM_InitField( &defaultGrpcPortNumber, "defaultGrpcPort", 50051, "Default Python Script Server Port", "", "", "" );
+    CAF_PDM_InitField( &defaultGrpcPortNumber, "defaultGrpcPort", 50051, "Default Python Script Server Port" );
 
-    CAF_PDM_InitFieldNoDefault( &scriptDirectories, "scriptDirectory", "Shared Script Folder(s)", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &scriptDirectories, "scriptDirectory", "Shared Script Folder(s)" );
     scriptDirectories.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 
     // TODO: This only currently works for installed ResInsight.
@@ -112,10 +112,10 @@ RiaPreferences::RiaPreferences()
     }
 #endif
 
-    CAF_PDM_InitField( &scriptEditorExecutable, "scriptEditorExecutable", defaultTextEditor, "Script Editor", "", "", "" );
+    CAF_PDM_InitField( &scriptEditorExecutable, "scriptEditorExecutable", defaultTextEditor, "Script Editor" );
     scriptEditorExecutable.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitField( &m_octaveExecutable, "octaveExecutable", QString( "octave" ), "Octave Executable Location", "", "", "" );
+    CAF_PDM_InitField( &m_octaveExecutable, "octaveExecutable", QString( "octave" ), "Octave Executable Location" );
     m_octaveExecutable.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
     m_octaveExecutable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
 
@@ -128,15 +128,15 @@ RiaPreferences::RiaPreferences()
                        "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &octaveShowHeaderInfoWhenExecutingScripts );
 
-    CAF_PDM_InitField( &m_pythonExecutable, "pythonExecutable", QString( "python" ), "Python Executable Location", "", "", "" );
+    CAF_PDM_InitField( &m_pythonExecutable, "pythonExecutable", QString( "python" ), "Python Executable Location" );
     m_pythonExecutable.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
     m_pythonExecutable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
-    CAF_PDM_InitField( &showPythonDebugInfo, "pythonDebugInfo", false, "Show Python Debug Info", "", "", "" );
+    CAF_PDM_InitField( &showPythonDebugInfo, "pythonDebugInfo", false, "Show Python Debug Info" );
 
-    CAF_PDM_InitField( &ssihubAddress, "ssihubAddress", QString( "http://" ), "SSIHUB Address", "", "", "" );
+    CAF_PDM_InitField( &ssihubAddress, "ssihubAddress", QString( "http://" ), "SSIHUB Address" );
     ssihubAddress.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
 
-    CAF_PDM_InitFieldNoDefault( &m_defaultMeshModeType, "defaultMeshModeType", "Show Grid Lines", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_defaultMeshModeType, "defaultMeshModeType", "Show Grid Lines" );
     CAF_PDM_InitField( &defaultGridLineColors,
                        "defaultGridLineColors",
                        RiaColorTables::defaultGridLineColor(),
@@ -167,26 +167,26 @@ RiaPreferences::RiaPreferences()
                        "The viewer background color for new views",
                        "" );
 
-    CAF_PDM_InitField( &m_defaultScaleFactorZ, "defaultScaleFactorZ", 5, "Default Z Scale Factor", "", "", "" );
+    CAF_PDM_InitField( &m_defaultScaleFactorZ, "defaultScaleFactorZ", 5, "Default Z Scale Factor" );
 
-    CAF_PDM_InitFieldNoDefault( &defaultSceneFontSize, "defaultSceneFontSizePt", "Viewer Font Size", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &defaultSceneFontSize, "defaultSceneFontSizePt", "Viewer Font Size" );
-    CAF_PDM_InitFieldNoDefault( &defaultAnnotationFontSize, "defaultAnnotationFontSizePt", "Annotation Font Size", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &defaultAnnotationFontSize, "defaultAnnotationFontSizePt", "Annotation Font Size" );
-    CAF_PDM_InitFieldNoDefault( &defaultWellLabelFontSize, "defaultWellLabelFontSizePt", "Well Label Font Size", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &defaultWellLabelFontSize, "defaultWellLabelFontSizePt", "Well Label Font Size" );
-    CAF_PDM_InitFieldNoDefault( &defaultPlotFontSize, "defaultPlotFontSizePt", "Plot Font Size", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &defaultPlotFontSize, "defaultPlotFontSizePt", "Plot Font Size" );
 
-    CAF_PDM_InitField( &m_showLegendBackground, "showLegendBackground", true, "Show Box around Legends", "", "", "" );
+    CAF_PDM_InitField( &m_showLegendBackground, "showLegendBackground", true, "Show Box around Legends" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showLegendBackground );
 
-    CAF_PDM_InitField( &m_enableFaultsByDefault, "enableFaultsByDefault", true, "Enable Faults By Default", "", "", "" );
+    CAF_PDM_InitField( &m_enableFaultsByDefault, "enableFaultsByDefault", true, "Enable Faults By Default" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_enableFaultsByDefault );
 
-    CAF_PDM_InitField( &m_showInfoBox, "showInfoBox", true, "Show Info Box in New Projects", "", "", "" );
+    CAF_PDM_InitField( &m_showInfoBox, "showInfoBox", true, "Show Info Box in New Projects" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showInfoBox );
 
-    CAF_PDM_InitField( &m_showGridBox, "showGridBox", true, "Show Grid Box in New Projects", "", "", "" );
+    CAF_PDM_InitField( &m_showGridBox, "showGridBox", true, "Show Grid Box in New Projects" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showGridBox );
 
-    CAF_PDM_InitFieldNoDefault( &lastUsedProjectFileName, "lastUsedProjectFileName", "Last Used Project File", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &lastUsedProjectFileName, "lastUsedProjectFileName", "Last Used Project File" );
     lastUsedProjectFileName.uiCapability()->setUiHidden( true );
 
     CAF_PDM_InitField( &autocomputeDepthRelatedProperties,
@@ -198,7 +198,7 @@ RiaPreferences::RiaPreferences()
                        "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &autocomputeDepthRelatedProperties );
 
-    CAF_PDM_InitField( &loadAndShowSoil, "loadAndShowSoil", true, "Load and Show SOIL", "", "", "" );
+    CAF_PDM_InitField( &loadAndShowSoil, "loadAndShowSoil", true, "Load and Show SOIL" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &loadAndShowSoil );
 
     CAF_PDM_InitField( &holoLensDisableCertificateVerification,
@@ -218,20 +218,20 @@ RiaPreferences::RiaPreferences()
                        "",
                        "" );
 
-    CAF_PDM_InitFieldNoDefault( &m_readerSettings, "readerSettings", "Reader Settings", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_readerSettings, "readerSettings", "Reader Settings" );
     m_readerSettings = new RifReaderSettings;
-    CAF_PDM_InitFieldNoDefault( &m_dateFormat, "dateFormat", "Date Format", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_dateFormat, "dateFormat", "Date Format" );
     m_dateFormat.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() );
     m_dateFormat = RiaQDateTimeTools::supportedDateFormats().front();
 
-    CAF_PDM_InitFieldNoDefault( &m_timeFormat, "timeFormat", "Time Format", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_timeFormat, "timeFormat", "Time Format" );
     m_timeFormat.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() );
     m_timeFormat = RiaQDateTimeTools::supportedTimeFormats().front();
 
-    CAF_PDM_InitField( &m_useUndoRedo, "useUndoRedo", true, "Enable Undo/Redo for Property Editor changes", "", "", "" );
+    CAF_PDM_InitField( &m_useUndoRedo, "useUndoRedo", true, "Enable Undo/Redo for Property Editor changes" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useUndoRedo );
 
-    CAF_PDM_InitFieldNoDefault( &m_plotTemplateFolders, "plotTemplateFolders", "Plot Template Folder(s)", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_plotTemplateFolders, "plotTemplateFolders", "Plot Template Folder(s)" );
     m_plotTemplateFolders.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
     CAF_PDM_InitField( &m_searchPlotTemplateFoldersRecursively,
                        "SearchPlotTemplateFoldersRecursively",
@@ -242,16 +242,16 @@ RiaPreferences::RiaPreferences()
                        "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_searchPlotTemplateFoldersRecursively );
 
-    CAF_PDM_InitFieldNoDefault( &m_defaultPlotTemplate, "defaultPlotTemplate", "Default Plot Template", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_defaultPlotTemplate, "defaultPlotTemplate", "Default Plot Template" );
 
-    CAF_PDM_InitFieldNoDefault( &m_pageSize, "pageSize", "Page Size", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_pageSize, "pageSize", "Page Size" );
-    CAF_PDM_InitFieldNoDefault( &m_pageOrientation, "pageOrientation", "Page Orientation", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_pageOrientation, "pageOrientation", "Page Orientation" );
-    CAF_PDM_InitField( &m_pageLeftMargin, "pageLeftMargin", defaultMarginSize( m_pageSize() ), "Left Margin", "", "", "" );
+    CAF_PDM_InitField( &m_pageLeftMargin, "pageLeftMargin", defaultMarginSize( m_pageSize() ), "Left Margin" );
-    CAF_PDM_InitField( &m_pageTopMargin, "pageTopMargin", defaultMarginSize( m_pageSize() ), "Top Margin", "", "", "" );
+    CAF_PDM_InitField( &m_pageTopMargin, "pageTopMargin", defaultMarginSize( m_pageSize() ), "Top Margin" );
-    CAF_PDM_InitField( &m_pageRightMargin, "pageRightMargin", defaultMarginSize( m_pageSize() ), "Right Margin", "", "", "" );
+    CAF_PDM_InitField( &m_pageRightMargin, "pageRightMargin", defaultMarginSize( m_pageSize() ), "Right Margin" );
-    CAF_PDM_InitField( &m_pageBottomMargin, "pageBottomMargin", defaultMarginSize( m_pageSize() ), "Bottom Margin", "", "", "" );
+    CAF_PDM_InitField( &m_pageBottomMargin, "pageBottomMargin", defaultMarginSize( m_pageSize() ), "Bottom Margin" );
 
-    CAF_PDM_InitField( &m_openExportedPdfInViewer, "openExportedPdfInViewer", false, "Open Exported PDF in Viewer", "", "", "" );
+    CAF_PDM_InitField( &m_openExportedPdfInViewer, "openExportedPdfInViewer", false, "Open Exported PDF in Viewer" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_openExportedPdfInViewer );
 
     CAF_PDM_InitField( &m_surfaceImportResamplingDistance,
@@ -272,15 +272,15 @@ RiaPreferences::RiaPreferences()
                        "" );
     m_multiLateralWellPattern.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitFieldNoDefault( &m_guiTheme, "guiTheme", "GUI theme", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_guiTheme, "guiTheme", "GUI theme" );
 
-    CAF_PDM_InitFieldNoDefault( &m_summaryPreferences, "summaryPreferences", "summaryPreferences", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_summaryPreferences, "summaryPreferences", "summaryPreferences" );
     m_summaryPreferences = new RiaPreferencesSummary;
 
-    CAF_PDM_InitFieldNoDefault( &m_geoMechPreferences, "geoMechPreferences", "geoMechPreferences", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_geoMechPreferences, "geoMechPreferences", "geoMechPreferences" );
     m_geoMechPreferences = new RiaPreferencesGeoMech;
 
-    CAF_PDM_InitFieldNoDefault( &m_systemPreferences, "systemPreferences", "systemPreferences", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_systemPreferences, "systemPreferences", "systemPreferences" );
     m_systemPreferences = new RiaPreferencesSystem;
 }
 

ApplicationLibCode/Application/RiaPreferencesGeoMech.cpp

@@ -34,41 +34,33 @@ CAF_PDM_SOURCE_INIT( RiaPreferencesGeoMech, "RiaPreferencesGeoMech" );
 //--------------------------------------------------------------------------------------------------
 RiaPreferencesGeoMech::RiaPreferencesGeoMech()
 {
-    CAF_PDM_InitFieldNoDefault( &m_geomechFRAPreprocCommand, "geomechFRAPreprocCommand", "Pre-Processing Command", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_geomechFRAPreprocCommand, "geomechFRAPreprocCommand", "Pre-Processing Command" );
     m_geomechFRAPreprocCommand.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
     m_geomechFRAPreprocCommand.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
 
-    CAF_PDM_InitFieldNoDefault( &m_geomechFRAPostprocCommand, "geomechFRAPostprocCommand", "Post-Processing Command", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_geomechFRAPostprocCommand, "geomechFRAPostprocCommand", "Post-Processing Command" );
     m_geomechFRAPostprocCommand.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
     m_geomechFRAPostprocCommand.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
 
-    CAF_PDM_InitFieldNoDefault( &m_geomechFRAMacrisCommand, "geomechFRAMacrisCommand", "Main Macris Command", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_geomechFRAMacrisCommand, "geomechFRAMacrisCommand", "Main Macris Command" );
     m_geomechFRAMacrisCommand.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
     m_geomechFRAMacrisCommand.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
 
-    CAF_PDM_InitFieldNoDefault( &m_geomechFRADefaultBasicXML,
+    CAF_PDM_InitFieldNoDefault( &m_geomechFRADefaultBasicXML, "geomechFRADefaultXML", "Basic Processing Parameter XML File" );
-                                "geomechFRADefaultXML",
-                                "Basic Processing Parameter XML File",
-                                "",
-                                "",
-                                "" );
     m_geomechFRADefaultBasicXML.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
     m_geomechFRADefaultBasicXML.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
 
     CAF_PDM_InitFieldNoDefault( &m_geomechFRADefaultAdvXML,
                                 "geomechFRADefaultAdvXML",
-                                "Advanced Processing Parameter XML File",
+                                "Advanced Processing Parameter XML File" );
-                                "",
-                                "",
-                                "" );
     m_geomechFRADefaultAdvXML.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
     m_geomechFRADefaultAdvXML.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
 
-    CAF_PDM_InitFieldNoDefault( &m_geomechWIADefaultXML, "geomechWIADefaultXML", "Default Parameter XML File", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_geomechWIADefaultXML, "geomechWIADefaultXML", "Default Parameter XML File" );
     m_geomechWIADefaultXML.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
     m_geomechWIADefaultXML.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
 
-    CAF_PDM_InitFieldNoDefault( &m_geomechWIACommand, "geomechWIACommand", "Command to run", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_geomechWIACommand, "geomechWIACommand", "Command to run" );
     m_geomechWIACommand.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
     m_geomechWIACommand.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
 

ApplicationLibCode/Application/RiaPreferencesSummary.cpp

@@ -66,10 +66,7 @@ RiaPreferencesSummary::RiaPreferencesSummary()
 {
     CAF_PDM_InitFieldNoDefault( &m_summaryRestartFilesShowImportDialog,
                                 "summaryRestartFilesShowImportDialog",
-                                "Show Import Dialog",
+                                "Show Import Dialog" );
-                                "",
-                                "",
-                                "" );
 
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_summaryRestartFilesShowImportDialog );
 
@@ -154,7 +151,7 @@ RiaPreferencesSummary::RiaPreferencesSummary()
                        "",
                        "" );
 
-    CAF_PDM_InitFieldNoDefault( &m_summaryReader, "summaryReaderType", "File Format", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_summaryReader, "summaryReaderType", "File Format" );
 
     CAF_PDM_InitField( &m_showSummaryTimeAsLongString,
                        "showSummaryTimeAsLongString",

ApplicationLibCode/Application/RiaPreferencesSystem.cpp

@@ -46,11 +46,11 @@ CAF_PDM_SOURCE_INIT( RiaPreferencesSystem, "RiaPreferencesSystem" );
 //--------------------------------------------------------------------------------------------------
 RiaPreferencesSystem::RiaPreferencesSystem()
 {
-    CAF_PDM_InitField( &m_useShaders, "useShaders", true, "Use Shaders", "", "", "" );
+    CAF_PDM_InitField( &m_useShaders, "useShaders", true, "Use Shaders" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useShaders );
-    CAF_PDM_InitField( &m_showHud, "showHud", false, "Show 3D Information", "", "", "" );
+    CAF_PDM_InitField( &m_showHud, "showHud", false, "Show 3D Information" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showHud );
-    CAF_PDM_InitField( &m_appendClassNameToUiText, "appendClassNameToUiText", false, "Show Class Names", "", "", "" );
+    CAF_PDM_InitField( &m_appendClassNameToUiText, "appendClassNameToUiText", false, "Show Class Names" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_appendClassNameToUiText );
 
     CAF_PDM_InitField( &m_appendFieldKeywordToToolTipText,
@@ -62,10 +62,10 @@ RiaPreferencesSystem::RiaPreferencesSystem()
                        "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_appendFieldKeywordToToolTipText );
 
-    CAF_PDM_InitField( &m_showViewIdInProjectTree, "showViewIdInTree", false, "Show View Id in Project Tree", "", "", "" );
+    CAF_PDM_InitField( &m_showViewIdInProjectTree, "showViewIdInTree", false, "Show View Id in Project Tree" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showViewIdInProjectTree );
 
-    CAF_PDM_InitField( &m_showTestToolbar, "showTestToolbar", false, "Enable Test Toolbar", "", "", "" );
+    CAF_PDM_InitField( &m_showTestToolbar, "showTestToolbar", false, "Enable Test Toolbar" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showTestToolbar );
 
     CAF_PDM_InitField( &m_includeFractureDebugInfoFile,
@@ -77,7 +77,7 @@ RiaPreferencesSystem::RiaPreferencesSystem()
                        "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_includeFractureDebugInfoFile );
 
-    CAF_PDM_InitFieldNoDefault( &m_holoLensExportFolder, "holoLensExportFolder", "HoloLens Export Folder", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_holoLensExportFolder, "holoLensExportFolder", "HoloLens Export Folder" );
     m_holoLensExportFolder.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
     m_holoLensExportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 
@@ -90,10 +90,10 @@ RiaPreferencesSystem::RiaPreferencesSystem()
                        "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showProjectChangedDialog );
 
-    CAF_PDM_InitField( &m_showProgressBar, "showProgressBar", true, "Show Progress Bar", "", "", "" );
+    CAF_PDM_InitField( &m_showProgressBar, "showProgressBar", true, "Show Progress Bar" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showProgressBar );
 
-    CAF_PDM_InitField( &m_gtestFilter, "gtestFilter", QString(), "Unit Test Filter (gtest)", "", "", "" );
+    CAF_PDM_InitField( &m_gtestFilter, "gtestFilter", QString(), "Unit Test Filter (gtest)" );
 
     CAF_PDM_InitField( &m_eclipseReaderMode,
                        "eclipseReaderMode",

ApplicationLibCode/Application/Tools/RiaRegressionTest.cpp

@@ -53,10 +53,10 @@ RiaRegressionTest::RiaRegressionTest( void )
                                 "" );
     folderContainingGitTool.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitFieldNoDefault( &regressionTestFolder, "regressionTestFolder", "Regression Test Folder", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &regressionTestFolder, "regressionTestFolder", "Regression Test Folder" );
     regressionTestFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitField( &showInteractiveDiffImages, "showInteractiveDiffImages", false, "Interactive Diff Images", "", "", "" );
+    CAF_PDM_InitField( &showInteractiveDiffImages, "showInteractiveDiffImages", false, "Interactive Diff Images" );
     CAF_PDM_InitField( &useOpenMPForGeometryCreation,
                        "useOpenMPForGeometryCreation",
                        true,
@@ -65,7 +65,7 @@ RiaRegressionTest::RiaRegressionTest( void )
                        "",
                        "" );
 
-    CAF_PDM_InitField( &openReportInBrowser, "openReportInBrowser", false, "Open Generated Report in Browser", "", "", "" );
+    CAF_PDM_InitField( &openReportInBrowser, "openReportInBrowser", false, "Open Generated Report in Browser" );
 
     CAF_PDM_InitFieldNoDefault( &testFilter,
                                 "testFilter",

ApplicationLibCode/CommandFileInterface/RicfCloneView.cpp

@@ -25,7 +25,7 @@ CAF_PDM_SOURCE_INIT( RicfCloneView, "cloneView" );
 //--------------------------------------------------------------------------------------------------
 RicfCloneView::RicfCloneView()
 {
-    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp

@@ -38,8 +38,8 @@ CAF_PDM_SOURCE_INIT( RicfComputeCaseGroupStatistics, "computeCaseGroupStatistics
 //--------------------------------------------------------------------------------------------------
 RicfComputeCaseGroupStatistics::RicfComputeCaseGroupStatistics()
 {
-    CAF_PDM_InitScriptableField( &m_groupId, "caseGroupId", -1, "Case Group ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_groupId, "caseGroupId", -1, "Case Group ID" );
-    CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector<int>(), "Case IDs", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector<int>(), "Case IDs" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfCreateGridCaseGroup.cpp

@@ -37,9 +37,9 @@ CAF_PDM_SOURCE_INIT( RicfCreateGridCaseGroupResult, "createGridCaseGroupResult"
 RicfCreateGridCaseGroupResult::RicfCreateGridCaseGroupResult( int            caseGroupId /*= -1*/,
                                                               const QString& caseGroupName /*= ""*/ )
 {
-    CAF_PDM_InitObject( "case_group_result", "", "", "" );
+    CAF_PDM_InitObject( "case_group_result" );
-    CAF_PDM_InitField( &this->caseGroupId, "groupId", caseGroupId, "", "", "", "" );
+    CAF_PDM_InitField( &this->caseGroupId, "groupId", caseGroupId, "" );
-    CAF_PDM_InitField( &this->caseGroupName, "groupName", caseGroupName, "", "", "", "" );
+    CAF_PDM_InitField( &this->caseGroupName, "groupName", caseGroupName, "" );
 }
 
 CAF_PDM_SOURCE_INIT( RicfCreateGridCaseGroup, "createGridCaseGroup" );
@@ -49,7 +49,7 @@ CAF_PDM_SOURCE_INIT( RicfCreateGridCaseGroup, "createGridCaseGroup" );
 //--------------------------------------------------------------------------------------------------
 RicfCreateGridCaseGroup::RicfCreateGridCaseGroup()
 {
-    CAF_PDM_InitScriptableFieldNoDefault( &m_casePaths, "casePaths", "List of Paths to Case Files", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_casePaths, "casePaths", "List of Paths to Case Files" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfCreateLgrForCompletions.cpp

@@ -48,13 +48,13 @@ CAF_PDM_SOURCE_INIT( RicfCreateLgrForCompletions, "createLgrForCompletions" );
 //--------------------------------------------------------------------------------------------------
 RicfCreateLgrForCompletions::RicfCreateLgrForCompletions()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" );
-    CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", 0, "Time Step Index", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", 0, "Time Step Index" );
-    CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector<QString>(), "Well Path Names", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector<QString>(), "Well Path Names" );
-    CAF_PDM_InitScriptableField( &m_refinementI, "refinementI", -1, "RefinementI", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_refinementI, "refinementI", -1, "RefinementI" );
-    CAF_PDM_InitScriptableField( &m_refinementJ, "refinementJ", -1, "RefinementJ", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_refinementJ, "refinementJ", -1, "RefinementJ" );
-    CAF_PDM_InitScriptableField( &m_refinementK, "refinementK", -1, "RefinementK", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_refinementK, "refinementK", -1, "RefinementK" );
-    CAF_PDM_InitScriptableField( &m_splitType, "splitType", Lgr::SplitTypeEnum(), "SplitType", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_splitType, "splitType", Lgr::SplitTypeEnum(), "SplitType" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfCreateMultipleFractures.cpp

@@ -58,14 +58,14 @@ void AppEnum<MultipleFractures::Action>::setUp()
 //--------------------------------------------------------------------------------------------------
 RicfCreateMultipleFractures::RicfCreateMultipleFractures()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" );
-    CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector<QString>(), "Well Path Names", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector<QString>(), "Well Path Names" );
-    CAF_PDM_InitScriptableField( &m_minDistFromWellTd, "minDistFromWellTd", 100.0, "Min Distance From Well TD", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_minDistFromWellTd, "minDistFromWellTd", 100.0, "Min Distance From Well TD" );
-    CAF_PDM_InitScriptableField( &m_maxFracturesPerWell, "maxFracturesPerWell", 100, "Max Fractures per Well", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_maxFracturesPerWell, "maxFracturesPerWell", 100, "Max Fractures per Well" );
-    CAF_PDM_InitScriptableField( &m_templateId, "templateId", -1, "Template ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_templateId, "templateId", -1, "Template ID" );
-    CAF_PDM_InitScriptableField( &m_topLayer, "topLayer", -1, "Top Layer", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_topLayer, "topLayer", -1, "Top Layer" );
-    CAF_PDM_InitScriptableField( &m_baseLayer, "baseLayer", -1, "Base Layer", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_baseLayer, "baseLayer", -1, "Base Layer" );
-    CAF_PDM_InitScriptableField( &m_spacing, "spacing", 300.0, "Spacing", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_spacing, "spacing", 300.0, "Spacing" );
     CAF_PDM_InitScriptableField( &m_action,
                                  "action",
                                  caf::AppEnum<MultipleFractures::Action>( MultipleFractures::Action::APPEND_FRACTURES ),

ApplicationLibCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp

@@ -38,7 +38,7 @@ CAF_PDM_SOURCE_INIT( RicfCreateSaturationPressurePlots, "createSaturationPressur
 //--------------------------------------------------------------------------------------------------
 RicfCreateSaturationPressurePlots::RicfCreateSaturationPressurePlots()
 {
-    CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector<int>(), "Case IDs", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector<int>(), "Case IDs" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfCreateStatisticsCase.cpp

@@ -38,8 +38,8 @@ CAF_PDM_SOURCE_INIT( RicfCreateStatisticsCaseResult, "createStatisticsCaseResult
 //--------------------------------------------------------------------------------------------------
 RicfCreateStatisticsCaseResult::RicfCreateStatisticsCaseResult( int caseId /*= -1*/ )
 {
-    CAF_PDM_InitObject( "statistics_case_result", "", "", "" );
+    CAF_PDM_InitObject( "statistics_case_result" );
-    CAF_PDM_InitField( &this->caseId, "caseId", caseId, "", "", "", "" );
+    CAF_PDM_InitField( &this->caseId, "caseId", caseId, "" );
 }
 
 CAF_PDM_SOURCE_INIT( RicfCreateStatisticsCase, "createStatisticsCase" );
@@ -49,7 +49,7 @@ CAF_PDM_SOURCE_INIT( RicfCreateStatisticsCase, "createStatisticsCase" );
 //--------------------------------------------------------------------------------------------------
 RicfCreateStatisticsCase::RicfCreateStatisticsCase()
 {
-    CAF_PDM_InitScriptableField( &m_caseGroupId, "caseGroupId", -1, "Case Group Id", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseGroupId, "caseGroupId", -1, "Case Group Id" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfCreateView.cpp

@@ -23,8 +23,8 @@ CAF_PDM_SOURCE_INIT( RicfCreateViewResult, "createViewResult" );
 //--------------------------------------------------------------------------------------------------
 RicfCreateViewResult::RicfCreateViewResult( int viewId /*= -1*/ )
 {
-    CAF_PDM_InitObject( "view_result", "", "", "" );
+    CAF_PDM_InitObject( "view_result" );
-    CAF_PDM_InitField( &this->viewId, "viewId", viewId, "", "", "", "" );
+    CAF_PDM_InitField( &this->viewId, "viewId", viewId, "" );
 }
 
 CAF_PDM_SOURCE_INIT( RicfCreateView, "createView" );
@@ -34,7 +34,7 @@ CAF_PDM_SOURCE_INIT( RicfCreateView, "createView" );
 //--------------------------------------------------------------------------------------------------
 RicfCreateView::RicfCreateView()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case Id", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case Id" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfCreateWellBoreStabilityPlotFeature.cpp

@@ -39,8 +39,8 @@ CAF_PDM_SOURCE_INIT( RicfCreateWbsPlotResult, "createWbsPlotResult" );
 //--------------------------------------------------------------------------------------------------
 RicfCreateWbsPlotResult::RicfCreateWbsPlotResult( int viewId /*= -1*/ )
 {
-    CAF_PDM_InitObject( "wbs_result", "", "", "" );
+    CAF_PDM_InitObject( "wbs_result" );
-    CAF_PDM_InitField( &this->viewId, "viewId", viewId, "", "", "", "" );
+    CAF_PDM_InitField( &this->viewId, "viewId", viewId, "" );
 }
 
 CAF_PDM_SOURCE_INIT( RicfCreateWellBoreStabilityPlotFeature, "createWellBoreStabilityPlot" );
@@ -50,11 +50,11 @@ CAF_PDM_SOURCE_INIT( RicfCreateWellBoreStabilityPlotFeature, "createWellBoreStab
 //--------------------------------------------------------------------------------------------------
 RicfCreateWellBoreStabilityPlotFeature::RicfCreateWellBoreStabilityPlotFeature()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "GeoMech Case Id", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "GeoMech Case Id" );
-    CAF_PDM_InitScriptableField( &m_wellPath, "wellPath", QString( "" ), "Well Path", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_wellPath, "wellPath", QString( "" ), "Well Path" );
-    CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step" );
 
-    CAF_PDM_InitFieldNoDefault( &m_wbsParameters, "wbsParameters", "WbsParameters", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_wbsParameters, "wbsParameters", "WbsParameters" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp

@@ -42,13 +42,13 @@ CAF_PDM_SOURCE_INIT( RicfExportFlowCharacteristics, "exportFlowCharacteristics"
 //--------------------------------------------------------------------------------------------------
 RicfExportFlowCharacteristics::RicfExportFlowCharacteristics()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" );
-    CAF_PDM_InitScriptableField( &m_selectedTimeSteps, "timeSteps", std::vector<int>(), "Selected Time Steps", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_selectedTimeSteps, "timeSteps", std::vector<int>(), "Selected Time Steps" );
-    CAF_PDM_InitScriptableField( &m_injectors, "injectors", std::vector<QString>(), "Injectors", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_injectors, "injectors", std::vector<QString>(), "Injectors" );
-    CAF_PDM_InitScriptableField( &m_producers, "producers", std::vector<QString>(), "Producers", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_producers, "producers", std::vector<QString>(), "Producers" );
-    CAF_PDM_InitScriptableField( &m_fileName, "fileName", QString(), "Export File Name", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_fileName, "fileName", QString(), "Export File Name" );
-    CAF_PDM_InitScriptableField( &m_minCommunication, "minimumCommunication", 0.0, "Minimum Communication", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_minCommunication, "minimumCommunication", 0.0, "Minimum Communication" );
-    CAF_PDM_InitScriptableField( &m_maxPvFraction, "aquiferCellThreshold", 0.1, "Aquifer Cell Threshold", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_maxPvFraction, "aquiferCellThreshold", 0.1, "Aquifer Cell Threshold" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfExportLgrForCompletions.cpp

@@ -47,13 +47,13 @@ CAF_PDM_SOURCE_INIT( RicfExportLgrForCompletions, "exportLgrForCompletions" );
 //--------------------------------------------------------------------------------------------------
 RicfExportLgrForCompletions::RicfExportLgrForCompletions()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" );
-    CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index" );
-    CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector<QString>(), "Well Path Names", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector<QString>(), "Well Path Names" );
-    CAF_PDM_InitScriptableField( &m_refinementI, "refinementI", -1, "RefinementI", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_refinementI, "refinementI", -1, "RefinementI" );
-    CAF_PDM_InitScriptableField( &m_refinementJ, "refinementJ", -1, "RefinementJ", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_refinementJ, "refinementJ", -1, "RefinementJ" );
-    CAF_PDM_InitScriptableField( &m_refinementK, "refinementK", -1, "RefinementK", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_refinementK, "refinementK", -1, "RefinementK" );
-    CAF_PDM_InitScriptableField( &m_splitType, "splitType", Lgr::SplitTypeEnum(), "SplitType", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_splitType, "splitType", Lgr::SplitTypeEnum(), "SplitType" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfExportMsw.cpp

@@ -45,11 +45,11 @@ CAF_PDM_SOURCE_INIT( RicfExportMsw, "exportMsw" );
 //--------------------------------------------------------------------------------------------------
 RicfExportMsw::RicfExportMsw()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" );
-    CAF_PDM_InitScriptableField( &m_wellPathName, "wellPath", QString(), "Well Path Name", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_wellPathName, "wellPath", QString(), "Well Path Name" );
-    CAF_PDM_InitScriptableField( &m_includePerforations, "includePerforations", true, "Include Perforations", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_includePerforations, "includePerforations", true, "Include Perforations" );
-    CAF_PDM_InitScriptableField( &m_includeFishbones, "includeFishbones", true, "Include Fishbones", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_includeFishbones, "includeFishbones", true, "Include Fishbones" );
-    CAF_PDM_InitScriptableField( &m_includeFractures, "includeFractures", true, "Include Fractures", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_includeFractures, "includeFractures", true, "Include Fractures" );
     CAF_PDM_InitScriptableField( &m_fileSplit,
                                  "fileSplit",
                                  RicExportCompletionDataSettingsUi::ExportSplitType(),

ApplicationLibCode/CommandFileInterface/RicfExportMultiCaseSnapshots.cpp

@@ -33,7 +33,7 @@ CAF_PDM_SOURCE_INIT( RicfExportMultiCaseSnapshots, "exportMultiCaseSnapshots" );
 //--------------------------------------------------------------------------------------------------
 RicfExportMultiCaseSnapshots::RicfExportMultiCaseSnapshots()
 {
-    CAF_PDM_InitScriptableField( &m_gridListFile, "gridListFile", QString(), "Grid List File", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_gridListFile, "gridListFile", QString(), "Grid List File" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfExportPropertyInViews.cpp

@@ -47,10 +47,10 @@ CAF_PDM_SOURCE_INIT( RicfExportPropertyInViews, "exportPropertyInViews" );
 //--------------------------------------------------------------------------------------------------
 RicfExportPropertyInViews::RicfExportPropertyInViews()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" );
-    CAF_PDM_InitScriptableField( &m_viewIds, "viewIds", std::vector<int>(), "View IDs", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_viewIds, "viewIds", std::vector<int>(), "View IDs" );
-    CAF_PDM_InitScriptableField( &m_viewNames, "viewNames", std::vector<QString>(), "View Names", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_viewNames, "viewNames", std::vector<QString>(), "View Names" );
-    CAF_PDM_InitScriptableField( &m_undefinedValue, "undefinedValue", 0.0, "Undefined Value", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_undefinedValue, "undefinedValue", 0.0, "Undefined Value" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfExportSimWellFractureCompletions.cpp

@@ -46,10 +46,10 @@ CAF_PDM_SOURCE_INIT( RicfExportSimWellFractureCompletions, "exportSimWellFractur
 //--------------------------------------------------------------------------------------------------
 RicfExportSimWellFractureCompletions::RicfExportSimWellFractureCompletions()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" );
-    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID" );
-    CAF_PDM_InitScriptableField( &m_viewName, "viewName", QString( "" ), "View Name", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_viewName, "viewName", QString( "" ), "View Name" );
-    CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index" );
     CAF_PDM_InitScriptableField( &m_simWellNames,
                                  "simulationWellNames",
                                  std::vector<QString>(),

ApplicationLibCode/CommandFileInterface/RicfExportSnapshots.cpp

@@ -60,12 +60,12 @@ void RicfExportSnapshots::SnapshotsTypeEnum::setUp()
 //--------------------------------------------------------------------------------------------------
 RicfExportSnapshots::RicfExportSnapshots()
 {
-    CAF_PDM_InitScriptableField( &m_type, "type", RicfExportSnapshots::SnapshotsTypeEnum(), "Type", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_type, "type", RicfExportSnapshots::SnapshotsTypeEnum(), "Type" );
-    CAF_PDM_InitScriptableField( &m_prefix, "prefix", QString(), "Prefix", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_prefix, "prefix", QString(), "Prefix" );
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case Id", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case Id" );
-    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id" );
-    CAF_PDM_InitScriptableField( &m_exportFolder, "exportFolder", QString(), "Export Folder", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_exportFolder, "exportFolder", QString(), "Export Folder" );
-    CAF_PDM_InitScriptableFieldNoDefault( &m_plotOutputFormat, "plotOutputFormat", "Output Format", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_plotOutputFormat, "plotOutputFormat", "Output Format" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfExportVisibleCells.cpp

@@ -63,9 +63,9 @@ void AppEnum<RicfExportVisibleCells::ExportKeyword>::setUp()
 //--------------------------------------------------------------------------------------------------
 RicfExportVisibleCells::RicfExportVisibleCells()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" );
-    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID" );
-    CAF_PDM_InitScriptableField( &m_viewName, "viewName", QString(), "View Name", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_viewName, "viewName", QString(), "View Name" );
     CAF_PDM_InitScriptableField( &m_exportKeyword,
                                  "exportKeyword",
                                  caf::AppEnum<RicfExportVisibleCells::ExportKeyword>(),
@@ -80,8 +80,8 @@ RicfExportVisibleCells::RicfExportVisibleCells()
                                  "",
                                  "",
                                  "" );
-    CAF_PDM_InitScriptableField( &m_hiddenActiveCellsValue, "hiddenActiveCellsValue", 0, "Hidden Active Cells Value", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_hiddenActiveCellsValue, "hiddenActiveCellsValue", 0, "Hidden Active Cells Value" );
-    CAF_PDM_InitScriptableField( &m_inactiveCellsValue, "inactiveCellsValue", 0, "Inactive Cells Value", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_inactiveCellsValue, "inactiveCellsValue", 0, "Inactive Cells Value" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfExportWellLogPlotData.cpp

@@ -49,8 +49,8 @@ CAF_PDM_SOURCE_INIT( RicfExportWellLogPlotDataResult, "exportWellLogPlotDataResu
 //--------------------------------------------------------------------------------------------------
 RicfExportWellLogPlotDataResult::RicfExportWellLogPlotDataResult()
 {
-    CAF_PDM_InitObject( "export_well_data_result", "", "", "" );
+    CAF_PDM_InitObject( "export_well_data_result" );
-    CAF_PDM_InitFieldNoDefault( &this->exportedFiles, "exportedFiles", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &this->exportedFiles, "exportedFiles", "" );
 }
 
 CAF_PDM_SOURCE_INIT( RicfExportWellLogPlotData, "exportWellLogPlotData" );
@@ -60,14 +60,14 @@ CAF_PDM_SOURCE_INIT( RicfExportWellLogPlotData, "exportWellLogPlotData" );
 //--------------------------------------------------------------------------------------------------
 RicfExportWellLogPlotData::RicfExportWellLogPlotData()
 {
-    CAF_PDM_InitScriptableFieldNoDefault( &m_format, "exportFormat", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_format, "exportFormat", "" );
-    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "" );
-    CAF_PDM_InitScriptableField( &m_folder, "exportFolder", QString(), "", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_folder, "exportFolder", QString(), "" );
-    CAF_PDM_InitScriptableField( &m_filePrefix, "filePrefix", QString(), "", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_filePrefix, "filePrefix", QString(), "" );
-    CAF_PDM_InitScriptableField( &m_exportTvdRkb, "exportTvdRkb", false, "", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_exportTvdRkb, "exportTvdRkb", false, "" );
-    CAF_PDM_InitScriptableField( &m_capitalizeFileNames, "capitalizeFileNames", false, "", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_capitalizeFileNames, "capitalizeFileNames", false, "" );
-    CAF_PDM_InitScriptableField( &m_resampleInterval, "resampleInterval", 0.0, "", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_resampleInterval, "resampleInterval", 0.0, "" );
-    CAF_PDM_InitScriptableField( &m_convertCurveUnits, "convertCurveUnits", false, "", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_convertCurveUnits, "convertCurveUnits", false, "" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfExportWellPathCompletions.cpp

@@ -43,9 +43,9 @@ CAF_PDM_SOURCE_INIT( RicfExportWellPathCompletions, "exportWellPathCompletions"
 //--------------------------------------------------------------------------------------------------
 RicfExportWellPathCompletions::RicfExportWellPathCompletions()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" );
-    CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index" );
-    CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector<QString>(), "Well Path Names", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector<QString>(), "Well Path Names" );
 
     CAF_PDM_InitScriptableField( &m_fileSplit,
                                  "fileSplit",
@@ -69,11 +69,11 @@ RicfExportWellPathCompletions::RicfExportWellPathCompletions()
                                  "",
                                  "" );
 
-    CAF_PDM_InitScriptableField( &m_includeMsw, "includeMsw", true, "Export Multi Segment Well Model", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_includeMsw, "includeMsw", true, "Export Multi Segment Well Model" );
-    CAF_PDM_InitScriptableField( &m_useLateralNTG, "useNtgHorizontally", false, "Use NTG Horizontally", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_useLateralNTG, "useNtgHorizontally", false, "Use NTG Horizontally" );
-    CAF_PDM_InitScriptableField( &m_includePerforations, "includePerforations", true, "Include Perforations", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_includePerforations, "includePerforations", true, "Include Perforations" );
-    CAF_PDM_InitScriptableField( &m_includeFishbones, "includeFishbones", true, "Include Fishbones", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_includeFishbones, "includeFishbones", true, "Include Fishbones" );
-    CAF_PDM_InitScriptableField( &m_includeFractures, "includeFractures", true, "Include Fractures", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_includeFractures, "includeFractures", true, "Include Fractures" );
 
     CAF_PDM_InitScriptableField( &m_excludeMainBoreForFishbones,
                                  "excludeMainBoreForFishbones",
@@ -119,8 +119,8 @@ RicfExportWellPathCompletions::RicfExportWellPathCompletions()
                                  "",
                                  "",
                                  "" );
-    CAF_PDM_InitScriptableField( &m_exportWelspec, "exportWelspec", true, "Export WELSPEC keyword", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_exportWelspec, "exportWelspec", true, "Export WELSPEC keyword" );
-    CAF_PDM_InitScriptableField( &m_customFileName, "customFileName", QString(), "Custom Filename", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_customFileName, "customFileName", QString(), "Custom Filename" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfExportWellPaths.cpp

@@ -45,8 +45,8 @@ CAF_PDM_SOURCE_INIT( RicfExportWellPaths, "exportWellPaths" );
 //--------------------------------------------------------------------------------------------------
 RicfExportWellPaths::RicfExportWellPaths()
 {
-    CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector<QString>(), "Well Path Names", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector<QString>(), "Well Path Names" );
-    CAF_PDM_InitScriptableField( &m_mdStepSize, "mdStepSize", 5.0, "MD Step Size", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_mdStepSize, "mdStepSize", 5.0, "MD Step Size" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfImportFormationNames.cpp

@@ -34,8 +34,8 @@ CAF_PDM_SOURCE_INIT( RicfImportFormationNames, "importFormationNames" );
 //--------------------------------------------------------------------------------------------------
 RicfImportFormationNames::RicfImportFormationNames()
 {
-    CAF_PDM_InitScriptableFieldNoDefault( &m_formationFiles, "formationFiles", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_formationFiles, "formationFiles", "" );
-    CAF_PDM_InitScriptableField( &m_applyToCaseId, "applyToCaseId", -1, "", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_applyToCaseId, "applyToCaseId", -1, "" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfImportWellLogFiles.cpp

@@ -35,8 +35,8 @@ CAF_PDM_SOURCE_INIT( RicfImportWellLogFilesResult, "importWellLogFilesResult" );
 //--------------------------------------------------------------------------------------------------
 RicfImportWellLogFilesResult::RicfImportWellLogFilesResult()
 {
-    CAF_PDM_InitObject( "well_log_files_result", "", "", "" );
+    CAF_PDM_InitObject( "well_log_files_result" );
-    CAF_PDM_InitFieldNoDefault( &wellPathNames, "wellPathNames", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &wellPathNames, "wellPathNames", "" );
 }
 
 CAF_PDM_SOURCE_INIT( RicfImportWellLogFiles, "importWellLogFiles" );
@@ -46,8 +46,8 @@ CAF_PDM_SOURCE_INIT( RicfImportWellLogFiles, "importWellLogFiles" );
 //--------------------------------------------------------------------------------------------------
 RicfImportWellLogFiles::RicfImportWellLogFiles()
 {
-    CAF_PDM_InitScriptableFieldNoDefault( &m_wellLogFileFolder, "wellLogFolder", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_wellLogFileFolder, "wellLogFolder", "" );
-    CAF_PDM_InitScriptableFieldNoDefault( &m_wellLogFilePaths, "wellLogFiles", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_wellLogFilePaths, "wellLogFiles", "" );
 }
 
 caf::PdmScriptResponse RicfImportWellLogFiles::execute()

ApplicationLibCode/CommandFileInterface/RicfLoadCase.cpp

@@ -37,8 +37,8 @@ CAF_PDM_SOURCE_INIT( RicfLoadCaseResult, "loadCaseResult" );
 //--------------------------------------------------------------------------------------------------
 RicfLoadCaseResult::RicfLoadCaseResult( int caseId )
 {
-    CAF_PDM_InitObject( "case_result", "", "", "" );
+    CAF_PDM_InitObject( "case_result" );
-    CAF_PDM_InitField( &this->caseId, "id", caseId, "", "", "", "" );
+    CAF_PDM_InitField( &this->caseId, "id", caseId, "" );
 }
 
 CAF_PDM_SOURCE_INIT( RicfLoadCase, "loadCase" );
@@ -48,8 +48,8 @@ CAF_PDM_SOURCE_INIT( RicfLoadCase, "loadCase" );
 //--------------------------------------------------------------------------------------------------
 RicfLoadCase::RicfLoadCase()
 {
-    CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path to Case File", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path to Case File" );
-    CAF_PDM_InitScriptableField( &m_gridOnly, "gridOnly", false, "Load Grid Data Only", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_gridOnly, "gridOnly", false, "Load Grid Data Only" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfOpenProject.cpp

@@ -35,7 +35,7 @@ CAF_PDM_SOURCE_INIT( RicfOpenProject, "openProject" );
 //--------------------------------------------------------------------------------------------------
 RicfOpenProject::RicfOpenProject()
 {
-    CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfReplaceCase.cpp

@@ -38,8 +38,8 @@ CAF_PDM_SOURCE_INIT( RicfSingleCaseReplace, "replaceCase" );
 //--------------------------------------------------------------------------------------------------
 RicfSingleCaseReplace::RicfSingleCaseReplace()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" );
-    CAF_PDM_InitScriptableField( &m_newGridFile, "newGridFile", QString(), "New Grid File", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_newGridFile, "newGridFile", QString(), "New Grid File" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfReplaceSourceCases.cpp

@@ -33,8 +33,8 @@ CAF_PDM_SOURCE_INIT( RicfReplaceSourceCases, "replaceSourceCases" );
 //--------------------------------------------------------------------------------------------------
 RicfReplaceSourceCases::RicfReplaceSourceCases()
 {
-    CAF_PDM_InitScriptableField( &m_caseGroupId, "caseGroupId", -1, "Case Group ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseGroupId, "caseGroupId", -1, "Case Group ID" );
-    CAF_PDM_InitScriptableField( &m_gridListFile, "gridListFile", QString(), "Grid List File", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_gridListFile, "gridListFile", QString(), "Grid List File" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfRunOctaveScript.cpp

@@ -37,8 +37,8 @@ CAF_PDM_SOURCE_INIT( RicfRunOctaveScript, "runOctaveScript" );
 //--------------------------------------------------------------------------------------------------
 RicfRunOctaveScript::RicfRunOctaveScript()
 {
-    CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path" );
-    CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector<int>(), "Case IDs", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector<int>(), "Case IDs" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfScaleFractureTemplate.cpp

@@ -34,13 +34,13 @@ CAF_PDM_SOURCE_INIT( RicfScaleFractureTemplate, "scaleFractureTemplate" );
 //--------------------------------------------------------------------------------------------------
 RicfScaleFractureTemplate::RicfScaleFractureTemplate()
 {
-    CAF_PDM_InitScriptableField( &m_id, "id", -1, "Id", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_id, "id", -1, "Id" );
-    CAF_PDM_InitScriptableField( &m_halfLengthScaleFactor, "halfLength", 1.0, "HalfLengthScaleFactor", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_halfLengthScaleFactor, "halfLength", 1.0, "HalfLengthScaleFactor" );
-    CAF_PDM_InitScriptableField( &m_heightScaleFactor, "height", 1.0, "HeightScaleFactor", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_heightScaleFactor, "height", 1.0, "HeightScaleFactor" );
-    CAF_PDM_InitScriptableField( &m_dFactorScaleFactor, "dFactor", 1.0, "DFactorScaleFactor", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_dFactorScaleFactor, "dFactor", 1.0, "DFactorScaleFactor" );
-    CAF_PDM_InitScriptableField( &m_conductivityScaleFactor, "conductivity", 1.0, "ConductivityScaleFactor", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_conductivityScaleFactor, "conductivity", 1.0, "ConductivityScaleFactor" );
 
-    CAF_PDM_InitScriptableField( &m_OBSOLETE_widthScaleFactor, "width", 1.0, "WidthScaleFactor", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_OBSOLETE_widthScaleFactor, "width", 1.0, "WidthScaleFactor" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfSetFractureContainment.cpp

@@ -34,9 +34,9 @@ CAF_PDM_SOURCE_INIT( RicfSetFractureContainment, "setFractureContainment" );
 //--------------------------------------------------------------------------------------------------
 RicfSetFractureContainment::RicfSetFractureContainment()
 {
-    CAF_PDM_InitScriptableField( &m_id, "id", -1, "Id", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_id, "id", -1, "Id" );
-    CAF_PDM_InitScriptableField( &m_topLayer, "topLayer", -1, "TopLayer", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_topLayer, "topLayer", -1, "TopLayer" );
-    CAF_PDM_InitScriptableField( &m_baseLayer, "baseLayer", -1, "BaseLayer", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_baseLayer, "baseLayer", -1, "BaseLayer" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfSetMainWindowSize.cpp

@@ -30,8 +30,8 @@ CAF_PDM_SOURCE_INIT( RicfSetMainWindowSize, "setMainWindowSize" );
 //--------------------------------------------------------------------------------------------------
 RicfSetMainWindowSize::RicfSetMainWindowSize()
 {
-    CAF_PDM_InitScriptableField( &m_height, "height", -1, "Height", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_height, "height", -1, "Height" );
-    CAF_PDM_InitScriptableField( &m_width, "width", -1, "Width", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_width, "width", -1, "Width" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfSetPlotWindowSize.cpp

@@ -30,8 +30,8 @@ CAF_PDM_SOURCE_INIT( RicfSetPlotWindowSize, "setPlotWindowSize" );
 //--------------------------------------------------------------------------------------------------
 RicfSetPlotWindowSize::RicfSetPlotWindowSize()
 {
-    CAF_PDM_InitScriptableField( &m_height, "height", -1, "Height", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_height, "height", -1, "Height" );
-    CAF_PDM_InitScriptableField( &m_width, "width", -1, "Width", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_width, "width", -1, "Width" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfSetStartDir.cpp

@@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT( RicfSetStartDir, "setStartDir" );
 //--------------------------------------------------------------------------------------------------
 RicfSetStartDir::RicfSetStartDir()
 {
-    CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/CommandFileInterface/RicfSetTimeStep.cpp

@@ -35,9 +35,9 @@ CAF_PDM_SOURCE_INIT( RicfSetTimeStep, "setTimeStep" );
 //--------------------------------------------------------------------------------------------------
 RicfSetTimeStep::RicfSetTimeStep()
 {
-    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" );
-    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID" );
-    CAF_PDM_InitScriptableField( &m_timeStepIndex, "timeStep", -1, "Time Step Index", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_timeStepIndex, "timeStep", -1, "Time Step Index" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp

@@ -34,7 +34,7 @@ RICF_SOURCE_INIT( RicSaveProjectAsFeature, "RicSaveProjectAsFeature", "saveProje
 //--------------------------------------------------------------------------------------------------
 RicSaveProjectAsFeature::RicSaveProjectAsFeature()
 {
-    CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "filePath", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "filePath", "" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp

@@ -31,7 +31,7 @@ RICF_SOURCE_INIT( RicSaveProjectFeature, "RicSaveProjectFeature", "saveProject"
 //--------------------------------------------------------------------------------------------------
 RicSaveProjectFeature::RicSaveProjectFeature()
 {
-    CAF_PDM_InitFieldNoDefault( &m_filePath, "filePath", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_filePath, "filePath", "" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/CompletionExportCommands/RicCaseAndFileExportSettingsUi.cpp

@@ -29,12 +29,12 @@ CAF_PDM_SOURCE_INIT( RicCaseAndFileExportSettingsUi, "RicCaseAndFileExportSettin
 //--------------------------------------------------------------------------------------------------
 RicCaseAndFileExportSettingsUi::RicCaseAndFileExportSettingsUi()
 {
-    CAF_PDM_InitObject( "RimCaseAndFileExportSettings", "", "", "" );
+    CAF_PDM_InitObject( "RimCaseAndFileExportSettings" );
 
-    CAF_PDM_InitFieldNoDefault( &folder, "Folder", "Export Folder", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &folder, "Folder", "Export Folder" );
     folder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitFieldNoDefault( &caseToApply, "CaseToApply", "Case to Apply", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &caseToApply, "CaseToApply", "Case to Apply" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp

@@ -72,26 +72,26 @@ CAF_PDM_SOURCE_INIT( RicExportCompletionDataSettingsUi, "RicExportCompletionData
 //--------------------------------------------------------------------------------------------------
 RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi()
 {
-    CAF_PDM_InitObject( "RimExportCompletionDataSettings", "", "", "" );
+    CAF_PDM_InitObject( "RimExportCompletionDataSettings" );
 
-    CAF_PDM_InitFieldNoDefault( &fileSplit, "FileSplit", "File Split", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &fileSplit, "FileSplit", "File Split" );
 
     CAF_PDM_InitFieldNoDefault( &compdatExport, "compdatExport", "Export", "", " ", "" );
 
-    CAF_PDM_InitField( &timeStep, "TimeStepIndex", 0, "    Time Step", "", "", "" );
+    CAF_PDM_InitField( &timeStep, "TimeStepIndex", 0, "    Time Step" );
 
-    CAF_PDM_InitField( &includeMsw, "IncludeMSW", true, "Multi Segment Well Model", "", "", "" );
+    CAF_PDM_InitField( &includeMsw, "IncludeMSW", true, "Multi Segment Well Model" );
 
-    CAF_PDM_InitField( &useLateralNTG, "UseLateralNTG", false, "Use NTG Horizontally", "", "", "" );
+    CAF_PDM_InitField( &useLateralNTG, "UseLateralNTG", false, "Use NTG Horizontally" );
 
-    CAF_PDM_InitField( &includePerforations, "IncludePerforations", true, "Perforations", "", "", "" );
+    CAF_PDM_InitField( &includePerforations, "IncludePerforations", true, "Perforations" );
-    CAF_PDM_InitField( &includeFishbones, "IncludeFishbones", true, "Fishbones", "", "", "" );
+    CAF_PDM_InitField( &includeFishbones, "IncludeFishbones", true, "Fishbones" );
-    CAF_PDM_InitField( &includeFractures, "IncludeFractures", true, "Fractures", "", "", "" );
+    CAF_PDM_InitField( &includeFractures, "IncludeFractures", true, "Fractures" );
 
-    CAF_PDM_InitField( &performTransScaling, "TransScalingType", false, "Perform Transmissibility Scaling", "", "", "" );
+    CAF_PDM_InitField( &performTransScaling, "TransScalingType", false, "Perform Transmissibility Scaling" );
-    CAF_PDM_InitField( &transScalingTimeStep, "TransScalingTimeStep", 0, "Current Time Step", "", "", "" );
+    CAF_PDM_InitField( &transScalingTimeStep, "TransScalingTimeStep", 0, "Current Time Step" );
-    CAF_PDM_InitFieldNoDefault( &transScalingWBHPSource, "TransScalingWBHPSource", "WBHP Selection", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &transScalingWBHPSource, "TransScalingWBHPSource", "WBHP Selection" );
-    CAF_PDM_InitField( &transScalingWBHP, "TransScalingWBHP", 200.0, "WBHP Before Production Start", "", "", "" );
+    CAF_PDM_InitField( &transScalingWBHP, "TransScalingWBHP", 200.0, "WBHP Before Production Start" );
 
     CAF_PDM_InitField( &excludeMainBoreForFishbones,
                        "ExcludeMainBoreForFishbones",
@@ -104,14 +104,11 @@ RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi()
 
     CAF_PDM_InitFieldNoDefault( &m_reportCompletionTypesSeparately,
                                 "ReportCompletionTypesSeparately",
-                                "Export Completion Types",
+                                "Export Completion Types" );
-                                "",
-                                "",
-                                "" );
 
-    CAF_PDM_InitField( &m_exportDataSourceAsComment, "ExportDataSourceAsComment", true, "Comments", "", "", "" );
+    CAF_PDM_InitField( &m_exportDataSourceAsComment, "ExportDataSourceAsComment", true, "Comments" );
 
-    CAF_PDM_InitField( &m_exportWelspec, "ExportWelspec", true, "WELSPEC keyword", "", "", "" );
+    CAF_PDM_InitField( &m_exportWelspec, "ExportWelspec", true, "WELSPEC keyword" );
     CAF_PDM_InitField( &m_completionWelspecAfterMainBore,
                        "CompletionWelspecAfterMainBore",
                        true,
@@ -120,8 +117,8 @@ RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi()
                        "",
                        "" );
 
-    CAF_PDM_InitField( &m_useCustomFileName, "UseCustomFileName", false, "Use Custom Filename", "", "", "" );
+    CAF_PDM_InitField( &m_useCustomFileName, "UseCustomFileName", false, "Use Custom Filename" );
-    CAF_PDM_InitField( &m_customFileName, "CustomFileName", {}, "Custom Filename", "", "", "" );
+    CAF_PDM_InitField( &m_customFileName, "CustomFileName", {}, "Custom Filename" );
 
     m_displayForSimWell = true;
 

ApplicationLibCode/Commands/ExportCommands/RicCellRangeUi.cpp

@@ -40,20 +40,20 @@ CAF_PDM_SOURCE_INIT( RicCellRangeUi, "RicCellRangeUi" );
 //--------------------------------------------------------------------------------------------------
 RicCellRangeUi::RicCellRangeUi()
 {
-    CAF_PDM_InitObject( "Cell Range", "", "", "" );
+    CAF_PDM_InitObject( "Cell Range" );
 
-    CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case" );
     m_case.uiCapability()->setUiHidden( true );
 
-    CAF_PDM_InitField( &m_gridIndex, "GridIndex", 0, "Grid", "", "", "" );
+    CAF_PDM_InitField( &m_gridIndex, "GridIndex", 0, "Grid" );
 
-    CAF_PDM_InitField( &m_startIndexI, "StartIndexI", 1, "Start Index I", "", "", "" );
+    CAF_PDM_InitField( &m_startIndexI, "StartIndexI", 1, "Start Index I" );
-    CAF_PDM_InitField( &m_startIndexJ, "StartIndexJ", 1, "Start Index J", "", "", "" );
+    CAF_PDM_InitField( &m_startIndexJ, "StartIndexJ", 1, "Start Index J" );
-    CAF_PDM_InitField( &m_startIndexK, "StartIndexK", 1, "Start Index K", "", "", "" );
+    CAF_PDM_InitField( &m_startIndexK, "StartIndexK", 1, "Start Index K" );
 
-    CAF_PDM_InitField( &m_cellCountI, "CellCountI", 1, "Cell Count I", "", "", "" );
+    CAF_PDM_InitField( &m_cellCountI, "CellCountI", 1, "Cell Count I" );
-    CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 1, "Cell Count J", "", "", "" );
+    CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 1, "Cell Count J" );
-    CAF_PDM_InitField( &m_cellCountK, "CellCountK", 1, "Cell Count K", "", "", "" );
+    CAF_PDM_InitField( &m_cellCountK, "CellCountK", 1, "Cell Count K" );
 
     m_startIndexI.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() );
     m_startIndexJ.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() );

ApplicationLibCode/Commands/ExportCommands/RicExportCarfinUi.cpp

@@ -33,20 +33,20 @@ CAF_PDM_SOURCE_INIT( RicExportCarfinUi, "RicExportCarfinUi" );
 //--------------------------------------------------------------------------------------------------
 RicExportCarfinUi::RicExportCarfinUi()
 {
-    CAF_PDM_InitObject( "Export CARFIN", "", "", "" );
+    CAF_PDM_InitObject( "Export CARFIN" );
 
-    CAF_PDM_InitFieldNoDefault( &m_cellRange, "CellRange", "Cell Range", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_cellRange, "CellRange", "Cell Range" );
     m_cellRange = new RicCellRangeUi;
 
-    CAF_PDM_InitFieldNoDefault( &m_exportFileName, "ExportFileName", "Export Filename", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_exportFileName, "ExportFileName", "Export Filename" );
     m_exportFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Source Case", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Source Case" );
 
-    CAF_PDM_InitField( &m_cellCountI, "CellCountI", 2, "Cell Count I", "", "", "" );
+    CAF_PDM_InitField( &m_cellCountI, "CellCountI", 2, "Cell Count I" );
-    CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 2, "Cell Count J", "", "", "" );
+    CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 2, "Cell Count J" );
-    CAF_PDM_InitField( &m_cellCountK, "CellCountK", 2, "Cell Count K", "", "", "" );
+    CAF_PDM_InitField( &m_cellCountK, "CellCountK", 2, "Cell Count K" );
-    CAF_PDM_InitField( &m_maxWellCount, "MaxWellCount", 8, "Max Well Count", "", "", "" );
+    CAF_PDM_InitField( &m_maxWellCount, "MaxWellCount", 8, "Max Well Count" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp

@@ -75,10 +75,10 @@ void RicExportEclipseSectorModelUi::GridBoxSelectionEnum::setUp()
 //--------------------------------------------------------------------------------------------------
 RicExportEclipseSectorModelUi::RicExportEclipseSectorModelUi()
 {
-    CAF_PDM_InitObject( "Export Visible Cells as Eclipse Input Grid", "", "", "" );
+    CAF_PDM_InitObject( "Export Visible Cells as Eclipse Input Grid" );
 
     CAF_PDM_InitField( &exportGrid, "ExportGrid", true, "Export Grid Data", "", "Includes COORD, ZCORN and ACTNUM", "" );
-    CAF_PDM_InitField( &exportGridFilename, "ExportGridFilename", QString(), "Grid File Name", "", "", "" );
+    CAF_PDM_InitField( &exportGridFilename, "ExportGridFilename", QString(), "Grid File Name" );
     exportGridFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
     CAF_PDM_InitField( &exportInLocalCoordinates,
                        "ExportInLocalCoords",
@@ -87,39 +87,39 @@ RicExportEclipseSectorModelUi::RicExportEclipseSectorModelUi()
                        "",
                        "Remove UTM location on export",
                        "" );
-    CAF_PDM_InitField( &makeInvisibleCellsInactive, "InvisibleCellActnum", false, "Make Invisible Cells Inactive", "", "", "" );
+    CAF_PDM_InitField( &makeInvisibleCellsInactive, "InvisibleCellActnum", false, "Make Invisible Cells Inactive" );
 
-    CAF_PDM_InitFieldNoDefault( &exportGridBox, "GridBoxSelection", "Cells to Export", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &exportGridBox, "GridBoxSelection", "Cells to Export" );
 
     QString minIJKLabel = "Min I, J, K";
-    CAF_PDM_InitField( &minI, "MinI", std::numeric_limits<int>::max(), minIJKLabel, "", "", "" );
+    CAF_PDM_InitField( &minI, "MinI", std::numeric_limits<int>::max(), minIJKLabel );
-    CAF_PDM_InitField( &minJ, "MinJ", std::numeric_limits<int>::max(), "", "", "", "" );
+    CAF_PDM_InitField( &minJ, "MinJ", std::numeric_limits<int>::max(), "" );
     minJ.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
-    CAF_PDM_InitField( &minK, "MinK", std::numeric_limits<int>::max(), "", "", "", "" );
+    CAF_PDM_InitField( &minK, "MinK", std::numeric_limits<int>::max(), "" );
     minK.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
     QString maxIJKLabel = "Max I, J, K";
-    CAF_PDM_InitField( &maxI, "MaxI", -std::numeric_limits<int>::max(), maxIJKLabel, "", "", "" );
+    CAF_PDM_InitField( &maxI, "MaxI", -std::numeric_limits<int>::max(), maxIJKLabel );
-    CAF_PDM_InitField( &maxJ, "MaxJ", -std::numeric_limits<int>::max(), "", "", "", "" );
+    CAF_PDM_InitField( &maxJ, "MaxJ", -std::numeric_limits<int>::max(), "" );
     maxJ.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
-    CAF_PDM_InitField( &maxK, "MaxK", -std::numeric_limits<int>::max(), "", "", "", "" );
+    CAF_PDM_InitField( &maxK, "MaxK", -std::numeric_limits<int>::max(), "" );
     maxK.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
 
-    CAF_PDM_InitFieldNoDefault( &exportFaults, "ExportFaults", "Export Fault Data", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &exportFaults, "ExportFaults", "Export Fault Data" );
     exportFaults = EXPORT_TO_SINGLE_SEPARATE_FILE;
 
-    CAF_PDM_InitField( &exportFaultsFilename, "ExportFaultsFilename", QString(), "Faults File Name", "", "", "" );
+    CAF_PDM_InitField( &exportFaultsFilename, "ExportFaultsFilename", QString(), "Faults File Name" );
     exportFaultsFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 
     QString ijkLabel = "Cell Count I, J, K";
-    CAF_PDM_InitField( &refinementCountI, "RefinementCountI", 1, ijkLabel, "", "", "" );
+    CAF_PDM_InitField( &refinementCountI, "RefinementCountI", 1, ijkLabel );
-    CAF_PDM_InitField( &refinementCountJ, "RefinementCountJ", 1, "", "", "", "" );
+    CAF_PDM_InitField( &refinementCountJ, "RefinementCountJ", 1, "" );
-    CAF_PDM_InitField( &refinementCountK, "RefinementCountK", 1, "", "", "", "" );
+    CAF_PDM_InitField( &refinementCountK, "RefinementCountK", 1, "" );
 
-    CAF_PDM_InitFieldNoDefault( &exportParameters, "ExportParams", "Export Parameters", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &exportParameters, "ExportParams", "Export Parameters" );
-    CAF_PDM_InitField( &exportParametersFilename, "ExportParamsFilename", QString(), "File Name", "", "", "" );
+    CAF_PDM_InitField( &exportParametersFilename, "ExportParamsFilename", QString(), "File Name" );
     exportParametersFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitFieldNoDefault( &selectedKeywords, "ExportMainKeywords", "Keywords to Export", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &selectedKeywords, "ExportMainKeywords", "Keywords to Export" );
 
     exportGridFilename       = defaultGridFileName();
     exportParametersFilename = defaultResultsFileName();

ApplicationLibCode/Commands/ExportCommands/RicExportLgrUi.cpp

@@ -50,27 +50,27 @@ void Lgr::SplitTypeEnum::setUp()
 //--------------------------------------------------------------------------------------------------
 RicExportLgrUi::RicExportLgrUi()
 {
-    CAF_PDM_InitObject( "Export CARFIN", "", "", "" );
+    CAF_PDM_InitObject( "Export CARFIN" );
 
-    CAF_PDM_InitFieldNoDefault( &m_exportFolder, "ExportFolder", "Export Folder", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_exportFolder, "ExportFolder", "Export Folder" );
     m_exportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Source Case", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Source Case" );
-    CAF_PDM_InitFieldNoDefault( &m_timeStep, "TimeStepIndex", "Time Step", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_timeStep, "TimeStepIndex", "Time Step" );
 
-    CAF_PDM_InitField( &m_includePerforations, "IncludePerforations", true, "Perforations", "", "", "" );
+    CAF_PDM_InitField( &m_includePerforations, "IncludePerforations", true, "Perforations" );
-    CAF_PDM_InitField( &m_includeFractures, "IncludeFractures", true, "Fractures", "", "", "" );
+    CAF_PDM_InitField( &m_includeFractures, "IncludeFractures", true, "Fractures" );
-    CAF_PDM_InitField( &m_includeFishbones, "IncludeFishbones", true, "Fishbones", "", "", "" );
+    CAF_PDM_InitField( &m_includeFishbones, "IncludeFishbones", true, "Fishbones" );
 
     QString ijkLabel = "Cell Count I, J, K";
-    CAF_PDM_InitField( &m_cellCountI, "CellCountI", 2, ijkLabel, "", "", "" );
+    CAF_PDM_InitField( &m_cellCountI, "CellCountI", 2, ijkLabel );
-    CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 2, "", "", "", "" );
+    CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 2, "" );
-    CAF_PDM_InitField( &m_cellCountK, "CellCountK", 2, "", "", "", "" );
+    CAF_PDM_InitField( &m_cellCountK, "CellCountK", 2, "" );
 
     m_cellCountJ.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
     m_cellCountK.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
 
-    CAF_PDM_InitField( &m_splitType, "SplitType", Lgr::SplitTypeEnum(), "Split Type", "", "", "" );
+    CAF_PDM_InitField( &m_splitType, "SplitType", Lgr::SplitTypeEnum(), "Split Type" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp

@@ -45,9 +45,9 @@ CAF_PDM_SOURCE_INIT( RicExportToLasFileObj, "RicExportToLasFileObj" );
 //--------------------------------------------------------------------------------------------------
 RicExportToLasFileObj::RicExportToLasFileObj( void )
 {
-    CAF_PDM_InitObject( "RicExportToLasFileObj", "", "", "" );
+    CAF_PDM_InitObject( "RicExportToLasFileObj" );
 
-    CAF_PDM_InitField( &tvdrkbOffset, "tvdrkbOffset", QString( "" ), "TVDRKB offset (RKB - MSL) [m]", "", "", "" );
+    CAF_PDM_InitField( &tvdrkbOffset, "tvdrkbOffset", QString( "" ), "TVDRKB offset (RKB - MSL) [m]" );
 }
 
 CAF_PDM_SOURCE_INIT( RicExportToLasFileResampleUi, "RicExportToLasFileResampleUi" );
@@ -58,23 +58,23 @@ CAF_PDM_SOURCE_INIT( RicExportToLasFileResampleUi, "RicExportToLasFileResampleUi
 RicExportToLasFileResampleUi::RicExportToLasFileResampleUi( void )
     : m_enableCurveUnitConversion( false )
 {
-    CAF_PDM_InitObject( "Resample LAS curves for export", "", "", "" );
+    CAF_PDM_InitObject( "Resample LAS curves for export" );
 
-    CAF_PDM_InitField( &exportFolder, "ExportFolder", QString(), "Export Folder", "", "", "" );
+    CAF_PDM_InitField( &exportFolder, "ExportFolder", QString(), "Export Folder" );
     exportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
-    CAF_PDM_InitField( &filePrefix, "FilePrefix", QString( "" ), "File Prefix", "", "", "" );
+    CAF_PDM_InitField( &filePrefix, "FilePrefix", QString( "" ), "File Prefix" );
-    CAF_PDM_InitField( &capitalizeFileName, "CapitalizeFileName", false, "Capitalize File Name", "", "", "" );
+    CAF_PDM_InitField( &capitalizeFileName, "CapitalizeFileName", false, "Capitalize File Name" );
-    CAF_PDM_InitFieldNoDefault( &curveUnitConversion, "CurveUnitConversion", "Curve Units", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &curveUnitConversion, "CurveUnitConversion", "Curve Units" );
 
-    CAF_PDM_InitField( &activateResample, "ActivateResample", false, "Resample Curve Data", "", "", "" );
+    CAF_PDM_InitField( &activateResample, "ActivateResample", false, "Resample Curve Data" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &activateResample );
 
-    CAF_PDM_InitField( &resampleInterval, "ResampleInterval", 1.0, "Resample Interval [m]", "", "", "" );
+    CAF_PDM_InitField( &resampleInterval, "ResampleInterval", 1.0, "Resample Interval [m]" );
 
-    CAF_PDM_InitField( &exportTvdrkb, "ExportTvdrkb", false, "Export TVDRKB", "", "", "" );
+    CAF_PDM_InitField( &exportTvdrkb, "ExportTvdrkb", false, "Export TVDRKB" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &exportTvdrkb );
 
-    CAF_PDM_InitFieldNoDefault( &m_tvdrkbOffsets, "tvdrkbOffsets", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_tvdrkbOffsets, "tvdrkbOffsets", "" );
 
     updateFieldVisibility();
 }

ApplicationLibCode/Commands/ExportCommands/RicExportWellPathsUi.cpp

@@ -34,12 +34,12 @@ CAF_PDM_SOURCE_INIT( RicExportWellPathsUi, "RicExportWellPathsUi" );
 //--------------------------------------------------------------------------------------------------
 RicExportWellPathsUi::RicExportWellPathsUi()
 {
-    CAF_PDM_InitObject( "Resample LAS curves for export", "", "", "" );
+    CAF_PDM_InitObject( "Resample LAS curves for export" );
 
-    CAF_PDM_InitField( &m_exportFolder, "ExportFolder", QString(), "Export Folder", "", "", "" );
+    CAF_PDM_InitField( &m_exportFolder, "ExportFolder", QString(), "Export Folder" );
     m_exportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitField( &m_mdStepSize, "MdStepSize", 5.0, "MD Step Size", "", "", "" );
+    CAF_PDM_InitField( &m_mdStepSize, "MdStepSize", 5.0, "MD Step Size" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsUi.cpp

@@ -45,14 +45,14 @@ CAF_PDM_SOURCE_INIT( RicSaveEclipseInputVisibleCellsUi, "RicSaveEclipseInputVisi
 RicSaveEclipseInputVisibleCellsUi::RicSaveEclipseInputVisibleCellsUi()
     : exportFilenameManuallyChanged( false )
 {
-    CAF_PDM_InitObject( "Export Visible Cells FLUXNUM/MULTNUM/ACTNUM", "", "", "" );
+    CAF_PDM_InitObject( "Export Visible Cells FLUXNUM/MULTNUM/ACTNUM" );
 
-    CAF_PDM_InitField( &exportFilename, "ExportFilename", QString(), "Export Filename", "", "", "" );
+    CAF_PDM_InitField( &exportFilename, "ExportFilename", QString(), "Export Filename" );
     exportFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
-    CAF_PDM_InitFieldNoDefault( &exportKeyword, "ExportKeyword", "Export Keyword", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &exportKeyword, "ExportKeyword", "Export Keyword" );
-    CAF_PDM_InitField( &visibleActiveCellsValue, "VisibleActiveCellsValue", 1, "Visible Active Cells Value", "", "", "" );
+    CAF_PDM_InitField( &visibleActiveCellsValue, "VisibleActiveCellsValue", 1, "Visible Active Cells Value" );
-    CAF_PDM_InitField( &hiddenActiveCellsValue, "HiddenActiveCellsValue", 0, "Hidden Active Cells Value", "", "", "" );
+    CAF_PDM_InitField( &hiddenActiveCellsValue, "HiddenActiveCellsValue", 0, "Hidden Active Cells Value" );
-    CAF_PDM_InitField( &inactiveCellsValue, "InactiveCellsValue", 0, "Inactive Cells Value", "", "", "" );
+    CAF_PDM_InitField( &inactiveCellsValue, "InactiveCellsValue", 0, "Inactive Cells Value" );
 
     exportFilename = getDefaultExportPath();
 }

ApplicationLibCode/Commands/FlowCommands/RicSelectViewUI.cpp

@@ -28,11 +28,11 @@ CAF_PDM_SOURCE_INIT( RicSelectViewUI, "RicSelectViewUI" );
 //--------------------------------------------------------------------------------------------------
 RicSelectViewUI::RicSelectViewUI()
 {
-    CAF_PDM_InitObject( "RicSelectViewUI", "", "", "" );
+    CAF_PDM_InitObject( "RicSelectViewUI" );
 
-    CAF_PDM_InitFieldNoDefault( &m_selectedView, "MasterView", "Select view", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_selectedView, "MasterView", "Select view" );
-    CAF_PDM_InitField( &m_createNewView, "CreateNewView", true, "Create New View", "", "", "" );
+    CAF_PDM_InitField( &m_createNewView, "CreateNewView", true, "Create New View" );
-    CAF_PDM_InitField( &m_newViewName, "NewViewName", QString( "ShowContributingWells" ), "New View Name", "", "", "" );
+    CAF_PDM_InitField( &m_newViewName, "NewViewName", QString( "ShowContributingWells" ), "New View Name" );
 
     m_currentView = nullptr;
     m_currentCase = nullptr;

ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.cpp

@@ -31,10 +31,10 @@ CAF_PDM_SOURCE_INIT( RicCreateMultipleFracturesOptionItemUi, "RiuMultipleFractio
 //--------------------------------------------------------------------------------------------------
 RicCreateMultipleFracturesOptionItemUi::RicCreateMultipleFracturesOptionItemUi()
 {
-    CAF_PDM_InitField( &m_topKOneBased, "TopKLayer", 1, "Top K Layer", "", "", "" );
+    CAF_PDM_InitField( &m_topKOneBased, "TopKLayer", 1, "Top K Layer" );
-    CAF_PDM_InitField( &m_baseKOneBased, "BaseKLayer", 1, "Base K Layer", "", "", "" );
+    CAF_PDM_InitField( &m_baseKOneBased, "BaseKLayer", 1, "Base K Layer" );
-    CAF_PDM_InitFieldNoDefault( &m_fractureTemplate, "Template", "Template", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_fractureTemplate, "Template", "Template" );
-    CAF_PDM_InitField( &m_minSpacing, "MinSpacing", 300.0, "Spacing", "", "", "" );
+    CAF_PDM_InitField( &m_minSpacing, "MinSpacing", 300.0, "Spacing" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp

@@ -85,17 +85,17 @@ const QString RiuCreateMultipleFractionsUi::REPLACE_FRACTURES_BUTTON_TEXT = "Rep
 //--------------------------------------------------------------------------------------------------
 RiuCreateMultipleFractionsUi::RiuCreateMultipleFractionsUi()
 {
-    CAF_PDM_InitFieldNoDefault( &m_sourceCase, "SourceCase", "Case", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_sourceCase, "SourceCase", "Case" );
 
-    CAF_PDM_InitField( &m_minDistanceFromWellTd, "MinDistanceFromWellTd", 10.0, "Min Distance From Well TD", "", "", "" );
+    CAF_PDM_InitField( &m_minDistanceFromWellTd, "MinDistanceFromWellTd", 10.0, "Min Distance From Well TD" );
-    CAF_PDM_InitField( &m_maxFracturesPerWell, "MaxFracturesPerWell", 10, "Max Fractures Per Well", "", "", "" );
+    CAF_PDM_InitField( &m_maxFracturesPerWell, "MaxFracturesPerWell", 10, "Max Fractures Per Well" );
 
-    CAF_PDM_InitFieldNoDefault( &m_options, "Options", "Options", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_options, "Options", "Options" );
     m_options.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() );
     m_options.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
     m_options.uiCapability()->setCustomContextMenuEnabled( true );
 
-    CAF_PDM_InitFieldNoDefault( &m_fractureCreationSummary, "FractureCreationSummary", "Generated Fractures", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_fractureCreationSummary, "FractureCreationSummary", "Generated Fractures" );
     m_fractureCreationSummary.registerGetMethod( this, &RiuCreateMultipleFractionsUi::summaryText );
     m_fractureCreationSummary.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
     m_fractureCreationSummary.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() );

ApplicationLibCode/Commands/GridCrossPlotCommands/RicSaturationPressureUi.cpp

@@ -29,10 +29,10 @@ CAF_PDM_SOURCE_INIT( RicSaturationPressureUi, "RicSaturationPressureUi" );
 //--------------------------------------------------------------------------------------------------
 RicSaturationPressureUi::RicSaturationPressureUi()
 {
-    CAF_PDM_InitObject( "RicSaturationPressureUi", "", "", "" );
+    CAF_PDM_InitObject( "RicSaturationPressureUi" );
 
-    CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Case to Apply", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Case to Apply" );
-    CAF_PDM_InitField( &m_timeStep, "TimeStep", 0, "Time Step", "", "", "" );
+    CAF_PDM_InitField( &m_timeStep, "TimeStep", 0, "Time Step" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensCreateSessionUi.cpp

@@ -35,12 +35,12 @@ CAF_PDM_SOURCE_INIT( RicHoloLensCreateSessionUi, "RicHoloLensCreateSessionUi" );
 //--------------------------------------------------------------------------------------------------
 RicHoloLensCreateSessionUi::RicHoloLensCreateSessionUi()
 {
-    CAF_PDM_InitObject( "HoloLens Create Session", "", "", "" );
+    CAF_PDM_InitObject( "HoloLens Create Session" );
 
-    CAF_PDM_InitField( &m_sessionName, "SessionName", QString( "DummySessionName" ), "Session Name", "", "", "" );
+    CAF_PDM_InitField( &m_sessionName, "SessionName", QString( "DummySessionName" ), "Session Name" );
-    CAF_PDM_InitField( &m_sessionPinCode, "SessionPinCode", QString( "1234" ), "Session Pin Code", "", "", "" );
+    CAF_PDM_InitField( &m_sessionPinCode, "SessionPinCode", QString( "1234" ), "Session Pin Code" );
 
-    CAF_PDM_InitFieldNoDefault( &m_serverSettings, "ServerSettings", "Server Settings", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_serverSettings, "ServerSettings", "Server Settings" );
     m_serverSettings = new RicHoloLensServerSettings;
 
     caf::PdmSettings::readFieldsFromApplicationStore( m_serverSettings );

ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensExportToFolderUi.cpp

@@ -34,11 +34,11 @@ CAF_PDM_SOURCE_INIT( RicHoloLensExportToFolderUi, "RicHoloLensExportToFolderUi"
 //--------------------------------------------------------------------------------------------------
 RicHoloLensExportToFolderUi::RicHoloLensExportToFolderUi()
 {
-    CAF_PDM_InitObject( "Resample LAS curves for export", "", "", "" );
+    CAF_PDM_InitObject( "Resample LAS curves for export" );
 
-    CAF_PDM_InitFieldNoDefault( &m_viewForExport, "ViewForExport", "View", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_viewForExport, "ViewForExport", "View" );
 
-    CAF_PDM_InitField( &m_exportFolder, "ExportFolder", QString(), "Export Folder", "", "", "" );
+    CAF_PDM_InitField( &m_exportFolder, "ExportFolder", QString(), "Export Folder" );
     m_exportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 }
 

ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensServerSettings.cpp

@@ -25,9 +25,9 @@ CAF_PDM_SOURCE_INIT( RicHoloLensServerSettings, "RicHoloLensServerSettings" );
 //--------------------------------------------------------------------------------------------------
 RicHoloLensServerSettings::RicHoloLensServerSettings()
 {
-    CAF_PDM_InitObject( "HoloLens Server Settings", "", "", "" );
+    CAF_PDM_InitObject( "HoloLens Server Settings" );
 
-    CAF_PDM_InitField( &m_serverAddress, "ServerAddress", QString(), "Server Address", "", "", "" );
+    CAF_PDM_InitField( &m_serverAddress, "ServerAddress", QString(), "Server Address" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/PlotTemplateCommands/RicSelectPlotTemplateUi.cpp

@@ -38,9 +38,9 @@ CAF_PDM_SOURCE_INIT( RicSelectPlotTemplateUi, "RicSelectPlotTemplateUi" );
 //--------------------------------------------------------------------------------------------------
 RicSelectPlotTemplateUi::RicSelectPlotTemplateUi()
 {
-    CAF_PDM_InitObject( "RicSelectPlotTemplateUi", "", "", "" );
+    CAF_PDM_InitObject( "RicSelectPlotTemplateUi" );
 
-    CAF_PDM_InitFieldNoDefault( &m_selectedPlotTemplates, "SelectedPlotTemplates", "Plot Templates", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_selectedPlotTemplates, "SelectedPlotTemplates", "Plot Templates" );
     m_selectedPlotTemplates.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
     m_selectedPlotTemplates.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
 }

ApplicationLibCode/Commands/RicCreateEnsembleSurfaceUi.cpp

@@ -32,9 +32,9 @@ CAF_PDM_SOURCE_INIT( RicCreateEnsembleSurfaceUi, "RicCreateEnsembleSurfaceUi" );
 //--------------------------------------------------------------------------------------------------
 RicCreateEnsembleSurfaceUi::RicCreateEnsembleSurfaceUi()
 {
-    CAF_PDM_InitObject( "Export Multiple Surfaces", "", "", "" );
+    CAF_PDM_InitObject( "Export Multiple Surfaces" );
 
-    CAF_PDM_InitFieldNoDefault( &m_layers, "Layers", "Layers", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_layers, "Layers", "Layers" );
     CAF_PDM_InitField( &m_autoCreateEnsembleSurfaces,
                        "AutoCreateEnsembleSurfaces",
                        false,
@@ -44,8 +44,8 @@ RicCreateEnsembleSurfaceUi::RicCreateEnsembleSurfaceUi()
                        "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_autoCreateEnsembleSurfaces );
 
-    CAF_PDM_InitFieldNoDefault( &m_minLayer, "MinLayer", "MinLayer", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_minLayer, "MinLayer", "MinLayer" );
-    CAF_PDM_InitFieldNoDefault( &m_maxLayer, "MaxLayer", "MaxLayer", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_maxLayer, "MaxLayer", "MaxLayer" );
 
     m_tabNames << "Configuration";
 }

ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp

@@ -55,7 +55,7 @@ void caf::AppEnum<RicCreateEnsembleWellLogUi::WellPathSource>::setUp()
 //--------------------------------------------------------------------------------------------------
 RicCreateEnsembleWellLogUi::RicCreateEnsembleWellLogUi()
 {
-    CAF_PDM_InitObject( "Create Ensemble Well Log", "", "", "" );
+    CAF_PDM_InitObject( "Create Ensemble Well Log" );
 
     CAF_PDM_InitField( &m_autoCreateEnsembleWellLogs,
                        "AutoCreateEnsembleWellLogs",
@@ -66,11 +66,11 @@ RicCreateEnsembleWellLogUi::RicCreateEnsembleWellLogUi()
                        "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_autoCreateEnsembleWellLogs );
 
-    CAF_PDM_InitField( &m_timeStep, "TimeStep", 0, "Time Step", "", "", "" );
+    CAF_PDM_InitField( &m_timeStep, "TimeStep", 0, "Time Step" );
-    CAF_PDM_InitFieldNoDefault( &m_wellPathSource, "WellPathSource", "Well Path Source", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_wellPathSource, "WellPathSource", "Well Path Source" );
-    CAF_PDM_InitFieldNoDefault( &m_wellPath, "WellPath", "Well Path", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_wellPath, "WellPath", "Well Path" );
-    CAF_PDM_InitFieldNoDefault( &m_wellFilePath, "WellFilePath", "Well File Path", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_wellFilePath, "WellFilePath", "Well File Path" );
-    CAF_PDM_InitFieldNoDefault( &m_selectedKeywords, "SelectedProperties", "Selected Properties", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_selectedKeywords, "SelectedProperties", "Selected Properties" );
     m_selectedKeywords.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
 
     m_tabNames << "Well"

ApplicationLibCode/Commands/RicDeleteItemExecData.h

@@ -37,8 +37,8 @@ public:
                             "CmdDeleteItemExecData tooltip",
                             "CmdDeleteItemExecData whatsthis" );
 
-        CAF_PDM_InitFieldNoDefault( &m_pathToField, "PathToField", "PathToField", "", "", "" );
+        CAF_PDM_InitFieldNoDefault( &m_pathToField, "PathToField", "PathToField" );
-        CAF_PDM_InitFieldNoDefault( &m_description, "Description", "Description", "", "", "" );
+        CAF_PDM_InitFieldNoDefault( &m_description, "Description", "Description" );
         CAF_PDM_InitField( &m_indexToObject,
                            "indexToObject",
                            -1,

ApplicationLibCode/Commands/RicExportContourMapToTextFeature.cpp

@@ -50,11 +50,11 @@ RICF_SOURCE_INIT( RicExportContourMapToTextFeature, "RicExportContourMapToTextFe
 
 RicExportContourMapToTextFeature::RicExportContourMapToTextFeature()
 {
-    CAF_PDM_InitScriptableFieldNoDefault( &m_exportFileName, "exportFileName", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_exportFileName, "exportFileName", "" );
-    CAF_PDM_InitScriptableFieldNoDefault( &m_exportLocalCoordinates, "exportLocalCoordinates", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_exportLocalCoordinates, "exportLocalCoordinates", "" );
-    CAF_PDM_InitScriptableFieldNoDefault( &m_undefinedValueLabel, "undefinedValueLabel", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_undefinedValueLabel, "undefinedValueLabel", "" );
-    CAF_PDM_InitScriptableFieldNoDefault( &m_excludeUndefinedValues, "excludeUndefinedValues", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_excludeUndefinedValues, "excludeUndefinedValues", "" );
-    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/RicExportContourMapToTextUi.cpp

@@ -9,14 +9,14 @@ CAF_PDM_SOURCE_INIT( RicExportContourMapToTextUi, "RicExportContourMapToTextUi"
 //--------------------------------------------------------------------------------------------------
 RicExportContourMapToTextUi::RicExportContourMapToTextUi()
 {
-    CAF_PDM_InitObject( "Export Contour Map to Text", "", "", "" );
+    CAF_PDM_InitObject( "Export Contour Map to Text" );
 
-    CAF_PDM_InitField( &m_exportFileName, "ExportFileName", QString(), "Export File Name", "", "", "" );
+    CAF_PDM_InitField( &m_exportFileName, "ExportFileName", QString(), "Export File Name" );
     m_exportFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitField( &m_exportLocalCoordinates, "ExportLocalCoordinates", false, "Export Local Coordinates", "", "", "" );
+    CAF_PDM_InitField( &m_exportLocalCoordinates, "ExportLocalCoordinates", false, "Export Local Coordinates" );
-    CAF_PDM_InitField( &m_undefinedValueLabel, "UndefinedValueLabel", QString( "NaN" ), "Undefined Value Label", "", "", "" );
+    CAF_PDM_InitField( &m_undefinedValueLabel, "UndefinedValueLabel", QString( "NaN" ), "Undefined Value Label" );
-    CAF_PDM_InitField( &m_excludeUndefinedValues, "ExcludeUndefinedValues", false, "Exclude Undefined Values", "", "", "" );
+    CAF_PDM_InitField( &m_excludeUndefinedValues, "ExcludeUndefinedValues", false, "Exclude Undefined Values" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/RicNewMultiPlotFeature.cpp

@@ -41,7 +41,7 @@ RICF_SOURCE_INIT( RicNewMultiPlotFeature, "RicNewMultiPlotFeature", "createMulti
 //--------------------------------------------------------------------------------------------------
 RicNewMultiPlotFeature::RicNewMultiPlotFeature()
 {
-    CAF_PDM_InitFieldNoDefault( &m_plots, "plots", "Plots", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_plots, "plots", "Plots" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/RicStackSelectedCurvesFeature.cpp

@@ -36,7 +36,7 @@ RICF_SOURCE_INIT( RicStackSelectedCurvesFeature, "RicStackSelectedCurvesFeature"
 //--------------------------------------------------------------------------------------------------
 RicStackSelectedCurvesFeature::RicStackSelectedCurvesFeature()
 {
-    CAF_PDM_InitScriptableFieldNoDefault( &m_curves, "curves", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_curves, "curves", "" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/RicUnstackSelectedCurvesFeature.cpp

@@ -36,7 +36,7 @@ RICF_SOURCE_INIT( RicUnstackSelectedCurvesFeature, "RicUnstackSelectedCurvesFeat
 //--------------------------------------------------------------------------------------------------
 RicUnstackSelectedCurvesFeature::RicUnstackSelectedCurvesFeature()
 {
-    CAF_PDM_InitScriptableFieldNoDefault( &m_curves, "curves", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_curves, "curves", "" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp

@@ -35,15 +35,15 @@ CAF_PDM_SOURCE_INIT( RimOilFieldEntry, "RimOilFieldEntry" );
 //--------------------------------------------------------------------------------------------------
 RimOilFieldEntry::RimOilFieldEntry()
 {
-    CAF_PDM_InitObject( "OilFieldEntry", "", "", "" );
+    CAF_PDM_InitObject( "OilFieldEntry" );
 
-    CAF_PDM_InitFieldNoDefault( &name, "OilFieldName", "Oil Field Name", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &name, "OilFieldName", "Oil Field Name" );
-    CAF_PDM_InitFieldNoDefault( &edmId, "EdmId", "Edm ID", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &edmId, "EdmId", "Edm ID" );
-    CAF_PDM_InitField( &selected, "Selected", false, "Selected", "", "", "" );
+    CAF_PDM_InitField( &selected, "Selected", false, "Selected" );
 
-    CAF_PDM_InitFieldNoDefault( &wellsFilePath, "wellsFilePath", "Wells File Path", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &wellsFilePath, "wellsFilePath", "Wells File Path" );
 
-    CAF_PDM_InitFieldNoDefault( &wells, "Wells", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &wells, "Wells", "" );
     wells.uiCapability()->setUiTreeHidden( true );
     wells.uiCapability()->setUiTreeChildrenHidden( true );
 }

ApplicationLibCode/Commands/SsiHubImportCommands/RimOilRegionEntry.cpp

@@ -26,14 +26,14 @@ CAF_PDM_SOURCE_INIT( RimOilRegionEntry, "RimOilRegionEntry" );
 //--------------------------------------------------------------------------------------------------
 RimOilRegionEntry::RimOilRegionEntry()
 {
-    CAF_PDM_InitObject( "OilRegionEntry", "", "", "" );
+    CAF_PDM_InitObject( "OilRegionEntry" );
 
-    CAF_PDM_InitFieldNoDefault( &name, "OilRegionEntry", "OilRegionEntry", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &name, "OilRegionEntry", "OilRegionEntry" );
 
-    CAF_PDM_InitFieldNoDefault( &fields, "Fields", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &fields, "Fields", "" );
     fields.uiCapability()->setUiTreeHidden( true );
 
-    CAF_PDM_InitField( &selected, "Selected", false, "Selected", "", "", "" );
+    CAF_PDM_InitField( &selected, "Selected", false, "Selected" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp

@@ -49,20 +49,20 @@ CAF_PDM_SOURCE_INIT( RimWellPathImport, "RimWellPathImport" );
 //--------------------------------------------------------------------------------------------------
 RimWellPathImport::RimWellPathImport()
 {
-    CAF_PDM_InitObject( "RimWellPathImport", "", "", "" );
+    CAF_PDM_InitObject( "RimWellPathImport" );
 
-    CAF_PDM_InitField( &wellTypeSurvey, "WellTypeSurvey", true, "Survey", "", "", "" );
+    CAF_PDM_InitField( &wellTypeSurvey, "WellTypeSurvey", true, "Survey" );
-    CAF_PDM_InitField( &wellTypePlans, "WellTypePlans", true, "Plans", "", "", "" );
+    CAF_PDM_InitField( &wellTypePlans, "WellTypePlans", true, "Plans" );
 
     caf::AppEnum<RimWellPathImport::UtmFilterEnum> defaultUtmMode = UTM_FILTER_OFF;
-    CAF_PDM_InitField( &utmFilterMode, "UtmMode", defaultUtmMode, "Utm Filter", "", "", "" );
+    CAF_PDM_InitField( &utmFilterMode, "UtmMode", defaultUtmMode, "Utm Filter" );
 
-    CAF_PDM_InitField( &north, "UtmNorth", 0.0, "North", "", "", "" );
+    CAF_PDM_InitField( &north, "UtmNorth", 0.0, "North" );
-    CAF_PDM_InitField( &south, "UtmSouth", 0.0, "South", "", "", "" );
+    CAF_PDM_InitField( &south, "UtmSouth", 0.0, "South" );
-    CAF_PDM_InitField( &east, "UtmEast", 0.0, "East", "", "", "" );
+    CAF_PDM_InitField( &east, "UtmEast", 0.0, "East" );
-    CAF_PDM_InitField( &west, "UtmWest", 0.0, "West", "", "", "" );
+    CAF_PDM_InitField( &west, "UtmWest", 0.0, "West" );
 
-    CAF_PDM_InitFieldNoDefault( &regions, "Regions", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &regions, "Regions", "" );
     regions.uiCapability()->setUiTreeHidden( true );
 }
 

ApplicationLibCode/Commands/SsiHubImportCommands/RimWellsEntry.cpp

@@ -39,18 +39,18 @@ CAF_PDM_SOURCE_INIT( RimWellPathEntry, "RimWellPathEntry" );
 //--------------------------------------------------------------------------------------------------
 RimWellPathEntry::RimWellPathEntry()
 {
-    CAF_PDM_InitObject( "WellPathEntry", "", "", "" );
+    CAF_PDM_InitObject( "WellPathEntry" );
 
-    CAF_PDM_InitFieldNoDefault( &name, "Name", "Name", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &name, "Name", "Name" );
-    CAF_PDM_InitField( &selected, "Selected", false, "Selected", "", "", "" );
+    CAF_PDM_InitField( &selected, "Selected", false, "Selected" );
 
     caf::AppEnum<RimWellPathEntry::WellTypeEnum> wellType = WELL_ALL;
-    CAF_PDM_InitField( &wellPathType, "WellPathType", wellType, "Well path type", "", "", "" );
+    CAF_PDM_InitField( &wellPathType, "WellPathType", wellType, "Well path type" );
 
-    CAF_PDM_InitFieldNoDefault( &surveyType, "surveyType", "surveyType", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &surveyType, "surveyType", "surveyType" );
-    CAF_PDM_InitFieldNoDefault( &requestUrl, "requestUrl", "requestUrl", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &requestUrl, "requestUrl", "requestUrl" );
 
-    CAF_PDM_InitFieldNoDefault( &wellPathFilePath, "wellPathFilePath", "wellPathFilePath", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &wellPathFilePath, "wellPathFilePath", "wellPathFilePath" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp

@@ -1198,9 +1198,9 @@ CAF_PDM_SOURCE_INIT( SummaryPageDownloadEntity, "SummaryPageDownloadEntity" );
 //--------------------------------------------------------------------------------------------------
 SummaryPageDownloadEntity::SummaryPageDownloadEntity()
 {
-    CAF_PDM_InitObject( "SummaryPageDownloadEntity", "", "", "" );
+    CAF_PDM_InitObject( "SummaryPageDownloadEntity" );
 
-    CAF_PDM_InitFieldNoDefault( &name, "Name", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &name, "Name", "" );
-    CAF_PDM_InitFieldNoDefault( &requestUrl, "RequestUrl", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &requestUrl, "RequestUrl", "" );
-    CAF_PDM_InitFieldNoDefault( &responseFilename, "ResponseFilename", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &responseFilename, "ResponseFilename", "" );
 }

ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.h

@@ -86,9 +86,9 @@ class ObjectGroupWithHeaders : public caf::PdmObject
 public:
     ObjectGroupWithHeaders()
     {
-        CAF_PDM_InitFieldNoDefault( &objects, "PdmObjects", "", "", "", "" );
+        CAF_PDM_InitFieldNoDefault( &objects, "PdmObjects", "" );
 
-        CAF_PDM_InitField( &m_isChecked, "IsChecked", true, "Active", "", "", "" );
+        CAF_PDM_InitField( &m_isChecked, "IsChecked", true, "Active" );
         m_isChecked.uiCapability()->setUiHidden( true );
     };
 
@@ -228,7 +228,7 @@ public slots:
 
     int wellSelectionPageId();
 
-#if !defined(QT_NO_OPENSSL) && !defined(CVF_OSX)
+#if !defined( QT_NO_OPENSSL ) && !defined( CVF_OSX )
     void sslErrors( QNetworkReply*, const QList<QSslError>& errors );
 #endif
 

ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp

@@ -174,16 +174,16 @@ RicPasteAsciiDataToSummaryPlotFeatureUi::DecimalSeparator mapDecimalSeparator( c
 RicPasteAsciiDataToSummaryPlotFeatureUi::RicPasteAsciiDataToSummaryPlotFeatureUi()
     : m_createNewPlot( false )
 {
-    CAF_PDM_InitObject( "RicPasteAsciiDataToSummaryPlotFeatureUi", "", "", "" );
+    CAF_PDM_InitObject( "RicPasteAsciiDataToSummaryPlotFeatureUi" );
 
-    CAF_PDM_InitField( &m_plotTitle, "PlotTitle", QString(), "Plot Title", "", "", "" );
+    CAF_PDM_InitField( &m_plotTitle, "PlotTitle", QString(), "Plot Title" );
-    CAF_PDM_InitField( &m_curvePrefix, "CurvePrefix", QString(), "Curve Prefix", "", "", "" );
+    CAF_PDM_InitField( &m_curvePrefix, "CurvePrefix", QString(), "Curve Prefix" );
 
-    CAF_PDM_InitFieldNoDefault( &m_decimalSeparator, "DecimalSeparator", "Decimal Separator", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_decimalSeparator, "DecimalSeparator", "Decimal Separator" );
 
-    CAF_PDM_InitFieldNoDefault( &m_dateFormat, "DateFormat", "Date Format", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_dateFormat, "DateFormat", "Date Format" );
-    CAF_PDM_InitFieldNoDefault( &m_timeFormat, "TimeFormat", "Time Format", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_timeFormat, "TimeFormat", "Time Format" );
-    CAF_PDM_InitField( &m_useCustomDateFormat, "UseCustomDateFormat", false, "Use Custom Date Time Format", "", "", "" );
+    CAF_PDM_InitField( &m_useCustomDateFormat, "UseCustomDateFormat", false, "Use Custom Date Time Format" );
     CAF_PDM_InitField( &m_customDateTimeFormat,
                        "CustomDateTimeFormat",
                        QString(),
@@ -207,13 +207,13 @@ RicPasteAsciiDataToSummaryPlotFeatureUi::RicPasteAsciiDataToSummaryPlotFeatureUi
                        "",
                        "",
                        "" );
-    CAF_PDM_InitField( &m_curveSymbolSkipDistance, "SymbolSkipDinstance", 0.0f, "Symbol Skip Distance", "", "", "" );
+    CAF_PDM_InitField( &m_curveSymbolSkipDistance, "SymbolSkipDinstance", 0.0f, "Symbol Skip Distance" );
 
-    CAF_PDM_InitFieldNoDefault( &m_cellSeparator, "CellSeparator", "Cell Separator", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_cellSeparator, "CellSeparator", "Cell Separator" );
 
-    CAF_PDM_InitFieldNoDefault( &m_timeSeriesColumnName, "TimeColumnName", "Selected Time Column", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_timeSeriesColumnName, "TimeColumnName", "Selected Time Column" );
 
-    CAF_PDM_InitFieldNoDefault( &m_previewText, "PreviewText", "Preview Text", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_previewText, "PreviewText", "Preview Text" );
     m_previewText.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() );
     m_previewText.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
     m_previewText.uiCapability()->setUiReadOnly( true );

ApplicationLibCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.cpp

@@ -34,11 +34,11 @@ CAF_PDM_SOURCE_INIT( RicSelectSummaryPlotUI, "RicSelectSummaryPlotUI" );
 //--------------------------------------------------------------------------------------------------
 RicSelectSummaryPlotUI::RicSelectSummaryPlotUI()
 {
-    CAF_PDM_InitObject( "RicSelectSummaryPlotUI", "", "", "" );
+    CAF_PDM_InitObject( "RicSelectSummaryPlotUI" );
 
-    CAF_PDM_InitFieldNoDefault( &m_selectedSummaryPlot, "SelectedSummaryPlot", "Select Plot", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_selectedSummaryPlot, "SelectedSummaryPlot", "Select Plot" );
-    CAF_PDM_InitField( &m_createNewPlot, "CreateNewPlot", false, "Create New Plot", "", "", "" );
+    CAF_PDM_InitField( &m_createNewPlot, "CreateNewPlot", false, "Create New Plot" );
-    CAF_PDM_InitField( &m_newSummaryPlotName, "NewViewName", QString( "Cell Results" ), "New Plot Name", "", "", "" );
+    CAF_PDM_InitField( &m_newSummaryPlotName, "NewViewName", QString( "Cell Results" ), "New Plot Name" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorUi.cpp

@@ -36,17 +36,17 @@ CAF_PDM_SOURCE_INIT( RicSummaryCurveCalculatorUi, "RicSummaryCurveCalculator" );
 //--------------------------------------------------------------------------------------------------
 RicSummaryCurveCalculatorUi::RicSummaryCurveCalculatorUi()
 {
-    CAF_PDM_InitObject( "RicSummaryCurveCalculator", "", "", "" );
+    CAF_PDM_InitObject( "RicSummaryCurveCalculator" );
 
-    CAF_PDM_InitFieldNoDefault( &m_currentCalculation, "CurrentCalculation", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_currentCalculation, "CurrentCalculation", "" );
     m_currentCalculation.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
     // m_currentCalculation.uiCapability()->setUiEditorTypeName(caf::PdmUiTreeSelectionEditor::uiEditorTypeName());
     m_currentCalculation.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitFieldNoDefault( &m_newCalculation, "NewCalculation", "New Calculation", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_newCalculation, "NewCalculation", "New Calculation" );
     RicSummaryCurveCalculatorUi::assignPushButtonEditor( &m_newCalculation );
 
-    CAF_PDM_InitFieldNoDefault( &m_deleteCalculation, "DeleteCalculation", "Delete Calculation", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_deleteCalculation, "DeleteCalculation", "Delete Calculation" );
     RicSummaryCurveCalculatorUi::assignPushButtonEditor( &m_deleteCalculation );
 
     m_calcContextMenuMgr = std::unique_ptr<RiuCalculationsContextMenuManager>( new RiuCalculationsContextMenuManager() );

ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp

@@ -84,33 +84,33 @@ std::vector<T> toVector( const std::set<T>& set );
 //--------------------------------------------------------------------------------------------------
 RicSummaryPlotEditorUi::RicSummaryPlotEditorUi()
 {
-    CAF_PDM_InitFieldNoDefault( &m_targetPlot, "TargetPlot", "Target Plot", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_targetPlot, "TargetPlot", "Target Plot" );
 
-    CAF_PDM_InitField( &m_useAutoAppearanceAssignment, "UseAutoAppearanceAssignment", true, "Auto", "", "", "" );
+    CAF_PDM_InitField( &m_useAutoAppearanceAssignment, "UseAutoAppearanceAssignment", true, "Auto" );
-    CAF_PDM_InitField( &m_appearanceApplyButton, "AppearanceApplyButton", false, "", "", "", "" );
+    CAF_PDM_InitField( &m_appearanceApplyButton, "AppearanceApplyButton", false, "" );
-    CAF_PDM_InitFieldNoDefault( &m_caseAppearanceType, "CaseAppearanceType", "Case", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_caseAppearanceType, "CaseAppearanceType", "Case" );
-    CAF_PDM_InitFieldNoDefault( &m_variableAppearanceType, "VariableAppearanceType", "Vector", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_variableAppearanceType, "VariableAppearanceType", "Vector" );
-    CAF_PDM_InitFieldNoDefault( &m_wellAppearanceType, "WellAppearanceType", "Well", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_wellAppearanceType, "WellAppearanceType", "Well" );
-    CAF_PDM_InitFieldNoDefault( &m_groupAppearanceType, "GroupAppearanceType", "Group", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_groupAppearanceType, "GroupAppearanceType", "Group" );
-    CAF_PDM_InitFieldNoDefault( &m_regionAppearanceType, "RegionAppearanceType", "Region", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_regionAppearanceType, "RegionAppearanceType", "Region" );
 
     m_previewPlot.reset( new RimSummaryPlot() );
 
-    CAF_PDM_InitFieldNoDefault( &m_useAutoPlotTitleProxy, "UseAutoPlotTitle", "Auto Plot Title", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_useAutoPlotTitleProxy, "UseAutoPlotTitle", "Auto Plot Title" );
     m_useAutoPlotTitleProxy.registerGetMethod( this, &RicSummaryPlotEditorUi::proxyPlotAutoTitle );
     m_useAutoPlotTitleProxy.registerSetMethod( this, &RicSummaryPlotEditorUi::proxyEnablePlotAutoTitle );
 
-    CAF_PDM_InitFieldNoDefault( &m_applyButtonField, "ApplySelection", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_applyButtonField, "ApplySelection", "" );
     m_applyButtonField = false;
     m_applyButtonField.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() );
     m_applyButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
 
-    CAF_PDM_InitFieldNoDefault( &m_closeButtonField, "Close", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_closeButtonField, "Close", "" );
     m_closeButtonField = false;
     m_closeButtonField.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() );
     m_closeButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
 
-    CAF_PDM_InitFieldNoDefault( &m_okButtonField, "OK", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_okButtonField, "OK", "" );
     m_okButtonField = false;
     m_okButtonField.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() );
     m_okButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
@@ -119,7 +119,7 @@ RicSummaryPlotEditorUi::RicSummaryPlotEditorUi()
     m_appearanceApplyButton.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() );
     m_appearanceApplyButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LEFT );
 
-    CAF_PDM_InitFieldNoDefault( &m_curveNameConfig, "SummaryCurveNameConfig", "SummaryCurveNameConfig", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_curveNameConfig, "SummaryCurveNameConfig", "SummaryCurveNameConfig" );
     m_curveNameConfig = new RimSummaryCurveAutoName();
     m_curveNameConfig.uiCapability()->setUiTreeHidden( true );
     m_curveNameConfig.uiCapability()->setUiTreeChildrenHidden( true );

ApplicationLibCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp

@@ -36,7 +36,7 @@ RicLinkVisibleViewsFeatureUi::RicLinkVisibleViewsFeatureUi( void )
 {
     CAF_PDM_InitObject( "Link Visible Views Feature UI", ":/LinkView16x16.png", "", "" );
 
-    CAF_PDM_InitFieldNoDefault( &m_masterView, "MasterView", "Primary View", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_masterView, "MasterView", "Primary View" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/WellPathCommands/RicCreateMultipleWellPathLateralsUi.cpp

@@ -45,12 +45,12 @@ CAF_PDM_SOURCE_INIT( RicCreateMultipleWellPathLateralsUi, "RicCreateMultipleWell
 //--------------------------------------------------------------------------------------------------
 RicCreateMultipleWellPathLateralsUi::RicCreateMultipleWellPathLateralsUi()
 {
-    CAF_PDM_InitFieldNoDefault( &m_sourceLateral, "SourceLaterals", "Source Well Path Lateral", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_sourceLateral, "SourceLaterals", "Source Well Path Lateral" );
 
-    CAF_PDM_InitFieldNoDefault( &m_topLevelWellPath, "TopLevelWellPath", "Top Level Well Path", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_topLevelWellPath, "TopLevelWellPath", "Top Level Well Path" );
     m_topLevelWellPath.uiCapability()->setUiHidden( true );
 
-    CAF_PDM_InitFieldNoDefault( &m_locations, "Locations", "Locations", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_locations, "Locations", "Locations" );
     m_locations = new RimMultipleLocations;
 }
 

ApplicationLibCode/Commands/WellPathCommands/RicImportWellPaths.cpp

@@ -48,8 +48,8 @@ class RicImportWellPathsResult : public caf::PdmObject
 public:
     RicImportWellPathsResult()
     {
-        CAF_PDM_InitObject( "well_path_result", "", "", "" );
+        CAF_PDM_InitObject( "well_path_result" );
-        CAF_PDM_InitFieldNoDefault( &wellPathNames, "wellPathNames", "", "", "", "" );
+        CAF_PDM_InitFieldNoDefault( &wellPathNames, "wellPathNames", "" );
     }
 
 public:
@@ -64,9 +64,9 @@ RICF_SOURCE_INIT( RicImportWellPaths, "RicWellPathsImportFileFeature", "importWe
 //--------------------------------------------------------------------------------------------------
 RicImportWellPaths::RicImportWellPaths()
 {
-    CAF_PDM_InitScriptableFieldNoDefault( &m_wellPathFolder, "wellPathFolder", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_wellPathFolder, "wellPathFolder", "" );
-    CAF_PDM_InitScriptableFieldNoDefault( &m_wellPathFiles, "wellPathFiles", "", "", "", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_wellPathFiles, "wellPathFiles", "" );
-    CAF_PDM_InitScriptableField( &m_importGrouped, "importGrouped", false, "", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_importGrouped, "importGrouped", false, "" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.cpp

@@ -25,9 +25,9 @@ CAF_PDM_SOURCE_INIT( RicWellPathsUnitSystemSettingsUi, "RicWellPathsUnitSystemSe
 //--------------------------------------------------------------------------------------------------
 RicWellPathsUnitSystemSettingsUi::RicWellPathsUnitSystemSettingsUi()
 {
-    CAF_PDM_InitObject( "RimWellPathsUnitSystemSettings", "", "", "" );
+    CAF_PDM_InitObject( "RimWellPathsUnitSystemSettings" );
 
-    CAF_PDM_InitFieldNoDefault( &unitSystem, "UnitSystem", "Unit System", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &unitSystem, "UnitSystem", "Unit System" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/FileInterface/RifReaderSettings.cpp

@@ -28,12 +28,12 @@ CAF_PDM_SOURCE_INIT( RifReaderSettings, "RifReaderSettings" );
 //--------------------------------------------------------------------------------------------------
 RifReaderSettings::RifReaderSettings()
 {
-    CAF_PDM_InitObject( "RifReaderSettings", "", "", "" );
+    CAF_PDM_InitObject( "RifReaderSettings" );
 
-    CAF_PDM_InitField( &importFaults, "importFaults", true, "Import Faults", "", "", "" );
+    CAF_PDM_InitField( &importFaults, "importFaults", true, "Import Faults" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &importFaults );
 
-    CAF_PDM_InitField( &importNNCs, "importSimulationNNCs", true, "Import NNCs", "", "", "" );
+    CAF_PDM_InitField( &importNNCs, "importSimulationNNCs", true, "Import NNCs" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &importNNCs );
 
     CAF_PDM_InitField( &includeInactiveCellsInFaultGeometry,
@@ -45,7 +45,7 @@ RifReaderSettings::RifReaderSettings()
                        "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &includeInactiveCellsInFaultGeometry );
 
-    CAF_PDM_InitField( &importAdvancedMswData, "importAdvancedMswData", false, "Import Advanced MSW Data", "", "", "" );
+    CAF_PDM_InitField( &importAdvancedMswData, "importAdvancedMswData", false, "Import Advanced MSW Data" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &importAdvancedMswData );
 
     CAF_PDM_InitField( &useResultIndexFile,
@@ -61,7 +61,7 @@ RifReaderSettings::RifReaderSettings()
 
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &useResultIndexFile );
 
-    CAF_PDM_InitField( &skipWellData, "skipWellData", false, "Skip Import of Simulation Well Data", "", "", "" );
+    CAF_PDM_InitField( &skipWellData, "skipWellData", false, "Skip Import of Simulation Well Data" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &skipWellData );
 
     CAF_PDM_InitField( &includeFileAbsolutePathPrefix,
@@ -73,7 +73,7 @@ RifReaderSettings::RifReaderSettings()
                        "for FAULTS and EQUIL",
                        "" );
 
-    CAF_PDM_InitField( &importSummaryData, "importSummaryData", true, "Import summary data", "", "", "" );
+    CAF_PDM_InitField( &importSummaryData, "importSummaryData", true, "Import summary data" );
     importSummaryData.uiCapability()->setUiHidden( true );
 }
 

ApplicationLibCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp

@@ -31,18 +31,18 @@ CAF_PDM_SOURCE_INIT( RimGeoMechGeometrySelectionItem, "GeoMechGeometrySelectionI
 //--------------------------------------------------------------------------------------------------
 RimGeoMechGeometrySelectionItem::RimGeoMechGeometrySelectionItem()
 {
-    CAF_PDM_InitObject( "GeoMech Topology Item", "", "", "" );
+    CAF_PDM_InitObject( "GeoMech Topology Item" );
 
-    CAF_PDM_InitFieldNoDefault( &m_geoMechCase, "GeoMechCase", "Geo Mech Case", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_geoMechCase, "GeoMechCase", "Geo Mech Case" );
 
-    CAF_PDM_InitFieldNoDefault( &m_gridIndex, "m_gridIndex", "GridIndex", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_gridIndex, "m_gridIndex", "GridIndex" );
-    CAF_PDM_InitFieldNoDefault( &m_cellIndex, "m_cellIndex", "CellIndex", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_cellIndex, "m_cellIndex", "CellIndex" );
-    CAF_PDM_InitFieldNoDefault( &m_elementFace, "m_elementFace", "ElementFace", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_elementFace, "m_elementFace", "ElementFace" );
-    CAF_PDM_InitFieldNoDefault( &m_hasIntersectionTriangle, "m_hasIntersectionTriangle", "HasIntersectionTriangle", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_hasIntersectionTriangle, "m_hasIntersectionTriangle", "HasIntersectionTriangle" );
-    CAF_PDM_InitFieldNoDefault( &m_intersectionTriangle_0, "m_intersectionTriangle_0", "IntersectionTriangle_0", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_intersectionTriangle_0, "m_intersectionTriangle_0", "IntersectionTriangle_0" );
-    CAF_PDM_InitFieldNoDefault( &m_intersectionTriangle_1, "m_intersectionTriangle_1", "IntersectionTriangle_1", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_intersectionTriangle_1, "m_intersectionTriangle_1", "IntersectionTriangle_1" );
-    CAF_PDM_InitFieldNoDefault( &m_intersectionTriangle_2, "m_intersectionTriangle_2", "IntersectionTriangle_2", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_intersectionTriangle_2, "m_intersectionTriangle_2", "IntersectionTriangle_2" );
-    CAF_PDM_InitFieldNoDefault( &m_localIntersectionPoint, "m_localIntersectionPoint", "LocalIntersectionPoint", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_localIntersectionPoint, "m_localIntersectionPoint", "LocalIntersectionPoint" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp

@@ -95,74 +95,74 @@ RimAnalysisPlot::RimAnalysisPlot()
 
     // Variable selection
 
-    CAF_PDM_InitFieldNoDefault( &m_selectedVarsUiField, "selectedVarsUiField", "Selected Vectors", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_selectedVarsUiField, "selectedVarsUiField", "Selected Vectors" );
     m_selectedVarsUiField.xmlCapability()->disableIO();
     m_selectedVarsUiField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
     m_selectedVarsUiField.uiCapability()->setUiReadOnly( true );
 
-    CAF_PDM_InitField( &m_selectVariablesButtonField, "BrowseButton", false, "...", "", "", "" );
+    CAF_PDM_InitField( &m_selectVariablesButtonField, "BrowseButton", false, "..." );
     caf::PdmUiActionPushButtonEditor::configureEditorForField( &m_selectVariablesButtonField );
 
-    CAF_PDM_InitFieldNoDefault( &m_analysisPlotDataSelection, "AnalysisPlotData", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_analysisPlotDataSelection, "AnalysisPlotData", "" );
     m_analysisPlotDataSelection.uiCapability()->setUiTreeChildrenHidden( true );
     m_analysisPlotDataSelection.uiCapability()->setUiTreeHidden( true );
 
     // Time Step Selection
-    CAF_PDM_InitFieldNoDefault( &m_timeStepFilter, "TimeStepFilter", "Available Time Steps", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_timeStepFilter, "TimeStepFilter", "Available Time Steps" );
-    CAF_PDM_InitFieldNoDefault( &m_selectedTimeSteps, "TimeSteps", "Select Time Steps", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_selectedTimeSteps, "TimeSteps", "Select Time Steps" );
     m_selectedTimeSteps.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
     m_selectedTimeSteps.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
 
     // Options
 
-    CAF_PDM_InitFieldNoDefault( &m_referenceCase, "ReferenceCase", "Reference Case", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_referenceCase, "ReferenceCase", "Reference Case" );
 
-    CAF_PDM_InitField( &m_useAutoPlotTitle, "IsUsingAutoName", true, "Auto", "", "", "" );
+    CAF_PDM_InitField( &m_useAutoPlotTitle, "IsUsingAutoName", true, "Auto" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useAutoPlotTitle );
 
-    CAF_PDM_InitField( &m_description, "PlotDescription", QString( "Analysis Plot" ), "Title", "", "", "" );
+    CAF_PDM_InitField( &m_description, "PlotDescription", QString( "Analysis Plot" ), "Title" );
     m_description.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
 
-    CAF_PDM_InitFieldNoDefault( &m_barOrientation, "BarOrientation", "Bar Orientation", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_barOrientation, "BarOrientation", "Bar Orientation" );
 
     // Grouping
 
-    CAF_PDM_InitFieldNoDefault( &m_majorGroupType, "MajorGroupType", "Major Grouping", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_majorGroupType, "MajorGroupType", "Major Grouping" );
-    CAF_PDM_InitFieldNoDefault( &m_mediumGroupType, "MediumGroupType", "Medium Grouping", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_mediumGroupType, "MediumGroupType", "Medium Grouping" );
-    CAF_PDM_InitFieldNoDefault( &m_minorGroupType, "MinorGroupType", "Minor Grouping", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_minorGroupType, "MinorGroupType", "Minor Grouping" );
 
-    CAF_PDM_InitFieldNoDefault( &m_valueSortOperation, "ValueSortOperation", "Sort by Value", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_valueSortOperation, "ValueSortOperation", "Sort by Value" );
 
-    CAF_PDM_InitFieldNoDefault( &m_sortGroupForColors, "groupForColors", "Coloring Using", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_sortGroupForColors, "groupForColors", "Coloring Using" );
     m_sortGroupForColors = RimAnalysisPlot::CASE;
     m_showPlotLegends    = false;
 
-    CAF_PDM_InitField( &m_useTopBarsFilter, "UseTopBarsFilter", false, "Show Only Top", "", "", "" );
+    CAF_PDM_InitField( &m_useTopBarsFilter, "UseTopBarsFilter", false, "Show Only Top" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useTopBarsFilter );
 
-    CAF_PDM_InitField( &m_maxBarCount, "MaxBarCount", 20, "Bar Count", "", "", "" );
+    CAF_PDM_InitField( &m_maxBarCount, "MaxBarCount", 20, "Bar Count" );
     m_maxBarCount.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
 
     // Bar text
 
-    CAF_PDM_InitField( &m_useBarText, "UseBarText", true, "Activate Bar Labels", "", "", "" );
+    CAF_PDM_InitField( &m_useBarText, "UseBarText", true, "Activate Bar Labels" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useBarText );
 
-    CAF_PDM_InitField( &m_useCaseInBarText, "UseCaseInBarText", true, "Case Name", "", "", "" );
+    CAF_PDM_InitField( &m_useCaseInBarText, "UseCaseInBarText", true, "Case Name" );
-    CAF_PDM_InitField( &m_useEnsembleInBarText, "UseEnsembleInBarText", false, "Ensemble", "", "", "" );
+    CAF_PDM_InitField( &m_useEnsembleInBarText, "UseEnsembleInBarText", false, "Ensemble" );
-    CAF_PDM_InitField( &m_useSummaryItemInBarText, "UseSummaryItemInBarText", false, "Summary Item", "", "", "" );
+    CAF_PDM_InitField( &m_useSummaryItemInBarText, "UseSummaryItemInBarText", false, "Summary Item" );
-    CAF_PDM_InitField( &m_useTimeStepInBarText, "UseTimeStepInBarText", false, "Time Step", "", "", "" );
+    CAF_PDM_InitField( &m_useTimeStepInBarText, "UseTimeStepInBarText", false, "Time Step" );
-    CAF_PDM_InitField( &m_useQuantityInBarText, "UseQuantityInBarText", false, "Quantity", "", "", "" );
+    CAF_PDM_InitField( &m_useQuantityInBarText, "UseQuantityInBarText", false, "Quantity" );
 
-    CAF_PDM_InitFieldNoDefault( &m_barTextFontSize, "BarTextFontSize", "Font Size", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_barTextFontSize, "BarTextFontSize", "Font Size" );
 
-    CAF_PDM_InitFieldNoDefault( &m_valueAxisProperties, "ValueAxisProperties", "ValueAxisProperties", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_valueAxisProperties, "ValueAxisProperties", "ValueAxisProperties" );
     m_valueAxisProperties.uiCapability()->setUiTreeHidden( true );
     m_valueAxisProperties = new RimPlotAxisProperties;
     m_valueAxisProperties->setNameAndAxis( "Value-Axis", QwtPlot::yLeft );
     m_valueAxisProperties->enableRangeSettings( false );
 
-    CAF_PDM_InitFieldNoDefault( &m_plotDataFilterCollection, "PlotDataFilterCollection", "PlotDataFilterCollection", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_plotDataFilterCollection, "PlotDataFilterCollection", "PlotDataFilterCollection" );
     m_plotDataFilterCollection.uiCapability()->setUiTreeHidden( true );
     m_plotDataFilterCollection = new RimPlotDataFilterCollection;
 

ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp

@@ -34,7 +34,7 @@ RimAnalysisPlotCollection::RimAnalysisPlotCollection()
 {
     CAF_PDM_InitObject( "Analysis Plots", ":/AnalysisPlots16x16.png", "", "" );
 
-    CAF_PDM_InitFieldNoDefault( &m_analysisPlots, "AnalysisPlots", "Analysis Plots", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_analysisPlots, "AnalysisPlots", "Analysis Plots" );
     m_analysisPlots.uiCapability()->setUiTreeHidden( true );
 }
 

ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotDataEntry.cpp

@@ -33,22 +33,22 @@ CAF_PDM_SOURCE_INIT( RimAnalysisPlotDataEntry, "AnalysisPlotDataEntry" );
 //--------------------------------------------------------------------------------------------------
 RimAnalysisPlotDataEntry::RimAnalysisPlotDataEntry()
 {
-    CAF_PDM_InitObject( "Data Entry", "", "", "" );
+    CAF_PDM_InitObject( "Data Entry" );
 
-    CAF_PDM_InitFieldNoDefault( &m_summaryCase, "SummaryCase", "Case", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_summaryCase, "SummaryCase", "Case" );
     m_summaryCase.uiCapability()->setUiTreeChildrenHidden( true );
     m_summaryCase.uiCapability()->setAutoAddingOptionFromValue( false );
 
-    CAF_PDM_InitFieldNoDefault( &m_ensemble, "Ensemble", "Ensemble", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_ensemble, "Ensemble", "Ensemble" );
     m_ensemble.uiCapability()->setUiTreeChildrenHidden( true );
     m_ensemble.uiCapability()->setAutoAddingOptionFromValue( false );
 
-    CAF_PDM_InitFieldNoDefault( &m_summaryAddress, "SummaryAddress", "Summary Address", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_summaryAddress, "SummaryAddress", "Summary Address" );
     m_summaryAddress.uiCapability()->setUiTreeHidden( true );
     m_summaryAddress.uiCapability()->setUiTreeChildrenHidden( true );
     m_summaryAddress = new RimSummaryAddress;
 
-    CAF_PDM_InitField( &m_isEnsembleCurve, "IsEnsembleCurve", false, "Is Ensemble Curve", "", "", "" );
+    CAF_PDM_InitField( &m_isEnsembleCurve, "IsEnsembleCurve", false, "Is Ensemble Curve" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterCollection.cpp

@@ -29,9 +29,9 @@ RimPlotDataFilterCollection::RimPlotDataFilterCollection()
 {
     CAF_PDM_InitObject( "Plot Data Filters", ":/AnalysisPlotFilter16x16.png", "", "" );
 
-    CAF_PDM_InitField( &m_isActive, "IsActive", true, "IsActive", "", "", "" );
+    CAF_PDM_InitField( &m_isActive, "IsActive", true, "IsActive" );
     m_isActive.uiCapability()->setUiHidden( true );
-    CAF_PDM_InitFieldNoDefault( &m_filters, "PlotDataFiltersField", "", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_filters, "PlotDataFiltersField", "" );
     m_filters.uiCapability()->setUiTreeHidden( true );
 }
 

ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp

@@ -85,37 +85,37 @@ RimPlotDataFilterItem::RimPlotDataFilterItem()
 {
     CAF_PDM_InitObject( "Plot Data Filter", ":/AnalysisPlotFilter16x16.png", "", "" );
 
-    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Active", "", "", "" );
+    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Active" );
     m_isActive.uiCapability()->setUiHidden( true );
 
-    CAF_PDM_InitFieldNoDefault( &m_filterTarget, "FilterTarget", "Use only the", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_filterTarget, "FilterTarget", "Use only the" );
 
-    CAF_PDM_InitFieldNoDefault( &m_filterAddress, "FilterAddressField", "Filter Address", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_filterAddress, "FilterAddressField", "Filter Address" );
     m_filterAddress.uiCapability()->setUiTreeHidden( true );
     m_filterAddress.uiCapability()->setUiTreeChildrenHidden( true );
     m_filterAddress = new RimSummaryAddress();
 
-    CAF_PDM_InitField( &m_filterEnsembleParameter, "QuantityText", QString( "" ), "where", "", "", "" );
+    CAF_PDM_InitField( &m_filterEnsembleParameter, "QuantityText", QString( "" ), "where" );
 
-    CAF_PDM_InitFieldNoDefault( &m_filterQuantityUiField, "SelectedVariableDisplayVar", "where", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_filterQuantityUiField, "SelectedVariableDisplayVar", "where" );
     m_filterQuantityUiField.xmlCapability()->disableIO();
     m_filterQuantityUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitField( &m_filterQuantitySelectButton, "SelectAddress", false, "...", "", "", "" );
+    CAF_PDM_InitField( &m_filterQuantitySelectButton, "SelectAddress", false, "..." );
     caf::PdmUiActionPushButtonEditor::configureEditorForField( &m_filterQuantitySelectButton );
 
-    CAF_PDM_InitFieldNoDefault( &m_filterOperation, "FilterOperation", "is", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_filterOperation, "FilterOperation", "is" );
-    CAF_PDM_InitField( &m_topBottomN, "MinTopN", 20, "N", "", "", "" );
+    CAF_PDM_InitField( &m_topBottomN, "MinTopN", 20, "N" );
     m_topBottomN.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
 
-    CAF_PDM_InitField( &m_max, "Max", m_upperLimit, "Max", "", "", "" );
+    CAF_PDM_InitField( &m_max, "Max", m_upperLimit, "Max" );
     m_max.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
-    CAF_PDM_InitField( &m_min, "Min", m_lowerLimit, "Min", "", "", "" );
+    CAF_PDM_InitField( &m_min, "Min", m_lowerLimit, "Min" );
     m_min.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitFieldNoDefault( &m_ensembleParameterValueCategories, "EnsembleParameterValueCategories", "one of", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_ensembleParameterValueCategories, "EnsembleParameterValueCategories", "one of" );
-    CAF_PDM_InitFieldNoDefault( &m_consideredTimestepsType, "ConsideredTimestepsType", "at the", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_consideredTimestepsType, "ConsideredTimestepsType", "at the" );
-    CAF_PDM_InitFieldNoDefault( &m_explicitlySelectedTimeSteps, "ExplicitlySelectedTimeSteps", "TimeSteps", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_explicitlySelectedTimeSteps, "ExplicitlySelectedTimeSteps", "TimeSteps" );
     m_explicitlySelectedTimeSteps.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() );
     m_explicitlySelectedTimeSteps.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
 

ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp

@@ -43,14 +43,11 @@ RimAnnotationCollection::RimAnnotationCollection()
 {
     CAF_PDM_InitObject( "Annotations", ":/Annotations16x16.png", "", "" );
 
-    CAF_PDM_InitFieldNoDefault( &m_reachCircleAnnotations, "ReachCircleAnnotations", "Reach Circle Annotations", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_reachCircleAnnotations, "ReachCircleAnnotations", "Reach Circle Annotations" );
     CAF_PDM_InitFieldNoDefault( &m_userDefinedPolylineAnnotations,
                                 "UserDefinedPolylineAnnotations",
-                                "User Defined Polyline Annotations",
+                                "User Defined Polyline Annotations" );
-                                "",
+    CAF_PDM_InitFieldNoDefault( &m_polylineFromFileAnnotations, "PolylineFromFileAnnotations", "Polylines From File" );
-                                "",
-                                "" );
-    CAF_PDM_InitFieldNoDefault( &m_polylineFromFileAnnotations, "PolylineFromFileAnnotations", "Polylines From File", "", "", "" );
 
     m_reachCircleAnnotations.uiCapability()->setUiTreeHidden( true );
     m_userDefinedPolylineAnnotations.uiCapability()->setUiTreeHidden( true );

ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp

@@ -38,10 +38,10 @@ RimAnnotationCollectionBase::RimAnnotationCollectionBase()
 {
     CAF_PDM_InitObject( "Annotations", ":/WellCollection.png", "", "" );
 
-    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
+    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
     m_isActive.uiCapability()->setUiHidden( true );
 
-    CAF_PDM_InitFieldNoDefault( &m_textAnnotations, "TextAnnotations", "Text Annotations", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_textAnnotations, "TextAnnotations", "Text Annotations" );
 
     m_textAnnotations.uiCapability()->setUiTreeHidden( true );
     m_textAnnotations = new RimAnnotationGroupCollection();

ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp

@@ -46,8 +46,8 @@ RimAnnotationGroupCollection::RimAnnotationGroupCollection()
 {
     CAF_PDM_InitObject( "Annotations", ":/WellCollection.png", "", "" );
 
-    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
+    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
-    CAF_PDM_InitFieldNoDefault( &m_annotations, "Annotations", "Annotations", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_annotations, "Annotations", "Annotations" );
 
     m_isActive.uiCapability()->setUiHidden( true );
     m_annotations.uiCapability()->setUiTreeHidden( true );

ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp

@@ -80,33 +80,24 @@ RimAnnotationInViewCollection::RimAnnotationInViewCollection()
 {
     CAF_PDM_InitObject( "Annotations", ":/Annotations16x16.png", "", "" );
 
-    CAF_PDM_InitField( &m_annotationPlaneDepth, "AnnotationPlaneDepth", 0.0, "Annotation Plane Depth", "", "", "" );
+    CAF_PDM_InitField( &m_annotationPlaneDepth, "AnnotationPlaneDepth", 0.0, "Annotation Plane Depth" );
-    CAF_PDM_InitField( &m_snapAnnotations, "SnapAnnotations", false, "Snap Annotations to Plane", "", "", "" );
+    CAF_PDM_InitField( &m_snapAnnotations, "SnapAnnotations", false, "Snap Annotations to Plane" );
 
     m_annotationPlaneDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
     m_annotationPlaneDepth.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::TOP );
 
-    CAF_PDM_InitFieldNoDefault( &m_globalTextAnnotations, "TextAnnotationsInView", "Global Text Annotations", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_globalTextAnnotations, "TextAnnotationsInView", "Global Text Annotations" );
     CAF_PDM_InitFieldNoDefault( &m_globalReachCircleAnnotations,
                                 "ReachCircleAnnotationsInView",
-                                "Global Reach Circle Annotations",
+                                "Global Reach Circle Annotations" );
-                                "",
-                                "",
-                                "" );
     CAF_PDM_InitFieldNoDefault( &m_globalUserDefinedPolylineAnnotations,
                                 "UserDefinedPolylinesAnnotationsInView",
-                                "Global User Defined Polylines Annotations",
+                                "Global User Defined Polylines Annotations" );
-                                "",
-                                "",
-                                "" );
     CAF_PDM_InitFieldNoDefault( &m_globalPolylineFromFileAnnotations,
                                 "PolylinesFromFileAnnotationsInView",
-                                "Global Polylines From File Annotations",
+                                "Global Polylines From File Annotations" );
-                                "",
-                                "",
-                                "" );
 
-    CAF_PDM_InitFieldNoDefault( &m_annotationFontSize, "AnnotationFontSize", "Default Font Size", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_annotationFontSize, "AnnotationFontSize", "Default Font Size" );
 
     m_globalTextAnnotations.uiCapability()->setUiTreeHidden( true );
     m_globalReachCircleAnnotations.uiCapability()->setUiTreeHidden( true );

ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationLineAppearance.cpp

@@ -65,12 +65,12 @@ RimAnnotationLineAppearance::RimAnnotationLineAppearance()
 {
     CAF_PDM_InitObject( "AnnotationLineAppearance", ":/WellCollection.png", "", "" );
 
-    CAF_PDM_InitField( &m_lineFieldsHidden, "LineFieldsHidden", false, "Line Fields Hidden", "", "", "" );
+    CAF_PDM_InitField( &m_lineFieldsHidden, "LineFieldsHidden", false, "Line Fields Hidden" );
-    CAF_PDM_InitField( &m_color, "Color", cvf::Color3f( cvf::Color3f::BLACK ), "Line Color", "", "", "" );
+    CAF_PDM_InitField( &m_color, "Color", cvf::Color3f( cvf::Color3f::BLACK ), "Line Color" );
-    CAF_PDM_InitField( &m_thickness, "Thickness", 2, "Line Thickness", "", "", "" );
+    CAF_PDM_InitField( &m_thickness, "Thickness", 2, "Line Thickness" );
 
     // Stippling not yet supported. Needs new stuff in VizFwk
-    CAF_PDM_InitField( &m_style, "Style", LineStyle(), "Style", "", "", "" );
+    CAF_PDM_InitField( &m_style, "Style", LineStyle(), "Style" );
     m_style.uiCapability()->setUiHidden( true );
     m_style.xmlCapability()->disableIO();
 
@@ -172,9 +172,9 @@ RimPolylineAppearance::RimPolylineAppearance()
 {
     CAF_PDM_InitObject( "PolylineAppearance", ":/WellCollection.png", "", "" );
 
-    CAF_PDM_InitField( &m_sphereFieldsHidden, "SphereFieldsHidden", false, "Sphere Fields Hidden", "", "", "" );
+    CAF_PDM_InitField( &m_sphereFieldsHidden, "SphereFieldsHidden", false, "Sphere Fields Hidden" );
-    CAF_PDM_InitField( &m_sphereColor, "SphereColor", cvf::Color3f( cvf::Color3f::BLACK ), "Sphere Color", "", "", "" );
+    CAF_PDM_InitField( &m_sphereColor, "SphereColor", cvf::Color3f( cvf::Color3f::BLACK ), "Sphere Color" );
-    CAF_PDM_InitField( &m_sphereRadiusFactor, "SphereRadiusFactor", 0.1, "Sphere Radius Factor", "", "", "" );
+    CAF_PDM_InitField( &m_sphereRadiusFactor, "SphereRadiusFactor", 0.1, "Sphere Radius Factor" );
 
     m_sphereFieldsHidden.uiCapability()->setUiHidden( true );
 }

ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationTextAppearance.cpp

@@ -35,11 +35,11 @@ RimAnnotationTextAppearance::RimAnnotationTextAppearance()
     auto prefs                  = RiaPreferences::current();
     auto defaultBackgroundColor = prefs->defaultViewerBackgroundColor();
 
-    CAF_PDM_InitFieldNoDefault( &m_fontSize, "FontSize", "Font Size", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_fontSize, "FontSize", "Font Size" );
     m_fontSize = prefs->defaultAnnotationFontSize();
 
-    CAF_PDM_InitField( &m_fontColor, "FontColor", cvf::Color3f( cvf::Color3f::BLACK ), "Font Color", "", "", "" );
+    CAF_PDM_InitField( &m_fontColor, "FontColor", cvf::Color3f( cvf::Color3f::BLACK ), "Font Color" );
-    CAF_PDM_InitField( &m_backgroundColor, "BackgroundColor", defaultBackgroundColor, "Background Color", "", "", "" );
+    CAF_PDM_InitField( &m_backgroundColor, "BackgroundColor", defaultBackgroundColor, "Background Color" );
     CAF_PDM_InitField( &m_anchorLineColor,
                        "AnchorLineColor",
                        cvf::Color3f( cvf::Color3f::BLACK ),

ApplicationLibCode/ProjectDataModel/Annotations/RimPolylineTarget.cpp

@@ -31,8 +31,8 @@ CAF_PDM_SOURCE_INIT( RimPolylineTarget, "PolylineTarget" );
 RimPolylineTarget::RimPolylineTarget()
     : m_isFullUpdateEnabled( true )
 {
-    CAF_PDM_InitField( &m_isEnabled, "IsEnabled", true, "", "", "", "" );
+    CAF_PDM_InitField( &m_isEnabled, "IsEnabled", true, "" );
-    CAF_PDM_InitFieldNoDefault( &m_targetPointXyd, "TargetPointXyd", "Point", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_targetPointXyd, "TargetPointXyd", "Point" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.cpp

@@ -37,14 +37,14 @@ RimPolylinesAnnotation::RimPolylinesAnnotation()
 {
     CAF_PDM_InitObject( "PolylineAnnotation", ":/WellCollection.png", "", "" );
 
-    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
+    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
     m_isActive.uiCapability()->setUiHidden( true );
 
-    CAF_PDM_InitField( &m_closePolyline, "ClosePolyline", false, "Close Polyline", "", "", "" );
+    CAF_PDM_InitField( &m_closePolyline, "ClosePolyline", false, "Close Polyline" );
-    CAF_PDM_InitField( &m_showLines, "ShowLines", true, "Show Lines", "", "", "" );
+    CAF_PDM_InitField( &m_showLines, "ShowLines", true, "Show Lines" );
-    CAF_PDM_InitField( &m_showSpheres, "ShowSpheres", false, "Show Spheres", "", "", "" );
+    CAF_PDM_InitField( &m_showSpheres, "ShowSpheres", false, "Show Spheres" );
 
-    CAF_PDM_InitFieldNoDefault( &m_appearance, "Appearance", "Appearance", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_appearance, "Appearance", "Appearance" );
 
     m_appearance = new RimPolylineAppearance();
     m_appearance.uiCapability()->setUiTreeHidden( true );

ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.cpp

@@ -33,8 +33,8 @@ RimPolylinesAnnotationInView::RimPolylinesAnnotationInView()
 {
     CAF_PDM_InitObject( "PolyLinesAnnotationInView", ":/WellCollection.png", "", "" );
 
-    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
+    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
-    CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation" );
 
     m_isActive.uiCapability()->setUiHidden( true );
     m_sourceAnnotation.uiCapability()->setUiHidden( true );

ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp

@@ -37,8 +37,8 @@ RimPolylinesFromFileAnnotation::RimPolylinesFromFileAnnotation()
 {
     CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png", "", "" );
 
-    CAF_PDM_InitFieldNoDefault( &m_polyLinesFileName, "PolyLineFilePath", "File", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_polyLinesFileName, "PolyLineFilePath", "File" );
-    CAF_PDM_InitField( &m_userDescription, "PolyLineDescription", QString( "" ), "Name", "", "", "" );
+    CAF_PDM_InitField( &m_userDescription, "PolyLineDescription", QString( "" ), "Name" );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp

@@ -38,19 +38,19 @@ RimReachCircleAnnotation::RimReachCircleAnnotation()
 {
     CAF_PDM_InitObject( "CircleAnnotation", ":/ReachCircle16x16.png", "", "" );
 
-    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
+    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
     m_isActive.uiCapability()->setUiHidden( true );
 
-    CAF_PDM_InitField( &m_centerPointXyd, "CenterPointXyd", Vec3d::ZERO, "Center Point", "", "", "" );
+    CAF_PDM_InitField( &m_centerPointXyd, "CenterPointXyd", Vec3d::ZERO, "Center Point" );
     m_centerPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() );
-    CAF_PDM_InitField( &m_centerPointPickEnabled, "AnchorPointPick", false, "", "", "", "" );
+    CAF_PDM_InitField( &m_centerPointPickEnabled, "AnchorPointPick", false, "" );
     caf::PdmUiPushButtonEditor::configureEditorForField( &m_centerPointPickEnabled );
     m_centerPointPickEnabled.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::HIDDEN );
 
-    CAF_PDM_InitField( &m_radius, "Radius", 100.0, "Radius", "", "", "" );
+    CAF_PDM_InitField( &m_radius, "Radius", 100.0, "Radius" );
-    CAF_PDM_InitField( &m_name, "Name", QString( "Circle Annotation" ), "Name", "", "", "" );
+    CAF_PDM_InitField( &m_name, "Name", QString( "Circle Annotation" ), "Name" );
 
-    CAF_PDM_InitFieldNoDefault( &m_appearance, "Appearance", "Appearance", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_appearance, "Appearance", "Appearance" );
 
     m_appearance = new RimReachCircleLineAppearance();
     m_appearance.uiCapability()->setUiTreeHidden( true );

ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.cpp

@@ -30,8 +30,8 @@ RimReachCircleAnnotationInView::RimReachCircleAnnotationInView()
 {
     CAF_PDM_InitObject( "ReachCircleAnnotationInView", ":/ReachCircle16x16.png", "", "" );
 
-    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
+    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
-    CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation" );
 
     m_isActive.uiCapability()->setUiHidden( true );
     m_sourceAnnotation.uiCapability()->setUiHidden( true );

ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp

@@ -47,30 +47,30 @@ RimTextAnnotation::RimTextAnnotation()
     CAF_PDM_InitObject( "TextAnnotation", ":/TextAnnotation16x16.png", "", "" );
     this->setUi3dEditorTypeName( RicTextAnnotation3dEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitField( &m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point", "", "", "" );
+    CAF_PDM_InitField( &m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point" );
     m_anchorPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() );
-    CAF_PDM_InitField( &m_anchorPointPickEnabledButtonField, "AnchorPointPick", false, "", "", "", "" );
+    CAF_PDM_InitField( &m_anchorPointPickEnabledButtonField, "AnchorPointPick", false, "" );
     caf::PdmUiPushButtonEditor::configureEditorForField( &m_anchorPointPickEnabledButtonField );
     m_anchorPointPickEnabledButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::HIDDEN );
 
-    CAF_PDM_InitField( &m_labelPointXyd, "LabelPointXyd", Vec3d::ZERO, "Label Point", "", "", "" );
+    CAF_PDM_InitField( &m_labelPointXyd, "LabelPointXyd", Vec3d::ZERO, "Label Point" );
     m_labelPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() );
-    CAF_PDM_InitField( &m_labelPointPickEnabledButtonField, "LabelPointPick", false, "", "", "", "" );
+    CAF_PDM_InitField( &m_labelPointPickEnabledButtonField, "LabelPointPick", false, "" );
     caf::PdmUiPushButtonEditor::configureEditorForField( &m_labelPointPickEnabledButtonField );
     m_labelPointPickEnabledButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::HIDDEN );
 
-    CAF_PDM_InitField( &m_text, "Text", QString( "(New text)" ), "Text", "", "", "" );
+    CAF_PDM_InitField( &m_text, "Text", QString( "(New text)" ), "Text" );
     m_text.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() );
 
-    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
+    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
     m_isActive.uiCapability()->setUiHidden( true );
 
-    CAF_PDM_InitFieldNoDefault( &m_textAppearance, "TextAppearance", "Text Appearance", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_textAppearance, "TextAppearance", "Text Appearance" );
     m_textAppearance = new RimAnnotationTextAppearance();
     m_textAppearance.uiCapability()->setUiTreeHidden( true );
     m_textAppearance.uiCapability()->setUiTreeChildrenHidden( true );
 
-    CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy" );
     m_nameProxy.registerGetMethod( this, &RimTextAnnotation::extractNameFromText );
     m_nameProxy.uiCapability()->setUiReadOnly( true );
     m_nameProxy.xmlCapability()->disableIO();

ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotationInView.cpp

@@ -30,8 +30,8 @@ RimTextAnnotationInView::RimTextAnnotationInView()
 {
     CAF_PDM_InitObject( "TextAnnotationInView", ":/TextAnnotation16x16.png", "", "" );
 
-    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
+    CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
-    CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation" );
 
     m_isActive.uiCapability()->setUiHidden( true );
     m_sourceAnnotation.uiCapability()->setUiHidden( true );