From 626539d7a63542eb5ddf8363f8f6cf5d67ef8474 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sat, 14 Dec 2019 01:15:14 -0500
Subject: [PATCH] Remove Importer file description from PluginDescriptor...

... it was not used for anything but to write to config and read it again, and
it was improperly writing translated string values to the config file.
---
 src/PluginManager.cpp | 21 +--------------------
 src/PluginManager.h   |  1 -
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
index a799a72c9..51fa306ca 100644
--- a/src/PluginManager.cpp
+++ b/src/PluginManager.cpp
@@ -1313,16 +1313,6 @@ void PluginDescriptor::SetImporterIdentifier(const wxString & identifier)
    mImporterIdentifier = identifier;
 }
 
-const wxString & PluginDescriptor::GetImporterFilterDescription() const
-{
-   return mImporterFilterDesc;
-}
-
-void PluginDescriptor::SetImporterFilterDescription(const wxString & filterDesc)
-{
-   mImporterFilterDesc = filterDesc;
-}
-
 const FileExtensions & PluginDescriptor::GetImporterExtensions()
    const
 {
@@ -1374,7 +1364,7 @@ void PluginDescriptor::SetImporterExtensions( FileExtensions extensions )
 #define KEY_EFFECTTYPE_TOOL            wxT("Tool")
 #define KEY_EFFECTTYPE_HIDDEN          wxT("Hidden")
 #define KEY_IMPORTERIDENT              wxT("ImporterIdent")
-#define KEY_IMPORTERFILTER             wxT("ImporterFilter")
+//#define KEY_IMPORTERFILTER             wxT("ImporterFilter")
 #define KEY_IMPORTEREXTENSIONS         wxT("ImporterExtensions")
 
 // ============================================================================
@@ -1499,7 +1489,6 @@ const PluginID & PluginManager::RegisterPlugin(ModuleInterface *provider, Import
    plug.SetProviderID(PluginManager::GetID(provider));
 
    plug.SetImporterIdentifier(importer->GetPluginStringID());
-   plug.SetImporterFilterDescription(importer->GetPluginFormatDescription());
    plug.SetImporterExtensions(importer->GetSupportedExtensions());
 
    return plug.GetID();
@@ -2226,13 +2215,6 @@ void PluginManager::LoadGroup(wxFileConfig *pRegistry, PluginType type)
             }
             plug.SetImporterIdentifier(strVal);
 
-            // Get the importer filter description and bypass group if not found
-            if (!pRegistry->Read(KEY_IMPORTERFILTER, &strVal))
-            {
-               continue;
-            }
-            plug.SetImporterFilterDescription(strVal);
-
             // Get the importer extensions and bypass group if not found
             if (!pRegistry->Read(KEY_IMPORTEREXTENSIONS, &strVal))
             {
@@ -2366,7 +2348,6 @@ void PluginManager::SaveGroup(wxFileConfig *pRegistry, PluginType type)
          case PluginTypeImporter:
          {
             pRegistry->Write(KEY_IMPORTERIDENT, plug.GetImporterIdentifier());
-            pRegistry->Write(KEY_IMPORTERFILTER, plug.GetImporterFilterDescription());
             const auto & extensions = plug.GetImporterExtensions();
             wxString strExt;
             for (size_t i = 0, cnt = extensions.size(); i < cnt; i++)
diff --git a/src/PluginManager.h b/src/PluginManager.h
index 00a12473d..0630143ee 100644
--- a/src/PluginManager.h
+++ b/src/PluginManager.h
@@ -153,7 +153,6 @@ private:
    // Importers
 
    wxString mImporterIdentifier;
-   wxString mImporterFilterDesc;
    FileExtensions mImporterExtensions;
 };