diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp index b3b1b0a59b..c382da6224 100644 --- a/ApplicationCode/Application/RiaPreferences.cpp +++ b/ApplicationCode/Application/RiaPreferences.cpp @@ -124,9 +124,6 @@ RiaPreferences::RiaPreferences(void) CAF_PDM_InitField(&m_showProjectChangedDialog, "showProjectChangedDialog", true, "Show 'Project has changed' dialog", "", "", ""); m_showProjectChangedDialog.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); - CAF_PDM_InitField(&m_showOctaveWarningForMultipleInstances, "showOctaveWarningForMultipleInstances", true, "Show Octave warning when multiple instances are created", "", "", ""); - m_showOctaveWarningForMultipleInstances.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); - CAF_PDM_InitFieldNoDefault(&m_readerSettings, "readerSettings", "Reader Settings", "", "", ""); m_readerSettings = new RifReaderSettings; @@ -175,7 +172,6 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt field == &showLasCurveWithoutTvdWarning || field == &holoLensDisableCertificateVerification || field == &m_showProjectChangedDialog || - field == &m_showOctaveWarningForMultipleInstances || field == &showLegendBackground) { caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast(attribute); @@ -263,7 +259,6 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering.add(&m_appendFieldKeywordToToolTipText); uiOrdering.add(&m_showProjectChangedDialog); - uiOrdering.add(&m_showOctaveWarningForMultipleInstances); uiOrdering.add(&m_showTestToolbar); uiOrdering.add(&m_includeFractureDebugInfoFile); @@ -355,19 +350,6 @@ bool RiaPreferences::showProjectChangedDialog() const return m_showProjectChangedDialog(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RiaPreferences::showOctaveCommunicationWarning() const -{ - if (!RiaApplication::enableDevelopmentFeatures()) - { - return true; - } - - return m_showOctaveWarningForMultipleInstances(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Application/RiaPreferences.h b/ApplicationCode/Application/RiaPreferences.h index f6ecb9b261..d7c8139153 100644 --- a/ApplicationCode/Application/RiaPreferences.h +++ b/ApplicationCode/Application/RiaPreferences.h @@ -60,7 +60,6 @@ public: bool showTestToolbar() const; bool includeFractureDebugInfoFile() const; bool showProjectChangedDialog() const; - bool showOctaveCommunicationWarning() const; QString holoLensExportFolder() const; std::map defaultFontSizes() const; @@ -117,7 +116,6 @@ private: caf::PdmField m_appendFieldKeywordToToolTipText; caf::PdmField m_showProjectChangedDialog; - caf::PdmField m_showOctaveWarningForMultipleInstances; caf::PdmField m_showTestToolbar; caf::PdmField m_includeFractureDebugInfoFile;