From 0247329077c4c83b07e0c58c51405b9fa9ec1bd1 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Fri, 6 Dec 2019 20:45:28 -0500
Subject: [PATCH] Remove eIs(Getting|Saving)ViaShuttle enum values...

... Because:

1 They weren't used

2 The branches selected by them were wrongly passing user-visible prompt strings
to DoDataShuttle, which elsewhere takes a preference path (this is an error that
could have been detected and avoided if there weren't naked wxString arguments)

3 Without those branches, the affected Tie... functions become more parallel to
other ShuttleGui member functions, which might later be unified into fewer
functions
---
 src/ShuttleGui.cpp | 42 ------------------------------------------
 src/ShuttleGui.h   |  2 --
 2 files changed, 44 deletions(-)

diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp
index 0fb0b5b37..acfe18a96 100644
--- a/src/ShuttleGui.cpp
+++ b/src/ShuttleGui.cpp
@@ -1239,12 +1239,6 @@ wxCheckBox * ShuttleGuiBase::DoTieCheckBox(const wxString &Prompt, WrappedType &
          pCheckBox->SetValue( WrappedRef.ReadAsBool() );
       }
       break;
-   // IF Saving settings to external storage...
-   // or IF Getting settings from external storage.
-   case eIsSavingViaShuttle:
-   case eIsGettingViaShuttle:
-      DoDataShuttle( Prompt, WrappedRef );
-      break;
    default:
       wxASSERT( false );
       break;
@@ -1281,12 +1275,6 @@ wxCheckBox * ShuttleGuiBase::DoTieCheckBoxOnRight(const wxString &Prompt, Wrappe
          pCheckBox->SetValue( WrappedRef.ReadAsBool() );
       }
       break;
-   // IF Saving settings to external storage...
-   // or IF Getting settings from external storage.
-   case eIsSavingViaShuttle:
-   case eIsGettingViaShuttle:
-      DoDataShuttle( Prompt, WrappedRef );
-      break;
    default:
       wxASSERT( false );
       break;
@@ -1324,12 +1312,6 @@ wxSpinCtrl * ShuttleGuiBase::DoTieSpinCtrl( const wxString &Prompt, WrappedType
          pSpinCtrl->SetValue( WrappedRef.ReadAsInt() );
       }
       break;
-      // IF Saving settings to external storage...
-      // or IF Getting settings from external storage.
-   case eIsGettingViaShuttle:
-   case eIsSavingViaShuttle:
-      DoDataShuttle( Prompt, WrappedRef );
-      break;
    default:
       wxASSERT( false );
       break;
@@ -1367,12 +1349,6 @@ wxTextCtrl * ShuttleGuiBase::DoTieTextBox( const wxString &Prompt, WrappedType &
          pTextBox->SetValue( WrappedRef.ReadAsString() );
       }
       break;
-   // IF Saving settings to external storage...
-   // or IF Getting settings from external storage.
-   case eIsGettingViaShuttle:
-   case eIsSavingViaShuttle:
-      DoDataShuttle( Prompt, WrappedRef );
-      break;
    default:
       wxASSERT( false );
       break;
@@ -1410,12 +1386,6 @@ wxTextCtrl * ShuttleGuiBase::DoTieNumericTextBox( const wxString &Prompt, Wrappe
          pTextBox->SetValue( WrappedRef.ReadAsString() );
       }
       break;
-   // IF Saving settings to external storage...
-   // or IF Getting settings from external storage.
-   case eIsGettingViaShuttle:
-   case eIsSavingViaShuttle:
-      DoDataShuttle( Prompt, WrappedRef );
-      break;
    default:
       wxASSERT( false );
       break;
@@ -1456,12 +1426,6 @@ wxSlider * ShuttleGuiBase::DoTieSlider( const wxString &Prompt, WrappedType & Wr
             pSlider->SetValue( WrappedRef.ReadAsInt() );
          }
          break;
-      // IF Saving settings to external storage...
-      // or IF Getting settings from external storage.
-      case eIsSavingViaShuttle:
-      case eIsGettingViaShuttle:
-         DoDataShuttle( Prompt, WrappedRef );
-         break;
       default:
          wxASSERT( false );
          break;
@@ -1520,12 +1484,6 @@ wxChoice * ShuttleGuiBase::DoTieChoice(
             pChoice->SetSelection( WrappedRef.ReadAsInt() );
       }
       break;
-   // IF Saving settings to external storage...
-   // or IF Getting settings from external storage.
-   case eIsSavingViaShuttle:
-   case eIsGettingViaShuttle:
-      DoDataShuttle( Prompt, WrappedRef );
-      break;
    default:
       wxASSERT( false );
       break;
diff --git a/src/ShuttleGui.h b/src/ShuttleGui.h
index ad1826ef6..4e54c1923 100644
--- a/src/ShuttleGui.h
+++ b/src/ShuttleGui.h
@@ -36,8 +36,6 @@ enum teShuttleMode
    eIsCreating,
    eIsGettingFromDialog,
    eIsSettingToDialog,
-   eIsSavingViaShuttle,
-   eIsGettingViaShuttle,
    eIsGettingMetadata,
 
    // Next two are only ever seen in constructor.