New library for files

2025-05-01 16:19:43 +02:00 · 2021-02-18 10:22:00 -05:00 · 2021-02-18 10:22:00 -05:00 · 0506faee02
commit 0506faee02
parent 4fd6e8a151
54 changed files with 145 additions and 130 deletions
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@ -12,6 +12,7 @@ set( LIBRARIES
   lib-exceptions
   lib-preferences
   lib-math
+   lib-files
 )

 if ( ${_OPT}has_networking )
--- a/libraries/lib-files/AudacityLogger.cpp
+++ b/libraries/lib-files/AudacityLogger.cpp
@ -14,12 +14,10 @@ Provides thread-safe logging based on the wxWidgets log facility.
 *//*******************************************************************/


-
 #include "AudacityLogger.h"

-
-
 #include "Internat.h"
+#include "MemoryX.h"

 #include <memory>
 #include <mutex>
--- a/libraries/lib-files/AudacityLogger.h
+++ b/libraries/lib-files/AudacityLogger.h
@ -17,7 +17,7 @@
 class wxFrame;
 class wxTextCtrl;

-class AUDACITY_DLL_API AudacityLogger final : public wxEvtHandler,
+class FILES_API AudacityLogger final : public wxEvtHandler,
                             public wxLog
 {
 public:
--- a/libraries/lib-files/CMakeLists.txt
+++ b/libraries/lib-files/CMakeLists.txt
@ -0,0 +1,34 @@
+#[[
+A library of utilities relating generally to files and file names, including
+an exception type for file errors.
+
+Also the definition of certain significant file paths, such as the directory
+for temporary projects.
+
+Also the global logger which can save to a file.
+]]#
+
+set( SOURCES
+   AudacityLogger.cpp
+   AudacityLogger.h
+   FileException.cpp
+   FileException.h
+   FileIO.cpp
+   FileIO.h
+   FileNames.cpp
+   FileNames.h
+   PlatformCompatibility.cpp
+   PlatformCompatibility.h
+   TempDirectory.cpp
+   TempDirectory.h
+   wxFileNameWrapper.h
+)
+set( LIBRARIES
+   lib-exceptions-interface
+   lib-preferences-interface
+   PRIVATE
+   wxBase
+)
+audacity_library( lib-files "${SOURCES}" "${LIBRARIES}"
+   "" ""
+)
--- a/libraries/lib-files/FileException.cpp
+++ b/libraries/lib-files/FileException.cpp
@ -7,7 +7,6 @@

 */

-
 #include "FileException.h"
 #include "FileNames.h"

--- a/libraries/lib-files/FileException.h
+++ b/libraries/lib-files/FileException.h
@ -10,11 +10,11 @@
 #ifndef __AUDACITY_FILE_EXCEPTION__
 #define __AUDACITY_FILE_EXCEPTION__

-#include "AudacityException.h"
+#include "AudacityException.h" // to inherit
 #include <wx/filename.h> // wxFileName member variable

 //! Thrown for failure of file or database operations in deeply nested places
-class AUDACITY_DLL_API FileException /* not final */
+class FILES_API FileException /* not final */
   : public MessageBoxException
 {
 public:
@ -47,7 +47,7 @@ public:
      , renameTarget{ that.renameTarget }
   {}

-   FileException& operator= (FileException&&) PROHIBITED;
+   FileException& operator= (FileException&&) = delete;

   ~FileException() override;

--- a/libraries/lib-files/FileIO.cpp
+++ b/libraries/lib-files/FileIO.cpp
@ -8,7 +8,6 @@

 **********************************************************************/

-
 #include "FileIO.h"

 #include <wx/defs.h>
--- a/libraries/lib-files/FileIO.h
+++ b/libraries/lib-files/FileIO.h
@ -18,7 +18,7 @@ class wxOutputStream;
 class wxFFileOutputStream;
 class wxFileNameWrapper;

-class AUDACITY_DLL_API FileIO
+class FILES_API FileIO
 {
 public:
   typedef enum FileIOMode
--- a/libraries/lib-files/FileNames.cpp
+++ b/libraries/lib-files/FileNames.cpp
@ -20,7 +20,6 @@ used throughout Audacity into this one place.

 *//********************************************************************/

-
 #include "FileNames.h"


--- a/libraries/lib-files/FileNames.h
+++ b/libraries/lib-files/FileNames.h
@ -11,13 +11,10 @@
 #ifndef __AUDACITY_FILE_NAMES__
 #define __AUDACITY_FILE_NAMES__

-
-
 #include <wx/dir.h> // for wxDIR_FILES
 #include <wx/string.h> // function return value
 #include "Identifier.h"
 #include "Prefs.h"
-#include <memory>

 // Please try to support unlimited path length instead of using PLATFORM_MAX_PATH!
 // Define one constant for maximum path value, so we don't have to do
@ -69,7 +66,7 @@ namespace FileNames
   };

   // Frequently used types
-   extern AUDACITY_DLL_API const FileType
+   extern FILES_API const FileType
        AllFiles // *
      , AudacityProjects // *.aup3
      , DynamicLibraries // depends on the operating system
@ -80,21 +77,21 @@ namespace FileNames

   // Convert fileTypes into a single string as expected by wxWidgets file
   // selection dialog
-   AUDACITY_DLL_API wxString FormatWildcard( const FileTypes &fileTypes );
+   FILES_API wxString FormatWildcard( const FileTypes &fileTypes );

   // This exists to compensate for bugs in wxCopyFile:
-   AUDACITY_DLL_API bool DoCopyFile(
+   FILES_API bool DoCopyFile(
      const FilePath& file1, const FilePath& file2, bool overwrite = true);

   // wxWidgets doesn't have a function to do this:  make a hard file-system
   // link if possible.  It might not be, as when the paths are on different
   // storage devices.
-   AUDACITY_DLL_API
+   FILES_API
   bool HardLinkFile( const FilePath& file1, const FilePath& file2);

-   AUDACITY_DLL_API wxString MkDir(const wxString &Str);
+   FILES_API wxString MkDir(const wxString &Str);

-   AUDACITY_DLL_API bool IsMidi(const FilePath &fName);
+   FILES_API bool IsMidi(const FilePath &fName);

   /** \brief A list of directories that should be searched for Audacity files
    * (plug-ins, help files, etc.).
@ -104,52 +101,52 @@ namespace FileNames
    * directories can be specified using the AUDACITY_PATH environment
    * variable.  On Windows or Mac OS, this will include the directory
    * which contains the Audacity program. */
-   AUDACITY_DLL_API const FilePaths &AudacityPathList();
-   AUDACITY_DLL_API void SetAudacityPathList( FilePaths list );
+   FILES_API const FilePaths &AudacityPathList();
+   FILES_API void SetAudacityPathList( FilePaths list );

   // originally an ExportMultipleDialog method. Append suffix if newName appears in otherNames.
-   AUDACITY_DLL_API void MakeNameUnique(
+   FILES_API void MakeNameUnique(
      FilePaths &otherNames, wxFileName &newName);

-   AUDACITY_DLL_API wxString LowerCaseAppNameInPath( const wxString & dirIn);
+   FILES_API wxString LowerCaseAppNameInPath( const wxString & dirIn);
   /** \brief Audacity user data directory
    *
    * Where audacity keeps its settings and other user data squirreled away,
    * by default ~/.audacity-data/ on Unix, Application Data/Audacity on
    * windows system */
-   AUDACITY_DLL_API FilePath DataDir();
-   AUDACITY_DLL_API FilePath ResourcesDir();
-   AUDACITY_DLL_API FilePath HtmlHelpDir();
-   AUDACITY_DLL_API FilePath HtmlHelpIndexFile(bool quick);
-   AUDACITY_DLL_API FilePath LegacyChainDir();
-   AUDACITY_DLL_API FilePath MacroDir();
-   AUDACITY_DLL_API FilePath NRPDir();
-   AUDACITY_DLL_API FilePath NRPFile();
-   AUDACITY_DLL_API FilePath PluginRegistry();
-   AUDACITY_DLL_API FilePath PluginSettings();
+   FILES_API FilePath DataDir();
+   FILES_API FilePath ResourcesDir();
+   FILES_API FilePath HtmlHelpDir();
+   FILES_API FilePath HtmlHelpIndexFile(bool quick);
+   FILES_API FilePath LegacyChainDir();
+   FILES_API FilePath MacroDir();
+   FILES_API FilePath NRPDir();
+   FILES_API FilePath NRPFile();
+   FILES_API FilePath PluginRegistry();
+   FILES_API FilePath PluginSettings();

-   AUDACITY_DLL_API FilePath BaseDir();
-   AUDACITY_DLL_API FilePath ModulesDir();
+   FILES_API FilePath BaseDir();
+   FILES_API FilePath ModulesDir();

   /** \brief The user plug-in directory (not a system one)
    *
    * This returns the string path to where the user may have put plug-ins
    * if they don't have system admin rights. Under default settings, it's
    * <DataDir>/Plug-Ins/ */
-   AUDACITY_DLL_API FilePath PlugInDir();
-   AUDACITY_DLL_API FilePath ThemeDir();
-   AUDACITY_DLL_API FilePath ThemeComponentsDir();
-   AUDACITY_DLL_API FilePath ThemeCachePng();
-   AUDACITY_DLL_API FilePath ThemeCacheAsCee();
-   AUDACITY_DLL_API FilePath ThemeComponent(const wxString &Str);
-   AUDACITY_DLL_API FilePath ThemeCacheHtm();
-   AUDACITY_DLL_API FilePath ThemeImageDefsAsCee();
+   FILES_API FilePath PlugInDir();
+   FILES_API FilePath ThemeDir();
+   FILES_API FilePath ThemeComponentsDir();
+   FILES_API FilePath ThemeCachePng();
+   FILES_API FilePath ThemeCacheAsCee();
+   FILES_API FilePath ThemeComponent(const wxString &Str);
+   FILES_API FilePath ThemeCacheHtm();
+   FILES_API FilePath ThemeImageDefsAsCee();

   // Obtain name of loaded module that contains address
-   AUDACITY_DLL_API FilePath PathFromAddr(void *addr);
+   FILES_API FilePath PathFromAddr(void *addr);

-   AUDACITY_DLL_API bool IsPathAvailable( const FilePath & Path);
-   AUDACITY_DLL_API wxFileNameWrapper DefaultToDocumentsFolder
+   FILES_API bool IsPathAvailable( const FilePath & Path);
+   FILES_API wxFileNameWrapper DefaultToDocumentsFolder
      (const wxString &preference);

   // If not None, determines a preference key (for the default path string) to
@ -177,10 +174,10 @@ namespace FileNames
      LastUsed
   };

-   AUDACITY_DLL_API wxString PreferenceKey(FileNames::Operation op, FileNames::PathType type);
+   FILES_API wxString PreferenceKey(FileNames::Operation op, FileNames::PathType type);

-   AUDACITY_DLL_API FilePath FindDefaultPath(Operation op);
-   AUDACITY_DLL_API void UpdateDefaultPath(Operation op, const FilePath &path);
+   FILES_API FilePath FindDefaultPath(Operation op);
+   FILES_API void UpdateDefaultPath(Operation op, const FilePath &path);

   // F is a function taking a wxString, returning wxString
   template<typename F>
@ -196,33 +193,33 @@ namespace FileNames
   }

   // Useful functions for working with search paths
-   AUDACITY_DLL_API void AddUniquePathToPathList(const FilePath &path,
+   FILES_API void AddUniquePathToPathList(const FilePath &path,
                                       FilePaths &pathList);
-   AUDACITY_DLL_API void AddMultiPathsToPathList(const wxString &multiPathString,
+   FILES_API void AddMultiPathsToPathList(const wxString &multiPathString,
                                       FilePaths &pathList);
-   AUDACITY_DLL_API void FindFilesInPathList(const wxString & pattern,
+   FILES_API void FindFilesInPathList(const wxString & pattern,
                                   const FilePaths & pathList,
                                   FilePaths &results,
                                   int flags = wxDIR_FILES);


   //! Check location on writable access and return true if checked successfully.
-   AUDACITY_DLL_API bool WritableLocationCheck(const FilePath& path);
+   FILES_API bool WritableLocationCheck(const FilePath& path);

   // wxString compare function for sorting case, which is needed to load correctly.
-   AUDACITY_DLL_API int CompareNoCase(const wxString& first, const wxString& second);
+   FILES_API int CompareNoCase(const wxString& first, const wxString& second);

   // Create a unique filename using the passed prefix and suffix
-   AUDACITY_DLL_API wxString CreateUniqueName(const wxString &prefix,
+   FILES_API wxString CreateUniqueName(const wxString &prefix,
                             const wxString &suffix = wxEmptyString);

   // File extension used for unsaved/temporary project files
-   AUDACITY_DLL_API wxString UnsavedProjectExtension();
+   FILES_API wxString UnsavedProjectExtension();

-   AUDACITY_DLL_API
+   FILES_API
   bool IsOnFATFileSystem(const FilePath &path);

-   AUDACITY_DLL_API
+   FILES_API
   //! Give enough of the path to identify the device.  (On Windows, drive letter plus ':')
   wxString AbbreviatePath(const wxFileName &fileName);
 };
--- a/libraries/lib-files/PlatformCompatibility.cpp
+++ b/libraries/lib-files/PlatformCompatibility.cpp
--- a/libraries/lib-files/PlatformCompatibility.h
+++ b/libraries/lib-files/PlatformCompatibility.h
@ -22,7 +22,7 @@

 #include "Identifier.h"

-class AUDACITY_DLL_API PlatformCompatibility
+class FILES_API PlatformCompatibility
 {
 public:
   //
--- a/libraries/lib-files/TempDirectory.cpp
+++ b/libraries/lib-files/TempDirectory.cpp
--- a/libraries/lib-files/TempDirectory.h
+++ b/libraries/lib-files/TempDirectory.h
@ -12,24 +12,26 @@
 #define __AUDACITY_TEMP_DIRECTORY__


-#include "Identifier.h"
 #include "BasicUI.h"
+
 class TranslatableString;
 class wxWindow;

+#include "Identifier.h"
+
 namespace TempDirectory
 {
-   AUDACITY_DLL_API wxString TempDir();
-   AUDACITY_DLL_API void ResetTempDir();
+   FILES_API wxString TempDir();
+   FILES_API void ResetTempDir();

-   AUDACITY_DLL_API const FilePath &DefaultTempDir();
-   AUDACITY_DLL_API void SetDefaultTempDir( const FilePath &tempDir );
-   AUDACITY_DLL_API bool IsTempDirectoryNameOK( const FilePath & Name );
+   FILES_API const FilePath &DefaultTempDir();
+   FILES_API void SetDefaultTempDir( const FilePath &tempDir );
+   FILES_API bool IsTempDirectoryNameOK( const FilePath & Name );

   // Create a filename for an unsaved/temporary project file
-   AUDACITY_DLL_API wxString UnsavedProjectFileName();
+   FILES_API wxString UnsavedProjectFileName();

-   AUDACITY_DLL_API bool FATFilesystemDenied(const FilePath &path,
+   FILES_API bool FATFilesystemDenied(const FilePath &path,
                            const TranslatableString &msg,
                            const BasicUI::WindowPlacement &placement = {});
 };
--- a/libraries/lib-files/wxFileNameWrapper.h
+++ b/libraries/lib-files/wxFileNameWrapper.h
--- a/libraries/lib-preferences/FileConfig.h
+++ b/libraries/lib-preferences/FileConfig.h
@ -15,7 +15,6 @@

 #include <wx/defs.h>
 #include <wx/fileconf.h>
-
 #include "Identifier.h"

 class PREFERENCES_API FileConfig : public wxConfigBase
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -92,8 +92,6 @@ list( APPEND SOURCES
      AudacityFileConfig.h
      AudacityHeaders.cpp
      AudacityHeaders.h
-      AudacityLogger.cpp
-      AudacityLogger.h
      AudioIO.cpp
      AudioIO.h
      AudioIOBase.cpp
@ -135,14 +133,8 @@ list( APPEND SOURCES
      EnvelopeEditor.h
      FFmpeg.cpp
      FFmpeg.h
-      FileException.cpp
-      FileException.h
      FileFormats.cpp
      FileFormats.h
-      FileIO.cpp
-      FileIO.h
-      FileNames.cpp
-      FileNames.h
      FreqWindow.cpp
      FreqWindow.h
      HelpText.cpp
@ -186,8 +178,6 @@ list( APPEND SOURCES
      NumberScale.h
      PitchName.cpp
      PitchName.h
-      PlatformCompatibility.cpp
-      PlatformCompatibility.h
      PlaybackSchedule.cpp
      PlaybackSchedule.h
      PluginManager.cpp
@ -267,8 +257,6 @@ list( APPEND SOURCES
      SseMathFuncs.h
      Tags.cpp
      Tags.h
-      TempDirectory.cpp
-      TempDirectory.h
      Theme.cpp
      Theme.h
      ThemeAsCeeCode.h
@ -318,7 +306,6 @@ list( APPEND SOURCES
      WrappedType.h
      ZoomInfo.cpp
      ZoomInfo.h
-      wxFileNameWrapper.h

      # Commands

--- a/src/commands/ImportExportCommands.cpp
+++ b/src/commands/ImportExportCommands.cpp
@ -25,7 +25,7 @@
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../Track.h"
-#include "../wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h"
 #include "CommandContext.h"

 const ComponentInterfaceSymbol ImportCommand::Symbol
--- a/src/commands/OpenSaveCommands.cpp
+++ b/src/commands/OpenSaveCommands.cpp
@ -18,7 +18,7 @@
 #include "OpenSaveCommands.h"

 #include "LoadCommands.h"
-#include "../AudacityLogger.h"
+#include "AudacityLogger.h"
 #include "../Project.h"
 #include "../ProjectFileIO.h"
 #include "../ProjectFileManager.h"
--- a/src/effects/Contrast.cpp
+++ b/src/effects/Contrast.cpp
@ -21,7 +21,7 @@
 #include "../ProjectWindow.h"
 #include "../SelectFile.h"
 #include "../ShuttleGui.h"
-#include "../FileNames.h"
+#include "FileNames.h"
 #include "../ViewInfo.h"
 #include "../widgets/HelpSystem.h"
 #include "../widgets/NumericTextCtrl.h"
@ -42,7 +42,7 @@
 #include <wx/txtstrm.h>
 #include <wx/textctrl.h>

-#include "../PlatformCompatibility.h"
+#include "PlatformCompatibility.h"

 #define DB_MAX_LIMIT 0.0   // Audio is massively distorted.
 #define WCAG2_PASS 20.0    // dB difference required to pass WCAG2 test.
--- a/src/effects/Effect.cpp
+++ b/src/effects/Effect.cpp
@ -40,7 +40,7 @@
 #include "../Shuttle.h"
 #include "../ViewInfo.h"
 #include "../WaveTrack.h"
-#include "../wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h"
 #include "../widgets/ProgressDialog.h"
 #include "../tracks/playabletrack/wavetrack/ui/WaveTrackView.h"
 #include "../tracks/playabletrack/wavetrack/ui/WaveTrackViewConstants.h"
--- a/src/effects/Equalization.cpp
+++ b/src/effects/Equalization.cpp
@ -90,8 +90,8 @@
 #include "../AColor.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
-#include "../PlatformCompatibility.h"
-#include "../FileNames.h"
+#include "PlatformCompatibility.h"
+#include "FileNames.h"
 #include "../Envelope.h"
 #include "../EnvelopeEditor.h"
 #include "FFT.h"
--- a/src/effects/ScienFilter.cpp
+++ b/src/effects/ScienFilter.cpp
@ -54,7 +54,7 @@ a graph for EffectScienFilter.

 #include "../AColor.h"
 #include "../AllThemeResources.h"
-#include "../PlatformCompatibility.h"
+#include "PlatformCompatibility.h"
 #include "Prefs.h"
 #include "../Project.h"
 #include "../Shuttle.h"
--- a/src/effects/VST/VSTEffect.cpp
+++ b/src/effects/VST/VSTEffect.cpp
@ -82,8 +82,8 @@
 // TODO:  Unfortunately we have some dependencies on Audacity provided 
 //        dialogs, widgets and other stuff.  This will need to be cleaned up.

-#include "../../FileNames.h"
-#include "../../PlatformCompatibility.h"
+#include "FileNames.h"
+#include "PlatformCompatibility.h"
 #include "../../SelectFile.h"
 #include "../../ShuttleGui.h"
 #include "../../effects/Effect.h"
--- a/src/effects/ladspa/LadspaEffect.cpp
+++ b/src/effects/ladspa/LadspaEffect.cpp
@ -54,7 +54,7 @@ effects from this one class.
 #include <wx/scrolwin.h>
 #include <wx/version.h>

-#include "../../FileNames.h"
+#include "FileNames.h"
 #include "../../ShuttleGui.h"
 #include "../../widgets/NumericTextCtrl.h"
 #include "../../widgets/valnum.h"
--- a/src/effects/nyquist/LoadNyquist.cpp
+++ b/src/effects/nyquist/LoadNyquist.cpp
@ -16,7 +16,7 @@

 #include "Nyquist.h"

-#include "../../FileNames.h"
+#include "FileNames.h"
 #include "../../PluginManager.h"
 #include "../../ModuleManager.h"

--- a/src/effects/nyquist/Nyquist.cpp
+++ b/src/effects/nyquist/Nyquist.cpp
@ -53,7 +53,7 @@ effects from this one class.
 #include <wx/stdpaths.h>

 #include "../EffectManager.h"
-#include "../../FileNames.h"
+#include "FileNames.h"
 #include "../../LabelTrack.h"
 #include "Languages.h"
 #include "../../NoteTrack.h"
@ -64,14 +64,14 @@ effects from this one class.
 #include "../../ProjectSettings.h"
 #include "../../ShuttleGetDefinition.h"
 #include "../../ShuttleGui.h"
-#include "../../TempDirectory.h"
+#include "TempDirectory.h"
 #include "../../ViewInfo.h"
 #include "../../WaveClip.h"
 #include "../../WaveTrack.h"
 #include "../../widgets/valnum.h"
 #include "../../widgets/AudacityMessageBox.h"
 #include "Prefs.h"
-#include "../../wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h"
 #include "../../prefs/GUIPrefs.h"
 #include "../../tracks/playabletrack/wavetrack/ui/WaveTrackView.h"
 #include "../../tracks/playabletrack/wavetrack/ui/WaveTrackViewConstants.h"
--- a/src/effects/nyquist/Nyquist.h
+++ b/src/effects/nyquist/Nyquist.h
@ -12,7 +12,7 @@
 #define __AUDACITY_EFFECT_NYQUIST__

 #include "../Effect.h"
-#include "../../FileNames.h"
+#include "FileNames.h"

 #include "nyx.h"

--- a/src/export/Export.cpp
+++ b/src/export/Export.cpp
@ -68,10 +68,10 @@
 #include "../widgets/Warning.h"
 #include "../widgets/HelpSystem.h"
 #include "../AColor.h"
-#include "../FileNames.h"
+#include "FileNames.h"
 #include "../widgets/HelpSystem.h"
 #include "../widgets/ProgressDialog.h"
-#include "../wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h"

 //----------------------------------------------------------------------------
 // ExportPlugin
--- a/src/export/Export.h
+++ b/src/export/Export.h
@ -17,7 +17,7 @@
 #include "Identifier.h"
 #include "SampleFormat.h"
 #include "../widgets/wxPanelWrapper.h" // to inherit
-#include "../FileNames.h" // for FileTypes
+#include "FileNames.h" // for FileTypes

 #include "../Registry.h"

--- a/src/export/ExportCL.cpp
+++ b/src/export/ExportCL.cpp
@ -27,7 +27,7 @@
 #include <wx/msw/registry.h> // for wxRegKey
 #endif

-#include "../FileNames.h"
+#include "FileNames.h"
 #include "Export.h"

 #include "../Mix.h"
@ -41,7 +41,7 @@
 #include "../widgets/AudacityMessageBox.h"
 #include "../widgets/ProgressDialog.h"
 #include "../widgets/Warning.h"
-#include "../wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h"

 #ifdef USE_LIBID3TAG
   #include <id3tag.h>
--- a/src/export/ExportFFmpeg.cpp
+++ b/src/export/ExportFFmpeg.cpp
@ -40,7 +40,7 @@ function.
 #include "../Track.h"
 #include "../widgets/AudacityMessageBox.h"
 #include "../widgets/ProgressDialog.h"
-#include "../wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h"

 #include "Export.h"

--- a/src/export/ExportFFmpegDialogs.h
+++ b/src/export/ExportFFmpegDialogs.h
@ -18,7 +18,7 @@ LRN
 #include "../FFmpeg.h"

 #include "../xml/XMLFileReader.h"
-#include "../FileNames.h"
+#include "FileNames.h"

 #include <unordered_map>
 #include "Identifier.h"
--- a/src/export/ExportFLAC.cpp
+++ b/src/export/ExportFLAC.cpp
@ -40,7 +40,7 @@ and libvorbis examples, Monty <monty@xiph.org>

 #include "../widgets/AudacityMessageBox.h"
 #include "../widgets/ProgressDialog.h"
-#include "../wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h"

 //----------------------------------------------------------------------------
 // ExportFLACOptions Class
--- a/src/export/ExportMP2.cpp
+++ b/src/export/ExportMP2.cpp
@ -47,7 +47,7 @@
 #include <wx/stream.h>

 #include "Export.h"
-#include "../FileIO.h"
+#include "FileIO.h"
 #include "../Mix.h"
 #include "Prefs.h"
 #include "../ProjectSettings.h"
--- a/src/export/ExportMP3.cpp
+++ b/src/export/ExportMP3.cpp
@ -79,7 +79,7 @@
 #include <wx/utils.h>
 #include <wx/window.h>

-#include "../FileNames.h"
+#include "FileNames.h"
 #include "float_cast.h"
 #include "../Mix.h"
 #include "Prefs.h"
@ -92,7 +92,7 @@
 #include "../widgets/HelpSystem.h"
 #include "../widgets/AudacityMessageBox.h"
 #include "../widgets/ProgressDialog.h"
-#include "../wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h"

 #include "Export.h"

--- a/src/export/ExportMultiple.cpp
+++ b/src/export/ExportMultiple.cpp
@ -38,7 +38,7 @@
 #include <wx/textctrl.h>
 #include <wx/textdlg.h>

-#include "../FileNames.h"
+#include "FileNames.h"
 #include "../LabelTrack.h"
 #include "../Project.h"
 #include "../ProjectSettings.h"
--- a/src/export/ExportMultiple.h
+++ b/src/export/ExportMultiple.h
@ -12,7 +12,7 @@
 #define __AUDACITY_EXPORT_MULTIPLE__

 #include "Export.h"
-#include "../wxFileNameWrapper.h" // member variable
+#include "wxFileNameWrapper.h" // member variable

 class wxButton;
 class wxCheckBox;
--- a/src/export/ExportOGG.cpp
+++ b/src/export/ExportOGG.cpp
@ -27,7 +27,7 @@
 
 #include <vorbis/vorbisenc.h>

-#include "../FileIO.h"
+#include "FileIO.h"
 #include "../ProjectSettings.h"
 #include "../Mix.h"
 #include "Prefs.h"
--- a/src/export/ExportPCM.cpp
+++ b/src/export/ExportPCM.cpp
@ -35,7 +35,7 @@
 #include "../widgets/AudacityMessageBox.h"
 #include "../widgets/ProgressDialog.h"
 #include "../widgets/wxWidgetsBasicUI.h"
-#include "../wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h"

 #include "Export.h"

--- a/src/import/Import.cpp
+++ b/src/import/Import.cpp
@ -50,7 +50,7 @@ ImportLOF.cpp, and ImportAUP.cpp.
 #include <wx/log.h>
 #include <wx/sizer.h>         //for wxBoxSizer
 #include "../FFmpeg.h"
-#include "../FileNames.h"
+#include "FileNames.h"
 #include "../ShuttleGui.h"
 #include "../Project.h"
 #include "../WaveTrack.h"
--- a/src/import/Import.h
+++ b/src/import/Import.h
@ -17,7 +17,7 @@
 #include <wx/tokenzr.h> // for enum wxStringTokenizerMode

 #include "../widgets/wxPanelWrapper.h" // to inherit
-#include "../FileNames.h" // for FileType
+#include "FileNames.h" // for FileType

 #include "../Registry.h"

--- a/src/import/ImportAUP.cpp
+++ b/src/import/ImportAUP.cpp
@ -24,7 +24,7 @@

 #include "../Envelope.h"
 #include "../FileFormats.h"
-#include "../FileNames.h"
+#include "FileNames.h"
 #include "../LabelTrack.h"
 #if defined(USE_MIDI)
 #include "../NoteTrack.h"
@ -47,7 +47,7 @@
 #include "../widgets/NumericTextCtrl.h"
 #include "../widgets/ProgressDialog.h"
 #include "../xml/XMLFileReader.h"
-#include "../wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h"

 #include <map>

--- a/src/import/ImportLOF.cpp
+++ b/src/import/ImportLOF.cpp
@ -80,7 +80,7 @@
 #ifdef USE_MIDI
 #include "ImportMIDI.h"
 #endif // USE_MIDI
-#include "../FileNames.h"
+#include "FileNames.h"
 #include "../WaveTrack.h"
 #include "ImportPlugin.h"
 #include "Import.h"
--- a/src/menus/FileMenus.cpp
+++ b/src/menus/FileMenus.cpp
@ -1,7 +1,7 @@


 #include "../CommonCommandFlags.h"
-#include "../FileNames.h"
+#include "FileNames.h"
 #include "../LabelTrack.h"
 #include "../NoteTrack.h"
 #include "Prefs.h"
--- a/src/menus/HelpMenus.cpp
+++ b/src/menus/HelpMenus.cpp
@ -9,7 +9,7 @@
 #include "../AudioIOBase.h"
 #include "../CommonCommandFlags.h"
 #include "../CrashReport.h" // for HAS_CRASH_REPORT
-#include "../FileNames.h"
+#include "FileNames.h"
 #include "../HelpText.h"
 #include "../LogWindow.h"
 #include "../Menus.h"
--- a/src/menus/PluginMenus.cpp
+++ b/src/menus/PluginMenus.cpp
@ -14,7 +14,7 @@
 #include "../ProjectSelectionManager.h"
 #include "../toolbars/ToolManager.h"
 #include "../Screenshot.h"
-#include "../TempDirectory.h"
+#include "TempDirectory.h"
 #include "../UndoManager.h"
 #include "../commands/CommandContext.h"
 #include "../commands/CommandManager.h"
--- a/src/prefs/DirectoriesPrefs.cpp
+++ b/src/prefs/DirectoriesPrefs.cpp
@ -34,11 +34,11 @@

 #include "Prefs.h"
 #include "../ShuttleGui.h"
-#include "../TempDirectory.h"
+#include "TempDirectory.h"
 #include "../widgets/AudacityMessageBox.h"
 #include "../widgets/ReadOnlyText.h"
 #include "../widgets/wxTextCtrlWrapper.h"
-#include "../FileNames.h"
+#include "FileNames.h"

 using namespace FileNames;
 using namespace TempDirectory;
--- a/src/prefs/GUIPrefs.cpp
+++ b/src/prefs/GUIPrefs.cpp
@ -23,7 +23,7 @@
 #include <wx/app.h>
 #include <wx/defs.h>

-#include "../FileNames.h"
+#include "FileNames.h"
 #include "Languages.h"
 #include "../Theme.h"
 #include "Prefs.h"
--- a/src/prefs/KeyConfigPrefs.cpp
+++ b/src/prefs/KeyConfigPrefs.cpp
@ -42,7 +42,7 @@ KeyConfigPrefs and MousePrefs use.
 #include "../SelectFile.h"
 #include "../ShuttleGui.h"

-#include "../FileNames.h"
+#include "FileNames.h"

 #include "../widgets/KeyView.h"
 #include "../widgets/AudacityMessageBox.h"
--- a/src/toolbars/ControlToolBar.cpp
+++ b/src/toolbars/ControlToolBar.cpp
@ -67,7 +67,7 @@
 #include "../ProjectWindow.h"
 #include "../Track.h"
 #include "../widgets/AButton.h"
-#include "../FileNames.h"
+#include "FileNames.h"

 #include "../tracks/ui/Scrubbing.h"
 #include "../toolbars/ToolManager.h"
--- a/src/widgets/HelpSystem.cpp
+++ b/src/widgets/HelpSystem.cpp
@ -38,13 +38,13 @@
 #include <wx/statusbr.h>
 #include <wx/regex.h>

-#include "../FileNames.h"
+#include "FileNames.h"
 #include "../AllThemeResources.h"
 #include "../ShuttleGui.h"
 #include "../Theme.h"
 #include "../HelpText.h"
 #include "Prefs.h"
-#include "../wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h"
 #include "../prefs/GUIPrefs.h"

 #ifdef USE_ALPHA_MANUAL
--- a/src/widgets/wxPanelWrapper.h
+++ b/src/widgets/wxPanelWrapper.h
@ -158,7 +158,7 @@ public:
 };

 #include "FileDialog/FileDialog.h"
-#include "../FileNames.h" // for FileTypes
+#include "FileNames.h" // for FileTypes

 class AUDACITY_DLL_API FileDialogWrapper
   : public wxTabTraversalWrapper<FileDialog>
--- a/src/xml/XMLWriter.h
+++ b/src/xml/XMLWriter.h
@ -13,7 +13,7 @@
 #include <vector>
 #include <wx/ffile.h> // to inherit

-#include "../FileException.h"
+#include "FileException.h"

 #include "Identifier.h"