Replace many inclusions of Types.h with Identifier.h

include/audacity/ConfigInterface.h

@@ -42,7 +42,7 @@
 #ifndef __AUDACITY_CONFIGINTERFACE_H__
 #define __AUDACITY_CONFIGINTERFACE_H__
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 /*************************************************************************************//**
 

include/audacity/EffectInterface.h

@@ -44,7 +44,7 @@
 
 #include <functional>
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 #include "audacity/ComponentInterface.h"
 #include "audacity/ConfigInterface.h"
 #include "audacity/EffectAutomationParameters.h" // for command automation

include/audacity/ImporterInterface.h

@@ -42,7 +42,7 @@
 #ifndef __AUDACITY_IMPORTERINTERFACE_H__
 #define __AUDACITY_IMPORTERINTERFACE_H__
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 #include "audacity/ConfigInterface.h"
 #include "audacity/ComponentInterface.h"
 

include/audacity/ModuleInterface.h

@@ -43,7 +43,7 @@
 #define __AUDACITY_MODULEINTERFACE_H__
 
 #include <functional>
-#include "audacity/Types.h"
+#include "Identifier.h"
 #include "audacity/ComponentInterface.h"
 #include "audacity/PluginInterface.h"
 

src/ActiveProjects.h

@@ -10,7 +10,7 @@
 #define __AUDACITY_ACTIVE_PROJECTS__
 
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 #include <wx/string.h>
 

src/AudacityApp.h

@@ -15,7 +15,7 @@
 #define __AUDACITY_APP__
 
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 
 

src/AudacityHeaders.h

@@ -39,7 +39,7 @@
 #include <wx/thread.h>
 #include <wx/tooltip.h>
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 #include "AColor.h"
 #include "AudioIO.h"

src/FFmpeg.h

@@ -151,7 +151,7 @@ extern "C" {
 #include "ShuttleGui.h"
 #include "Prefs.h"
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 class wxDynamicLibrary;
 

src/FileNames.h

@@ -15,7 +15,7 @@
 
 #include <wx/dir.h> // for wxDIR_FILES
 #include <wx/string.h> // function return value
-#include "audacity/Types.h"
+#include "Identifier.h"
 #include "Prefs.h"
 #include "MemoryX.h"
 

src/Languages.cpp

@@ -32,7 +32,7 @@
 
 
 #include "Languages.h"
-#include "audacity/Types.h"
+#include "Identifier.h"
 #include "MemoryX.h"
 
 #include "Internat.h"

src/Menus.h

@@ -10,7 +10,7 @@
 #ifndef __AUDACITY_MENUS__
 #define __AUDACITY_MENUS__
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 #include <wx/string.h> // member variable
 #include "Prefs.h"

src/ModuleSettings.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_MODULE_SETTINGS__
 #define __AUDACITY_MODULE_SETTINGS__
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 enum {
    kModuleDisabled = 0,

src/PlatformCompatibility.h

@@ -20,7 +20,7 @@
 #ifndef __AUDACITY_COMPATIBILITY__
 #define __AUDACITY_COMPATIBILITY__
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 class AUDACITY_DLL_API PlatformCompatibility
 {

src/ProjectFileIORegistry.cpp

@@ -10,7 +10,7 @@
 
 #include "ProjectFileIORegistry.h"
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 #include <unordered_map>
 #include <wx/string.h>
 

src/ProjectSerializer.h

@@ -17,7 +17,7 @@
 
 #include <unordered_set>
 #include <unordered_map>
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 // From SampleBlock.h
 using SampleBlockID = long long;

src/Sequence.h

@@ -18,7 +18,7 @@
 #include "SampleFormat.h"
 #include "xml/XMLTagHandler.h"
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 class SampleBlock;
 class SampleBlockFactory;

src/ShuttleGui.h

@@ -15,7 +15,7 @@
 #define SHUTTLE_GUI
 
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 #include <vector>
 #include <wx/slider.h> // to inherit

src/Tags.h

@@ -40,7 +40,7 @@
 
 #include <memory>
 #include <unordered_map>
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 class wxArrayString;
 class wxComboBox;

src/TempDirectory.h

@@ -12,8 +12,8 @@
 #define __AUDACITY_TEMP_DIRECTORY__
 
 
-#include "audacity/Types.h"
-
+#include "Identifier.h"
+class TranslatableString;
 class wxWindow;
 
 namespace TempDirectory

src/commands/CommandContext.h

@@ -12,7 +12,7 @@
 #define __AUDACITY_COMMAND_CONTEXT__
 
 #include <memory>
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 class AudacityProject;
 class wxEvent;

src/commands/CommandManager.h

@@ -12,7 +12,7 @@
 #ifndef __AUDACITY_COMMAND_MANAGER__
 #define __AUDACITY_COMMAND_MANAGER__
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 #include "../ClientData.h"
 #include "CommandFunctors.h"
@@ -27,8 +27,6 @@
 
 #include "../xml/XMLTagHandler.h"
 
-#include "audacity/Types.h"
-
 #include <unordered_map>
 
 class wxMenu;

src/commands/Keyboard.h

@@ -12,7 +12,7 @@
 #ifndef __AUDACITY_KEYBOARD__
 #define __AUDACITY_KEYBOARD__
 
-#include <audacity/Types.h>
+#include "../Identifier.h"
 #include <wx/defs.h>
 
 class wxKeyEvent;

src/effects/EffectManager.h

@@ -17,7 +17,7 @@
 
 #include <unordered_map>
 #include "audacity/EffectInterface.h"
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 class AudacityCommand;
 class AudacityProject;

src/export/Export.h

@@ -14,7 +14,7 @@
 #include <functional>
 #include <vector>
 #include <wx/filename.h> // member variable
-#include "audacity/Types.h"
+#include "Identifier.h"
 #include "../SampleFormat.h"
 #include "../widgets/wxPanelWrapper.h" // to inherit
 #include "../FileNames.h" // for FileTypes

src/export/ExportFFmpegDialogs.h

@@ -21,7 +21,7 @@ LRN
 #include "../FileNames.h"
 
 #include <unordered_map>
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 class wxArrayStringEx;
 

src/import/Import.h

@@ -12,7 +12,7 @@
 #define _IMPORT_
 
 #include "ImportForwards.h"
-#include "audacity/Types.h"
+#include "Identifier.h"
 #include <vector>
 #include <wx/tokenzr.h> // for enum wxStringTokenizerMode
 

src/import/ImportMIDI.h

@@ -19,7 +19,7 @@ into a NoteTrack.
 #define _IMPORT_MIDI_
 
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 #if defined(USE_MIDI)
 

src/toolbars/SpectralSelectionBarListener.h

@@ -12,7 +12,7 @@
 #define __AUDACITY_SPECTRAL_SELECTION_BAR_LISTENER__
 
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 class AUDACITY_DLL_API SpectralSelectionBarListener /* not final */ {
 

src/toolbars/TranscriptionToolBar.h

@@ -17,7 +17,7 @@
 
 #include <wx/brush.h> // member variable
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 class wxChoice;
 class wxCommandEvent;

src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp

@@ -34,7 +34,7 @@ Paul Licameli split from TrackPanel.cpp
 #include "../../../../widgets/AudacityMessageBox.h"
 #include "widgets/ProgressDialog.h"
 #include "UserException.h"
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 #include <wx/combobox.h>
 #include <wx/frame.h>

src/tracks/ui/Scrubbing.h

@@ -22,7 +22,7 @@ Paul Licameli split from TrackPanel.cpp
 #include "../../widgets/Overlay.h" // to inherit
 #include "../../commands/CommandContext.h"
 #include "../../commands/CommandManager.h" // for MenuTable
-#include "../../../include/audacity/Types.h"
+#include "../../Identifier.h"
 
 class AudacityProject;
 class TranslatableString;

src/widgets/FileConfig.h

@@ -16,7 +16,7 @@
 #include <wx/defs.h>
 #include <wx/fileconf.h>
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 class FileConfig : public wxConfigBase
 {

src/widgets/FileHistory.h

@@ -16,7 +16,7 @@
 #include <wx/defs.h>
 #include <wx/weakref.h> // member variable
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 #include "../MemoryX.h"
 
 class wxConfigBase;

src/widgets/NumericTextCtrl.cpp

@@ -168,7 +168,7 @@ different formats.
 
 #include "NumericTextCtrl.h"
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 #include "../AllThemeResources.h"
 #include "../AColor.h"
 #include "../KeyboardCapture.h"

src/widgets/wxPanelWrapper.h

@@ -15,7 +15,7 @@
 
 #include "../Internat.h"
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 AUDACITY_DLL_API void wxTabTraversalWrapperCharHook(wxKeyEvent &event);
 

src/xml/XMLTagHandler.h

@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 #include "XMLWriter.h"
 class AUDACITY_DLL_API XMLValueChecker

src/xml/XMLWriter.h

@@ -15,7 +15,7 @@
 
 #include "../FileException.h"
 
-#include "audacity/Types.h"
+#include "Identifier.h"
 
 ///
 /// XMLWriter