From 281214124ae3d2323523f0eae86ab1827bec9ed0 Mon Sep 17 00:00:00 2001 From: Jon Jenssen Date: Thu, 22 Oct 2026 15:18:52 +0200 Subject: [PATCH] Remove obsolete code in preferences from failed merge. --- ApplicationLibCode/Application/RiaPreferencesBatch.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ApplicationLibCode/Application/RiaPreferencesBatch.cpp b/ApplicationLibCode/Application/RiaPreferencesBatch.cpp index aed86a9b8c..a5f60f47f5 100644 --- a/ApplicationLibCode/Application/RiaPreferencesBatch.cpp +++ b/ApplicationLibCode/Application/RiaPreferencesBatch.cpp @@ -24,7 +24,6 @@ #include "RiaPreferencesOpm.h" #include "cafPdmUiCheckBoxEditor.h" -#include "cafPdmUiComboBoxEditor.h" #include @@ -44,10 +43,6 @@ RiaPreferencesBatch::RiaPreferencesBatch() caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_exclusive ); CAF_PDM_InitFieldNoDefault( &m_queueName, "queueName", "Default queue/partition name" ); - m_queueName.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - m_queueName.uiCapability()->setAttribute( caf::PdmUiComboBoxEditor::Keys::ENABLE_EDITABLE_CONTENT, true ); - m_queueName.uiCapability()->setAttribute( caf::PdmUiComboBoxEditor::Keys::ENABLE_AUTO_COMPLETE, false ); - m_queueName.uiCapability()->setAttribute( caf::PdmUiComboBoxEditor::Keys::ADJUST_WIDTH_TO_CONTENTS, true ); CAF_PDM_InitFieldNoDefault( &m_additionalLsfOptions, "additionalLsfOptions", "" ); CAF_PDM_InitFieldNoDefault( &m_additionalSlurmOptions, "additionalSlurmOptions", "" );