From 347cb7c294524de6d322cc28a2f273a7724c14da Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Fri, 30 Jul 2021 07:16:04 -0400
Subject: [PATCH] Move AppName to lib-utility...

... It makes more sense there, at an even lower level than lib-files.  Avoid
type wxString.
---
 libraries/lib-utility/CMakeLists.txt      |  1 +
 libraries/lib-utility/ModuleConstants.cpp | 21 +++++++++++++++++++++
 libraries/lib-utility/ModuleConstants.h   |  5 +++++
 src/AudacityApp.cpp                       |  7 +++----
 src/FileNames.cpp                         | 11 +----------
 src/FileNames.h                           |  3 ---
 6 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 libraries/lib-utility/ModuleConstants.cpp

diff --git a/libraries/lib-utility/CMakeLists.txt b/libraries/lib-utility/CMakeLists.txt
index 56939fd97..fb9cc4a78 100644
--- a/libraries/lib-utility/CMakeLists.txt
+++ b/libraries/lib-utility/CMakeLists.txt
@@ -18,6 +18,7 @@ used utilities that don't correspond to things in the standard.
 set( SOURCES
    MemoryX.cpp
    MemoryX.h
+   ModuleConstants.cpp
    ModuleConstants.h
 )
 audacity_library( lib-utility "${SOURCES}" ""
diff --git a/libraries/lib-utility/ModuleConstants.cpp b/libraries/lib-utility/ModuleConstants.cpp
new file mode 100644
index 000000000..edaffec23
--- /dev/null
+++ b/libraries/lib-utility/ModuleConstants.cpp
@@ -0,0 +1,21 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  ModuleConstants.cpp
+
+  Paul Licameli
+
+**********************************************************************/
+
+#include "ModuleConstants.h"
+
+// We want Audacity with a capital 'A'
+// DA: App name
+const std::wstring AppName =
+#ifndef EXPERIMENTAL_DA
+   L"Audacity"
+#else
+   L"DarkAudacity"
+#endif
+;
diff --git a/libraries/lib-utility/ModuleConstants.h b/libraries/lib-utility/ModuleConstants.h
index 6b4a1bbbb..3720c2ac4 100644
--- a/libraries/lib-utility/ModuleConstants.h
+++ b/libraries/lib-utility/ModuleConstants.h
@@ -11,6 +11,8 @@
 #ifndef __AUDACITY_MODULE_CONSTANTS__
 #define __AUDACITY_MODULE_CONSTANTS__
 
+#include <string>
+
 #define ModuleDispatchName "ModuleDispatch"
 
 #ifdef _MSC_VER
@@ -53,4 +55,7 @@ extern "C" {                                                           \
 DEFINE_VERSION_CHECK                                                   \
 extern "C" DLL_API int ModuleDispatch(ModuleDispatchTypes type){ return 1; }
 
+//! This program's name
+UTILITY_API extern const std::wstring AppName;
+
 #endif
diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index 098a2d362..39059cc59 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -1118,11 +1118,10 @@ bool AudacityApp::OnInit()
                        "widget_class \"*GtkCombo*\" style \"audacity\"");
 #endif
 
-   const auto &appName = FileNames::AppName;
-   wxTheApp->SetAppName(appName);
+   wxTheApp->SetAppName(AppName);
    // Explicitly set since OSX will use it for the "Quit" menu item
-   wxTheApp->SetAppDisplayName(appName);
-   wxTheApp->SetVendorName(appName);
+   wxTheApp->SetAppDisplayName(AppName);
+   wxTheApp->SetVendorName(AppName);
 
    ::wxInitAllImageHandlers();
 
diff --git a/src/FileNames.cpp b/src/FileNames.cpp
index 591e7b24f..a5f4141cb 100644
--- a/src/FileNames.cpp
+++ b/src/FileNames.cpp
@@ -34,6 +34,7 @@ used throughout Audacity into this one place.
 #include "BasicUI.h"
 #include "Prefs.h"
 #include "Internat.h"
+#include "ModuleConstants.h"
 #include "PlatformCompatibility.h"
 #include "wxFileNameWrapper.h"
 
@@ -765,13 +766,3 @@ wxString FileNames::AbbreviatePath( const wxFileName &fileName )
 #endif
    return target;
 }
-
-// We want Audacity with a capital 'A'
-// DA: App name
-const wxString FileNames::AppName =
-#ifndef EXPERIMENTAL_DA
-   L"Audacity"
-#else
-   L"DarkAudacity"
-#endif
-;
diff --git a/src/FileNames.h b/src/FileNames.h
index 66fe10b00..78f28a97e 100644
--- a/src/FileNames.h
+++ b/src/FileNames.h
@@ -225,9 +225,6 @@ namespace FileNames
    AUDACITY_DLL_API
    //! Give enough of the path to identify the device.  (On Windows, drive letter plus ':')
    wxString AbbreviatePath(const wxFileName &fileName);
-
-   AUDACITY_DLL_API
-   extern const wxString AppName;
 };
 
 #endif