diff --git a/include/tenacity/ComponentInterface.h b/include/tenacity/ComponentInterface.h index 832f9b150..8a1b911ab 100644 --- a/include/tenacity/ComponentInterface.h +++ b/include/tenacity/ComponentInterface.h @@ -39,8 +39,7 @@ **********************************************************************/ -#ifndef __AUDACITY_COMPONENT_INTERFACE_H__ -#define __AUDACITY_COMPONENT_INTERFACE_H__ +#pragma once #include "Identifier.h" #include "tenacity/Types.h" @@ -84,5 +83,3 @@ public: // Parameters, if defined. false means no defined parameters. virtual bool DefineParams( ShuttleParams & WXUNUSED(S) ){ return false;}; }; - -#endif // __AUDACITY_IDENTINTERFACE_H__ diff --git a/include/tenacity/ConfigInterface.h b/include/tenacity/ConfigInterface.h index c39a1acd9..db5d3e402 100644 --- a/include/tenacity/ConfigInterface.h +++ b/include/tenacity/ConfigInterface.h @@ -39,8 +39,7 @@ **********************************************************************/ -#ifndef __AUDACITY_CONFIGINTERFACE_H__ -#define __AUDACITY_CONFIGINTERFACE_H__ +#pragma once #include "Identifier.h" @@ -94,5 +93,3 @@ public: virtual bool RemovePrivateConfigSubgroup(const RegistryPath & group) = 0; virtual bool RemovePrivateConfig(const RegistryPath & group, const RegistryPath & key) = 0; }; - -#endif // __AUDACITY_CONFIGINTERFACE_H__ diff --git a/include/tenacity/EffectAutomationParameters.h b/include/tenacity/EffectAutomationParameters.h index 60c797803..3949a59d1 100644 --- a/include/tenacity/EffectAutomationParameters.h +++ b/include/tenacity/EffectAutomationParameters.h @@ -40,8 +40,7 @@ **********************************************************************/ -#ifndef __AUDACITY_COMMAND_PARAMETERS_H__ -#define __AUDACITY_COMMAND_PARAMETERS_H__ +#pragma once #include @@ -338,5 +337,3 @@ public: return val; } }; - -#endif diff --git a/include/tenacity/EffectInterface.h b/include/tenacity/EffectInterface.h index e473aac2a..98778bc81 100644 --- a/include/tenacity/EffectInterface.h +++ b/include/tenacity/EffectInterface.h @@ -39,8 +39,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECTINTERFACE_H__ -#define __AUDACITY_EFFECTINTERFACE_H__ +#pragma once #include @@ -246,5 +245,3 @@ public: virtual bool HasOptions() = 0; virtual void ShowOptions() = 0; }; - -#endif // __AUDACITY_EFFECTINTERFACE_H__ diff --git a/include/tenacity/ModuleInterface.h b/include/tenacity/ModuleInterface.h index 1c69029c4..54f75d3da 100644 --- a/include/tenacity/ModuleInterface.h +++ b/include/tenacity/ModuleInterface.h @@ -39,8 +39,7 @@ **********************************************************************/ -#ifndef __AUDACITY_MODULEINTERFACE_H__ -#define __AUDACITY_MODULEINTERFACE_H__ +#pragma once #include #include @@ -177,5 +176,3 @@ void name::Unregister() \ { \ UnregisterProvider(AudacityModule); \ } - -#endif // __AUDACITY_MODULEINTERFACE_H__ diff --git a/include/tenacity/PluginInterface.h b/include/tenacity/PluginInterface.h index 47ecf177e..df71df983 100644 --- a/include/tenacity/PluginInterface.h +++ b/include/tenacity/PluginInterface.h @@ -39,8 +39,7 @@ **********************************************************************/ -#ifndef __AUDACITY_PLUGININTERFACE_H__ -#define __AUDACITY_PLUGININTERFACE_H__ +#pragma once #include "tenacity/ConfigInterface.h" #include "tenacity/EffectInterface.h" @@ -111,5 +110,3 @@ public: virtual bool RemovePrivateConfigSubgroup(const PluginID & ID, const RegistryPath & group) = 0; virtual bool RemovePrivateConfig(const PluginID & ID, const RegistryPath & group, const RegistryPath & key) = 0; }; - -#endif // __AUDACITY_PLUGININTERFACE_H__ diff --git a/include/tenacity/Types.h b/include/tenacity/Types.h index 8b00333f9..60cbe06d7 100644 --- a/include/tenacity/Types.h +++ b/include/tenacity/Types.h @@ -39,8 +39,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TYPES_H__ -#define __AUDACITY_TYPES_H__ +#pragma once #include #include @@ -255,5 +254,3 @@ typedef enum ChannelNameBottomFrontLeft, ChannelNameBottomFrontRight, } ChannelName, *ChannelNames; - -#endif // __AUDACITY_TYPES_H__ diff --git a/libraries/lib-strings/Identifier.h b/libraries/lib-strings/Identifier.h index 30f2de251..ffd9b3dc6 100644 --- a/libraries/lib-strings/Identifier.h +++ b/libraries/lib-strings/Identifier.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_IDENTIFIER__ -#define __AUDACITY_IDENTIFIER__ +#pragma once #include #include @@ -234,6 +233,3 @@ using CommandIDs = std::vector; struct ManualPageIDTag; using ManualPageID = TaggedIdentifier< ManualPageIDTag >; - -#endif - diff --git a/libraries/lib-strings/Internat.h b/libraries/lib-strings/Internat.h index e7e983cbc..95cf51be9 100644 --- a/libraries/lib-strings/Internat.h +++ b/libraries/lib-strings/Internat.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_INTERNAT__ -#define __AUDACITY_INTERNAT__ +#pragma once #include #include @@ -163,5 +162,3 @@ private: // If not, then the program builds and runs, but strings in the catalog with // contexts will fail to translate #define HAS_I18N_CONTEXTS wxCHECK_VERSION(3, 1, 1) - -#endif diff --git a/libraries/lib-strings/Languages.h b/libraries/lib-strings/Languages.h index c6707ee01..c975bfe5c 100644 --- a/libraries/lib-strings/Languages.h +++ b/libraries/lib-strings/Languages.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_LANGUAGES__ -#define __AUDACITY_LANGUAGES__ +#pragma once class wxArrayString; class wxString; @@ -56,5 +55,3 @@ STRINGS_API wxString GetLocaleName(); } - -#endif // __AUDACITY_LANGUAGES__ diff --git a/libraries/lib-strings/TranslatableString.h b/libraries/lib-strings/TranslatableString.h index fe755088d..2e975e3fa 100644 --- a/libraries/lib-strings/TranslatableString.h +++ b/libraries/lib-strings/TranslatableString.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TRANSLATABLE_STRING__ -#define __AUDACITY_TRANSLATABLE_STRING__ +#pragma once #include // for size_t #include @@ -320,5 +319,3 @@ inline Sink &operator <<( Sink &sink, const TranslatableString &str ) review the uses of this function, separately from the uses of the type. */ inline TranslatableString Verbatim( wxString str ) { return TranslatableString( std::move( str ) ); } - -#endif diff --git a/libraries/lib-strings/wxArrayStringEx.h b/libraries/lib-strings/wxArrayStringEx.h index 6896bef7d..563159f31 100644 --- a/libraries/lib-strings/wxArrayStringEx.h +++ b/libraries/lib-strings/wxArrayStringEx.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_WX_ARRAY_STRING_EX__ -#define __AUDACITY_WX_ARRAY_STRING_EX__ +#pragma once #include @@ -69,5 +68,3 @@ public: return result; } }; - -#endif diff --git a/libraries/lib-utility/MemoryX.h b/libraries/lib-utility/MemoryX.h index 8226d8615..365cc8343 100644 --- a/libraries/lib-utility/MemoryX.h +++ b/libraries/lib-utility/MemoryX.h @@ -1,5 +1,4 @@ -#ifndef __AUDACITY_MEMORY_X_H__ -#define __AUDACITY_MEMORY_X_H__ +#pragma once // C++ standard header with a few extensions #include @@ -634,5 +633,3 @@ template< typename T > struct NonInterfering #define LINEAR_TO_DB(x) (20.0 * log10(x)) #define MAX_AUDIO (1. - 1./(1<<15)) - -#endif // __AUDACITY_MEMORY_X_H__ diff --git a/libraries/lib-utility/ModuleConstants.h b/libraries/lib-utility/ModuleConstants.h index 6b4a1bbbb..1eed5d9ec 100644 --- a/libraries/lib-utility/ModuleConstants.h +++ b/libraries/lib-utility/ModuleConstants.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_MODULE_CONSTANTS__ -#define __AUDACITY_MODULE_CONSTANTS__ +#pragma once #define ModuleDispatchName "ModuleDispatch" @@ -52,5 +51,3 @@ extern "C" { \ #define DEFINE_MODULE_ENTRIES \ DEFINE_VERSION_CHECK \ extern "C" DLL_API int ModuleDispatch(ModuleDispatchTypes type){ return 1; } - -#endif diff --git a/src/AColor.h b/src/AColor.h index 6c431fc0c..9cee59229 100644 --- a/src/AColor.h +++ b/src/AColor.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_COLOR__ -#define __AUDACITY_COLOR__ +#pragma once #include #include // member variable @@ -151,5 +150,3 @@ inline void GetColorGradient(float value, *green = AColor::gradient_pre[selected][colorScheme][idx][1]; *blue = AColor::gradient_pre[selected][colorScheme][idx][2]; } - -#endif diff --git a/src/AboutDialog.h b/src/AboutDialog.h index 0ceb456c7..aac5550fa 100644 --- a/src/AboutDialog.h +++ b/src/AboutDialog.h @@ -6,8 +6,7 @@ **********************************************************************/ -#ifndef TENACITY_ABOUT_DLG -#define TENACITY_ABOUT_DLG +#pragma once #include #include "widgets/wxPanelWrapper.h" // to inherit @@ -89,5 +88,3 @@ class TENACITY_DLL_API AboutDialog final : public wxDialogWrapper{ static void AddBuildInfoRow(wxTextOutputStream * str, const wxChar * libname, const TranslatableString & libdesc, const TranslatableString & status); static void AddBuildInfoRow(wxTextOutputStream * str, const TranslatableString & description, const wxChar * spec); }; - -#endif diff --git a/src/ActiveProjects.h b/src/ActiveProjects.h index 075641a86..21710c297 100644 --- a/src/ActiveProjects.h +++ b/src/ActiveProjects.h @@ -6,8 +6,7 @@ **********************************************************************/ -#ifndef __AUDACITY_ACTIVE_PROJECTS__ -#define __AUDACITY_ACTIVE_PROJECTS__ +#pragma once #include "Identifier.h" @@ -19,5 +18,3 @@ namespace ActiveProjects void Remove(const FilePath &path); wxString Find(const FilePath &path); }; - -#endif diff --git a/src/AdornedRulerPanel.h b/src/AdornedRulerPanel.h index 218e8fe00..bb5dcb8aa 100644 --- a/src/AdornedRulerPanel.h +++ b/src/AdornedRulerPanel.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_ADORNED_RULER_PANEL__ -#define __AUDACITY_ADORNED_RULER_PANEL__ +#pragma once #include "CellularPanel.h" #include "widgets/Ruler.h" // member variable @@ -237,5 +236,3 @@ private: double mLastDrawnZoom{}; bool mDirtySelectedRegion{}; }; - -#endif //define __AUDACITY_ADORNED_RULER_PANEL__ diff --git a/src/AttachedVirtualFunction.h b/src/AttachedVirtualFunction.h index 7af4ef900..b85abaad3 100644 --- a/src/AttachedVirtualFunction.h +++ b/src/AttachedVirtualFunction.h @@ -9,8 +9,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_ATTACHED_VIRTUAL_FUNCTION__ -#define __AUDACITY_ATTACHED_VIRTUAL_FUNCTION__ +#pragma once #include @@ -286,5 +285,3 @@ private: return registry; } }; - -#endif diff --git a/src/AudacityApp.h b/src/AudacityApp.h index 9f3a45602..7b7cf91e6 100644 --- a/src/AudacityApp.h +++ b/src/AudacityApp.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_APP__ -#define __AUDACITY_APP__ +#pragma once #include "Identifier.h" @@ -118,5 +117,3 @@ class AudacityApp final : public wxApp { }; extern AudacityApp & wxGetApp(); - -#endif diff --git a/src/AudacityException.h b/src/AudacityException.h index 558a299de..61993d901 100644 --- a/src/AudacityException.h +++ b/src/AudacityException.h @@ -1,6 +1,3 @@ -#ifndef __AUDACITY_EXCEPTION__ -#define __AUDACITY_EXCEPTION__ - /*!******************************************************************** Tenacity @@ -11,6 +8,9 @@ Paul Licameli **********************************************************************/ +#pragma once + + #include "MemoryX.h" #include // used in inline function template #include @@ -227,5 +227,3 @@ R GuardedCall( return handler( nullptr ); } } - -#endif diff --git a/src/AudacityFileConfig.h b/src/AudacityFileConfig.h index 7e3f534b3..754d821ea 100644 --- a/src/AudacityFileConfig.h +++ b/src/AudacityFileConfig.h @@ -9,8 +9,7 @@ Paul Licameli split from Prefs.h **********************************************************************/ -#ifndef __AUDACITY_FILE_CONFIG__ -#define __AUDACITY_FILE_CONFIG__ +#pragma once #include #include "widgets/FileConfig.h" // to inherit @@ -45,4 +44,3 @@ private: const wxMBConv& conv ); }; -#endif diff --git a/src/AudacityLogger.h b/src/AudacityLogger.h index 81a4d8f26..11aaee8dc 100644 --- a/src/AudacityLogger.h +++ b/src/AudacityLogger.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_LOGGER__ -#define __AUDACITY_LOGGER__ +#pragma once @@ -64,5 +63,3 @@ class TENACITY_DLL_API AudacityLogger final : public wxEvtHandler, wxString mBuffer; bool mUpdated; }; - -#endif diff --git a/src/AudioIO.h b/src/AudioIO.h index c629942ca..8d8367267 100644 --- a/src/AudioIO.h +++ b/src/AudioIO.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_AUDIO_IO__ -#define __AUDACITY_AUDIO_IO__ +#pragma once @@ -789,5 +788,3 @@ private: }; static constexpr unsigned ScrubPollInterval_ms = 50; - -#endif diff --git a/src/AudioIOBase.h b/src/AudioIOBase.h index 8c659ff9b..74102f84d 100644 --- a/src/AudioIOBase.h +++ b/src/AudioIOBase.h @@ -8,8 +8,7 @@ Paul Licameli split from AudioIO.h **********************************************************************/ -#ifndef __AUDACITY_AUDIO_IO_BASE__ -#define __AUDACITY_AUDIO_IO_BASE__ +#pragma once @@ -340,8 +339,6 @@ protected: static const int NumRatesToTry; }; -#endif - #include "Prefs.h" extern TENACITY_DLL_API StringSetting AudioIOHost; diff --git a/src/AudioIOBufferHelper.h b/src/AudioIOBufferHelper.h index cf1c95a17..f6b093079 100644 --- a/src/AudioIOBufferHelper.h +++ b/src/AudioIOBufferHelper.h @@ -1,5 +1,4 @@ -#ifndef AUDIOIO_BUFFER_HELPER_H -#define AUDIOIO_BUFFER_HELPER_H +#pragma once #include "AudioIO.h" #include "../libraries/lib-utility/MemoryX.h" @@ -38,5 +37,3 @@ class AudioIOBufferHelper delete[] chans; } }; - -#endif diff --git a/src/AudioIOListener.h b/src/AudioIOListener.h index 24b048d8f..46adbd905 100644 --- a/src/AudioIOListener.h +++ b/src/AudioIOListener.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_AUDIO_IO_LISTENER__ -#define __AUDACITY_AUDIO_IO_LISTENER__ +#pragma once @@ -39,5 +38,3 @@ public: virtual void OnSoundActivationThreshold() = 0; }; - -#endif diff --git a/src/AutoRecoveryDialog.h b/src/AutoRecoveryDialog.h index 7a96d7322..c380ca4e4 100644 --- a/src/AutoRecoveryDialog.h +++ b/src/AutoRecoveryDialog.h @@ -8,8 +8,7 @@ Paul Licameli split from AutoRecovery.h **********************************************************************/ -#ifndef __AUDACITY_AUTO_RECOVERY_DIALOG__ -#define __AUDACITY_AUTO_RECOVERY_DIALOG__ +#pragma once class AudacityProject; @@ -28,5 +27,3 @@ class AudacityProject; // bool ShowAutoRecoveryDialogIfNeeded(AudacityProject*& pproj, bool *didRecoverAnything); - -#endif diff --git a/src/BatchCommandDialog.h b/src/BatchCommandDialog.h index a2341d74d..cb9194ed6 100644 --- a/src/BatchCommandDialog.h +++ b/src/BatchCommandDialog.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_MACRO_COMMAND_DIALOG__ -#define __AUDACITY_MACRO_COMMAND_DIALOG__ +#pragma once #include @@ -61,6 +60,3 @@ class MacroCommandDialog final : public wxDialogWrapper { DECLARE_EVENT_TABLE() }; - - -#endif diff --git a/src/BatchCommands.h b/src/BatchCommands.h index 9f7ceaec2..08654d8db 100644 --- a/src/BatchCommands.h +++ b/src/BatchCommands.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_BATCH_COMMANDS_DIALOG__ -#define __AUDACITY_BATCH_COMMANDS_DIALOG__ +#pragma once #include @@ -125,5 +124,3 @@ private: Exporter mExporter; wxString mFileName; }; - -#endif diff --git a/src/BatchProcessDialog.h b/src/BatchProcessDialog.h index 99eb3ec6e..d2a9c6777 100644 --- a/src/BatchProcessDialog.h +++ b/src/BatchProcessDialog.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_MACROS_WINDOW__ -#define __AUDACITY_MACROS_WINDOW__ +#pragma once #include @@ -145,5 +144,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/Benchmark.h b/src/Benchmark.h index 68b27e6c1..6ddba457e 100644 --- a/src/Benchmark.h +++ b/src/Benchmark.h @@ -8,13 +8,10 @@ **********************************************************************/ -#ifndef __AUDACITY_BENCHMARK__ -#define __AUDACITY_BENCHMARK__ +#pragma once class wxWindow; class AudacityProject; TENACITY_DLL_API void RunBenchmark( wxWindow *parent, AudacityProject &project ); - -#endif // define __AUDACITY_BENCHMARK__ diff --git a/src/BuildInfo.h b/src/BuildInfo.h index f413c88ec..3ce390729 100644 --- a/src/BuildInfo.h +++ b/src/BuildInfo.h @@ -6,8 +6,7 @@ **********************************************************************/ -#ifndef BUILD_INFO_H -#define BUILD_INFO_H +#pragma once #include "wx/cpp.h" #include @@ -140,4 +139,3 @@ public: return o.GetString(); } }; -#endif diff --git a/src/CellularPanel.h b/src/CellularPanel.h index 07b9bacb2..b9aa85b6e 100644 --- a/src/CellularPanel.h +++ b/src/CellularPanel.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_CELLULAR_PANEL__ -#define __AUDACITY_CELLULAR_PANEL__ +#pragma once #include "widgets/OverlayPanel.h" // to inherit @@ -171,5 +170,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/ClientData.h b/src/ClientData.h index b410e1b53..173b0c423 100644 --- a/src/ClientData.h +++ b/src/ClientData.h @@ -9,8 +9,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_CLIENT_DATA__ -#define __AUDACITY_CLIENT_DATA__ +#pragma once #include "ClientDataHelpers.h" @@ -564,5 +563,3 @@ private: }; } - -#endif diff --git a/src/ClientDataHelpers.h b/src/ClientDataHelpers.h index 9cf5282bd..d1d251492 100644 --- a/src/ClientDataHelpers.h +++ b/src/ClientDataHelpers.h @@ -9,8 +9,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_CLIENT_DATA_HELPERS__ -#define __AUDACITY_CLIENT_DATA_HELPERS__ +#pragma once #include #include @@ -149,5 +148,3 @@ template< typename Container > struct Copyable< Container, DeepCopying > }; } - -#endif diff --git a/src/Clipboard.h b/src/Clipboard.h index 4c3e9c17e..c4b4af2ef 100644 --- a/src/Clipboard.h +++ b/src/Clipboard.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_CLIPBOARD__ -#define __AUDACITY_CLIPBOARD__ +#pragma once @@ -55,5 +54,3 @@ private: double mT0{ 0 }; double mT1{ 0 }; }; - -#endif diff --git a/src/CommonCommandFlags.h b/src/CommonCommandFlags.h index 9b8558584..0f903350d 100644 --- a/src/CommonCommandFlags.h +++ b/src/CommonCommandFlags.h @@ -8,8 +8,7 @@ Paul Licameli split from Menus.cpp **********************************************************************/ -#ifndef __AUDACITY_COMMON_COMMAND_FLAGS__ -#define __AUDACITY_COMMON_COMMAND_FLAGS__ +#pragma once @@ -62,5 +61,3 @@ extern TENACITY_DLL_API const ReservedCommandFlag &AudioTracksSelectedFlag(), &NoAutoSelect() // jkc ; - -#endif diff --git a/src/ComponentInterfaceSymbol.h b/src/ComponentInterfaceSymbol.h index e9e58503a..742d5831b 100644 --- a/src/ComponentInterfaceSymbol.h +++ b/src/ComponentInterfaceSymbol.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_COMPONENT_INTERFACE_SYMBOL__ -#define __AUDACITY_COMPONENT_INTERFACE_SYMBOL__ +#pragma once #include "Identifier.h" #include "Internat.h" @@ -78,5 +77,3 @@ private: using EnumValueSymbol = ComponentInterfaceSymbol; using NumericFormatSymbol = EnumValueSymbol; using EffectFamilySymbol = ComponentInterfaceSymbol; - -#endif diff --git a/src/CrossFade.h b/src/CrossFade.h index b4a91ca4e..27f8cf64c 100644 --- a/src/CrossFade.h +++ b/src/CrossFade.h @@ -8,8 +8,7 @@ Licensed under the GPL version 2.0 **********************************************************************/ -#ifndef __AUDACITY_CROSSFADE__ -#define __AUDACITY_CROSSFADE__ +#pragma once /// This defines a crossfader class that /// accepts a list of WaveClips and can do a mini-mixing @@ -54,7 +53,3 @@ class CrossFader }; - - - -#endif diff --git a/src/DBConnection.h b/src/DBConnection.h index e19d7a516..eb80625fb 100644 --- a/src/DBConnection.h +++ b/src/DBConnection.h @@ -9,8 +9,7 @@ Paul Licameli -- split from ProjectFileIO.h **********************************************************************/ -#ifndef __AUDACITY_DB_CONNECTION__ -#define __AUDACITY_DB_CONNECTION__ +#pragma once #include #include @@ -168,5 +167,3 @@ public: Connection mpConnection; }; - -#endif diff --git a/src/Dependencies.h b/src/Dependencies.h index 1735b0957..2e28d3e23 100644 --- a/src/Dependencies.h +++ b/src/Dependencies.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_DEPENDENCIES__ -#define __AUDACITY_DEPENDENCIES__ +#pragma once #include #include "MemoryX.h" @@ -62,5 +61,3 @@ bool ShowDependencyDialogIfNeeded(AudacityProject *project, // Returns a list of aliased files associated with a project. void FindDependencies(AudacityProject *project, AliasedFileArray &outAliasedFiles); - -#endif diff --git a/src/DeviceChange.h b/src/DeviceChange.h index 67164f5a8..8f106e723 100644 --- a/src/DeviceChange.h +++ b/src/DeviceChange.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_DEVICECHANGE_H__ -#define __AUDACITY_DEVICECHANGE_H__ +#pragma once @@ -59,5 +58,3 @@ private: #endif #endif - -#endif diff --git a/src/DeviceManager.h b/src/DeviceManager.h index ac0768573..1007b1501 100644 --- a/src/DeviceManager.h +++ b/src/DeviceManager.h @@ -15,8 +15,7 @@ *//*******************************************************************/ -#ifndef __AUDACITY_DEVICEMANAGER__ -#define __AUDACITY_DEVICEMANAGER__ +#pragma once #include #include @@ -97,6 +96,3 @@ private: static DeviceManager dm; }; - -#endif - diff --git a/src/Diags.h b/src/Diags.h index 4d2d2705c..bb5c477b4 100644 --- a/src/Diags.h +++ b/src/Diags.h @@ -12,8 +12,7 @@ **********************************************************************/ -#ifndef __AUDACITY_DIAGS__ -#define __AUDACITY_DIAGS__ +#pragma once typedef long t_diag_timer; @@ -77,7 +76,3 @@ extern void diagnostics_do_perfmon_stop( t_diag_struct ** ppDiag); if( timername != NULL )\ diagnostics_do_perfmon_stop( &timername );\ } - - - -#endif diff --git a/src/Dither.h b/src/Dither.h index 6758dff80..4539b3d6e 100644 --- a/src/Dither.h +++ b/src/Dither.h @@ -7,8 +7,7 @@ **********************************************************************/ -#ifndef __AUDACITY_DITHER_H__ -#define __AUDACITY_DITHER_H__ +#pragma once #include "tenacity/Types.h" // for samplePtr @@ -61,5 +60,3 @@ private: float mTriangleState; float mBuffer[8 /* = BUF_SIZE */]; }; - -#endif /* __AUDACITY_DITHER_H__ */ diff --git a/src/Envelope.h b/src/Envelope.h index 1edf6332b..ae0b9771d 100644 --- a/src/Envelope.h +++ b/src/Envelope.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_ENVELOPE__ -#define __AUDACITY_ENVELOPE__ +#pragma once #include #include @@ -294,5 +293,3 @@ public: private: double mRangeLower{}, mRangeUpper{}; }; - -#endif diff --git a/src/EnvelopeEditor.h b/src/EnvelopeEditor.h index 41b005ec0..f5095e1b6 100644 --- a/src/EnvelopeEditor.h +++ b/src/EnvelopeEditor.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_ENVELOPE_EDITOR__ -#define __AUDACITY_ENVELOPE_EDITOR__ +#pragma once class wxMouseEvent; class wxRect; @@ -68,6 +67,3 @@ private: int mButton; bool mDirty; }; - - -#endif diff --git a/src/FFT.h b/src/FFT.h index f41dcca1d..4bf23164e 100644 --- a/src/FFT.h +++ b/src/FFT.h @@ -29,8 +29,7 @@ you need to use doubles. **********************************************************************/ -#ifndef __AUDACITY_FFT_H__ -#define __AUDACITY_FFT_H__ +#pragma once #include @@ -155,5 +154,3 @@ TENACITY_DLL_API const TranslatableString WindowFuncName(int whichFunction); TENACITY_DLL_API int NumWindowFuncs(); void DeinitFFT(); - -#endif diff --git a/src/FFmpeg.h b/src/FFmpeg.h index 4ccc46afa..b492761b7 100644 --- a/src/FFmpeg.h +++ b/src/FFmpeg.h @@ -13,8 +13,7 @@ Describes shared object that is used to access FFmpeg libraries. *//*******************************************************************/ -#if !defined(__AUDACITY_FFMPEG__) -#define __AUDACITY_FFMPEG__ +#pragma once @@ -1038,5 +1037,3 @@ using ScsPtr = std::shared_ptr; extern FFmpegLibs *FFmpegLibsInst(); #endif // USE_FFMPEG -#endif // __AUDACITY_FFMPEG__ - diff --git a/src/FileException.h b/src/FileException.h index d64a35ef0..b73c132da 100644 --- a/src/FileException.h +++ b/src/FileException.h @@ -7,8 +7,7 @@ */ -#ifndef __AUDACITY_FILE_EXCEPTION__ -#define __AUDACITY_FILE_EXCEPTION__ +#pragma once #include "AudacityException.h" #include // wxFileName member variable @@ -63,5 +62,3 @@ public: wxFileName fileName; wxFileName renameTarget; }; - -#endif diff --git a/src/FileFormats.h b/src/FileFormats.h index 042bfc07f..cf69321b9 100644 --- a/src/FileFormats.h +++ b/src/FileFormats.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_FILE_FORMATS__ -#define __AUDACITY_FILE_FORMATS__ +#pragma once @@ -157,5 +156,3 @@ struct SFFile : public std::unique_ptr extern ChoiceSetting FileFormatsCopyOrEditSetting; extern ChoiceSetting FileFormatsSaveWithDependenciesSetting; - -#endif diff --git a/src/FileIO.h b/src/FileIO.h index 3049aa6db..a880f8ad7 100644 --- a/src/FileIO.h +++ b/src/FileIO.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_FILEIO__ -#define __AUDACITY_FILEIO__ +#pragma once #include @@ -46,5 +45,3 @@ class TENACITY_DLL_API FileIO std::unique_ptr mOutputStream; bool mOpen; }; - -#endif diff --git a/src/FileNames.h b/src/FileNames.h index 931601676..96c82ca83 100644 --- a/src/FileNames.h +++ b/src/FileNames.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_FILE_NAMES__ -#define __AUDACITY_FILE_NAMES__ +#pragma once @@ -264,5 +263,3 @@ namespace FileNames #define OSINPUT(X) OSFILENAME(X) #define OSOUTPUT(X) OSFILENAME(X) #endif - -#endif diff --git a/src/FreqWindow.h b/src/FreqWindow.h index 4510cf71c..622fe518b 100644 --- a/src/FreqWindow.h +++ b/src/FreqWindow.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_FREQ_WINDOW__ -#define __AUDACITY_FREQ_WINDOW__ +#pragma once #include #include // member variable @@ -170,5 +169,3 @@ private: friend class FreqPlot; }; - -#endif diff --git a/src/HelpText.h b/src/HelpText.h index 8c129eefe..831cdee5f 100644 --- a/src/HelpText.h +++ b/src/HelpText.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_HELP_TEXT__ -#define __AUDACITY_HELP_TEXT__ +#pragma once class TranslatableString; class wxString; @@ -24,5 +23,3 @@ TENACITY_DLL_API TranslatableString TitleText( const wxString & Key ); extern TENACITY_DLL_API const wxString VerCheckArgs(); extern TENACITY_DLL_API wxString FormatHtmlText( const wxString & Text ); - -#endif diff --git a/src/HistoryWindow.h b/src/HistoryWindow.h index e728c850c..f9bc24997 100644 --- a/src/HistoryWindow.h +++ b/src/HistoryWindow.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_HISTORY_WINDOW__ -#define __AUDACITY_HISTORY_WINDOW__ +#pragma once #include "Prefs.h" #include "widgets/wxPanelWrapper.h" // to inherit @@ -70,5 +69,3 @@ class HistoryDialog final : public wxDialogWrapper, public: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/HitTestResult.h b/src/HitTestResult.h index d4d2183ce..a5cddf03b 100644 --- a/src/HitTestResult.h +++ b/src/HitTestResult.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_HIT_TEST_RESULT__ -#define __AUDACITY_HIT_TEST_RESULT__ +#pragma once #include #include "Internat.h" // for TranslatableString @@ -30,5 +29,3 @@ struct HitTestPreview wxCursor *cursor {}; TranslatableString tooltip{}; }; - -#endif diff --git a/src/ImageManipulation.h b/src/ImageManipulation.h index 372fd78d9..87cd764b3 100644 --- a/src/ImageManipulation.h +++ b/src/ImageManipulation.h @@ -8,6 +8,8 @@ **********************************************************************/ +#pragma once + #include #include diff --git a/src/InconsistencyException.h b/src/InconsistencyException.h index 26efdf57c..dbabc171d 100644 --- a/src/InconsistencyException.h +++ b/src/InconsistencyException.h @@ -6,8 +6,7 @@ */ -#ifndef __AUDACITY_INCONSISTENCY_EXCEPTION__ -#define __AUDACITY_INCONSISTENCY_EXCEPTION__ +#pragma once #include "AudacityException.h" @@ -77,5 +76,3 @@ For cases where the exception object is not immediately thrown */ @brief Throw InconsistencyException, using C++ preprocessor to identify the source code location */ #define THROW_INCONSISTENCY_EXCEPTION throw CONSTRUCT_INCONSISTENCY_EXCEPTION - -#endif diff --git a/src/InterpolateAudio.h b/src/InterpolateAudio.h index df06d5d9c..ab1bf7632 100644 --- a/src/InterpolateAudio.h +++ b/src/InterpolateAudio.h @@ -22,8 +22,7 @@ *//*******************************************************************/ -#ifndef __AUDACITY_INTERPOLATE_AUDIO__ -#define __AUDACITY_INTERPOLATE_AUDIO__ +#pragma once #include @@ -38,5 +37,3 @@ // the other. void TENACITY_DLL_API InterpolateAudio(float *buffer, size_t len, size_t firstBad, size_t numBad); - -#endif // __AUDACITY_INTERPOLATE_AUDIO__ diff --git a/src/KeyboardCapture.h b/src/KeyboardCapture.h index 7822e396f..d7fd7eea7 100644 --- a/src/KeyboardCapture.h +++ b/src/KeyboardCapture.h @@ -8,9 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_KEYBOARD_CAPTURE__ -#define __AUDACITY_KEYBOARD_CAPTURE__ - +#pragma once #include @@ -60,5 +58,3 @@ namespace KeyboardCapture TENACITY_DLL_API void OnFocus( wxWindow &window, wxFocusEvent &event ); } - -#endif diff --git a/src/LabelDialog.h b/src/LabelDialog.h index 9d583abd1..e634c938f 100644 --- a/src/LabelDialog.h +++ b/src/LabelDialog.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_LABELDIALOG__ -#define __AUDACITY_LABELDIALOG__ +#pragma once #include #include @@ -114,5 +113,3 @@ class LabelDialog final : public wxDialogWrapper DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/LabelTrack.h b/src/LabelTrack.h index 46cea6890..f653b1318 100644 --- a/src/LabelTrack.h +++ b/src/LabelTrack.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef _LABELTRACK_ -#define _LABELTRACK_ +#pragma once #include "SelectedRegion.h" #include "Track.h" @@ -225,4 +224,3 @@ wxDECLARE_EXPORTED_EVENT(TENACITY_DLL_API, // Posted when the track is selected or unselected. wxDECLARE_EXPORTED_EVENT(TENACITY_DLL_API, EVT_LABELTRACK_SELECTION, LabelTrackEvent); -#endif diff --git a/src/LangChoice.h b/src/LangChoice.h index cc9b84fe0..44e53d1db 100644 --- a/src/LangChoice.h +++ b/src/LangChoice.h @@ -12,12 +12,9 @@ **********************************************************************/ -#ifndef __AUDACITY_LANG_CHOICE__ -#define __AUDACITY_LANG_CHOICE__ +#pragma once class wxString; class wxWindow; wxString ChooseLanguage(wxWindow *parent); - -#endif // __AUDACITY_LANG_CHOICE__ diff --git a/src/Legacy.h b/src/Legacy.h index b83d3f0cd..6a6fb8ba3 100644 --- a/src/Legacy.h +++ b/src/Legacy.h @@ -8,6 +8,8 @@ **********************************************************************/ +#pragma once + #include class wxFileName; diff --git a/src/Lyrics.h b/src/Lyrics.h index 517afca7f..80ec35045 100644 --- a/src/Lyrics.h +++ b/src/Lyrics.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_LYRICS__ -#define __AUDACITY_LYRICS__ +#pragma once @@ -161,5 +160,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif // __AUDACITY_LYRICS__ diff --git a/src/LyricsWindow.h b/src/LyricsWindow.h index 4e26f7e9c..2f52bc5df 100644 --- a/src/LyricsWindow.h +++ b/src/LyricsWindow.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_LYRICS_WINDOW__ -#define __AUDACITY_LYRICS_WINDOW__ +#pragma once #include // to inherit @@ -46,5 +45,3 @@ class LyricsWindow final : public wxFrame, public: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/Matrix.h b/src/Matrix.h index 81f5e50d6..d529b396d 100644 --- a/src/Matrix.h +++ b/src/Matrix.h @@ -23,8 +23,7 @@ *//*******************************************************************/ -#ifndef __AUDACITY_MATRIX__ -#define __AUDACITY_MATRIX__ +#pragma once #include "SampleFormat.h" @@ -109,5 +108,3 @@ Matrix MatrixSubset(const Matrix &M, Matrix MatrixConcatenateCols(const Matrix& left, const Matrix& right); bool InvertMatrix(const Matrix& M, Matrix& Minv); - -#endif // __AUDACITY_MATRIX__ diff --git a/src/Menus.h b/src/Menus.h index 70e62d905..9c73cbf16 100644 --- a/src/Menus.h +++ b/src/Menus.h @@ -7,8 +7,7 @@ Dominic Mazzoni **********************************************************************/ -#ifndef __AUDACITY_MENUS__ -#define __AUDACITY_MENUS__ +#pragma once #include "Identifier.h" @@ -122,5 +121,3 @@ public: int mWhatIfNoSelection; bool mStopIfWasPaused; }; - -#endif diff --git a/src/Mix.h b/src/Mix.h index 8b7703875..dddc12957 100644 --- a/src/Mix.h +++ b/src/Mix.h @@ -17,8 +17,7 @@ *//********************************************************************/ -#ifndef __AUDACITY_MIX__ -#define __AUDACITY_MIX__ +#pragma once #include "SampleFormat.h" #include @@ -196,6 +195,3 @@ class TENACITY_DLL_API Mixer { const bool mMayThrow; }; - -#endif - diff --git a/src/MixerBoard.h b/src/MixerBoard.h index 747c98750..fb8d9900d 100644 --- a/src/MixerBoard.h +++ b/src/MixerBoard.h @@ -11,8 +11,7 @@ -#ifndef __AUDACITY_MIXER_BOARD__ -#define __AUDACITY_MIXER_BOARD__ +#pragma once #include // to inherit #include // to inherit @@ -288,7 +287,3 @@ public: public: DECLARE_EVENT_TABLE() }; - -#endif // __AUDACITY_MIXER_BOARD__ - - diff --git a/src/ModuleManager.h b/src/ModuleManager.h index 8afa22881..9fcb0ceb8 100644 --- a/src/ModuleManager.h +++ b/src/ModuleManager.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_MODULEMANAGER_H__ -#define __AUDACITY_MODULEMANAGER_H__ +#pragma once #include "MemoryX.h" #include @@ -152,5 +151,3 @@ void UnregisterProvider(ModuleMain rtn); // be destroyed only after the un-registrations static struct Init{ Init() { RegisterProvider(nullptr); } } sInitBuiltinModules; - -#endif /* __AUDACITY_MODULEMANAGER_H__ */ diff --git a/src/ModuleSettings.h b/src/ModuleSettings.h index 5dea0e1b8..d4f1e2dea 100644 --- a/src/ModuleSettings.h +++ b/src/ModuleSettings.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_MODULE_SETTINGS__ -#define __AUDACITY_MODULE_SETTINGS__ +#pragma once #include "Identifier.h" @@ -27,5 +26,3 @@ int GetModuleStatus( const FilePath &fname ); void SetModuleStatus( const FilePath &fname, int iStatus ); } - -#endif diff --git a/src/NoteTrack.h b/src/NoteTrack.h index 052a03129..06717d031 100644 --- a/src/NoteTrack.h +++ b/src/NoteTrack.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_NOTETRACK__ -#define __AUDACITY_NOTETRACK__ +#pragma once @@ -290,6 +289,3 @@ public: #define SonifyBeginModifyState() #define SonifyEndModifyState() #endif - - -#endif diff --git a/src/NumberScale.h b/src/NumberScale.h index 6baf15962..f4d6e4fa6 100644 --- a/src/NumberScale.h +++ b/src/NumberScale.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_NUMBER_SCALE__ -#define __AUDACITY_NUMBER_SCALE__ +#pragma once #include #include @@ -279,5 +278,3 @@ private: float mValue0; float mValue1; }; - -#endif diff --git a/src/PitchName.h b/src/PitchName.h index 6732fa12e..cb3d034b8 100644 --- a/src/PitchName.h +++ b/src/PitchName.h @@ -15,8 +15,7 @@ *//*******************************************************************/ -#ifndef __AUDACITY_PITCHNAME__ -#define __AUDACITY_PITCHNAME__ +#pragma once class TranslatableString; @@ -60,5 +59,3 @@ double PitchToMIDInote(const unsigned int nPitchIndex, const int nPitchOctave); TENACITY_DLL_API double PitchToFreq(const unsigned int nPitchIndex, const int nPitchOctave); - -#endif // __AUDACITY_PITCHNAME__ diff --git a/src/PlatformCompatibility.h b/src/PlatformCompatibility.h index a45376cad..92a6b31a0 100644 --- a/src/PlatformCompatibility.h +++ b/src/PlatformCompatibility.h @@ -17,8 +17,7 @@ **********************************************************************/ -#ifndef __AUDACITY_COMPATIBILITY__ -#define __AUDACITY_COMPATIBILITY__ +#pragma once #include "Identifier.h" @@ -40,5 +39,3 @@ public: // static const FilePath &GetExecutablePath(); }; - -#endif diff --git a/src/PlaybackSchedule.h b/src/PlaybackSchedule.h index 5fcac85c5..ea6b358da 100644 --- a/src/PlaybackSchedule.h +++ b/src/PlaybackSchedule.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_PLAYBACK_SCHEDULE__ -#define __AUDACITY_PLAYBACK_SCHEDULE__ +#pragma once #include #include @@ -163,5 +162,3 @@ struct TENACITY_DLL_API PlaybackSchedule { void RealTimeRestart(); }; - -#endif diff --git a/src/PluginManager.h b/src/PluginManager.h index d1bbe077e..d87a10796 100644 --- a/src/PluginManager.h +++ b/src/PluginManager.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_PLUGINMANAGER_H__ -#define __AUDACITY_PLUGINMANAGER_H__ +#pragma once #include @@ -360,5 +359,3 @@ private: #define NYQUIST_PROMPT_ID wxT("Nyquist Prompt") // User-visible name might change in later versions #define NYQUIST_PROMPT_NAME XO("Nyquist Prompt") - -#endif /* __AUDACITY_PLUGINMANAGER_H__ */ diff --git a/src/PluginRegistrationDialog.h b/src/PluginRegistrationDialog.h index 713bebe81..b8587aaf0 100644 --- a/src/PluginRegistrationDialog.h +++ b/src/PluginRegistrationDialog.h @@ -7,8 +7,7 @@ Paul Licameli split from PluginManager.cpp **********************************************************************/ -#ifndef __AUDACITY_PLUGIN_REGISTRATION_DIALOG__ -#define __AUDACITY_PLUGIN_REGISTRATION_DIALOG__ +#pragma once #include "widgets/wxPanelWrapper.h" // to inherit #include @@ -80,6 +79,3 @@ private: DECLARE_EVENT_TABLE() }; - - -#endif diff --git a/src/Prefs.h b/src/Prefs.h index 446d58973..965cff973 100644 --- a/src/Prefs.h +++ b/src/Prefs.h @@ -26,8 +26,7 @@ track of... **********************************************************************/ -#ifndef __AUDACITY_PREFS__ -#define __AUDACITY_PREFS__ +#pragma once @@ -423,5 +422,3 @@ struct TENACITY_DLL_API PreferenceInitializer { static void ReinitializeAll(); }; - -#endif diff --git a/src/Printing.h b/src/Printing.h index 0c9364031..04f4bac83 100644 --- a/src/Printing.h +++ b/src/Printing.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_PRINTING__ -#define __AUDACITY_PRINTING__ +#pragma once #include @@ -22,6 +21,3 @@ void HandlePageSetup(wxWindow *parent); void HandlePrint( wxWindow *parent, const wxString &name, TrackList *tracks, TrackPanel &panel); - -#endif // __AUDACITY_PRINTING__ - diff --git a/src/Profiler.h b/src/Profiler.h index 57241f223..21d52fa88 100644 --- a/src/Profiler.h +++ b/src/Profiler.h @@ -22,10 +22,9 @@ but it will probably work fine if you use it on a high level. +#pragma once -#ifndef __AUDACITY_PROFILER__ -#define __AUDACITY_PROFILER__ #include #include #include "MemoryX.h" @@ -85,7 +84,3 @@ class Profiler clock_t mCumTime; clock_t mLastTime; }; - - -#endif - diff --git a/src/Project.h b/src/Project.h index 20007c8ae..8eac61f57 100644 --- a/src/Project.h +++ b/src/Project.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_PROJECT__ -#define __AUDACITY_PROJECT__ +#pragma once #include "Identifier.h" @@ -181,5 +180,3 @@ inline const wxFrame *FindProjectFrame( const AudacityProject *project ) { TENACITY_DLL_API wxWindow &GetProjectPanel( AudacityProject &project ); TENACITY_DLL_API const wxWindow &GetProjectPanel( const AudacityProject &project ); - -#endif diff --git a/src/ProjectAudioIO.h b/src/ProjectAudioIO.h index 9f9e992a5..6cdb2776d 100644 --- a/src/ProjectAudioIO.h +++ b/src/ProjectAudioIO.h @@ -8,8 +8,7 @@ Paul Licameli split from AudacityProject.h **********************************************************************/ -#ifndef __PROJECT_AUDIO_IO__ -#define __PROJECT_AUDIO_IO__ +#pragma once #include "ClientData.h" // to inherit #include @@ -52,5 +51,3 @@ private: int mAudioIOToken{ -1 }; }; - -#endif diff --git a/src/ProjectAudioManager.h b/src/ProjectAudioManager.h index 6aa8d63d7..9579b78e1 100644 --- a/src/ProjectAudioManager.h +++ b/src/ProjectAudioManager.h @@ -8,8 +8,7 @@ Paul Licameli split from ProjectManager.h **********************************************************************/ -#ifndef __AUDACITY_PROJECT_AUDIO_MANAGER__ -#define __AUDACITY_PROJECT_AUDIO_MANAGER__ +#pragma once #include #include @@ -182,5 +181,3 @@ PropertiesOfSelected GetPropertiesOfSelected(const AudacityProject &proj); extern TENACITY_DLL_API const ReservedCommandFlag &CanStopAudioStreamFlag(); - -#endif diff --git a/src/ProjectFSCK.h b/src/ProjectFSCK.h index 0d0b6b44f..dd8afc0c9 100644 --- a/src/ProjectFSCK.h +++ b/src/ProjectFSCK.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_PROJECT_FSCK__ -#define __AUDACITY_PROJECT_FSCK__ +#pragma once class DirManager; @@ -28,5 +27,3 @@ enum : unsigned { // Too complicated during auto-recover. Just correct problems the "safest" way. int ProjectFSCK( DirManager &dm, const bool bForceError, const bool bAutoRecoverMode); - -#endif diff --git a/src/ProjectFileIO.h b/src/ProjectFileIO.h index 71f96a812..bb9b6e285 100644 --- a/src/ProjectFileIO.h +++ b/src/ProjectFileIO.h @@ -8,8 +8,7 @@ Paul Licameli split from AudacityProject.h **********************************************************************/ -#ifndef __AUDACITY_PROJECT_FILE_IO__ -#define __AUDACITY_PROJECT_FILE_IO__ +#pragma once #include #include @@ -339,5 +338,3 @@ public: private: std::shared_ptr mpProject; }; - -#endif diff --git a/src/ProjectFileIORegistry.h b/src/ProjectFileIORegistry.h index 467f531d1..b0a72b412 100644 --- a/src/ProjectFileIORegistry.h +++ b/src/ProjectFileIORegistry.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_PROJECT_FILE_IO_REGISTRY__ -#define __AUDACITY_PROJECT_FILE_IO_REGISTRY__ +#pragma once #include @@ -31,5 +30,3 @@ struct TENACITY_DLL_API Entry{ TagHandlerFactory Lookup( const wxString &tag ); } - -#endif diff --git a/src/ProjectFileManager.h b/src/ProjectFileManager.h index 54424406b..d410c76d9 100644 --- a/src/ProjectFileManager.h +++ b/src/ProjectFileManager.h @@ -8,8 +8,7 @@ Paul Licameli split from AudacityProject.h **********************************************************************/ -#ifndef __AUDACITY_PROJECT_FILE_MANAGER__ -#define __AUDACITY_PROJECT_FILE_MANAGER__ +#pragma once #include #include @@ -134,5 +133,3 @@ private: // Are we currently closing as the result of a menu command? bool mMenuClose{ false }; }; - -#endif diff --git a/src/ProjectHistory.h b/src/ProjectHistory.h index f8226c0a3..80765b35d 100644 --- a/src/ProjectHistory.h +++ b/src/ProjectHistory.h @@ -8,8 +8,7 @@ Paul Licameli split from ProjectManager.h **********************************************************************/ -#ifndef __AUDACITY_PROJECT_HISTORY__ -#define __AUDACITY_PROJECT_HISTORY__ +#pragma once #include "ClientData.h" @@ -56,5 +55,3 @@ private: bool mDirty{ false }; }; - -#endif diff --git a/src/ProjectManager.h b/src/ProjectManager.h index d9713ba47..aad05a469 100644 --- a/src/ProjectManager.h +++ b/src/ProjectManager.h @@ -8,8 +8,7 @@ Paul Licameli split from AudacityProject.h **********************************************************************/ -#ifndef __AUDACITY_PROJECT_MANAGER__ -#define __AUDACITY_PROJECT_MANAGER__ +#pragma once #include @@ -128,5 +127,3 @@ private: static bool sbWindowRectAlreadySaved; static bool sbSkipPromptingForSave; }; - -#endif diff --git a/src/ProjectSelectionManager.h b/src/ProjectSelectionManager.h index 3e97fbbee..030d11e50 100644 --- a/src/ProjectSelectionManager.h +++ b/src/ProjectSelectionManager.h @@ -8,8 +8,7 @@ Paul Licameli split from ProjectManager.cpp **********************************************************************/ -#ifndef __AUDACITY_PROJECT_SELECTION_MANAGER__ -#define __AUDACITY_PROJECT_SELECTION_MANAGER__ +#pragma once #include "ClientData.h" // to inherit #include "toolbars/SelectionBarListener.h" // to inherit @@ -61,5 +60,3 @@ private: AudacityProject &mProject; }; - -#endif diff --git a/src/ProjectSerializer.h b/src/ProjectSerializer.h index a9e827d50..0e7149d4b 100644 --- a/src/ProjectSerializer.h +++ b/src/ProjectSerializer.h @@ -8,8 +8,7 @@ *******************************************************************/ -#ifndef __AUDACITY_PROJECTSERIALIZER__ -#define __AUDACITY_PROJECTSERIALIZER__ +#pragma once #include "xml/XMLTagHandler.h" @@ -78,5 +77,3 @@ private: static NameMap mNames; static wxMemoryBuffer mDict; }; - -#endif diff --git a/src/ProjectSettings.h b/src/ProjectSettings.h index dd627df27..d3f2707ca 100644 --- a/src/ProjectSettings.h +++ b/src/ProjectSettings.h @@ -8,8 +8,7 @@ Paul Licameli split from AudacityProject.h **********************************************************************/ -#ifndef __AUDACITY_PROJECT_SETTINGS__ -#define __AUDACITY_PROJECT_SETTINGS__ +#pragma once #include #include // to declare custom event type @@ -146,5 +145,3 @@ private: bool mEmptyCanBeDirty; bool mShowSplashScreen; }; - -#endif diff --git a/src/ProjectStatus.h b/src/ProjectStatus.h index 0eea6fad6..130b04089 100644 --- a/src/ProjectStatus.h +++ b/src/ProjectStatus.h @@ -8,9 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_PROJECT_STATUS__ -#define __AUDACITY_PROJECT_STATUS__ -#endif +#pragma once #include #include diff --git a/src/ProjectWindow.h b/src/ProjectWindow.h index 1d759c8e9..f5eee0c25 100644 --- a/src/ProjectWindow.h +++ b/src/ProjectWindow.h @@ -8,8 +8,7 @@ Paul Licameli split from AudacityProject.h **********************************************************************/ -#ifndef __AUDACITY_PROJECT_WINDOW__ -#define __AUDACITY_PROJECT_WINDOW__ +#pragma once #include #include "ProjectWindowBase.h" // to inherit @@ -204,5 +203,3 @@ private: void GetDefaultWindowRect(wxRect *defRect); void GetNextWindowPlacement(wxRect *nextRect, bool *pMaximized, bool *pIconized); - -#endif diff --git a/src/ProjectWindowBase.h b/src/ProjectWindowBase.h index 582ce6caf..3f0fe21b1 100644 --- a/src/ProjectWindowBase.h +++ b/src/ProjectWindowBase.h @@ -8,8 +8,7 @@ Paul Licameli split from ProjectWindow.h **********************************************************************/ -#ifndef __AUDACITY_PROJECT_WINDOW_BASE__ -#define __AUDACITY_PROJECT_WINDOW_BASE__ +#pragma once #include // to inherit @@ -35,6 +34,3 @@ protected: TENACITY_DLL_API AudacityProject *FindProjectFromWindow( wxWindow *pWindow ); const AudacityProject *FindProjectFromWindow( const wxWindow *pWindow ); - -#endif - diff --git a/src/RealFFTf.h b/src/RealFFTf.h index 7d3e9d4c2..52f39e232 100644 --- a/src/RealFFTf.h +++ b/src/RealFFTf.h @@ -1,5 +1,4 @@ -#ifndef __realfftf_h -#define __realfftf_h +#pragma once @@ -31,6 +30,3 @@ TENACITY_DLL_API void InverseRealFFTf(fft_type *, const FFTParam *); TENACITY_DLL_API void ReorderToTime(const FFTParam *hFFT, const fft_type *buffer, fft_type *TimeOut); TENACITY_DLL_API void ReorderToFreq(const FFTParam *hFFT, const fft_type *buffer, fft_type *RealOut, fft_type *ImagOut); - -#endif - diff --git a/src/RealFFTf48x.h b/src/RealFFTf48x.h index b06309e65..597e0c6c2 100644 --- a/src/RealFFTf48x.h +++ b/src/RealFFTf48x.h @@ -1,5 +1,4 @@ -#ifndef __realfftf48x_h -#define __realfftf48x_h +#pragma once #include "MemoryX.h" @@ -97,7 +96,3 @@ public: int SmallRB(int bits, int numberBits); extern int (*SmallVRB[])(int bits); - - -#endif - diff --git a/src/RefreshCode.h b/src/RefreshCode.h index 43acee7d8..b4bf36510 100644 --- a/src/RefreshCode.h +++ b/src/RefreshCode.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_REFRESH_CODE__ -#define __AUDACITY_REFRESH_CODE__ +#pragma once /// Namespace containing an enum 'what to do on a refresh?' namespace RefreshCode @@ -35,7 +34,3 @@ namespace RefreshCode }; } - - - -#endif diff --git a/src/Registrar.h b/src/Registrar.h index c2cb551ed..5aa658bfb 100644 --- a/src/Registrar.h +++ b/src/Registrar.h @@ -17,8 +17,7 @@ responsible for calling the appropriate callback functions. **********************************************************************/ -#ifndef __AUDACITY_REGISTRAR__ -#define __AUDACITY_REGISTRAR__ +#pragma once @@ -47,5 +46,3 @@ public: virtual void AddModule(std::unique_ptr && WXUNUSED(module) ){;}; virtual void AddEffect(std::unique_ptr && WXUNUSED(effect) ){;}; }; - -#endif diff --git a/src/Registry.h b/src/Registry.h index 63a2486c1..886f8d647 100644 --- a/src/Registry.h +++ b/src/Registry.h @@ -8,8 +8,7 @@ Paul Licameli split from CommandManager.h **********************************************************************/ -#ifndef __AUDACITY_REGISTRY__ -#define __AUDACITY_REGISTRY__ +#pragma once #include "Prefs.h" @@ -290,6 +289,3 @@ namespace Registry { Literal mRoot; }; } - -#endif - diff --git a/src/Resample.h b/src/Resample.h index 3eed46816..d550b15f0 100644 --- a/src/Resample.h +++ b/src/Resample.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_RESAMPLE_H__ -#define __AUDACITY_RESAMPLE_H__ +#pragma once @@ -82,5 +81,3 @@ class TENACITY_DLL_API Resample final soxrHandle mHandle; // constant-rate or variable-rate resampler (XOR per instance) bool mbWantConstRateResampling; }; - -#endif // __AUDACITY_RESAMPLE_H__ diff --git a/src/RingBuffer.h b/src/RingBuffer.h index 1aafe4736..349f4380a 100644 --- a/src/RingBuffer.h +++ b/src/RingBuffer.h @@ -8,8 +8,7 @@ *******************************************************************/ -#ifndef __AUDACITY_RING_BUFFER__ -#define __AUDACITY_RING_BUFFER__ +#pragma once #include "SampleFormat.h" #include @@ -51,5 +50,3 @@ class RingBuffer final : public NonInterferingBase { sampleFormat mFormat; SampleBuffer mBuffer; }; - -#endif /* __AUDACITY_RING_BUFFER__ */ diff --git a/src/SampleBlock.h b/src/SampleBlock.h index 65968fd42..7af06010b 100644 --- a/src/SampleBlock.h +++ b/src/SampleBlock.h @@ -6,8 +6,7 @@ SampleBlock.h **********************************************************************/ -#ifndef __AUDACITY_SAMPLE_BLOCK__ -#define __AUDACITY_SAMPLE_BLOCK__ +#pragma once #include "tenacity/Types.h" @@ -161,5 +160,3 @@ protected: sampleFormat srcformat, const wxChar **attrs) = 0; }; - -#endif diff --git a/src/SampleFormat.h b/src/SampleFormat.h index 7bd462250..e23476e38 100644 --- a/src/SampleFormat.h +++ b/src/SampleFormat.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SAMPLE_FORMAT__ -#define __AUDACITY_SAMPLE_FORMAT__ +#pragma once @@ -174,5 +173,3 @@ void InitDitherers(); using Floats = ArrayOf; using FloatBuffers = ArraysOf; using Doubles = ArrayOf; - -#endif diff --git a/src/Screenshot.h b/src/Screenshot.h index 0a745c372..f5110b1f3 100644 --- a/src/Screenshot.h +++ b/src/Screenshot.h @@ -16,8 +16,7 @@ *//*******************************************************************/ -#ifndef __AUDACITY_SCREENSHOT__ -#define __AUDACITY_SCREENSHOT__ +#pragma once @@ -27,5 +26,3 @@ class AudacityProject; TENACITY_DLL_API void OpenScreenshotTools( AudacityProject &project ); void CloseScreenshotTools(); - -#endif // __AUDACITY_SCREENSHOT__ diff --git a/src/SelectUtilities.h b/src/SelectUtilities.h index 50a637d5c..e4be82a29 100644 --- a/src/SelectUtilities.h +++ b/src/SelectUtilities.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SELECT_UTILITIES__ -#define __AUDACITY_SELECT_UTILITIES__ +#pragma once class AudacityProject; class Track; @@ -30,5 +29,3 @@ TENACITY_DLL_API void DoSelectAllAudio( AudacityProject &project ); TENACITY_DLL_API void DoSelectSomething( AudacityProject &project ); } - -#endif diff --git a/src/SelectedRegion.h b/src/SelectedRegion.h index 9d5373aa2..eefb5d705 100644 --- a/src/SelectedRegion.h +++ b/src/SelectedRegion.h @@ -22,8 +22,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SELECTEDREGION__ -#define __AUDACITY_SELECTEDREGION__ +#pragma once @@ -284,5 +283,3 @@ inline bool operator != (const SelectedRegion &lhs, const SelectedRegion &rhs) { return !(lhs == rhs); } - -#endif diff --git a/src/SelectionState.h b/src/SelectionState.h index 261f62f93..dcff374f2 100644 --- a/src/SelectionState.h +++ b/src/SelectionState.h @@ -6,8 +6,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SELECTION_STATE__ -#define __AUDACITY_SELECTION_STATE__ +#pragma once class AudacityProject; class Track; @@ -68,5 +67,3 @@ private: std::weak_ptr mInitialLastPickedTrack; std::vector mInitialTrackSelection; }; - -#endif diff --git a/src/Sequence.h b/src/Sequence.h index 1d15c7e94..e1d316509 100644 --- a/src/Sequence.h +++ b/src/Sequence.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SEQUENCE__ -#define __AUDACITY_SEQUENCE__ +#pragma once #include @@ -280,6 +279,3 @@ private: sampleCount numSamples, const wxChar *whereStr); }; - -#endif // __AUDACITY_SEQUENCE__ - diff --git a/src/Shuttle.h b/src/Shuttle.h index 48afa68c3..be4b23048 100644 --- a/src/Shuttle.h +++ b/src/Shuttle.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SHUTTLE__ -#define __AUDACITY_SHUTTLE__ +#pragma once #include "../include/tenacity/ComponentInterface.h" #include "ComponentInterfaceSymbol.h" @@ -171,5 +170,3 @@ public: #define SHUTTLE_ENUM_PARAM( var, name, strings, nStrings ) \ DefineEnum( var, KEY_ ## name, DEF_ ## name, strings, nStrings ) - -#endif diff --git a/src/ShuttleGetDefinition.h b/src/ShuttleGetDefinition.h index 7879acf0f..6a837a7f0 100644 --- a/src/ShuttleGetDefinition.h +++ b/src/ShuttleGetDefinition.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SHUTTLE_GET_DEFINITION__ -#define __AUDACITY_SHUTTLE_GET_DEFINITION__ +#pragma once #include "Shuttle.h" // to inherit #include "commands/CommandTargets.h" // to inherit @@ -35,5 +34,3 @@ public: void DefineEnum( int &var, const wxChar * key, const int vdefault, const EnumValueSymbol strings[], size_t nStrings ) override; }; - -#endif diff --git a/src/ShuttleGui.h b/src/ShuttleGui.h index d35d928cf..bc57b2881 100644 --- a/src/ShuttleGui.h +++ b/src/ShuttleGui.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef SHUTTLE_GUI -#define SHUTTLE_GUI +#pragma once #include "Identifier.h" @@ -767,5 +766,3 @@ TENACITY_DLL_API TranslatableStrings Msgids( //! Convenience function often useful when adding choice controls TENACITY_DLL_API TranslatableStrings Msgids( const std::vector &strings ); - -#endif diff --git a/src/ShuttlePrefs.h b/src/ShuttlePrefs.h index b40b52f6a..35233108a 100644 --- a/src/ShuttlePrefs.h +++ b/src/ShuttlePrefs.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SHUTTLE_PREFS__ -#define __AUDACITY_SHUTTLE_PREFS__ +#pragma once #include "Shuttle.h" @@ -30,5 +29,3 @@ public: bool TransferWrappedType(const wxString & Name, WrappedType & W) override; bool ExchangeWithMaster(const wxString & Name) override; }; - -#endif diff --git a/src/Snap.h b/src/Snap.h index a6dc91d40..7c4c43c07 100644 --- a/src/Snap.h +++ b/src/Snap.h @@ -12,8 +12,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SNAP__ -#define __AUDACITY_SNAP__ +#pragma once #include #include @@ -112,5 +111,3 @@ private: double mRate{ 0.0 }; NumericFormatSymbol mFormat{}; }; - -#endif diff --git a/src/SoundActivatedRecord.h b/src/SoundActivatedRecord.h index 4100f6225..c12e2ab53 100644 --- a/src/SoundActivatedRecord.h +++ b/src/SoundActivatedRecord.h @@ -13,8 +13,7 @@ ********************************************************************/ -#ifndef __AUDACITY_SOUND_ACTIVATED_RECORD__ -#define __AUDACITY_SOUND_ACTIVATED_RECORD__ +#pragma once #include "widgets/wxPanelWrapper.h" // to inherit @@ -33,5 +32,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/Spectrum.h b/src/Spectrum.h index 90f8add93..40ce6ef18 100644 --- a/src/Spectrum.h +++ b/src/Spectrum.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SPECTRUM__ -#define __AUDACITY_SPECTRUM__ +#pragma once #include "FFT.h" @@ -25,5 +24,3 @@ TENACITY_DLL_API bool ComputeSpectrum(const float * data, size_t width, size_t windowSize, double rate, float *out, bool autocorrelation, int windowFunc = eWinFuncHann); - -#endif diff --git a/src/SpectrumAnalyst.h b/src/SpectrumAnalyst.h index f850ffe9f..386752f5a 100644 --- a/src/SpectrumAnalyst.h +++ b/src/SpectrumAnalyst.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SPECTRUM_ANALYST__ -#define __AUDACITY_SPECTRUM_ANALYST__ +#pragma once #include #include @@ -78,5 +77,3 @@ private: int mGap; int mMargin; }; - -#endif diff --git a/src/SplashDialog.h b/src/SplashDialog.h index ad9edd9ca..bfb493bde 100644 --- a/src/SplashDialog.h +++ b/src/SplashDialog.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SPLASH_DLG__ -#define __AUDACITY_SPLASH_DLG__ +#pragma once #include "widgets/wxPanelWrapper.h" // to inherit @@ -41,5 +40,3 @@ private: std::unique_ptr m_pLogo; //vvv static SplashDialog * pSelf; }; - -#endif diff --git a/src/SseMathFuncs.h b/src/SseMathFuncs.h index a4ec61029..91c93cbfd 100644 --- a/src/SseMathFuncs.h +++ b/src/SseMathFuncs.h @@ -59,8 +59,7 @@ misrepresented as being the original software. (this is the zlib license) */ -#ifndef SSE_MATHFUN -#define SSE_MATHFUN +#pragma once /* SIMD (SSE1+MMX or SSE2) implementation of sin, cos, exp and log Inspired by Intel Approximate Math library, and based on the @@ -771,5 +770,3 @@ void sincos_ps(v4sf x, v4sf *s, v4sf *c) { *s = _mm_xor_ps(xmm1, sign_bit_sin); *c = _mm_xor_ps(xmm2, sign_bit_cos); } - -#endif diff --git a/src/Tags.h b/src/Tags.h index 4434d7520..93380701e 100644 --- a/src/Tags.h +++ b/src/Tags.h @@ -26,8 +26,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TAGS__ -#define __AUDACITY_TAGS__ +#pragma once @@ -202,5 +201,3 @@ class TagsEditorDialog final : public wxDialogWrapper DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/TempDirectory.h b/src/TempDirectory.h index 5ba22522f..be6a546b3 100644 --- a/src/TempDirectory.h +++ b/src/TempDirectory.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TEMP_DIRECTORY__ -#define __AUDACITY_TEMP_DIRECTORY__ +#pragma once #include "Identifier.h" @@ -32,5 +31,3 @@ namespace TempDirectory const TranslatableString &msg, wxWindow *window = nullptr); }; - -#endif diff --git a/src/Theme.h b/src/Theme.h index ea49902ca..0b6cb72e5 100644 --- a/src/Theme.h +++ b/src/Theme.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_THEME__ -#define __AUDACITY_THEME__ +#pragma once @@ -196,5 +195,3 @@ extern TENACITY_DLL_API Theme theTheme; extern TENACITY_DLL_API ChoiceSetting GUITheme ; - -#endif // __AUDACITY_THEME__ diff --git a/src/TimeDialog.h b/src/TimeDialog.h index 9fac53c5f..c14e182cc 100644 --- a/src/TimeDialog.h +++ b/src/TimeDialog.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TimeDialog__ -#define __AUDACITY_TimeDialog__ +#pragma once #include @@ -55,5 +54,3 @@ class TENACITY_DLL_API TimeDialog final : public wxDialogWrapper DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/TimeTrack.h b/src/TimeTrack.h index 845f8f647..84e9a38bf 100644 --- a/src/TimeTrack.h +++ b/src/TimeTrack.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TIMETRACK__ -#define __AUDACITY_TIMETRACK__ +#pragma once #include "Track.h" @@ -118,7 +117,3 @@ class TENACITY_DLL_API TimeTrack final : public Track { private: Track::Holder Clone() const override; }; - - -#endif // __AUDACITY_TIMETRACK__ - diff --git a/src/TimerRecordDialog.h b/src/TimerRecordDialog.h index dbeac8c44..c63b46ff0 100644 --- a/src/TimerRecordDialog.h +++ b/src/TimerRecordDialog.h @@ -13,8 +13,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TIMERRECORD_DIALOG__ -#define __AUDACITY_TIMERRECORD_DIALOG__ +#pragma once #include // to inherit #include // member variable @@ -146,5 +145,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/Track.h b/src/Track.h index dae644edf..fc075ae51 100644 --- a/src/Track.h +++ b/src/Track.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TRACK__ -#define __AUDACITY_TRACK__ +#pragma once @@ -1697,5 +1696,3 @@ private: //! This is in correspondence with mPendingUpdates std::vector< Updater > mUpdaters; }; - -#endif diff --git a/src/TrackArtist.h b/src/TrackArtist.h index ebb91bceb..8d5f153f3 100644 --- a/src/TrackArtist.h +++ b/src/TrackArtist.h @@ -15,8 +15,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TRACKARTIST__ -#define __AUDACITY_TRACKARTIST__ +#pragma once @@ -154,5 +153,3 @@ extern TENACITY_DLL_API int GetWaveYPos(float value, float min, float max, extern float FromDB(float value, double dBRange); extern TENACITY_DLL_API float ValueOfPixel(int yy, int height, bool offset, bool dB, double dBRange, float zoomMin, float zoomMax); - -#endif // define __AUDACITY_TRACKARTIST__ diff --git a/src/TrackInfo.h b/src/TrackInfo.h index 2119eb5c0..9f62a03c9 100644 --- a/src/TrackInfo.h +++ b/src/TrackInfo.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_TRACK_INFO__ -#define __AUDACITY_TRACK_INFO__ +#pragma once @@ -143,5 +142,3 @@ namespace TrackInfo TENACITY_DLL_API bool HasSoloButton(); }; - -#endif diff --git a/src/TrackPanel.h b/src/TrackPanel.h index b29d551a3..b6549566f 100644 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TRACK_PANEL__ -#define __AUDACITY_TRACK_PANEL__ +#pragma once @@ -221,5 +220,3 @@ struct TENACITY_DLL_API IsVisibleTrack wxRect mPanelRect; }; - -#endif diff --git a/src/TrackPanelAx.h b/src/TrackPanelAx.h index 3f5446d38..01bdffd09 100644 --- a/src/TrackPanelAx.h +++ b/src/TrackPanelAx.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TRACK_PANEL_ACCESSIBILITY__ -#define __AUDACITY_TRACK_PANEL_ACCESSIBILITY__ +#pragma once @@ -200,5 +199,3 @@ private: std::unique_ptr mAx; #endif }; - -#endif // __AUDACITY_TRACK_PANEL_ACCESSIBILITY__ diff --git a/src/TrackPanelCell.h b/src/TrackPanelCell.h index 17de843d1..06deaafda 100644 --- a/src/TrackPanelCell.h +++ b/src/TrackPanelCell.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_TRACK_PANEL_CELL__ -#define __AUDACITY_TRACK_PANEL_CELL__ +#pragma once @@ -135,5 +134,3 @@ public: (wxKeyEvent & event, ViewInfo &viewInfo, wxWindow *pParent, AudacityProject *project); }; - -#endif diff --git a/src/TrackPanelDrawable.h b/src/TrackPanelDrawable.h index b6b4f73a0..05a60d6d0 100644 --- a/src/TrackPanelDrawable.h +++ b/src/TrackPanelDrawable.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_TRACK_PANEL_DRAWABLE__ -#define __AUDACITY_TRACK_PANEL_DRAWABLE__ +#pragma once @@ -54,5 +53,3 @@ public: return { rect.x, panelRect.y, rect.width, panelRect.height }; } }; - -#endif diff --git a/src/TrackPanelDrawingContext.h b/src/TrackPanelDrawingContext.h index 0fa85ab29..d0a8168ea 100644 --- a/src/TrackPanelDrawingContext.h +++ b/src/TrackPanelDrawingContext.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TRACK_PANEL_DRAWING_CONTEXT__ -#define __AUDACITY_TRACK_PANEL_DRAWING_CONTEXT__ +#pragma once #include @@ -29,5 +28,3 @@ struct TrackPanelDrawingContext { // This redundancy fixes an MSVC compiler warning: TrackPanelDrawingContext() = delete; }; - -#endif diff --git a/src/TrackPanelListener.h b/src/TrackPanelListener.h index da189aad1..cc7c1ba5d 100644 --- a/src/TrackPanelListener.h +++ b/src/TrackPanelListener.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TRACK_PANEL_LISTENER__ -#define __AUDACITY_TRACK_PANEL_LISTENER__ +#pragma once @@ -33,5 +32,3 @@ class TENACITY_DLL_API TrackPanelListener /* not final */ { virtual bool TP_ScrollUpDown(int delta) = 0; virtual void TP_HandleResize() = 0; }; - -#endif diff --git a/src/TrackPanelMouseEvent.h b/src/TrackPanelMouseEvent.h index 8d4ebd19d..96d570621 100644 --- a/src/TrackPanelMouseEvent.h +++ b/src/TrackPanelMouseEvent.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_TRACK_PANEL_MOUSE_EVENT__ -#define __AUDACITY_TRACK_PANEL_MOUSE_EVENT__ +#pragma once class wxMouseEvent; class wxMouseState; @@ -61,5 +60,3 @@ struct TrackPanelMouseEvent std::shared_ptr pCell; // may be NULL double steps; // for mouse wheel rotation }; - -#endif diff --git a/src/TrackPanelResizeHandle.h b/src/TrackPanelResizeHandle.h index eb3a9b0e8..d3fc39a94 100644 --- a/src/TrackPanelResizeHandle.h +++ b/src/TrackPanelResizeHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_TRACK_PANEL_RESIZE_HANDLE__ -#define __AUDACITY_TRACK_PANEL_RESIZE_HANDLE__ +#pragma once #include "UIHandle.h" @@ -64,5 +63,3 @@ private: int mMouseClickY{}; }; - -#endif diff --git a/src/TrackPanelResizerCell.h b/src/TrackPanelResizerCell.h index 5cdf651b5..24fedc212 100644 --- a/src/TrackPanelResizerCell.h +++ b/src/TrackPanelResizerCell.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TRACK_PANEL_RESIZER_CELL__ -#define __AUDACITY_TRACK_PANEL_RESIZER_CELL__ +#pragma once #include "ClientData.h" // to inherit #include "tracks/ui/CommonTrackPanelCell.h" // to inherit @@ -49,5 +48,3 @@ private: std::weak_ptr mResizeHandle; }; - -#endif diff --git a/src/TrackUtilities.h b/src/TrackUtilities.h index 5aeb14bfa..c253f4e74 100644 --- a/src/TrackUtilities.h +++ b/src/TrackUtilities.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TRACK_UTILITIES__ -#define __AUDACITY_TRACK_UTILITIES__ +#pragma once class AudacityProject; class Track; @@ -35,5 +34,3 @@ namespace TrackUtilities { void DoRemoveTracks( AudacityProject & ); } - -#endif diff --git a/src/UIHandle.h b/src/UIHandle.h index 9815d7b36..aed2061af 100644 --- a/src/UIHandle.h +++ b/src/UIHandle.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_UI_HANDLE__ -#define __AUDACITY_UI_HANDLE__ +#pragma once #include #include @@ -160,5 +159,3 @@ std::shared_ptr AssignUIHandlePtr return ptr; } } - -#endif diff --git a/src/UndoManager.h b/src/UndoManager.h index 488faff02..edf4a7e87 100644 --- a/src/UndoManager.h +++ b/src/UndoManager.h @@ -46,8 +46,7 @@ **********************************************************************/ -#ifndef __AUDACITY_UNDOMANAGER__ -#define __AUDACITY_UNDOMANAGER__ +#pragma once #include #include // to declare custom event types @@ -223,5 +222,3 @@ class TENACITY_DLL_API UndoManager final SpaceArray space; unsigned long long mClipboardSpaceUsage {}; }; - -#endif diff --git a/src/UserException.h b/src/UserException.h index c429de3d2..2c59c3925 100644 --- a/src/UserException.h +++ b/src/UserException.h @@ -6,8 +6,7 @@ */ -#ifndef __AUDACITY_USER_EXCEPTION__ -#define __AUDACITY_USER_EXCEPTION__ +#pragma once #include "AudacityException.h" @@ -22,5 +21,3 @@ public: void DelayedHandlerAction() override; }; - -#endif diff --git a/src/ViewInfo.h b/src/ViewInfo.h index 27ce66c25..3abab11e8 100644 --- a/src/ViewInfo.h +++ b/src/ViewInfo.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_VIEWINFO__ -#define __AUDACITY_VIEWINFO__ +#pragma once #include #include @@ -231,5 +230,3 @@ public: private: int mHeight{ 0 }; }; - -#endif diff --git a/src/VoiceKey.h b/src/VoiceKey.h index 114487bac..5a1acf1d4 100644 --- a/src/VoiceKey.h +++ b/src/VoiceKey.h @@ -8,8 +8,7 @@ Distributed under the terms of the GPL Version 2 or later. ***************************************************************************/ -#ifndef __AUDACITY_VOICEKEY__ -#define __AUDACITY_VOICEKEY__ +#pragma once #ifndef M_PI @@ -101,4 +100,3 @@ inline int sgn(int number){ return (number<0) ? -1: 1;} // a logistic distn has variance (pi*s)^2/3 //inline float inline float logistic(float z){ return fexp(-1 * z/(pi / sqrt(3)) / (1 + pow(fexp(-1 * z(pi / sqrt(3))),2)));} -#endif diff --git a/src/WaveClip.h b/src/WaveClip.h index a9954a4f2..f2a913eca 100644 --- a/src/WaveClip.h +++ b/src/WaveClip.h @@ -9,8 +9,7 @@ *******************************************************************/ -#ifndef __AUDACITY_WAVECLIP__ -#define __AUDACITY_WAVECLIP__ +#pragma once @@ -378,5 +377,3 @@ protected: // AWD, Oct. 2009: for whitespace-at-end-of-selection pasting bool mIsPlaceholder { false }; }; - -#endif diff --git a/src/WaveTrack.h b/src/WaveTrack.h index c3b9066a6..cb3e38b5c 100644 --- a/src/WaveTrack.h +++ b/src/WaveTrack.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_WAVETRACK__ -#define __AUDACITY_WAVETRACK__ +#pragma once #include "Track.h" @@ -725,5 +724,3 @@ class TENACITY_DLL_API WaveTrackFactory final sampleFormat format = (sampleFormat)0, double rate = 0); }; - -#endif // __AUDACITY_WAVETRACK__ diff --git a/src/WaveTrackLocation.h b/src/WaveTrackLocation.h index 05d908063..5a1c9913a 100644 --- a/src/WaveTrackLocation.h +++ b/src/WaveTrackLocation.h @@ -8,8 +8,7 @@ Paul Licameli -- split from WaveTrack.h **********************************************************************/ -#ifndef __AUDACITY_WAVE_TRACK_LOCATION__ -#define __AUDACITY_WAVE_TRACK_LOCATION__ +#pragma once struct WaveTrackLocation { @@ -50,5 +49,3 @@ bool operator != (const WaveTrackLocation &a, const WaveTrackLocation &b) { return !( a == b ); } - -#endif diff --git a/src/WrappedType.h b/src/WrappedType.h index 73f58aeb2..fa2612228 100644 --- a/src/WrappedType.h +++ b/src/WrappedType.h @@ -9,8 +9,7 @@ *************************************************************************/ -#ifndef __WRAPPED_TYPE__ -#define __WRAPPED_TYPE__ +#pragma once @@ -68,5 +67,3 @@ public : bool *const mpBool {}; }; - -#endif diff --git a/src/ZoomInfo.h b/src/ZoomInfo.h index 9d92990fc..6a1909314 100644 --- a/src/ZoomInfo.h +++ b/src/ZoomInfo.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_ZOOM_INFO__ -#define __AUDACITY_ZOOM_INFO__ +#pragma once #include "ClientData.h" // to inherit #include "Prefs.h" // to inherit @@ -178,5 +177,3 @@ public: int mWidth{ 0 }; int mVRulerWidth{ 36 }; }; - -#endif diff --git a/src/blockfile/LegacyAliasBlockFile.h b/src/blockfile/LegacyAliasBlockFile.h index 6738ceb10..bf45ba592 100644 --- a/src/blockfile/LegacyAliasBlockFile.h +++ b/src/blockfile/LegacyAliasBlockFile.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_LEGACYALIASBLOCKFILE__ -#define __AUDACITY_LEGACYALIASBLOCKFILE__ +#pragma once #include "PCMAliasBlockFile.h" @@ -36,5 +35,3 @@ class LegacyAliasBlockFile final : public PCMAliasBlockFile static BlockFilePtr BuildFromXML(const FilePath &projDir, const wxChar **attrs); }; - -#endif diff --git a/src/blockfile/LegacyBlockFile.h b/src/blockfile/LegacyBlockFile.h index 7f13adbbe..cb999f547 100644 --- a/src/blockfile/LegacyBlockFile.h +++ b/src/blockfile/LegacyBlockFile.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_LEGACY_BLOCKFILE__ -#define __AUDACITY_LEGACY_BLOCKFILE__ +#pragma once #include "../BlockFile.h" @@ -66,5 +65,3 @@ class LegacyBlockFile final : public BlockFile { protected: sampleFormat mFormat; }; - -#endif // __AUDACITY_LEGACY_BLOCKFILE__ diff --git a/src/blockfile/NotYetAvailableException.h b/src/blockfile/NotYetAvailableException.h index 536b1a963..cf683b324 100644 --- a/src/blockfile/NotYetAvailableException.h +++ b/src/blockfile/NotYetAvailableException.h @@ -6,8 +6,7 @@ // // -#ifndef __AUDACITY_NOT_YET_AVAILABLE_EXCEPTION__ -#define __AUDACITY_NOT_YET_AVAILABLE_EXCEPTION__ +#pragma once #include "../FileException.h" @@ -23,5 +22,3 @@ public: protected: TranslatableString ErrorMessage() const override; }; - -#endif diff --git a/src/blockfile/ODDecodeBlockFile.h b/src/blockfile/ODDecodeBlockFile.h index bc0f26c30..e0d57941e 100644 --- a/src/blockfile/ODDecodeBlockFile.h +++ b/src/blockfile/ODDecodeBlockFile.h @@ -24,8 +24,7 @@ Also, see ODPCMAliasBlockFile for a similar file. -#ifndef __AUDACITY_ODDecodeBlockFile__ -#define __AUDACITY_ODDecodeBlockFile__ +#pragma once #include "SimpleBlockFile.h" #include // member variable @@ -230,6 +229,3 @@ protected: unsigned int mNumSamples;//this may depend on the channel - so TODO: we should probably let the decoder create/modify the track info directly. unsigned int mNumChannels; }; - -#endif - diff --git a/src/blockfile/ODPCMAliasBlockFile.h b/src/blockfile/ODPCMAliasBlockFile.h index e87a81c88..76c9f4fc2 100644 --- a/src/blockfile/ODPCMAliasBlockFile.h +++ b/src/blockfile/ODPCMAliasBlockFile.h @@ -33,8 +33,7 @@ Some of these methods have been overridden only because they used the unsafe wxL -#ifndef __AUDACITY_ODPCMALIASBLOCKFILE__ -#define __AUDACITY_ODPCMALIASBLOCKFILE__ +#pragma once #include "PCMAliasBlockFile.h" @@ -162,6 +161,3 @@ protected: ///the ODTask needs to know where this blockfile lies in the track, so for convenience, we have this here. sampleCount mClipOffset; }; - -#endif - diff --git a/src/blockfile/PCMAliasBlockFile.h b/src/blockfile/PCMAliasBlockFile.h index 9aa60f84e..b49ace574 100644 --- a/src/blockfile/PCMAliasBlockFile.h +++ b/src/blockfile/PCMAliasBlockFile.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_PCMALIASBLOCKFILE__ -#define __AUDACITY_PCMALIASBLOCKFILE__ +#pragma once #include "../BlockFile.h" @@ -47,6 +46,3 @@ class PCMAliasBlockFile /* not final */ : public AliasBlockFile static BlockFilePtr BuildFromXML(DirManager &dm, const wxChar **attrs); }; - -#endif - diff --git a/src/blockfile/SilentBlockFile.h b/src/blockfile/SilentBlockFile.h index 4ca5cd275..302c6b6a8 100644 --- a/src/blockfile/SilentBlockFile.h +++ b/src/blockfile/SilentBlockFile.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SILENT_BLOCKFILE__ -#define __AUDACITY_SILENT_BLOCKFILE__ +#pragma once #include "../BlockFile.h" @@ -45,6 +44,3 @@ class SilentBlockFile final : public BlockFile { static BlockFilePtr BuildFromXML(DirManager &dm, const wxChar **attrs); }; - -#endif - diff --git a/src/blockfile/SimpleBlockFile.h b/src/blockfile/SimpleBlockFile.h index 935277efc..228373198 100644 --- a/src/blockfile/SimpleBlockFile.h +++ b/src/blockfile/SimpleBlockFile.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SIMPLE_BLOCKFILE__ -#define __AUDACITY_SIMPLE_BLOCKFILE__ +#pragma once #include "../BlockFile.h" @@ -72,5 +71,3 @@ class PROFILE_DLL_API SimpleBlockFile /* not final */ : public BlockFile { private: mutable sampleFormat mFormat; // may be found lazily }; - -#endif diff --git a/src/commands/AppCommandEvent.h b/src/commands/AppCommandEvent.h index 44b9904ef..133ebcb28 100644 --- a/src/commands/AppCommandEvent.h +++ b/src/commands/AppCommandEvent.h @@ -13,8 +13,7 @@ *//*******************************************************************/ -#ifndef __APPCOMMANDEVENT__ -#define __APPCOMMANDEVENT__ +#pragma once @@ -51,5 +50,3 @@ typedef void (wxEvtHandler::*wxAppCommandEventFunction)(AppCommandEvent&); (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxAppCommandEventFunction, &func) #define EVT_APP_COMMAND(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_APP_COMMAND_RECEIVED, winid, wxID_ANY, wxAppCommandEventHandler(fn), (wxObject *) NULL ), - -#endif /* End of include guard: __APPCOMMANDEVENT__ */ diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h index 2f8920715..d07faaf93 100644 --- a/src/commands/AudacityCommand.h +++ b/src/commands/AudacityCommand.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_COMMAND__ -#define __AUDACITY_COMMAND__ +#pragma once @@ -169,7 +168,3 @@ private: DECLARE_EVENT_TABLE() wxDECLARE_NO_COPY_CLASS(AudacityCommandDialog); }; - - - -#endif diff --git a/src/commands/BatchEvalCommand.h b/src/commands/BatchEvalCommand.h index bf6fbcee7..39a99625f 100644 --- a/src/commands/BatchEvalCommand.h +++ b/src/commands/BatchEvalCommand.h @@ -19,8 +19,7 @@ to that system. *//*******************************************************************/ -#ifndef __BATCHEVALCOMMAND__ -#define __BATCHEVALCOMMAND__ +#pragma once #include "Command.h" #include "CommandType.h" @@ -47,5 +46,3 @@ public: virtual ~BatchEvalCommand(); bool Apply(const CommandContext &context) override; }; - -#endif /* End of include guard: __BATCHEVALCOMMAND__ */ diff --git a/src/commands/Command.h b/src/commands/Command.h index 71f88ebdc..c147d42d0 100644 --- a/src/commands/Command.h +++ b/src/commands/Command.h @@ -14,8 +14,7 @@ *//*******************************************************************/ -#ifndef __COMMAND__ -#define __COMMAND__ +#pragma once #include "CommandSignature.h" #include "../commands/AudacityCommand.h" @@ -121,5 +120,3 @@ public: bool Apply() override { return false;};// No longer supported. bool Apply(const CommandContext &context) override; }; - -#endif /* End of include guard: __COMMAND__ */ diff --git a/src/commands/CommandBuilder.h b/src/commands/CommandBuilder.h index 036d3acab..1ca7ffa02 100644 --- a/src/commands/CommandBuilder.h +++ b/src/commands/CommandBuilder.h @@ -13,8 +13,7 @@ *//*******************************************************************/ -#ifndef __COMMANDBUILDER__ -#define __COMMANDBUILDER__ +#pragma once #include #include @@ -51,4 +50,3 @@ class CommandBuilder OldStyleCommandPointer GetCommand(); wxString GetResponse(); }; -#endif /* End of include guard: __COMMANDBUILDER__ */ diff --git a/src/commands/CommandContext.h b/src/commands/CommandContext.h index 3e94987d6..1526d00f3 100644 --- a/src/commands/CommandContext.h +++ b/src/commands/CommandContext.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_COMMAND_CONTEXT__ -#define __AUDACITY_COMMAND_CONTEXT__ +#pragma once #include #include "Identifier.h" @@ -55,4 +54,3 @@ public: int index; CommandParameter parameter; }; -#endif diff --git a/src/commands/CommandDirectory.h b/src/commands/CommandDirectory.h index 6adfa7d17..279b1dfa7 100644 --- a/src/commands/CommandDirectory.h +++ b/src/commands/CommandDirectory.h @@ -20,8 +20,7 @@ they are kept separate to make things simpler. *//*******************************************************************/ -#ifndef __COMMANDDIRECTORY__ -#define __COMMANDDIRECTORY__ +#pragma once #include "CommandType.h" @@ -55,5 +54,3 @@ public: private: CommandDirectory(); }; - -#endif /* End of include guard: __COMMANDDIRECTORY__ */ diff --git a/src/commands/CommandFlag.h b/src/commands/CommandFlag.h index 07592819e..de5b9aeca 100644 --- a/src/commands/CommandFlag.h +++ b/src/commands/CommandFlag.h @@ -6,8 +6,7 @@ // // -#ifndef __AUDACITY_COMMAND_FLAG__ -#define __AUDACITY_COMMAND_FLAG__ +#pragma once // Flags used in command handling. @@ -122,5 +121,3 @@ struct TENACITY_DLL_API RegisteredMenuItemEnabler{ // Unnecessary #include to indicate otherwise hidden link dependencies #include "Menus.h" - -#endif diff --git a/src/commands/CommandFunctors.h b/src/commands/CommandFunctors.h index 2bed25f04..4ed452e79 100644 --- a/src/commands/CommandFunctors.h +++ b/src/commands/CommandFunctors.h @@ -6,8 +6,7 @@ // // -#ifndef __AUDACITY_COMMAND_FUNCTORS__ -#define __AUDACITY_COMMAND_FUNCTORS__ +#pragma once class AudacityProject; class AudacityApp; @@ -36,5 +35,3 @@ using CommandHandlerFinder = // to a member function of the handler object using CommandFunctorPointer = void (CommandHandlerObject::*)(const CommandContext &context ); - -#endif diff --git a/src/commands/CommandHandler.h b/src/commands/CommandHandler.h index 6a71923a7..1f30f538f 100644 --- a/src/commands/CommandHandler.h +++ b/src/commands/CommandHandler.h @@ -13,8 +13,7 @@ *//******************************************************************/ -#ifndef __COMMANDHANDLER__ -#define __COMMANDHANDLER__ +#pragma once #include class AudacityApp; @@ -31,5 +30,3 @@ class CommandHandler // Whenever a command is received, process it. void OnReceiveCommand(AppCommandEvent &event); }; - -#endif /* End of include guard: __COMMANDHANDLER__ */ diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h index e7c119f82..c073e231c 100644 --- a/src/commands/CommandManager.h +++ b/src/commands/CommandManager.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_COMMAND_MANAGER__ -#define __AUDACITY_COMMAND_MANAGER__ +#pragma once #include "Identifier.h" @@ -704,5 +703,3 @@ namespace MenuTable { void DestroyRegistry(); } - -#endif diff --git a/src/commands/CommandManagerWindowClasses.h b/src/commands/CommandManagerWindowClasses.h index 2794655fe..90c0bfe6d 100644 --- a/src/commands/CommandManagerWindowClasses.h +++ b/src/commands/CommandManagerWindowClasses.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_COMMAND_MANAGER_WINDOW_CLASSES__ -#define __AUDACITY_COMMAND_MANAGER_WINDOW_CLASSES__ +#pragma once /* \brief By default, windows when focused override the association of the digits @@ -29,5 +28,3 @@ struct TENACITY_DLL_API TopLevelKeystrokeHandlingWindow { virtual ~TopLevelKeystrokeHandlingWindow(); }; - -#endif diff --git a/src/commands/CommandMisc.h b/src/commands/CommandMisc.h index 28e5a48f4..8b6ea9ac7 100644 --- a/src/commands/CommandMisc.h +++ b/src/commands/CommandMisc.h @@ -13,8 +13,7 @@ *//*******************************************************************/ -#ifndef __COMMANDMISC__ -#define __COMMANDMISC__ +#pragma once #include #include "Validators.h" @@ -34,5 +33,3 @@ typedef std::map> ValidatorMap; // Map from command name to type // to do: use hash typedef std::map> CommandMap; - -#endif /* End of include guard: __COMMANDMISC__ */ diff --git a/src/commands/CommandSignature.h b/src/commands/CommandSignature.h index 343649b2d..b61530c5a 100644 --- a/src/commands/CommandSignature.h +++ b/src/commands/CommandSignature.h @@ -16,8 +16,7 @@ *//*******************************************************************/ -#ifndef __COMMANDSIGNATURE__ -#define __COMMANDSIGNATURE__ +#pragma once #include "CommandMisc.h" @@ -48,5 +47,3 @@ public: ParamValueMap GetDefaults() const; Validator &GetValidator(const wxString ¶mName); }; - -#endif /* End of include guard: __COMMANDSIGNATURE__ */ diff --git a/src/commands/CommandTargets.h b/src/commands/CommandTargets.h index d0c95ff96..17ce2771b 100644 --- a/src/commands/CommandTargets.h +++ b/src/commands/CommandTargets.h @@ -52,8 +52,7 @@ and sends it to that message target. *//*******************************************************************/ -#ifndef __COMMANDTARGETS__ -#define __COMMANDTARGETS__ +#pragma once #include #include @@ -411,5 +410,3 @@ public: InteractiveOutputTargets(); }; - -#endif /* End of include guard: __COMMANDTARGETS__ */ diff --git a/src/commands/CommandType.h b/src/commands/CommandType.h index 56c71f7a3..432085ab5 100644 --- a/src/commands/CommandType.h +++ b/src/commands/CommandType.h @@ -13,8 +13,7 @@ *//*******************************************************************/ -#ifndef __COMMANDTYPE__ -#define __COMMANDTYPE__ +#pragma once #include "CommandSignature.h" #include "../commands/AudacityCommand.h" @@ -66,5 +65,3 @@ public: virtual OldStyleCommandPointer Create( AudacityProject *project, std::unique_ptr &&target) = 0; }; - -#endif /* End of include guard: __COMMANDTYPE__ */ diff --git a/src/commands/CompareAudioCommand.h b/src/commands/CompareAudioCommand.h index 4d0133352..68418e016 100644 --- a/src/commands/CompareAudioCommand.h +++ b/src/commands/CompareAudioCommand.h @@ -15,8 +15,7 @@ classes *//*******************************************************************/ -#ifndef __COMPAREAUDIOCOMMAND__ -#define __COMPAREAUDIOCOMMAND__ +#pragma once #include "Command.h" #include "CommandType.h" @@ -52,5 +51,3 @@ protected: double CompareSample(double value1, double value2) /* not override */; }; - -#endif /* End of include guard: __COMPAREAUDIOCOMMAND__ */ diff --git a/src/commands/Demo.h b/src/commands/Demo.h index cb76b0c84..891c7c0f5 100644 --- a/src/commands/Demo.h +++ b/src/commands/Demo.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_DEMO_COMMAND__ -#define __AUDACITY_DEMO_COMMAND__ +#pragma once #include "AudacityCommand.h" #include "../SampleFormat.h" @@ -35,5 +34,3 @@ private: double delay; double decay; }; - -#endif // __AUDACITY_DEMO_COMMAND__ diff --git a/src/commands/DragCommand.h b/src/commands/DragCommand.h index a1856adbb..b747440a3 100644 --- a/src/commands/DragCommand.h +++ b/src/commands/DragCommand.h @@ -13,8 +13,7 @@ *//*******************************************************************/ -#ifndef __DRAG_COMMAND__ -#define __DRAG_COMMAND__ +#pragma once #include "Command.h" #include "CommandType.h" @@ -54,6 +53,3 @@ public: bool bHasWinName; }; - - -#endif /* End of include guard: __DRAG_COMMAND__ */ diff --git a/src/commands/GetInfoCommand.h b/src/commands/GetInfoCommand.h index a7b76a756..dbfc7afd7 100644 --- a/src/commands/GetInfoCommand.h +++ b/src/commands/GetInfoCommand.h @@ -17,8 +17,7 @@ channel. *//*******************************************************************/ -#ifndef __GET_INFO_COMMAND__ -#define __GET_INFO_COMMAND__ +#pragma once #include "Command.h" #include "CommandType.h" @@ -65,5 +64,3 @@ private: wxPoint P, wxWindow * pWin, int Id, int depth ); }; - -#endif /* End of include guard: __GET_INFO_COMMAND__ */ diff --git a/src/commands/GetTrackInfoCommand.h b/src/commands/GetTrackInfoCommand.h index c6c00e584..74485366c 100644 --- a/src/commands/GetTrackInfoCommand.h +++ b/src/commands/GetTrackInfoCommand.h @@ -13,8 +13,7 @@ *//*******************************************************************/ -#ifndef __GETTRACKINFOCOMMAND__ -#define __GETTRACKINFOCOMMAND__ +#pragma once #include "Command.h" #include "CommandType.h" @@ -38,5 +37,3 @@ public: public: int mInfoType; }; - -#endif /* End of include guard: __GETTRACKINFOCOMMAND__ */ diff --git a/src/commands/HelpCommand.h b/src/commands/HelpCommand.h index 62bddb87d..cf175d0a8 100644 --- a/src/commands/HelpCommand.h +++ b/src/commands/HelpCommand.h @@ -17,8 +17,7 @@ *//*******************************************************************/ -#ifndef __HELPCOMMAND__ -#define __HELPCOMMAND__ +#pragma once #include "CommandType.h" #include "Command.h" @@ -62,6 +61,3 @@ public: public: wxString mComment; }; - - -#endif /* End of include guard: __HELPCOMMAND__ */ diff --git a/src/commands/ImportExportCommands.h b/src/commands/ImportExportCommands.h index dc3024eee..dab140e35 100644 --- a/src/commands/ImportExportCommands.h +++ b/src/commands/ImportExportCommands.h @@ -18,6 +18,8 @@ *//*******************************************************************/ +#pragma once + #include "Command.h" #include "CommandType.h" diff --git a/src/commands/Keyboard.h b/src/commands/Keyboard.h index 182ebc712..b3ae0697d 100644 --- a/src/commands/Keyboard.h +++ b/src/commands/Keyboard.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_KEYBOARD__ -#define __AUDACITY_KEYBOARD__ +#pragma once #include "Identifier.h" #include @@ -37,5 +36,3 @@ namespace std TENACITY_DLL_API NormalizedKeyString KeyEventToKeyString(const wxKeyEvent & keyEvent); - -#endif diff --git a/src/commands/LoadCommands.h b/src/commands/LoadCommands.h index 530cd8e62..cab00c2ca 100644 --- a/src/commands/LoadCommands.h +++ b/src/commands/LoadCommands.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_LOAD_COMMANDS__ -#define __AUDACITY_LOAD_COMMANDS__ +#pragma once #include "tenacity/ModuleInterface.h" @@ -86,5 +85,3 @@ private: using CommandHash = std::unordered_map< wxString, const Entry* > ; CommandHash mCommands; }; - -#endif diff --git a/src/commands/MessageCommand.h b/src/commands/MessageCommand.h index 1899eb40c..a324c3589 100644 --- a/src/commands/MessageCommand.h +++ b/src/commands/MessageCommand.h @@ -18,8 +18,7 @@ *//*******************************************************************/ -#ifndef __MESSAGE_COMMAND__ -#define __MESSAGE_COMMAND__ +#pragma once #include "CommandType.h" #include "Command.h" @@ -41,6 +40,3 @@ public: public: wxString mMessage; }; - - -#endif /* End of include guard: __MESSAGECOMMAND__ */ diff --git a/src/commands/OpenSaveCommands.h b/src/commands/OpenSaveCommands.h index 1ea614bd3..cf260e0a5 100644 --- a/src/commands/OpenSaveCommands.h +++ b/src/commands/OpenSaveCommands.h @@ -24,6 +24,8 @@ *//*******************************************************************/ +#pragma once + #include "Command.h" #include "CommandType.h" diff --git a/src/commands/PreferenceCommands.h b/src/commands/PreferenceCommands.h index cfe4ec1e8..4737548c5 100644 --- a/src/commands/PreferenceCommands.h +++ b/src/commands/PreferenceCommands.h @@ -18,8 +18,7 @@ *//*******************************************************************/ -#ifndef __PREFERENCE_COMMANDS__ -#define __PREFERENCE_COMMANDS__ +#pragma once #include "Command.h" #include "CommandType.h" @@ -66,5 +65,3 @@ public: bool mbReload; bool bHasReload; }; - -#endif /* End of include guard: __PREFERENCE_COMMANDS__ */ diff --git a/src/commands/ResponseQueue.h b/src/commands/ResponseQueue.h index 6b5f6ad1a..5079fa50c 100644 --- a/src/commands/ResponseQueue.h +++ b/src/commands/ResponseQueue.h @@ -31,8 +31,7 @@ force the script thread to wait until a response is available. *//*******************************************************************/ -#ifndef __RESPONSEQUEUE__ -#define __RESPONSEQUEUE__ +#pragma once #include #include @@ -70,5 +69,3 @@ class ResponseQueue { void AddResponse(Response response); Response WaitAndGetResponse(); }; - -#endif /* End of include guard: __RESPONSEQUEUE__ */ diff --git a/src/commands/ScreenshotCommand.h b/src/commands/ScreenshotCommand.h index 48c1116de..b35324516 100644 --- a/src/commands/ScreenshotCommand.h +++ b/src/commands/ScreenshotCommand.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __SCREENSHOT_COMMAND__ -#define __SCREENSHOT_COMMAND__ +#pragma once #include "Command.h" @@ -148,5 +147,3 @@ public: void CaptureWindowOnIdle( const CommandContext & context, wxWindow * pWin ); wxTopLevelWindow *GetFrontWindow(AudacityProject *project); }; - -#endif /* End of include guard: __SCREENSHOT_COMMAND__ */ diff --git a/src/commands/ScriptCommandRelay.h b/src/commands/ScriptCommandRelay.h index 0b292d3a3..60b2702b1 100644 --- a/src/commands/ScriptCommandRelay.h +++ b/src/commands/ScriptCommandRelay.h @@ -13,8 +13,7 @@ *//*******************************************************************/ -#ifndef __SCRIPT_COMMAND_RELAY__ -#define __SCRIPT_COMMAND_RELAY__ +#pragma once @@ -34,5 +33,3 @@ public: // The void * return is actually a Lisp LVAL and will be cast to such as needed. extern void * ExecForLisp( char * pIn ); extern void * nyq_make_opaque_string( int size, unsigned char *src ); - -#endif /* End of include guard: __SCRIPT_COMMAND_RELAY__ */ diff --git a/src/commands/SelectCommand.h b/src/commands/SelectCommand.h index 2703fefe6..a2baa5460 100644 --- a/src/commands/SelectCommand.h +++ b/src/commands/SelectCommand.h @@ -14,8 +14,7 @@ *//*******************************************************************/ -#ifndef __SELECT_COMMAND__ -#define __SELECT_COMMAND__ +#pragma once @@ -131,5 +130,3 @@ private: }; - -#endif /* End of include guard: __SELECT_COMMAND__ */ diff --git a/src/commands/SetClipCommand.h b/src/commands/SetClipCommand.h index 528d94289..f64fbadb8 100644 --- a/src/commands/SetClipCommand.h +++ b/src/commands/SetClipCommand.h @@ -13,8 +13,7 @@ *//*******************************************************************/ -#ifndef __SET_CLIP_COMMAND__ -#define __SET_CLIP_COMMAND__ +#pragma once #include "SetTrackInfoCommand.h" @@ -44,6 +43,3 @@ public: bool bHasColour; bool bHasT0; }; - - -#endif /* End of include guard: __SETTRACKINFOCOMMAND__ */ diff --git a/src/commands/SetEnvelopeCommand.h b/src/commands/SetEnvelopeCommand.h index 80d1246db..8ed62e14a 100644 --- a/src/commands/SetEnvelopeCommand.h +++ b/src/commands/SetEnvelopeCommand.h @@ -13,8 +13,7 @@ *//*******************************************************************/ -#ifndef __SET_ENVELOPE_COMMAND__ -#define __SET_ENVELOPE_COMMAND__ +#pragma once #include "SetTrackInfoCommand.h" @@ -43,6 +42,3 @@ public: bool bHasV; bool bHasDelete; }; - - -#endif /* End of include guard: __SETTRACKINFOCOMMAND__ */ diff --git a/src/commands/SetLabelCommand.h b/src/commands/SetLabelCommand.h index e9c1dbd93..0e59c04f7 100644 --- a/src/commands/SetLabelCommand.h +++ b/src/commands/SetLabelCommand.h @@ -13,8 +13,7 @@ *//*******************************************************************/ -#ifndef __SET_LABEL_COMMAND__ -#define __SET_LABEL_COMMAND__ +#pragma once #include "Command.h" #include "CommandType.h" @@ -51,6 +50,3 @@ public: bool bHasT1; bool bHasSelected; }; - - -#endif /* End of include guard: __SETTRACKINFOCOMMAND__ */ diff --git a/src/commands/SetProjectCommand.h b/src/commands/SetProjectCommand.h index 533462657..a3d3edee9 100644 --- a/src/commands/SetProjectCommand.h +++ b/src/commands/SetProjectCommand.h @@ -14,8 +14,7 @@ *//*******************************************************************/ -#ifndef __SET_PROJECT_COMMAND__ -#define __SET_PROJECT_COMMAND__ +#pragma once #include "Command.h" #include "CommandType.h" @@ -51,6 +50,3 @@ public: bool bHasSizing; bool bHasRate; }; - - -#endif /* End of include guard: __SETTRACKINFOCOMMAND__ */ diff --git a/src/commands/SetTrackInfoCommand.h b/src/commands/SetTrackInfoCommand.h index 9e551c4c6..f0d6ec29b 100644 --- a/src/commands/SetTrackInfoCommand.h +++ b/src/commands/SetTrackInfoCommand.h @@ -14,8 +14,7 @@ *//*******************************************************************/ -#ifndef __SET_TRACK_COMMAND__ -#define __SET_TRACK_COMMAND__ +#pragma once #include "Command.h" #include "CommandType.h" @@ -182,7 +181,3 @@ private: SetTrackAudioCommand mSetAudio; SetTrackVisualsCommand mSetVisuals; }; - - - -#endif /* End of include guard: __SETTRACKINFOCOMMAND__ */ diff --git a/src/commands/Validators.h b/src/commands/Validators.h index 6234c8864..2dff1fe53 100644 --- a/src/commands/Validators.h +++ b/src/commands/Validators.h @@ -40,8 +40,7 @@ a certain criterion. This is a base validator which allows anything. *//*******************************************************************/ -#ifndef __VALIDATORS__ -#define __VALIDATORS__ +#pragma once class wxArrayString; @@ -266,5 +265,3 @@ public: return std::make_unique(v1->GetClone(), v2->GetClone()); } };*/ - -#endif /* End of include guard: __VALIDATORS__ */ diff --git a/src/effects/Amplify.h b/src/effects/Amplify.h index 896d7d569..566b74867 100644 --- a/src/effects/Amplify.h +++ b/src/effects/Amplify.h @@ -12,8 +12,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_AMPLIFY__ -#define __AUDACITY_EFFECT_AMPLIFY__ +#pragma once #include "Effect.h" @@ -84,5 +83,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif // __AUDACITY_EFFECT_AMPLIFY__ diff --git a/src/effects/AutoDuck.h b/src/effects/AutoDuck.h index c13bd065a..97c946d59 100644 --- a/src/effects/AutoDuck.h +++ b/src/effects/AutoDuck.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_AUTODUCK__ -#define __AUDACITY_EFFECT_AUTODUCK__ +#pragma once #include "Effect.h" @@ -131,5 +130,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/BassTreble.h b/src/effects/BassTreble.h index b25243fc1..2daa4e611 100644 --- a/src/effects/BassTreble.h +++ b/src/effects/BassTreble.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_BASS_TREBLE__ -#define __AUDACITY_EFFECT_BASS_TREBLE__ +#pragma once #include "Effect.h" @@ -120,5 +119,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/Biquad.h b/src/effects/Biquad.h index 9a77d0e92..cd4e1ffa6 100644 --- a/src/effects/Biquad.h +++ b/src/effects/Biquad.h @@ -9,8 +9,7 @@ Max Maisel ***********************************************************************/ -#ifndef __BIQUAD_H__ -#define __BIQUAD_H__ +#pragma once #include "MemoryX.h" @@ -75,5 +74,3 @@ struct Biquad static const double s_fChebyCoeffs[MAX_Order][MAX_Order + 1]; static double ChebyPoly(int Order, double NormFreq); }; - -#endif diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h index 71364a4a9..71bcffcd5 100644 --- a/src/effects/ChangePitch.h +++ b/src/effects/ChangePitch.h @@ -16,10 +16,9 @@ the pitch without changing the tempo. *//*******************************************************************/ -#if USE_SOUNDTOUCH +#pragma once -#ifndef __AUDACITY_EFFECT_CHANGEPITCH__ -#define __AUDACITY_EFFECT_CHANGEPITCH__ +#if USE_SOUNDTOUCH #if USE_SBSMS #include "SBSMSEffect.h" @@ -149,6 +148,4 @@ private: DECLARE_EVENT_TABLE() }; -#endif // __AUDACITY_EFFECT_CHANGEPITCH__ - #endif // USE_SOUNDTOUCH diff --git a/src/effects/ChangeSpeed.h b/src/effects/ChangeSpeed.h index 33b0d2922..ce0465ecc 100644 --- a/src/effects/ChangeSpeed.h +++ b/src/effects/ChangeSpeed.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_CHANGESPEED__ -#define __AUDACITY_EFFECT_CHANGESPEED__ +#pragma once #include "Effect.h" @@ -115,5 +114,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif // __AUDACITY_EFFECT_CHANGESPEED__ diff --git a/src/effects/ChangeTempo.h b/src/effects/ChangeTempo.h index 777da2b9c..407db7079 100644 --- a/src/effects/ChangeTempo.h +++ b/src/effects/ChangeTempo.h @@ -11,12 +11,10 @@ **********************************************************************/ +#pragma once #if USE_SOUNDTOUCH -#ifndef __AUDACITY_EFFECT_CHANGETEMPO__ -#define __AUDACITY_EFFECT_CHANGETEMPO__ - #if USE_SBSMS #include "SBSMSEffect.h" #endif @@ -105,6 +103,4 @@ private: DECLARE_EVENT_TABLE() }; -#endif // __AUDACITY_EFFECT_CHANGETEMPO__ - #endif // USE_SOUNDTOUCH diff --git a/src/effects/ClickRemoval.h b/src/effects/ClickRemoval.h index 68b68fe7e..aea7b2fd8 100644 --- a/src/effects/ClickRemoval.h +++ b/src/effects/ClickRemoval.h @@ -13,8 +13,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_CLICK_REMOVAL__ -#define __AUDACITY_EFFECT_CLICK_REMOVAL__ +#pragma once #include "Effect.h" @@ -83,5 +82,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h index a01389a20..b55e41493 100644 --- a/src/effects/Compressor.h +++ b/src/effects/Compressor.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_COMPRESSOR__ -#define __AUDACITY_EFFECT_COMPRESSOR__ +#pragma once #include "TwoPassSimpleMono.h" @@ -146,6 +145,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/effects/Contrast.h b/src/effects/Contrast.h index 423cc52b5..6550c1114 100644 --- a/src/effects/Contrast.h +++ b/src/effects/Contrast.h @@ -6,8 +6,7 @@ **********************************************************************/ -#ifndef __AUDACITY_CONTRAST_DIALOG__ -#define __AUDACITY_CONTRAST_DIALOG__ +#pragma once #include "../widgets/wxPanelWrapper.h" // to inherit @@ -83,5 +82,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/Distortion.h b/src/effects/Distortion.h index f3d5a68ed..55cd389e4 100644 --- a/src/effects/Distortion.h +++ b/src/effects/Distortion.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_DISTORTION__ -#define __AUDACITY_EFFECT_DISTORTION__ +#pragma once #include @@ -212,5 +211,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/DtmfGen.h b/src/effects/DtmfGen.h index 44ce1f4c6..fe8e2e2be 100644 --- a/src/effects/DtmfGen.h +++ b/src/effects/DtmfGen.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_DTMF__ -#define __AUDACITY_EFFECT_DTMF__ +#pragma once #include "Effect.h" @@ -99,5 +98,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/EBUR128.h b/src/effects/EBUR128.h index 80522d867..e0afef62b 100644 --- a/src/effects/EBUR128.h +++ b/src/effects/EBUR128.h @@ -8,8 +8,7 @@ Max Maisel ***********************************************************************/ -#ifndef __EBUR128_H__ -#define __EBUR128_H__ +#pragma once #include "Biquad.h" #include @@ -57,5 +56,3 @@ private: /// FILTER = HSF/HPF (0/1) ArrayOf> mWeightingFilter; }; - -#endif diff --git a/src/effects/Echo.h b/src/effects/Echo.h index b4db4fdc8..784b8fdb4 100644 --- a/src/effects/Echo.h +++ b/src/effects/Echo.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_ECHO__ -#define __AUDACITY_EFFECT_ECHO__ +#pragma once #include "Effect.h" @@ -60,5 +59,3 @@ private: size_t histPos; size_t histLen; }; - -#endif // __AUDACITY_EFFECT_ECHO__ diff --git a/src/effects/Effect.h b/src/effects/Effect.h index 6868a9876..30d4d482d 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT__ -#define __AUDACITY_EFFECT__ +#pragma once @@ -632,5 +631,3 @@ inline long TrapLong(long x, long min, long max) #define ReadAndVerifyFloat(name) ReadParam(float, name) #define ReadAndVerifyBool(name) ReadBasic(bool, name) #define ReadAndVerifyString(name) ReadBasic(wxString, name) - -#endif diff --git a/src/effects/EffectManager.h b/src/effects/EffectManager.h index 2e832d29c..ff34ad845 100644 --- a/src/effects/EffectManager.h +++ b/src/effects/EffectManager.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECTMANAGER__ -#define __AUDACITY_EFFECTMANAGER__ +#pragma once #include #include @@ -156,5 +155,3 @@ private: #endif }; - -#endif diff --git a/src/effects/EffectUI.h b/src/effects/EffectUI.h index d0449a84a..8245f71f3 100644 --- a/src/effects/EffectUI.h +++ b/src/effects/EffectUI.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECTUI_H__ -#define __AUDACITY_EFFECTUI_H__ +#pragma once #include // member variables @@ -264,5 +263,3 @@ private: DECLARE_EVENT_TABLE() wxDECLARE_NO_COPY_CLASS(EffectDialog); }; - -#endif // __AUDACITY_EFFECTUI_H__ diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h index b0a908467..3e42f4996 100644 --- a/src/effects/Equalization.h +++ b/src/effects/Equalization.h @@ -9,8 +9,8 @@ ***********************************************************************/ -#ifndef __AUDACITY_EFFECT_EQUALIZATION__ -#define __AUDACITY_EFFECT_EQUALIZATION__ +#pragma once + #define NUMBER_OF_BANDS 31 #define NUM_PTS 180 #define PANELBORDER 1 // only increase from '1' for testing purposes - MJS @@ -392,5 +392,3 @@ private: void OnListSelectionChange( wxListEvent &event ); DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/Equalization48x.h b/src/effects/Equalization48x.h index 05f95236b..bb7124700 100644 --- a/src/effects/Equalization48x.h +++ b/src/effects/Equalization48x.h @@ -8,8 +8,7 @@ Intrinsics (SSE/AVX) and Threaded Equalization ***********************************************************************/ -#ifndef __AUDACITY_EFFECT_EQUALIZATION48X__ -#define __AUDACITY_EFFECT_EQUALIZATION48X__ +#pragma once #ifdef EXPERIMENTAL_EQ_SSE_THREADED @@ -176,5 +175,3 @@ private: }; #endif - -#endif diff --git a/src/effects/Fade.h b/src/effects/Fade.h index 526fbcdfb..9b48aafb1 100644 --- a/src/effects/Fade.h +++ b/src/effects/Fade.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_FADE__ -#define __AUDACITY_EFFECT_FADE__ +#pragma once #include "Effect.h" @@ -59,5 +58,3 @@ public: EffectFadeOut() : EffectFade{ false } {} }; - -#endif diff --git a/src/effects/FindClipping.h b/src/effects/FindClipping.h index 88bab7080..878970e7f 100644 --- a/src/effects/FindClipping.h +++ b/src/effects/FindClipping.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_FINDCLIPPING__ -#define __AUDACITY_EFFECT_FINDCLIPPING__ +#pragma once class wxString; @@ -59,5 +58,3 @@ private: int mStart; ///< Using int rather than sampleCount because values are only ever small numbers int mStop; ///< Using int rather than sampleCount because values are only ever small numbers }; - -#endif // __AUDACITY_EFFECT_FINDCLIPPING__ diff --git a/src/effects/Generator.h b/src/effects/Generator.h index 55fc453aa..77a11e221 100644 --- a/src/effects/Generator.h +++ b/src/effects/Generator.h @@ -15,8 +15,7 @@ **********************************************************************/ -#ifndef __AUDACITY_GENERATOR__ -#define __AUDACITY_GENERATOR__ +#pragma once #include "Effect.h" @@ -71,5 +70,3 @@ protected: // Generate the track, one block at a time, & adding the results to tmp bool GenerateTrack(WaveTrack *tmp, const WaveTrack &track, int ntrack) override; }; - -#endif diff --git a/src/effects/Invert.h b/src/effects/Invert.h index 00dfbdfa7..9569d73a6 100644 --- a/src/effects/Invert.h +++ b/src/effects/Invert.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_INVERT__ -#define __AUDACITY_EFFECT_INVERT__ +#pragma once #include "Effect.h" @@ -39,5 +38,3 @@ public: unsigned GetAudioOutCount() override; size_t ProcessBlock(float **inBlock, float **outBlock, size_t blockLen) override; }; - -#endif diff --git a/src/effects/Leveller.h b/src/effects/Leveller.h index 66e2c3b16..781867eaf 100644 --- a/src/effects/Leveller.h +++ b/src/effects/Leveller.h @@ -8,10 +8,6 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_LEVELER__ -#define __AUDACITY_EFFECT_LEVELER__ +#pragma once // PRL: no longer used - -#endif - diff --git a/src/effects/LoadEffects.h b/src/effects/LoadEffects.h index 8fc76a116..60badcebc 100644 --- a/src/effects/LoadEffects.h +++ b/src/effects/LoadEffects.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_LOAD_EFFECTS__ -#define __AUDACITY_LOAD_EFFECTS__ +#pragma once #include "tenacity/ModuleInterface.h" @@ -86,5 +85,3 @@ private: using EffectHash = std::unordered_map< wxString, const Entry* > ; EffectHash mEffects; }; - -#endif diff --git a/src/effects/Loudness.h b/src/effects/Loudness.h index a7e1bdd7f..ff25f6f33 100644 --- a/src/effects/Loudness.h +++ b/src/effects/Loudness.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_LOUDNESS__ -#define __AUDACITY_EFFECT_LOUDNESS__ +#pragma once #include #include @@ -111,5 +110,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/Noise.h b/src/effects/Noise.h index 77f424bb6..eae406163 100644 --- a/src/effects/Noise.h +++ b/src/effects/Noise.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_NOISE__ -#define __AUDACITY_EFFECT_NOISE__ +#pragma once #include "Effect.h" @@ -62,5 +61,3 @@ private: NumericTextCtrl *mNoiseDurationT; }; - -#endif diff --git a/src/effects/NoiseReduction.h b/src/effects/NoiseReduction.h index 53f1fff9a..3bec76628 100644 --- a/src/effects/NoiseReduction.h +++ b/src/effects/NoiseReduction.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_NOISE_REDUCTION__ -#define __AUDACITY_EFFECT_NOISE_REDUCTION__ +#pragma once #include "Effect.h" @@ -55,5 +54,3 @@ private: std::unique_ptr mSettings; std::unique_ptr mStatistics; }; - -#endif diff --git a/src/effects/NoiseRemoval.h b/src/effects/NoiseRemoval.h index 5ee2d523a..a93502caa 100644 --- a/src/effects/NoiseRemoval.h +++ b/src/effects/NoiseRemoval.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_NOISE_REMOVAL__ -#define __AUDACITY_EFFECT_NOISE_REMOVAL__ +#pragma once @@ -195,5 +194,3 @@ private: }; #endif - -#endif diff --git a/src/effects/Normalize.h b/src/effects/Normalize.h index 554667a29..ba0e8b010 100644 --- a/src/effects/Normalize.h +++ b/src/effects/Normalize.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_NORMALIZE__ -#define __AUDACITY_EFFECT_NORMALIZE__ +#pragma once #include "Effect.h" #include "Biquad.h" @@ -90,5 +89,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/Paulstretch.h b/src/effects/Paulstretch.h index 8e20a7aad..b3f10ea43 100644 --- a/src/effects/Paulstretch.h +++ b/src/effects/Paulstretch.h @@ -7,8 +7,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_PAULSTRETCH__ -#define __AUDACITY_EFFECT_PAULSTRETCH__ +#pragma once #include "Effect.h" @@ -61,6 +60,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/effects/Phaser.h b/src/effects/Phaser.h index dded23ff1..3646e1d6b 100644 --- a/src/effects/Phaser.h +++ b/src/effects/Phaser.h @@ -13,8 +13,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_PHASER__ -#define __AUDACITY_EFFECT_PHASER__ +#pragma once #include "Effect.h" @@ -145,5 +144,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/RealtimeEffectManager.h b/src/effects/RealtimeEffectManager.h index 7faa95957..23f7f1ad9 100644 --- a/src/effects/RealtimeEffectManager.h +++ b/src/effects/RealtimeEffectManager.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_REALTIME_EFFECT_MANAGER__ -#define __AUDACITY_REALTIME_EFFECT_MANAGER__ +#pragma once #include #include @@ -56,5 +55,3 @@ private: std::vector mRealtimeChans; std::vector mRealtimeRates; }; - -#endif diff --git a/src/effects/Repair.h b/src/effects/Repair.h index 5d69664f0..c2180ad32 100644 --- a/src/effects/Repair.h +++ b/src/effects/Repair.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_REPAIR__ -#define __AUDACITY_EFFECT_REPAIR__ +#pragma once #include "Effect.h" @@ -46,5 +45,3 @@ private: size_t repairStart, // offset relative to start size_t repairLen); }; - -#endif // __AUDACITY_EFFECT_REPAIT__ diff --git a/src/effects/Repeat.h b/src/effects/Repeat.h index 0e1b940c9..bd4c176d6 100644 --- a/src/effects/Repeat.h +++ b/src/effects/Repeat.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_REPEAT__ -#define __AUDACITY_EFFECT_REPEAT__ +#pragma once #include "Effect.h" @@ -64,6 +63,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/effects/Reverb.h b/src/effects/Reverb.h index 0accfc831..202eb0c9d 100644 --- a/src/effects/Reverb.h +++ b/src/effects/Reverb.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_REVERB__ -#define __AUDACITY_EFFECT_REVERB__ +#pragma once #include "Effect.h" @@ -122,5 +121,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/Reverb_libSoX.h b/src/effects/Reverb_libSoX.h index 509475cbb..13ef55b07 100644 --- a/src/effects/Reverb_libSoX.h +++ b/src/effects/Reverb_libSoX.h @@ -12,6 +12,8 @@ **********************************************************************/ +#pragma once + #include #include #ifdef __WXMSW__ @@ -267,4 +269,3 @@ static void reverb_delete(reverb_t * p) } fifo_delete(&p->input_fifo); } - diff --git a/src/effects/Reverse.h b/src/effects/Reverse.h index 29018355a..856ad761a 100644 --- a/src/effects/Reverse.h +++ b/src/effects/Reverse.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_REVERSE__ -#define __AUDACITY_EFFECT_REVERSE__ +#pragma once #include "Effect.h" @@ -44,6 +43,3 @@ private: sampleCount start, sampleCount len, sampleCount originalStart, sampleCount originalEnd); bool ProcessOneWave(int count, WaveTrack* track, sampleCount start, sampleCount len); }; - -#endif - diff --git a/src/effects/SBSMSEffect.h b/src/effects/SBSMSEffect.h index c32dceb03..f2c78ef06 100644 --- a/src/effects/SBSMSEffect.h +++ b/src/effects/SBSMSEffect.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_SBSMS__ -#define __AUDACITY_EFFECT_SBSMS__ +#pragma once @@ -62,5 +61,3 @@ private: }; #endif - -#endif diff --git a/src/effects/ScienFilter.h b/src/effects/ScienFilter.h index 7ba840665..19a0607d0 100644 --- a/src/effects/ScienFilter.h +++ b/src/effects/ScienFilter.h @@ -10,8 +10,7 @@ Vaughan Johnson (Preview) ***********************************************************************/ -#ifndef __AUDACITY_EFFECT_SCIENFILTER__ -#define __AUDACITY_EFFECT_SCIENFILTER__ +#pragma once #include // for wxUSE_* macros @@ -168,5 +167,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/ScoreAlignDialog.h b/src/effects/ScoreAlignDialog.h index 190a527ec..eae94de68 100644 --- a/src/effects/ScoreAlignDialog.h +++ b/src/effects/ScoreAlignDialog.h @@ -6,8 +6,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SCORE_ALIGN_DIALOG__ -#define __AUDACITY_SCORE_ALIGN_DIALOG__ +#pragma once #ifdef EXPERIMENTAL_SCOREALIGN @@ -129,5 +128,3 @@ private: }; #endif - -#endif diff --git a/src/effects/Silence.h b/src/effects/Silence.h index 7596a28ab..e290b17e1 100644 --- a/src/effects/Silence.h +++ b/src/effects/Silence.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_SILENCE__ -#define __AUDACITY_EFFECT_SILENCE__ +#pragma once #include "Generator.h" @@ -49,5 +48,3 @@ protected: private: NumericTextCtrl *mDurationT; }; - -#endif diff --git a/src/effects/SimpleMono.h b/src/effects/SimpleMono.h index 1f2f8a766..74fed629c 100644 --- a/src/effects/SimpleMono.h +++ b/src/effects/SimpleMono.h @@ -14,8 +14,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_SIMPLE_MONO__ -#define __AUDACITY_EFFECT_SIMPLE_MONO__ +#pragma once #include "Effect.h" @@ -47,5 +46,3 @@ protected: private: bool ProcessOne(WaveTrack * t, sampleCount start, sampleCount end); }; - -#endif diff --git a/src/effects/SoundTouchEffect.h b/src/effects/SoundTouchEffect.h index 81be775c2..5cf3e5620 100644 --- a/src/effects/SoundTouchEffect.h +++ b/src/effects/SoundTouchEffect.h @@ -12,13 +12,10 @@ **********************************************************************/ - +#pragma once #if USE_SOUNDTOUCH -#ifndef __AUDACITY_EFFECT_SOUNDTOUCH__ -#define __AUDACITY_EFFECT_SOUNDTOUCH__ - #include "Effect.h" // forward declaration of a class defined in SoundTouch.h @@ -81,5 +78,3 @@ private: }; #endif - -#endif diff --git a/src/effects/StereoToMono.h b/src/effects/StereoToMono.h index 811c8ba61..7aca3307f 100644 --- a/src/effects/StereoToMono.h +++ b/src/effects/StereoToMono.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_STEREO_TO_MONO__ -#define __AUDACITY_EFFECT_STEREO_TO_MONO__ +#pragma once #include "Effect.h" @@ -47,6 +46,3 @@ private: bool ProcessOne(sampleCount & curTime, sampleCount totalTime, WaveTrack *left, WaveTrack *right); }; - -#endif - diff --git a/src/effects/TimeScale.h b/src/effects/TimeScale.h index 0e6ef2696..1b9834672 100644 --- a/src/effects/TimeScale.h +++ b/src/effects/TimeScale.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_TIMESCALE__ -#define __AUDACITY_EFFECT_TIMESCALE__ +#pragma once @@ -105,6 +104,4 @@ private: DECLARE_EVENT_TABLE() }; -#endif // __AUDACITY_EFFECT_TIMESCALE - #endif // USE_SBSMS diff --git a/src/effects/TimeWarper.h b/src/effects/TimeWarper.h index 8bbaa602d..84b0e3461 100644 --- a/src/effects/TimeWarper.h +++ b/src/effects/TimeWarper.h @@ -53,8 +53,7 @@ of the warped region. *//*******************************************************************/ -#ifndef __TIMEWARPER__ -#define __TIMEWARPER__ +#pragma once #include @@ -215,5 +214,3 @@ public: } } }; - -#endif /* End of include guard: __TIMEWARPER__ */ diff --git a/src/effects/ToneGen.h b/src/effects/ToneGen.h index c30bf91c3..8413db002 100644 --- a/src/effects/ToneGen.h +++ b/src/effects/ToneGen.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_TONEGEN__ -#define __AUDACITY_EFFECT_TONEGEN__ +#pragma once #include "Effect.h" @@ -91,5 +90,3 @@ public: EffectTone() : EffectToneGen{ false } {} }; - -#endif diff --git a/src/effects/TruncSilence.h b/src/effects/TruncSilence.h index fa8a24996..020e9f853 100644 --- a/src/effects/TruncSilence.h +++ b/src/effects/TruncSilence.h @@ -14,8 +14,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_TRUNC_SILENCE__ -#define __AUDACITY_EFFECT_TRUNC_SILENCE__ +#pragma once #include "Effect.h" @@ -111,5 +110,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/TwoPassSimpleMono.h b/src/effects/TwoPassSimpleMono.h index 142bd62aa..db3c20883 100644 --- a/src/effects/TwoPassSimpleMono.h +++ b/src/effects/TwoPassSimpleMono.h @@ -9,8 +9,7 @@ This bit by Martyn Shaw. **********************************************************************/ -#ifndef __AUDACITY_EFFECT_TWOPASSSIMPLEMONO__ -#define __AUDACITY_EFFECT_TWOPASSSIMPLEMONO__ +#pragma once #include "SimpleMono.h" @@ -83,5 +82,3 @@ private: sampleCount start, sampleCount end); bool ProcessPass() override; }; - -#endif diff --git a/src/effects/VST/VSTControl.h b/src/effects/VST/VSTControl.h index 0bebe0de6..34c188d09 100644 --- a/src/effects/VST/VSTControl.h +++ b/src/effects/VST/VSTControl.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef AUDACITY_VSTCONTROL_H -#define AUDACITY_VSTCONTROL_H +#pragma once #include // to inherit @@ -52,5 +51,3 @@ protected: wxWindow *mParent; VSTEffectLink *mLink; }; - -#endif diff --git a/src/effects/VST/VSTControlGTK.h b/src/effects/VST/VSTControlGTK.h index 24f088966..8ac3b0fcc 100644 --- a/src/effects/VST/VSTControlGTK.h +++ b/src/effects/VST/VSTControlGTK.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef AUDACITY_VSTCONTROLGTK_H -#define AUDACITY_VSTCONTROLGTK_H +#pragma once // Must include after ours since we have a lot of name collisions @@ -33,5 +32,3 @@ private: Display *mXdisp; Window mXwin; }; - -#endif diff --git a/src/effects/VST/VSTControlMSW.h b/src/effects/VST/VSTControlMSW.h index f9477ea99..5e4f7a016 100644 --- a/src/effects/VST/VSTControlMSW.h +++ b/src/effects/VST/VSTControlMSW.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef AUDACITY_VSTCONTROLMSW_H -#define AUDACITY_VSTCONTROLMSW_H +#pragma once #include @@ -26,5 +25,3 @@ public: private: HANDLE mHwnd; }; - -#endif diff --git a/src/effects/VST/VSTControlOSX.h b/src/effects/VST/VSTControlOSX.h index 2a114cc57..328e7f92b 100644 --- a/src/effects/VST/VSTControlOSX.h +++ b/src/effects/VST/VSTControlOSX.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef AUDACITY_VSTCONTROLOSX_H -#define AUDACITY_VSTCONTROLOSX_H +#pragma once #if !defined(_LP64) #include @@ -53,5 +52,3 @@ private: HIViewRef mHIView; #endif }; - -#endif diff --git a/src/effects/VST/VSTEffect.h b/src/effects/VST/VSTEffect.h index 00aaeef18..ebf28e257 100644 --- a/src/effects/VST/VSTEffect.h +++ b/src/effects/VST/VSTEffect.h @@ -8,7 +8,7 @@ **********************************************************************/ - +#pragma once #if USE_VST diff --git a/src/effects/Wahwah.h b/src/effects/Wahwah.h index 2bce0895e..c26ee4f36 100644 --- a/src/effects/Wahwah.h +++ b/src/effects/Wahwah.h @@ -13,8 +13,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_WAHWAH__ -#define __AUDACITY_EFFECT_WAHWAH__ +#pragma once #include "Effect.h" @@ -137,6 +136,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/effects/audiounits/AUControl.h b/src/effects/audiounits/AUControl.h index c7488e572..c257e3c19 100644 --- a/src/effects/audiounits/AUControl.h +++ b/src/effects/audiounits/AUControl.h @@ -15,8 +15,7 @@ \brief a wxWidgetCocoaImpl *//********************************************************************/ -#ifndef AUDACITY_AUCONTROL_H -#define AUDACITY_AUCONTROL_H +#pragma once #if !defined(_LP64) #include @@ -77,5 +76,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/effects/audiounits/AudioUnitEffect.h b/src/effects/audiounits/AudioUnitEffect.h index f461e23e2..d1c455b35 100644 --- a/src/effects/audiounits/AudioUnitEffect.h +++ b/src/effects/audiounits/AudioUnitEffect.h @@ -8,8 +8,8 @@ Leland Lucius **********************************************************************/ -#ifndef AUDACITY_AUDIOUNIT_EFFECT_H +#pragma once #if USE_AUDIO_UNITS @@ -274,5 +274,3 @@ public: }; #endif - -#endif diff --git a/src/effects/ladspa/LadspaEffect.h b/src/effects/ladspa/LadspaEffect.h index fd63f80a2..a4cfb2cbc 100644 --- a/src/effects/ladspa/LadspaEffect.h +++ b/src/effects/ladspa/LadspaEffect.h @@ -8,6 +8,8 @@ **********************************************************************/ +#pragma once + class wxSlider; class wxStaticText; class wxTextCtrl; @@ -244,4 +246,3 @@ public: FilePaths GetSearchPaths(); }; - diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h index be249f191..694fdadc7 100755 --- a/src/effects/lv2/LV2Effect.h +++ b/src/effects/lv2/LV2Effect.h @@ -9,7 +9,7 @@ *********************************************************************/ - +#pragma once #if USE_LV2 diff --git a/src/effects/lv2/LoadLV2.h b/src/effects/lv2/LoadLV2.h index d7c7cb0c3..836efaf4e 100755 --- a/src/effects/lv2/LoadLV2.h +++ b/src/effects/lv2/LoadLV2.h @@ -9,8 +9,7 @@ *********************************************************************/ -#ifndef LV2EFFECTSMODULE_H -#define LV2EFFECTSMODULE_H +#pragma once #include @@ -202,5 +201,3 @@ private: }; extern LilvWorld *gWorld; - -#endif diff --git a/src/effects/lv2/NativeWindow.h b/src/effects/lv2/NativeWindow.h index bd9098b57..c8d0abc17 100755 --- a/src/effects/lv2/NativeWindow.h +++ b/src/effects/lv2/NativeWindow.h @@ -11,8 +11,7 @@ *********************************************************************/ -#ifndef NATIVEWINDOW_H -#define NATIVEWINDOW_H +#pragma once #if defined(__WXMSW__) #include @@ -116,6 +115,3 @@ public: } #endif }; - -#endif - diff --git a/src/effects/nyquist/LoadNyquist.h b/src/effects/nyquist/LoadNyquist.h index 6d50f2a78..39c39f531 100644 --- a/src/effects/nyquist/LoadNyquist.h +++ b/src/effects/nyquist/LoadNyquist.h @@ -8,6 +8,8 @@ **********************************************************************/ +#pragma once + #include "tenacity/ModuleInterface.h" #include "tenacity/EffectInterface.h" #include "tenacity/PluginInterface.h" diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h index 59fe4d937..8da94e813 100644 --- a/src/effects/nyquist/Nyquist.h +++ b/src/effects/nyquist/Nyquist.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECT_NYQUIST__ -#define __AUDACITY_EFFECT_NYQUIST__ +#pragma once #include "../Effect.h" #include "../../FileNames.h" @@ -305,6 +304,3 @@ private: private: DECLARE_EVENT_TABLE() }; - - -#endif diff --git a/src/effects/vamp/LoadVamp.h b/src/effects/vamp/LoadVamp.h index 96bc6b29c..1825cef93 100644 --- a/src/effects/vamp/LoadVamp.h +++ b/src/effects/vamp/LoadVamp.h @@ -8,7 +8,7 @@ **********************************************************************/ - +#pragma once #if defined(USE_VAMP) diff --git a/src/effects/vamp/VampEffect.h b/src/effects/vamp/VampEffect.h index 2555b0da6..5b3bbeaf0 100644 --- a/src/effects/vamp/VampEffect.h +++ b/src/effects/vamp/VampEffect.h @@ -11,7 +11,7 @@ **********************************************************************/ - +#pragma once #if defined(USE_VAMP) diff --git a/src/export/Export.h b/src/export/Export.h index a7d46d887..4af7ff186 100644 --- a/src/export/Export.h +++ b/src/export/Export.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EXPORT__ -#define __AUDACITY_EXPORT__ +#pragma once #include #include @@ -335,5 +334,3 @@ TENACITY_DLL_API void ShowExportErrorDialog(wxString ErrorCode, TENACITY_DLL_API void ShowDiskFullExportErrorDialog(const wxFileNameWrapper &fileName); - -#endif diff --git a/src/export/ExportFFmpegDialogs.h b/src/export/ExportFFmpegDialogs.h index a52da2bc8..05490242b 100644 --- a/src/export/ExportFFmpegDialogs.h +++ b/src/export/ExportFFmpegDialogs.h @@ -8,8 +8,7 @@ LRN **********************************************************************/ -#if !defined(__EXPORT_FFMPEG_DIALOGS_H__) -#define __EXPORT_FFMPEG_DIALOGS_H__ +#pragma once @@ -343,5 +342,3 @@ private: }; #endif - -#endif //__EXPORT_FFMPEG_DIALOGS_H__ diff --git a/src/export/ExportMP3.h b/src/export/ExportMP3.h index b90cd5c0b..36f4fbd06 100644 --- a/src/export/ExportMP3.h +++ b/src/export/ExportMP3.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EXPORTMP3__ -#define __AUDACITY_EXPORTMP3__ +#pragma once /* --------------------------------------------------------------------------*/ @@ -36,6 +35,3 @@ class wxWindow; // Get MP3 library version //---------------------------------------------------------------------------- TranslatableString GetMP3Version(wxWindow *parent, bool prompt); - -#endif - diff --git a/src/export/ExportMultiple.h b/src/export/ExportMultiple.h index da344445e..381bf1f79 100644 --- a/src/export/ExportMultiple.h +++ b/src/export/ExportMultiple.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EXPORT_MULTIPLE__ -#define __AUDACITY_EXPORT_MULTIPLE__ +#pragma once #include "Export.h" #include "../wxFileNameWrapper.h" // member variable @@ -185,6 +184,3 @@ public: private: DECLARE_EVENT_TABLE() }; - - -#endif diff --git a/src/import/FormatClassifier.h b/src/import/FormatClassifier.h index 03a7585f4..e264d5c7e 100644 --- a/src/import/FormatClassifier.h +++ b/src/import/FormatClassifier.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_FORMATCLASSIFIER_H_ -#define __AUDACITY_FORMATCLASSIFIER_H_ +#pragma once #include #include "MultiFormatReader.h" @@ -113,5 +112,3 @@ private: template void ToFloat(T* in, float* out, size_t len); }; - -#endif diff --git a/src/import/Import.h b/src/import/Import.h index 0208c8968..865806d7e 100644 --- a/src/import/Import.h +++ b/src/import/Import.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef _IMPORT_ -#define _IMPORT_ +#pragma once #include "ImportForwards.h" #include "Identifier.h" @@ -210,5 +209,3 @@ private: private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/import/ImportForwards.h b/src/import/ImportForwards.h index 4c180d63a..3477f2293 100644 --- a/src/import/ImportForwards.h +++ b/src/import/ImportForwards.h @@ -6,8 +6,7 @@ // // -#ifndef __AUDACITY_IMPORT_FORWARDS__ -#define __AUDACITY_IMPORT_FORWARDS__ +#pragma once #include #include @@ -19,5 +18,3 @@ using ImportPluginList = std::vector< ImportPlugin * >; using UnusableImportPluginList = std::vector< std::unique_ptr >; - -#endif diff --git a/src/import/ImportPlugin.h b/src/import/ImportPlugin.h index 2a870f8b8..38ee0add1 100644 --- a/src/import/ImportPlugin.h +++ b/src/import/ImportPlugin.h @@ -42,8 +42,7 @@ but little else. *//*******************************************************************/ -#ifndef __AUDACITY_IMPORTER__ -#define __AUDACITY_IMPORTER__ +#pragma once @@ -182,5 +181,3 @@ private: TranslatableString mFormatName; const FileExtensions mExtensions; }; - -#endif diff --git a/src/import/ImportRaw.h b/src/import/ImportRaw.h index cd54b90ec..831728cc5 100644 --- a/src/import/ImportRaw.h +++ b/src/import/ImportRaw.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_IMPORT_RAW__ -#define __AUDACITY_IMPORT_RAW__ +#pragma once #include @@ -29,5 +28,3 @@ using TrackHolders = std::vector< NewChannelGroup >; void ImportRaw(const AudacityProject &project, wxWindow *parent, const wxString &fileName, WaveTrackFactory *trackFactory, TrackHolders &outTracks); - -#endif diff --git a/src/import/MultiFormatReader.h b/src/import/MultiFormatReader.h index 73d1f4722..df4595911 100644 --- a/src/import/MultiFormatReader.h +++ b/src/import/MultiFormatReader.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_MULTIFORMATREADER_H__ -#define __AUDACITY_MULTIFORMATREADER_H__ +#pragma once #include #include @@ -80,5 +79,3 @@ private: size_t Read(void* buffer, size_t size, size_t len, size_t stride); void SwapBytes(void* buffer, size_t size, size_t len); }; - -#endif diff --git a/src/import/RawAudioGuess.h b/src/import/RawAudioGuess.h index 2bc2c3946..f52461d0c 100644 --- a/src/import/RawAudioGuess.h +++ b/src/import/RawAudioGuess.h @@ -13,6 +13,8 @@ **********************************************************************/ +#pragma once + #include #include diff --git a/src/import/SpecPowerMeter.h b/src/import/SpecPowerMeter.h index 5fba4fe71..28ccc8d69 100644 --- a/src/import/SpecPowerMeter.h +++ b/src/import/SpecPowerMeter.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SPECPOWERMETER_H_ -#define __AUDACITY_SPECPOWERMETER_H_ +#pragma once #include #include "../SampleFormat.h" @@ -30,6 +29,3 @@ public: float CalcPower(float* sig, float fc, float bw); }; - -#endif - diff --git a/src/ondemand/ODComputeSummaryTask.h b/src/ondemand/ODComputeSummaryTask.h index c4ae28939..c63356178 100644 --- a/src/ondemand/ODComputeSummaryTask.h +++ b/src/ondemand/ODComputeSummaryTask.h @@ -16,8 +16,7 @@ updating the ODPCMAliasBlockFile and the GUI of the newly available data. *//*******************************************************************/ -#ifndef __AUDACITY_ODComputeSummaryTask__ -#define __AUDACITY_ODComputeSummaryTask__ +#pragma once #include #include "ODTask.h" @@ -79,6 +78,3 @@ protected: ODLock mHasUpdateRanMutex; bool mHasUpdateRan; }; - -#endif - diff --git a/src/ondemand/ODDecodeFFmpegTask.h b/src/ondemand/ODDecodeFFmpegTask.h index 12176637b..d3be3f088 100644 --- a/src/ondemand/ODDecodeFFmpegTask.h +++ b/src/ondemand/ODDecodeFFmpegTask.h @@ -9,8 +9,7 @@ ******************************************************************/ -#ifndef __ODDECODEFFMPEGTASK__ -#define __ODDECODEFFMPEGTASK__ +#pragma once #ifdef EXPERIMENTAL_OD_FFMPEG @@ -56,6 +55,4 @@ protected: std::shared_ptr mContext; int mStreamIndex; }; -#endif //__ODDECODEFFMPEGTASK__ - -#endif //EXPERIMENTAL_OD_FFMPEG +#endif // EXPERIMENTAL_OD_FFMPEG diff --git a/src/ondemand/ODDecodeFlacTask.h b/src/ondemand/ODDecodeFlacTask.h index 5ea372eec..bb4a726ee 100644 --- a/src/ondemand/ODDecodeFlacTask.h +++ b/src/ondemand/ODDecodeFlacTask.h @@ -25,8 +25,7 @@ robust enough to allow all the user changes such as copy/paste, DELETE, and so o -#ifndef __AUDACITY_ODDecodeFLACTask__ -#define __AUDACITY_ODDecodeFLACTask__ +#pragma once #include #include // data member @@ -138,8 +137,3 @@ private: unsigned int mDecodeBufferLen; samplePtr mDecodeBuffer; }; - -#endif - - - diff --git a/src/ondemand/ODDecodeTask.h b/src/ondemand/ODDecodeTask.h index 4d51bb807..1da059d8f 100644 --- a/src/ondemand/ODDecodeTask.h +++ b/src/ondemand/ODDecodeTask.h @@ -25,8 +25,7 @@ robust enough to allow all the user changes such as copy/paste, DELETE, and so o -#ifndef __AUDACITY_ODDecodeTask__ -#define __AUDACITY_ODDecodeTask__ +#pragma once #include #include "ODTask.h" @@ -94,8 +93,3 @@ protected: int mMaxBlockFiles; }; - -#endif - - - diff --git a/src/ondemand/ODManager.h b/src/ondemand/ODManager.h index 94ae79d02..1587b6f3c 100644 --- a/src/ondemand/ODManager.h +++ b/src/ondemand/ODManager.h @@ -16,8 +16,7 @@ number of threads. *//*******************************************************************/ -#ifndef __AUDACITY_ODMANAGER__ -#define __AUDACITY_ODMANAGER__ +#pragma once #include #include "ODTaskThread.h" @@ -241,6 +240,3 @@ class ODManagerHelperThread { }; #endif //__WXMAC__ }; - -#endif - diff --git a/src/ondemand/ODTask.h b/src/ondemand/ODTask.h index 83df511c6..b89c78042 100644 --- a/src/ondemand/ODTask.h +++ b/src/ondemand/ODTask.h @@ -20,8 +20,7 @@ in a background thread. -#ifndef __AUDACITY_ODTASK__ -#define __AUDACITY_ODTASK__ +#pragma once #include "../BlockFile.h" @@ -175,6 +174,3 @@ class ODTask /* not final */ }; - -#endif - diff --git a/src/ondemand/ODTaskThread.h b/src/ondemand/ODTaskThread.h index 9104545ed..a9b9d74a0 100644 --- a/src/ondemand/ODTaskThread.h +++ b/src/ondemand/ODTaskThread.h @@ -19,8 +19,7 @@ -#ifndef __AUDACITY_ODTASKTHREAD__ -#define __AUDACITY_ODTASKTHREAD__ +#pragma once #include "../Audacity.h" // contains the set-up of TENACITY_DLL_API @@ -148,6 +147,3 @@ public: ODLocker(const ODLocker &that) PROHIBITED; ODLocker &operator= (const ODLocker &that) PROHIBITED; }; - -#endif //__AUDACITY_ODTASKTHREAD__ - diff --git a/src/ondemand/ODWaveTrackTaskQueue.h b/src/ondemand/ODWaveTrackTaskQueue.h index 1f0a369a2..12d7dff17 100644 --- a/src/ondemand/ODWaveTrackTaskQueue.h +++ b/src/ondemand/ODWaveTrackTaskQueue.h @@ -19,8 +19,7 @@ tasks associated with a WaveTrack. -#ifndef __AUDACITY_ODWAVETRACKTASKQUEUE__ -#define __AUDACITY_ODWAVETRACKTASKQUEUE__ +#pragma once #include #include "ODTaskThread.h" @@ -108,6 +107,3 @@ class ODWaveTrackTaskQueue final ODLock mTasksMutex; }; - -#endif - diff --git a/src/prefs/ApplicationPrefs.h b/src/prefs/ApplicationPrefs.h index ed5db513f..d95ca7070 100644 --- a/src/prefs/ApplicationPrefs.h +++ b/src/prefs/ApplicationPrefs.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_APPLICATION_PREFS__ -#define __AUDACITY_APPLICATION_PREFS__ +#pragma once #include @@ -33,5 +32,3 @@ class ApplicationPrefs final : public PrefsPanel void Populate(); void PopulateOrExchange(ShuttleGui & S) override; }; - -#endif diff --git a/src/prefs/BatchPrefs.h b/src/prefs/BatchPrefs.h index a4e1a3dad..3fa76abde 100644 --- a/src/prefs/BatchPrefs.h +++ b/src/prefs/BatchPrefs.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_BATCH_PREFS__ -#define __AUDACITY_BATCH_PREFS__ +#pragma once #include @@ -37,5 +36,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/prefs/DevicePrefs.h b/src/prefs/DevicePrefs.h index 543071410..32d76c8ce 100644 --- a/src/prefs/DevicePrefs.h +++ b/src/prefs/DevicePrefs.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_DEVICE_PREFS__ -#define __AUDACITY_DEVICE_PREFS__ +#pragma once #include @@ -55,5 +54,3 @@ class DevicePrefs final : public PrefsPanel DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/prefs/DirectoriesPrefs.h b/src/prefs/DirectoriesPrefs.h index d8348a4a6..ad848bf95 100644 --- a/src/prefs/DirectoriesPrefs.h +++ b/src/prefs/DirectoriesPrefs.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_DIRECTORIES_PREFS__ -#define __AUDACITY_DIRECTORIES_PREFS__ +#pragma once #include "PrefsPanel.h" @@ -57,4 +56,3 @@ class DirectoriesPrefs final : public PrefsPanel /// A PrefsPanel::Factory that creates one DirectoriesPrefs panel. /// This one is used not only in the Preferences command. extern PrefsPanel::Factory DirectoriesPrefsFactory(); -#endif diff --git a/src/prefs/EffectsPrefs.h b/src/prefs/EffectsPrefs.h index 80280a942..735e921cf 100644 --- a/src/prefs/EffectsPrefs.h +++ b/src/prefs/EffectsPrefs.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EFFECTS_PREFS__ -#define __AUDACITY_EFFECTS_PREFS__ +#pragma once #include @@ -39,4 +38,3 @@ class EffectsPrefs final : public PrefsPanel }; TENACITY_DLL_API extern ChoiceSetting EffectsGroupBy; -#endif diff --git a/src/prefs/ExtImportPrefs.h b/src/prefs/ExtImportPrefs.h index 7b0ccc35c..6d0d1a67e 100644 --- a/src/prefs/ExtImportPrefs.h +++ b/src/prefs/ExtImportPrefs.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EXT_IMPORT_PREFS__ -#define __AUDACITY_EXT_IMPORT_PREFS__ +#pragma once #include #include // to inherit wxDropTarget @@ -116,5 +115,3 @@ class ExtImportPrefs final : public PrefsPanel void Populate(); DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/prefs/GUIPrefs.h b/src/prefs/GUIPrefs.h index c3fad799b..fcba7d077 100644 --- a/src/prefs/GUIPrefs.h +++ b/src/prefs/GUIPrefs.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_GUI_PREFS__ -#define __AUDACITY_GUI_PREFS__ +#pragma once #include @@ -63,5 +62,3 @@ int ShowTrackNameInWaveformPrefsID(); extern TENACITY_DLL_API ChoiceSetting GUIManualLocation ; - -#endif diff --git a/src/prefs/GUISettings.h b/src/prefs/GUISettings.h index 73498de37..c85af32b6 100644 --- a/src/prefs/GUISettings.h +++ b/src/prefs/GUISettings.h @@ -9,8 +9,7 @@ Paul Licameli Define the key string in one place here too **********************************************************************/ -#ifndef __AUDACITY_GUI_SETTINGS__ -#define __AUDACITY_GUI_SETTINGS__ +#pragma once #define ENV_DB_KEY (wxT("/GUI/EnvdBRange")) #define ENV_DB_RANGE 60 @@ -24,5 +23,3 @@ Paul Licameli #else #define RTL_WORKAROUND( pWnd ) #endif - -#endif diff --git a/src/prefs/ImportExportPrefs.h b/src/prefs/ImportExportPrefs.h index ad44c4131..b182701f5 100644 --- a/src/prefs/ImportExportPrefs.h +++ b/src/prefs/ImportExportPrefs.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_IMPORT_EXPORT_PREFS__ -#define __AUDACITY_IMPORT_EXPORT_PREFS__ +#pragma once #include @@ -42,5 +41,3 @@ class TENACITY_DLL_API ImportExportPrefs final : public PrefsPanel private: void Populate(); }; - -#endif diff --git a/src/prefs/KeyConfigPrefs.h b/src/prefs/KeyConfigPrefs.h index 19cb3a3e1..a60c9dd44 100644 --- a/src/prefs/KeyConfigPrefs.h +++ b/src/prefs/KeyConfigPrefs.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_KEY_CONFIG_PREFS__ -#define __AUDACITY_KEY_CONFIG_PREFS__ +#pragma once class CommandManager; class ShuttleGui; @@ -113,4 +112,3 @@ private: /// focused initially extern PrefsPanel::Factory KeyConfigPrefsFactory( const CommandID &name = {} ); -#endif diff --git a/src/prefs/LibraryPrefs.h b/src/prefs/LibraryPrefs.h index 2d9ff1554..f1cca5a22 100644 --- a/src/prefs/LibraryPrefs.h +++ b/src/prefs/LibraryPrefs.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_FILE_FORMAT_PREFS__ -#define __AUDACITY_FILE_FORMAT_PREFS__ +#pragma once #include @@ -51,5 +50,3 @@ class LibraryPrefs final : public PrefsPanel DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/prefs/MidiIOPrefs.h b/src/prefs/MidiIOPrefs.h index dc5e00e80..473f33e96 100644 --- a/src/prefs/MidiIOPrefs.h +++ b/src/prefs/MidiIOPrefs.h @@ -9,15 +9,14 @@ **********************************************************************/ +#pragma once + class wxChoice; class wxTextCtrl; class ShuttleGui; #ifdef EXPERIMENTAL_MIDI_OUT -#ifndef __AUDACITY_MIDI_IO_PREFS__ -#define __AUDACITY_MIDI_IO_PREFS__ - #include #include "PrefsPanel.h" @@ -65,5 +64,3 @@ class MidiIOPrefs final : public PrefsPanel }; #endif - -#endif diff --git a/src/prefs/ModulePrefs.h b/src/prefs/ModulePrefs.h index b2bc3ad75..feaa7ff94 100644 --- a/src/prefs/ModulePrefs.h +++ b/src/prefs/ModulePrefs.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_MODULE_PREFS__ -#define __AUDACITY_MODULE_PREFS__ +#pragma once #include @@ -42,5 +41,3 @@ class ModulePrefs final : public PrefsPanel std::vector mStatuses; FilePaths mPaths; }; - -#endif diff --git a/src/prefs/MousePrefs.h b/src/prefs/MousePrefs.h index ff3e5b0d2..e7dcee935 100644 --- a/src/prefs/MousePrefs.h +++ b/src/prefs/MousePrefs.h @@ -6,8 +6,7 @@ **********************************************************************/ -#ifndef __AUDACITY_MOUSE_PREFS__ -#define __AUDACITY_MOUSE_PREFS__ +#pragma once #include @@ -45,5 +44,3 @@ class MousePrefs final : public PrefsPanel wxListCtrl * mList; }; - -#endif diff --git a/src/prefs/PlaybackPrefs.h b/src/prefs/PlaybackPrefs.h index a5666ee8c..b301db7ba 100644 --- a/src/prefs/PlaybackPrefs.h +++ b/src/prefs/PlaybackPrefs.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_PLAYBACK_PREFS__ -#define __AUDACITY_PLAYBACK_PREFS__ +#pragma once #include @@ -37,5 +36,3 @@ class PlaybackPrefs final : public PrefsPanel private: void Populate(); }; - -#endif diff --git a/src/prefs/PrefsDialog.h b/src/prefs/PrefsDialog.h index e40a68cf1..e516acf14 100644 --- a/src/prefs/PrefsDialog.h +++ b/src/prefs/PrefsDialog.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_PREFS_DIALOG__ -#define __AUDACITY_PREFS_DIALOG__ +#pragma once #include #include @@ -91,5 +90,3 @@ public: class AudacityProject; void TENACITY_DLL_API DoReloadPreferences( AudacityProject &project ); - -#endif diff --git a/src/prefs/PrefsPanel.h b/src/prefs/PrefsPanel.h index 8aebfae47..2fa395cde 100644 --- a/src/prefs/PrefsPanel.h +++ b/src/prefs/PrefsPanel.h @@ -24,8 +24,7 @@ MousePrefs, QualityPrefs, SpectrumPrefs and ThemePrefs. *//*******************************************************************/ -#ifndef __AUDACITY_PREFS_PANEL__ -#define __AUDACITY_PREFS_PANEL__ +#pragma once #include #include "../widgets/wxPanelWrapper.h" // to inherit @@ -121,5 +120,3 @@ class TENACITY_DLL_API PrefsPanel /* not final */ virtual void Cancel(); }; - -#endif diff --git a/src/prefs/QualityPrefs.h b/src/prefs/QualityPrefs.h index c229f62f4..ceed927ac 100644 --- a/src/prefs/QualityPrefs.h +++ b/src/prefs/QualityPrefs.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_QUALITY_PREFS__ -#define __AUDACITY_QUALITY_PREFS__ +#pragma once #include #include @@ -51,5 +50,3 @@ class TENACITY_DLL_API QualityPrefs final : public PrefsPanel DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/prefs/QualitySettings.h b/src/prefs/QualitySettings.h index efc1211a7..58b9147e3 100644 --- a/src/prefs/QualitySettings.h +++ b/src/prefs/QualitySettings.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_QUALITY_SETTINGS__ -#define __AUDACITY_QUALITY_SETTINGS__ +#pragma once #include "Prefs.h" // for EnumSetting @@ -20,5 +19,3 @@ extern TENACITY_DLL_API IntSetting DefaultSampleRate; extern TENACITY_DLL_API EnumSetting< sampleFormat > SampleFormatSetting; extern TENACITY_DLL_API sampleFormat SampleFormatChoice(); } - -#endif diff --git a/src/prefs/RecordingPrefs.h b/src/prefs/RecordingPrefs.h index 950a99a16..cc7b12291 100644 --- a/src/prefs/RecordingPrefs.h +++ b/src/prefs/RecordingPrefs.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_RECORDING_PREFS__ -#define __AUDACITY_RECORDING_PREFS__ +#pragma once @@ -61,5 +60,3 @@ class RecordingPrefs final : public PrefsPanel DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/prefs/SpectrogramSettings.h b/src/prefs/SpectrogramSettings.h index 8a1be4064..8cc4521b2 100644 --- a/src/prefs/SpectrogramSettings.h +++ b/src/prefs/SpectrogramSettings.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_SPECTROGRAM_SETTINGS__ -#define __AUDACITY_SPECTROGRAM_SETTINGS__ +#pragma once #include "../Prefs.h" #include "../SampleFormat.h" @@ -183,4 +182,3 @@ public: mutable Floats tWindow; // Window times time parameter mutable Floats dWindow; // Derivative of window }; -#endif diff --git a/src/prefs/SpectrumPrefs.h b/src/prefs/SpectrumPrefs.h index d845f58b3..aacd265ac 100644 --- a/src/prefs/SpectrumPrefs.h +++ b/src/prefs/SpectrumPrefs.h @@ -18,8 +18,7 @@ */ -#ifndef __AUDACITY_SPECTRUM_PREFS__ -#define __AUDACITY_SPECTRUM_PREFS__ +#pragma once #include #include @@ -109,4 +108,3 @@ class SpectrumPrefs final : public PrefsPanel /// This factory can be parametrized by a single track, to change settings /// non-globally extern PrefsPanel::Factory SpectrumPrefsFactory( WaveTrack *wt = 0 ); -#endif diff --git a/src/prefs/ThemePrefs.h b/src/prefs/ThemePrefs.h index f8859c83a..400524a8d 100644 --- a/src/prefs/ThemePrefs.h +++ b/src/prefs/ThemePrefs.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_THEME_PREFS__ -#define __AUDACITY_THEME_PREFS__ +#pragma once #include #include // to declare a custom event type @@ -52,5 +51,3 @@ class ThemePrefs final : public PrefsPanel DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/prefs/TracksBehaviorsPrefs.h b/src/prefs/TracksBehaviorsPrefs.h index b2bf0f15b..8ff0e60d7 100644 --- a/src/prefs/TracksBehaviorsPrefs.h +++ b/src/prefs/TracksBehaviorsPrefs.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TRACKSBEHAVIORS_PREFS__ -#define __AUDACITY_TRACKSBEHAVIORS_PREFS__ +#pragma once #include "PrefsPanel.h" @@ -43,5 +42,3 @@ class TENACITY_DLL_API TracksBehaviorsPrefs final : public PrefsPanel extern TENACITY_DLL_API ChoiceSetting TracksBehaviorsSolo; TENACITY_DLL_API bool GetEditClipsCanMove(); - -#endif diff --git a/src/prefs/TracksPrefs.h b/src/prefs/TracksPrefs.h index dde637ba9..a8a091d58 100644 --- a/src/prefs/TracksPrefs.h +++ b/src/prefs/TracksPrefs.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TRACKS_PREFS__ -#define __AUDACITY_TRACKS_PREFS__ +#pragma once //#include @@ -55,5 +54,3 @@ class TENACITY_DLL_API TracksPrefs final : public PrefsPanel static int iPreferencePinned; }; - -#endif diff --git a/src/prefs/WarningsPrefs.h b/src/prefs/WarningsPrefs.h index 77bf93e56..eb6ed9623 100644 --- a/src/prefs/WarningsPrefs.h +++ b/src/prefs/WarningsPrefs.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_WARNINGS_PREFS__ -#define __AUDACITY_WARNINGS_PREFS__ +#pragma once #include @@ -36,5 +35,3 @@ class WarningsPrefs final : public PrefsPanel void Populate(); void PopulateOrExchange(ShuttleGui & S) override; }; - -#endif diff --git a/src/prefs/WaveformPrefs.h b/src/prefs/WaveformPrefs.h index 46342f56a..19018b5b8 100644 --- a/src/prefs/WaveformPrefs.h +++ b/src/prefs/WaveformPrefs.h @@ -9,8 +9,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_WAVEFORM_PREFS__ -#define __AUDACITY_WAVEFORM_PREFS__ +#pragma once #include "PrefsPanel.h" #include "WaveformSettings.h" @@ -68,4 +67,3 @@ private: /// This factory can be parametrized by a single track, to change settings /// non-globally extern PrefsPanel::Factory WaveformPrefsFactory(WaveTrack *wt); -#endif diff --git a/src/prefs/WaveformSettings.h b/src/prefs/WaveformSettings.h index d6eb7e16a..91d18138a 100644 --- a/src/prefs/WaveformSettings.h +++ b/src/prefs/WaveformSettings.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_WAVEFORM_SETTINGS__ -#define __AUDACITY_WAVEFORM_SETTINGS__ +#pragma once #include "../Prefs.h" @@ -70,4 +69,3 @@ public: // Convenience bool isLinear() const { return stLinear == scaleType; } }; -#endif diff --git a/src/toolbars/ControlToolBar.h b/src/toolbars/ControlToolBar.h index 257bfacf7..1e60929dd 100644 --- a/src/toolbars/ControlToolBar.h +++ b/src/toolbars/ControlToolBar.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_CONTROL_TOOLBAR__ -#define __AUDACITY_CONTROL_TOOLBAR__ +#pragma once #include "ToolBar.h" @@ -129,6 +128,3 @@ class TENACITY_DLL_API ControlToolBar final : public ToolBar { DECLARE_CLASS(ControlToolBar) DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/toolbars/DeviceToolBar.h b/src/toolbars/DeviceToolBar.h index 362616020..35126ab40 100644 --- a/src/toolbars/DeviceToolBar.h +++ b/src/toolbars/DeviceToolBar.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_DEVICE_TOOLBAR__ -#define __AUDACITY_DEVICE_TOOLBAR__ +#pragma once #include #include "ToolBar.h" @@ -79,6 +78,3 @@ class DeviceToolBar final : public ToolBar { DECLARE_CLASS(DeviceToolBar) DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/toolbars/EditToolBar.h b/src/toolbars/EditToolBar.h index 5b0b5e266..7f2ac107c 100644 --- a/src/toolbars/EditToolBar.h +++ b/src/toolbars/EditToolBar.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EDIT_TOOLBAR__ -#define __AUDACITY_EDIT_TOOLBAR__ +#pragma once #include @@ -109,6 +108,3 @@ class EditToolBar final : public ToolBar { DECLARE_CLASS(EditToolBar) DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/toolbars/MeterToolBar.h b/src/toolbars/MeterToolBar.h index 315e4544b..f852bdbec 100644 --- a/src/toolbars/MeterToolBar.h +++ b/src/toolbars/MeterToolBar.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_METER_TOOLBAR__ -#define __AUDACITY_METER_TOOLBAR__ +#pragma once #include "ToolBar.h" @@ -69,6 +68,3 @@ class MeterToolBar final : public ToolBar { DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/toolbars/MixerToolBar.h b/src/toolbars/MixerToolBar.h index 3726f64a9..d38af5cfb 100644 --- a/src/toolbars/MixerToolBar.h +++ b/src/toolbars/MixerToolBar.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_MIXER_TOOLBAR__ -#define __AUDACITY_MIXER_TOOLBAR__ +#pragma once #include "ToolBar.h" @@ -74,6 +73,3 @@ class MixerToolBar final : public ToolBar { DECLARE_CLASS(MixerToolBar) DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/toolbars/ScrubbingToolBar.h b/src/toolbars/ScrubbingToolBar.h index a627d663f..bb4f4b7de 100644 --- a/src/toolbars/ScrubbingToolBar.h +++ b/src/toolbars/ScrubbingToolBar.h @@ -9,9 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SCRUBBING_TOOLBAR__ -#define __AUDACITY_SCRUBBING_TOOLBAR__ - +#pragma once #include @@ -86,5 +84,3 @@ private: bool mLastSeek{ false }; bool mLastRuler{ false }; }; - -#endif diff --git a/src/toolbars/SelectionBar.h b/src/toolbars/SelectionBar.h index 1babbd24e..ac98a6cec 100644 --- a/src/toolbars/SelectionBar.h +++ b/src/toolbars/SelectionBar.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SELECTION_BAR__ -#define __AUDACITY_SELECTION_BAR__ +#pragma once #include @@ -120,6 +119,3 @@ class TENACITY_DLL_API SelectionBar final : public ToolBar { DECLARE_CLASS(SelectionBar) DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/toolbars/SelectionBarListener.h b/src/toolbars/SelectionBarListener.h index 3b3e5b8fa..556f97338 100644 --- a/src/toolbars/SelectionBarListener.h +++ b/src/toolbars/SelectionBarListener.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SELECTION_BAR_LISTENER__ -#define __AUDACITY_SELECTION_BAR_LISTENER__ +#pragma once #include "tenacity/Types.h" #include "ComponentInterfaceSymbol.h" @@ -42,5 +41,3 @@ class TENACITY_DLL_API TimeToolBarListener /* not final */ { virtual const NumericFormatSymbol & TT_GetAudioTimeFormat() = 0; virtual void TT_SetAudioTimeFormat(const NumericFormatSymbol & format) = 0; }; - -#endif diff --git a/src/toolbars/SpectralSelectionBar.h b/src/toolbars/SpectralSelectionBar.h index 1e2670023..ee1792ecb 100644 --- a/src/toolbars/SpectralSelectionBar.h +++ b/src/toolbars/SpectralSelectionBar.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_SPECTRAL_SELECTION_BAR__ -#define __AUDACITY_SPECTRAL_SELECTION_BAR__ +#pragma once #include @@ -81,6 +80,3 @@ public: DECLARE_CLASS(SpectralSelectionBar) DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/toolbars/SpectralSelectionBarListener.h b/src/toolbars/SpectralSelectionBarListener.h index e3490bb22..fc3b05cd7 100644 --- a/src/toolbars/SpectralSelectionBarListener.h +++ b/src/toolbars/SpectralSelectionBarListener.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SPECTRAL_SELECTION_BAR_LISTENER__ -#define __AUDACITY_SPECTRAL_SELECTION_BAR_LISTENER__ +#pragma once #include "Identifier.h" @@ -31,5 +30,3 @@ class TENACITY_DLL_API SpectralSelectionBarListener /* not final */ { virtual void SSBL_ModifySpectralSelection(double &bottom, double &top, bool done) = 0; }; - -#endif diff --git a/src/toolbars/TimeToolBar.h b/src/toolbars/TimeToolBar.h index bbf3a99e5..7d690f328 100644 --- a/src/toolbars/TimeToolBar.h +++ b/src/toolbars/TimeToolBar.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TIME_TOOLBAR__ -#define __AUDACITY_TIME_TOOLBAR__ +#pragma once #include @@ -69,5 +68,3 @@ inline wxSize TimeToolBar::ComputeSizing(int digitH) { return mAudioTime->ComputeSizing(false, digitH * mDigitRatio, digitH); } - -#endif diff --git a/src/toolbars/ToolBar.h b/src/toolbars/ToolBar.h index a6ad93b20..6dd6552d5 100644 --- a/src/toolbars/ToolBar.h +++ b/src/toolbars/ToolBar.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TOOLBAR__ -#define __AUDACITY_TOOLBAR__ +#pragma once #include #include @@ -268,5 +267,3 @@ struct TENACITY_DLL_API RegisteredToolbarFactory { static const Functions &GetFactories(); }; - -#endif diff --git a/src/toolbars/ToolDock.h b/src/toolbars/ToolDock.h index 1b1489a28..bd2b09a74 100644 --- a/src/toolbars/ToolDock.h +++ b/src/toolbars/ToolDock.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TOOLDOCK__ -#define __AUDACITY_TOOLDOCK__ +#pragma once #include #include @@ -347,5 +346,3 @@ public: DECLARE_CLASS( ToolDock ) DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/toolbars/ToolManager.h b/src/toolbars/ToolManager.h index ab8dfd307..607f679fc 100644 --- a/src/toolbars/ToolManager.h +++ b/src/toolbars/ToolManager.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TOOLMANAGER__ -#define __AUDACITY_TOOLMANAGER__ +#pragma once #include @@ -233,5 +232,3 @@ struct TENACITY_DLL_API AttachedToolBarMenuItem : CommandHandlerObject { const MenuTable::AttachedItem mAttachedItem; const std::vector< ToolBarID > mExcludeIds; }; - -#endif diff --git a/src/toolbars/ToolsToolBar.h b/src/toolbars/ToolsToolBar.h index 8b6b27782..923bb6f94 100644 --- a/src/toolbars/ToolsToolBar.h +++ b/src/toolbars/ToolsToolBar.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TOOLS_TOOLBAR__ -#define __AUDACITY_TOOLS_TOOLBAR__ +#pragma once #include @@ -75,6 +74,3 @@ class ToolsToolBar final : public ToolBar { DECLARE_CLASS(ToolsToolBar) DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/toolbars/TranscriptionToolBar.h b/src/toolbars/TranscriptionToolBar.h index 3f862a1de..764906831 100644 --- a/src/toolbars/TranscriptionToolBar.h +++ b/src/toolbars/TranscriptionToolBar.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TRANSCRIPTION_TOOLBAR__ -#define __AUDACITY_TRANSCRIPTION_TOOLBAR__ +#pragma once #include "ToolBar.h" @@ -157,6 +156,3 @@ class TranscriptionToolBar final : public ToolBar { DECLARE_CLASS(TranscriptionToolBar) DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/tracks/labeltrack/ui/LabelDefaultClickHandle.h b/src/tracks/labeltrack/ui/LabelDefaultClickHandle.h index 71927e527..3e00d45ed 100644 --- a/src/tracks/labeltrack/ui/LabelDefaultClickHandle.h +++ b/src/tracks/labeltrack/ui/LabelDefaultClickHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_LABEL_DEFAULT_CLICK_HANDLE__ -#define __AUDACITY_LABEL_DEFAULT_CLICK_HANDLE__ +#pragma once #include "../../../UIHandle.h" @@ -47,5 +46,3 @@ private: void SaveState( AudacityProject *pProject ); void RestoreState( AudacityProject *pProject ); }; - -#endif diff --git a/src/tracks/labeltrack/ui/LabelGlyphHandle.h b/src/tracks/labeltrack/ui/LabelGlyphHandle.h index cc7621d18..15a011d2c 100644 --- a/src/tracks/labeltrack/ui/LabelGlyphHandle.h +++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_LABEL_GLYPH_HANDLE__ -#define __AUDACITY_LABEL_GLYPH_HANDLE__ +#pragma once #include "LabelDefaultClickHandle.h" @@ -110,5 +109,3 @@ private: /// Displacement of mouse cursor from the centre being dragged. int mxMouseDisplacement; }; - -#endif diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.h b/src/tracks/labeltrack/ui/LabelTextHandle.h index 80928ca14..bd30f183a 100644 --- a/src/tracks/labeltrack/ui/LabelTextHandle.h +++ b/src/tracks/labeltrack/ui/LabelTextHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_LABEL_TEXT_HANDLE__ -#define __AUDACITY_LABEL_TEXT_HANDLE__ +#pragma once #include "LabelDefaultClickHandle.h" #include "../../../SelectedRegion.h" @@ -74,5 +73,3 @@ private: /// flag to tell if it's a valid dragging bool mRightDragging{ false }; }; - -#endif diff --git a/src/tracks/labeltrack/ui/LabelTrackControls.h b/src/tracks/labeltrack/ui/LabelTrackControls.h index b73355b10..5c7fcb64a 100644 --- a/src/tracks/labeltrack/ui/LabelTrackControls.h +++ b/src/tracks/labeltrack/ui/LabelTrackControls.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_LABEL_TRACK_CONTROLS__ -#define __AUDACITY_LABEL_TRACK_CONTROLS__ +#pragma once #include "../../ui/CommonTrackControls.h" // to inherit @@ -30,5 +29,3 @@ public: PopupMenuTable *GetMenuExtension(Track *pTrack) override; }; - -#endif diff --git a/src/tracks/labeltrack/ui/LabelTrackVRulerControls.h b/src/tracks/labeltrack/ui/LabelTrackVRulerControls.h index b31cb3e29..9182d5753 100644 --- a/src/tracks/labeltrack/ui/LabelTrackVRulerControls.h +++ b/src/tracks/labeltrack/ui/LabelTrackVRulerControls.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_LABEL_TRACK_VRULER_CONTROLS__ -#define __AUDACITY_LABEL_TRACK_VRULER_CONTROLS__ +#pragma once #include "../../ui/TrackVRulerControls.h" @@ -38,5 +37,3 @@ private: void UpdateRuler( const wxRect &rect ) override; }; - -#endif diff --git a/src/tracks/labeltrack/ui/LabelTrackView.h b/src/tracks/labeltrack/ui/LabelTrackView.h index 3f309a5a7..4a7357e3d 100644 --- a/src/tracks/labeltrack/ui/LabelTrackView.h +++ b/src/tracks/labeltrack/ui/LabelTrackView.h @@ -8,8 +8,7 @@ Paul Licameli split from class LabelTrack **********************************************************************/ -#ifndef __AUDACITY_LABEL_TRACK_VIEW__ -#define __AUDACITY_LABEL_TRACK_VIEW__ +#pragma once #include "../../ui/CommonTrackView.h" @@ -256,5 +255,3 @@ private: // Bug #2571: See explanation in ShowContextMenu() int mEditIndex; }; - -#endif diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackAffordanceControls.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackAffordanceControls.h index d7ba89bed..d618e0ffb 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackAffordanceControls.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackAffordanceControls.h @@ -8,6 +8,7 @@ **********************************************************************/ + #pragma once #include "../../../ui/CommonTrackPanelCell.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h index c92a4ae33..2c06a2a44 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_NOTE_TRACK_BUTTON_HANDLE__ -#define __AUDACITY_NOTE_TRACK_BUTTON_HANDLE__ +#pragma once class wxMouseState; class NoteTrack; @@ -68,5 +67,3 @@ protected: int mChannel{ -1 }; wxRect mRect{}; }; - -#endif diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h index 8b75716ba..1fc2483af 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_NOTE_TRACK_CONTROLS__ -#define __AUDACITY_NOTE_TRACK_CONTROLS__ +#pragma once #include "../../ui/PlayableTrackControls.h" // to inherit class wxEvent; @@ -66,5 +65,3 @@ public: private: static void ReCreateVelocitySlider( wxEvent& ); }; - -#endif diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h index bf25168ec..99f3904b7 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_NOTE_TRACK_SLIDER_HANDLES__ -#define __AUDACITY_NOTE_TRACK_SLIDER_HANDLES__ +#pragma once #ifdef EXPERIMENTAL_MIDI_OUT @@ -53,5 +52,3 @@ public: }; #endif - -#endif diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.h index df4429335..9c8929c1d 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_NOTE_TRACK_VRULER_CONTROLS__ -#define __AUDACITY_NOTE_TRACK_VRULER_CONTROLS__ +#pragma once #include "../../../ui/TrackVRulerControls.h" @@ -45,5 +44,3 @@ private: std::weak_ptr mVZoomHandle; }; - -#endif diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h index 301e1566d..843ca583e 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_NOTE_TRACK_VZOOM_HANDLE__ -#define __AUDACITY_NOTE_TRACK_VZOOM_HANDLE__ +#pragma once class wxMouseState; class NoteTrack; @@ -69,5 +68,3 @@ private: int mZoomStart, mZoomEnd; wxRect mRect; }; - -#endif diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackView.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.h index a43c10fec..739f2487f 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackView.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.h @@ -8,8 +8,7 @@ Paul Licameli split from class NoteTrack **********************************************************************/ -#ifndef __AUDACITY_NOTE_TRACK_VIEW__ -#define __AUDACITY_NOTE_TRACK_VIEW__ +#pragma once #include "../../../ui/CommonTrackView.h" @@ -37,4 +36,3 @@ private: TrackPanelDrawingContext &context, const wxRect &rect, unsigned iPass ) override; }; -#endif diff --git a/src/tracks/playabletrack/notetrack/ui/StretchHandle.h b/src/tracks/playabletrack/notetrack/ui/StretchHandle.h index f022b079c..e073657ec 100644 --- a/src/tracks/playabletrack/notetrack/ui/StretchHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/StretchHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_STRETCH_HANDLE__ -#define __AUDACITY_STRETCH_HANDLE__ +#pragma once #include "../../../../UIHandle.h" @@ -98,5 +97,3 @@ private: StretchState mStretchState{}; }; - -#endif diff --git a/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.h b/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.h index 2b5c83818..8810650d4 100644 --- a/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.h +++ b/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_PLAYABLE_TRACK_BUTTON_HANDLES__ -#define __AUDACITY_PLAYABLE_TRACK_BUTTON_HANDLES__ +#pragma once #include "../../ui/ButtonHandle.h" class wxMouseState; @@ -73,5 +72,3 @@ public: const wxMouseState &state, const wxRect &rect, const AudacityProject *pProject, const std::shared_ptr &pTrack); }; - -#endif diff --git a/src/tracks/playabletrack/ui/PlayableTrackControls.h b/src/tracks/playabletrack/ui/PlayableTrackControls.h index 2d0eaae9f..b5084bf47 100644 --- a/src/tracks/playabletrack/ui/PlayableTrackControls.h +++ b/src/tracks/playabletrack/ui/PlayableTrackControls.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_PLAYABLE_TRACK_CONTROLS__ -#define __AUDACITY_PLAYABLE_TRACK_CONTROLS__ +#pragma once #include "../../ui/CommonTrackControls.h" @@ -29,5 +28,3 @@ public: using CommonTrackControls::CommonTrackControls; }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h index 2affdf444..7d1807b79 100644 --- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_CUTLINE_HANDLE__ -#define __AUDACITY_CUTLINE_HANDLE__ +#pragma once #include "../../../../UIHandle.h" #include "../../../../WaveTrackLocation.h" @@ -70,5 +69,3 @@ private: double mStartTime{}, mEndTime{}; WaveTrackLocation mLocation {}; }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h index e98c6b183..e6113f55e 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_SAMPLE_HANDLE__ -#define __AUDACITY_SAMPLE_HANDLE__ +#pragma once #include "../../../../UIHandle.h" #include "tenacity/Types.h" @@ -76,5 +75,3 @@ private: float mLastDragSampleValue{}; bool mAltKey{}; }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumVRulerControls.h b/src/tracks/playabletrack/wavetrack/ui/SpectrumVRulerControls.h index b51a4fabc..8ea83d159 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVRulerControls.h +++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVRulerControls.h @@ -8,8 +8,7 @@ Paul Licameli split from WaveTrackVRulerControls.h **********************************************************************/ -#ifndef __AUDACITY_SPECTRUM_VRULER_CONTROLS__ -#define __AUDACITY_SPECTRUM_VRULER_CONTROLS__ +#pragma once #include "../../../ui/TrackVRulerControls.h" // to inherit @@ -51,5 +50,3 @@ private: std::weak_ptr mVZoomHandle; }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h index 1a7348252..b3b416f8e 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from WaveTrackVZoomHandle.h **********************************************************************/ -#ifndef __AUDACITY_SPECTRUM_VZOOM_HANDLE__ -#define __AUDACITY_SPECTRUM_VZOOM_HANDLE__ +#pragma once #include "../../../../UIHandle.h" // to inherit #include "WaveTrackViewConstants.h" @@ -87,5 +86,3 @@ public: private: void OnSpectrumScaleType(wxCommandEvent &evt); }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumView.h b/src/tracks/playabletrack/wavetrack/ui/SpectrumView.h index 97b930ff2..9e1ef76dc 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SpectrumView.h +++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumView.h @@ -8,8 +8,7 @@ Paul Licameli split from WaveTrackView.h **********************************************************************/ -#ifndef __AUDACITY_SPECTRUM_VIEW__ -#define __AUDACITY_SPECTRUM_VIEW__ +#pragma once #include "WaveTrackView.h" // to inherit @@ -49,5 +48,3 @@ private: protected: void DoSetMinimized( bool minimized ) override; }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.h index 1fc48fd5d..6ee4482d5 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_WAVE_TRACK_CONTROLS__ -#define __AUDACITY_WAVE_TRACK_CONTROLS__ +#pragma once #include "../../ui/PlayableTrackControls.h" // to inherit @@ -83,5 +82,3 @@ protected: // Expose the wave track menu table to registration of menu items TENACITY_DLL_API WaveTrackPopupMenuTable &GetWaveTrackMenuTable(); - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.h index ccd1dc7a0..4bef95318 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_WAVE_TRACK_SLIDER_HANDLES__ -#define __AUDACITY_WAVE_TRACK_SLIDER_HANDLES__ +#pragma once #include "../../../ui/SliderHandle.h" @@ -84,5 +83,3 @@ public: const wxMouseState &state, const wxRect &rect, const std::shared_ptr &pTrack); }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.h index b4d934cc5..b800617a2 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_WAVE_TRACK_VRULER_CONTROLS__ -#define __AUDACITY_WAVE_TRACK_VRULER_CONTROLS__ +#pragma once #include "../../../ui/TrackVRulerControls.h" @@ -24,5 +23,3 @@ namespace WaveTrackVRulerControls TrackPanelDrawingContext &context, const wxRect &rect, unsigned iPass ); }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h index 42a9cb582..281ff180a 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_WAVE_TRACK_VZOOM_HANDLE__ -#define __AUDACITY_WAVE_TRACK_VZOOM_HANDLE__ +#pragma once class wxMouseState; class PopupMenuTable; @@ -127,5 +126,3 @@ enum { OnFirstSpectrumScaleID, OnLastSpectrumScaleID = OnFirstSpectrumScaleID + 19, }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h index df640d599..6df8bcea8 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h @@ -8,8 +8,7 @@ Paul Licameli split from class WaveTrack **********************************************************************/ -#ifndef __AUDACITY_WAVE_TRACK_VIEW__ -#define __AUDACITY_WAVE_TRACK_VIEW__ +#pragma once #include "../../../ui/CommonTrackView.h" #include "../../../../ClientData.h" @@ -200,5 +199,3 @@ struct TENACITY_DLL_API ClipParameters // and with clipOffsetX - clip horizontal origin offset within view rect static wxRect GetClipRect(const WaveClip& clip, const ZoomInfo& zoomInfo, const wxRect& viewRect, int clipOffsetX = 0); }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackViewConstants.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackViewConstants.h index bafcb843d..c0592492d 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackViewConstants.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackViewConstants.h @@ -8,8 +8,7 @@ Paul Licameli split from class WaveTrack **********************************************************************/ -#ifndef __AUDACITY_WAVE_TRACK_VIEW_CONSTANTS__ -#define __AUDACITY_WAVE_TRACK_VIEW_CONSTANTS__ +#pragma once #include "ComponentInterfaceSymbol.h" // for EnumValueSymbol @@ -115,5 +114,3 @@ struct TENACITY_DLL_API WaveTrackSubViewType { //! Return a preferred type static Display Default(); }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformVRulerControls.h b/src/tracks/playabletrack/wavetrack/ui/WaveformVRulerControls.h index 7537eeb12..4afa73faf 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveformVRulerControls.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVRulerControls.h @@ -8,8 +8,7 @@ Paul Licameli split from WaveTrackVRulerControls.h **********************************************************************/ -#ifndef __AUDACITY_WAVEFORM_VRULER_CONTROLS__ -#define __AUDACITY_WAVEFORM_VRULER_CONTROLS__ +#pragma once #include "../../../ui/TrackVRulerControls.h" // to inherit @@ -51,5 +50,3 @@ private: std::weak_ptr mVZoomHandle; }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h index c3f3529c5..c170297ce 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from WaveTrackVZoomHandle.h **********************************************************************/ -#ifndef __AUDACITY_WAVEFORM_VZOOM_HANDLE__ -#define __AUDACITY_WAVEFORM_VZOOM_HANDLE__ +#pragma once #include "../../../../UIHandle.h" // to inherit #include "WaveTrackViewConstants.h" @@ -87,5 +86,3 @@ public: private: void OnWaveformScaleType(wxCommandEvent &evt); }; - -#endif diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformView.h b/src/tracks/playabletrack/wavetrack/ui/WaveformView.h index 492c68186..2b6942d0e 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveformView.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveformView.h @@ -8,8 +8,7 @@ Paul Licameli split from WaveTrackView.h **********************************************************************/ -#ifndef __AUDACITY_WAVEFORM_VIEW__ -#define __AUDACITY_WAVEFORM_VIEW__ +#pragma once #include "WaveTrackView.h" // to inherit @@ -53,5 +52,3 @@ protected: std::weak_ptr mSampleHandle; std::weak_ptr mEnvelopeHandle; }; - -#endif diff --git a/src/tracks/timetrack/ui/TimeTrackControls.h b/src/tracks/timetrack/ui/TimeTrackControls.h index 50c4548e6..44b0abd06 100644 --- a/src/tracks/timetrack/ui/TimeTrackControls.h +++ b/src/tracks/timetrack/ui/TimeTrackControls.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_TIME_TRACK_CONTROLS__ -#define __AUDACITY_TIME_TRACK_CONTROLS__ +#pragma once #include "../../ui/CommonTrackControls.h" // to inherit @@ -60,5 +59,3 @@ private: void OnTimeTrackLog(wxCommandEvent & /*event*/); void OnTimeTrackLogInt(wxCommandEvent & /*event*/); }; - -#endif diff --git a/src/tracks/timetrack/ui/TimeTrackVRulerControls.h b/src/tracks/timetrack/ui/TimeTrackVRulerControls.h index 3b8b6b37d..5a97a5e3a 100644 --- a/src/tracks/timetrack/ui/TimeTrackVRulerControls.h +++ b/src/tracks/timetrack/ui/TimeTrackVRulerControls.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_TIME_TRACK_VRULER_CONTROLS__ -#define __AUDACITY_TIME_TRACK_VRULER_CONTROLS__ +#pragma once #include "../../ui/TrackVRulerControls.h" @@ -44,5 +43,3 @@ private: std::weak_ptr mVZoomHandle; }; - -#endif diff --git a/src/tracks/timetrack/ui/TimeTrackVZoomHandle.h b/src/tracks/timetrack/ui/TimeTrackVZoomHandle.h index 6044755a2..54fc148eb 100644 --- a/src/tracks/timetrack/ui/TimeTrackVZoomHandle.h +++ b/src/tracks/timetrack/ui/TimeTrackVZoomHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TimeTrackVZoomHandle.h **********************************************************************/ -#ifndef __AUDACITY_TIMETRACK_VZOOM_HANDLE__ -#define __AUDACITY_TIMETRACK_VZOOM_HANDLE__ +#pragma once #include "../../../UIHandle.h" // to inherit @@ -48,5 +47,3 @@ public: private: std::weak_ptr mpTrack; }; - -#endif \ No newline at end of file diff --git a/src/tracks/timetrack/ui/TimeTrackView.h b/src/tracks/timetrack/ui/TimeTrackView.h index d5740ed2a..4910217b6 100644 --- a/src/tracks/timetrack/ui/TimeTrackView.h +++ b/src/tracks/timetrack/ui/TimeTrackView.h @@ -8,8 +8,7 @@ Paul Licameli split from class TimeTrack **********************************************************************/ -#ifndef __AUDACITY_TIME_TRACK_VIEW__ -#define __AUDACITY_TIME_TRACK_VIEW__ +#pragma once #include "../../ui/CommonTrackView.h" @@ -40,5 +39,3 @@ private: TrackPanelDrawingContext &context, const wxRect &rect, unsigned iPass ) override; }; - -#endif diff --git a/src/tracks/ui/BackgroundCell.h b/src/tracks/ui/BackgroundCell.h index f75994d40..029a22e4b 100644 --- a/src/tracks/ui/BackgroundCell.h +++ b/src/tracks/ui/BackgroundCell.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_BACKGROUND_CELL__ -#define __AUDACITY_BACKGROUND_CELL__ +#pragma once #include "../../ClientData.h" #include "CommonTrackPanelCell.h" @@ -62,5 +61,3 @@ public: // For want of a better place... mutable std::weak_ptr mZoomHandle; }; - -#endif diff --git a/src/tracks/ui/ButtonHandle.h b/src/tracks/ui/ButtonHandle.h index b822a59c0..7d87c6aed 100644 --- a/src/tracks/ui/ButtonHandle.h +++ b/src/tracks/ui/ButtonHandle.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_BUTTON_HANDLE__ -#define __AUDACITY_BUTTON_HANDLE__ +#pragma once #include "../../UIHandle.h" @@ -74,5 +73,3 @@ protected: bool mWasIn{ true }; bool mIsClicked{}; }; - -#endif diff --git a/src/tracks/ui/CommonTrackControls.h b/src/tracks/ui/CommonTrackControls.h index bc864544e..2daae9b23 100644 --- a/src/tracks/ui/CommonTrackControls.h +++ b/src/tracks/ui/CommonTrackControls.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackControls.h **********************************************************************/ -#ifndef __AUDACITY_COMMON_TRACK_CONTROLS__ -#define __AUDACITY_COMMON_TRACK_CONTROLS__ +#pragma once #include "TrackControls.h" // to inherit @@ -73,5 +72,3 @@ protected: std::weak_ptr mSelectButtonHandle; std::weak_ptr mSelectHandle; }; - -#endif diff --git a/src/tracks/ui/CommonTrackPanelCell.h b/src/tracks/ui/CommonTrackPanelCell.h index e7cb608c9..89c629d65 100644 --- a/src/tracks/ui/CommonTrackPanelCell.h +++ b/src/tracks/ui/CommonTrackPanelCell.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_COMMON_TRACK_PANEL_CELL__ -#define __AUDACITY_COMMON_TRACK_PANEL_CELL__ +#pragma once #include "../../TrackPanelCell.h" @@ -79,5 +78,3 @@ public: private: std::weak_ptr< Track > mwTrack; }; - -#endif diff --git a/src/tracks/ui/CommonTrackView.h b/src/tracks/ui/CommonTrackView.h index d79e2edc8..8506cd200 100644 --- a/src/tracks/ui/CommonTrackView.h +++ b/src/tracks/ui/CommonTrackView.h @@ -8,8 +8,7 @@ Paul Licameli split from class TrackView **********************************************************************/ -#ifndef __AUDACITY_COMMON_TRACK_VIEW__ -#define __AUDACITY_COMMON_TRACK_VIEW__ +#pragma once #include "TrackView.h" // to inherit @@ -47,5 +46,3 @@ protected: public: std::weak_ptr mTimeShiftHandle; }; - -#endif diff --git a/src/tracks/ui/EditCursorOverlay.h b/src/tracks/ui/EditCursorOverlay.h index 55fcbec81..64bee0645 100644 --- a/src/tracks/ui/EditCursorOverlay.h +++ b/src/tracks/ui/EditCursorOverlay.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_EDIT_CURSOR_OVERLAY__ -#define __AUDACITY_EDIT_CURSOR_OVERLAY__ +#pragma once #include #include "../../ClientData.h" // to inherit @@ -38,5 +37,3 @@ private: double mCursorTime; int mNewCursorX; }; - -#endif diff --git a/src/tracks/ui/EnvelopeHandle.h b/src/tracks/ui/EnvelopeHandle.h index 6bfc22bb7..d291cb097 100644 --- a/src/tracks/ui/EnvelopeHandle.h +++ b/src/tracks/ui/EnvelopeHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_ENVELOPE_HANDLE__ -#define __AUDACITY_ENVELOPE_HANDLE__ +#pragma once #include "../../UIHandle.h" @@ -89,5 +88,3 @@ private: bool mTimeTrack{}; }; - -#endif diff --git a/src/tracks/ui/PlayIndicatorOverlay.h b/src/tracks/ui/PlayIndicatorOverlay.h index 0a680d8bb..65da0d3ee 100644 --- a/src/tracks/ui/PlayIndicatorOverlay.h +++ b/src/tracks/ui/PlayIndicatorOverlay.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_PLAY_INDICATOR_OVERLAY__ -#define __AUDACITY_PLAY_INDICATOR_OVERLAY__ +#pragma once #include // to inherit #include @@ -58,5 +57,3 @@ private: std::shared_ptr mPartner; }; - -#endif diff --git a/src/tracks/ui/ScrubUI.h b/src/tracks/ui/ScrubUI.h index b66420ad4..59d0dc1ce 100644 --- a/src/tracks/ui/ScrubUI.h +++ b/src/tracks/ui/ScrubUI.h @@ -8,9 +8,4 @@ **********************************************************************/ -#ifndef __AUDACITY_SCRUB_UI__ -#define __AUDACITY_SCRUB_UI__ - - - -#endif +#pragma once diff --git a/src/tracks/ui/Scrubbing.h b/src/tracks/ui/Scrubbing.h index caf26f1e1..30f0582eb 100644 --- a/src/tracks/ui/Scrubbing.h +++ b/src/tracks/ui/Scrubbing.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_SCRUBBING__ -#define __AUDACITY_SCRUBBING__ +#pragma once @@ -198,5 +197,3 @@ private: bool mShowScrubbing { false }; bool mMayDragToSeek{ false }; }; - -#endif diff --git a/src/tracks/ui/SelectHandle.h b/src/tracks/ui/SelectHandle.h index e6d38ff8e..ddb506624 100644 --- a/src/tracks/ui/SelectHandle.h +++ b/src/tracks/ui/SelectHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_SELECT_HANDLE__ -#define __AUDACITY_SELECT_HANDLE__ +#pragma once #include "../../UIHandle.h" #include "../../SelectedRegion.h" @@ -172,4 +171,3 @@ private: friend TimerHandler; std::shared_ptr mTimerHandler; }; -#endif diff --git a/src/tracks/ui/SliderHandle.h b/src/tracks/ui/SliderHandle.h index 0db3ac03d..836fe5e01 100644 --- a/src/tracks/ui/SliderHandle.h +++ b/src/tracks/ui/SliderHandle.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_SLIDER_HANDLE__ -#define __AUDACITY_SLIDER_HANDLE__ +#pragma once #include "../../UIHandle.h" @@ -81,5 +80,3 @@ protected: bool mIsClicked{}; }; - -#endif diff --git a/src/tracks/ui/TimeShiftHandle.h b/src/tracks/ui/TimeShiftHandle.h index 7842870d6..fb347ef1e 100644 --- a/src/tracks/ui/TimeShiftHandle.h +++ b/src/tracks/ui/TimeShiftHandle.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_TIMESHIFT_HANDLE__ -#define __AUDACITY_TIMESHIFT_HANDLE__ +#pragma once #include #include @@ -339,5 +338,3 @@ private: ClipMoveState mClipMoveState{}; bool mGripHit {}; }; - -#endif diff --git a/src/tracks/ui/TrackButtonHandles.h b/src/tracks/ui/TrackButtonHandles.h index 99def2387..d1b89931d 100644 --- a/src/tracks/ui/TrackButtonHandles.h +++ b/src/tracks/ui/TrackButtonHandles.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_TRACK_BUTTON_HANDLES__ -#define __AUDACITY_TRACK_BUTTON_HANDLES__ +#pragma once #include "../ui/ButtonHandle.h" @@ -125,5 +124,3 @@ public: private: std::weak_ptr mpCell; }; - -#endif diff --git a/src/tracks/ui/TrackControls.h b/src/tracks/ui/TrackControls.h index b783c6a0c..cfdec632e 100644 --- a/src/tracks/ui/TrackControls.h +++ b/src/tracks/ui/TrackControls.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_TRACK_CONTROLS__ -#define __AUDACITY_TRACK_CONTROLS__ +#pragma once #include "CommonTrackPanelCell.h" @@ -38,5 +37,3 @@ AttachedVirtualFunction< std::shared_ptr< TrackControls >, Track >; - -#endif diff --git a/src/tracks/ui/TrackSelectHandle.h b/src/tracks/ui/TrackSelectHandle.h index 3b4226397..76d193795 100644 --- a/src/tracks/ui/TrackSelectHandle.h +++ b/src/tracks/ui/TrackSelectHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_TRACK_SELECT_HANDLE__ -#define __AUDACITY_TRACK_SELECT_HANDLE__ +#pragma once #include "../../UIHandle.h" @@ -62,5 +61,3 @@ private: void CalculateRearrangingThresholds( const wxMouseEvent & event, AudacityProject *project); }; - -#endif diff --git a/src/tracks/ui/TrackVRulerControls.h b/src/tracks/ui/TrackVRulerControls.h index 98489631c..a16b8d684 100644 --- a/src/tracks/ui/TrackVRulerControls.h +++ b/src/tracks/ui/TrackVRulerControls.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_TRACK_VRULER_CONTROLS__ -#define __AUDACITY_TRACK_VRULER_CONTROLS__ +#pragma once #include "CommonTrackPanelCell.h" @@ -63,5 +62,3 @@ protected: std::weak_ptr mwTrackView; }; - -#endif diff --git a/src/tracks/ui/TrackView.h b/src/tracks/ui/TrackView.h index 732e2817c..cd2cd7445 100644 --- a/src/tracks/ui/TrackView.h +++ b/src/tracks/ui/TrackView.h @@ -8,8 +8,7 @@ Paul Licameli split from class Track **********************************************************************/ -#ifndef __AUDACITY_TRACK_VIEW__ -#define __AUDACITY_TRACK_VIEW__ +#pragma once #include #include "CommonTrackPanelCell.h" // to inherit @@ -122,5 +121,3 @@ AttachedVirtualFunction< int, Track >; - -#endif diff --git a/src/tracks/ui/ZoomHandle.h b/src/tracks/ui/ZoomHandle.h index fda9693c1..e2f71f468 100644 --- a/src/tracks/ui/ZoomHandle.h +++ b/src/tracks/ui/ZoomHandle.h @@ -8,8 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#ifndef __AUDACITY_ZOOM_HANDLE__ -#define __AUDACITY_ZOOM_HANDLE__ +#pragma once #include "../../UIHandle.h" @@ -66,5 +65,3 @@ private: int mZoomStart{}, mZoomEnd{}; wxRect mRect{}; }; - -#endif diff --git a/src/widgets/AButton.h b/src/widgets/AButton.h index aea3464e5..aa230357f 100644 --- a/src/widgets/AButton.h +++ b/src/widgets/AButton.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_BUTTON__ -#define __AUDACITY_BUTTON__ +#pragma once #include @@ -190,5 +189,3 @@ public: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h index 08c385435..4383b199a 100644 --- a/src/widgets/ASlider.h +++ b/src/widgets/ASlider.h @@ -10,8 +10,7 @@ **********************************************************************/ -#ifndef __AUDACITY_SLIDER__ -#define __AUDACITY_SLIDER__ +#pragma once #include // for wxUSE_* macros #include @@ -362,5 +361,3 @@ class SliderDialog final : public wxDialogWrapper public: DECLARE_EVENT_TABLE() }; - -#endif diff --git a/src/widgets/AttachableScrollBar.h b/src/widgets/AttachableScrollBar.h index 9f2bb497f..d6c08fddd 100644 --- a/src/widgets/AttachableScrollBar.h +++ b/src/widgets/AttachableScrollBar.h @@ -14,8 +14,7 @@ **********************************************************************/ -#ifndef __AUDACITY_ATTACHABLE_SCROLL_BAR__ -#define __AUDACITY_ATTACHABLE_SCROLL_BAR__ +#pragma once #include // to inherit @@ -42,5 +41,3 @@ public: ViewInfo * mpViewInfo; DECLARE_EVENT_TABLE() }; - -#endif // __AUDACITY_ATTACHABLE_SCROLL_BAR__ diff --git a/src/widgets/AudacityMessageBox.h b/src/widgets/AudacityMessageBox.h index d21693329..ab99a3065 100644 --- a/src/widgets/AudacityMessageBox.h +++ b/src/widgets/AudacityMessageBox.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_MESSAGE_BOX__ -#define __AUDACITY_MESSAGE_BOX__ +#pragma once #include #include "Internat.h" @@ -26,5 +25,3 @@ inline int AudacityMessageBox(const TranslatableString& message, return ::wxMessageBox(message.Translation(), caption.Translation(), style, parent, x, y); } - -#endif diff --git a/src/widgets/BackedPanel.h b/src/widgets/BackedPanel.h index 2351c6a73..46461e864 100644 --- a/src/widgets/BackedPanel.h +++ b/src/widgets/BackedPanel.h @@ -6,8 +6,7 @@ // // -#ifndef __AUDACITY_BACKED_PANEL__ -#define __AUDACITY_BACKED_PANEL__ +#pragma once #include // member variable #include "wxPanelWrapper.h" // to inherit @@ -39,6 +38,3 @@ private: DECLARE_EVENT_TABLE() }; - - -#endif diff --git a/src/widgets/ErrorDialog.h b/src/widgets/ErrorDialog.h index 67ba2d04d..fb52fd30e 100644 --- a/src/widgets/ErrorDialog.h +++ b/src/widgets/ErrorDialog.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_ERRORDIALOG__ -#define __AUDACITY_ERRORDIALOG__ +#pragma once @@ -98,5 +97,3 @@ public: private: bool mSetInsertionPointEnd{}; }; - -#endif // __AUDACITY_ERRORDIALOG__ diff --git a/src/widgets/ExpandingToolBar.h b/src/widgets/ExpandingToolBar.h index 74ed0ef49..2d8d25e81 100644 --- a/src/widgets/ExpandingToolBar.h +++ b/src/widgets/ExpandingToolBar.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_EXPANDING_TOOL_BAR__ -#define __AUDACITY_EXPANDING_TOOL_BAR__ +#pragma once #include #include @@ -248,5 +247,3 @@ class ToolBarArea final : public wxPanelWrapper DECLARE_EVENT_TABLE() }; - -#endif // __AUDACITY_EXPANDING_TOOL_BAR__ diff --git a/src/widgets/FileConfig.h b/src/widgets/FileConfig.h index adc58371a..68f361373 100644 --- a/src/widgets/FileConfig.h +++ b/src/widgets/FileConfig.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_WIDGETS_FILECONFIG__ -#define __AUDACITY_WIDGETS_FILECONFIG__ +#pragma once #include @@ -98,6 +97,3 @@ private: bool mDirty; }; - -#endif - diff --git a/src/widgets/FileDialog/FileDialog.h b/src/widgets/FileDialog/FileDialog.h index 8bc00bf30..e3608f6eb 100644 --- a/src/widgets/FileDialog/FileDialog.h +++ b/src/widgets/FileDialog/FileDialog.h @@ -14,8 +14,7 @@ custom controls. *//*******************************************************************/ -#ifndef _FILEDIALOG_H_ -#define _FILEDIALOG_H_ +#pragma once #include // to inherit @@ -88,5 +87,3 @@ FileSelectorEx(const wxString& message = wxFileSelectorPromptStr, int flags = 0, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord); - -#endif diff --git a/src/widgets/FileHistory.h b/src/widgets/FileHistory.h index 3e237f496..311b6d015 100644 --- a/src/widgets/FileHistory.h +++ b/src/widgets/FileHistory.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_WIDGETS_FILEHISTORY__ -#define __AUDACITY_WIDGETS_FILEHISTORY__ +#pragma once #include #include @@ -73,5 +72,3 @@ class TENACITY_DLL_API FileHistory wxString mGroup; }; - -#endif diff --git a/src/widgets/Grabber.h b/src/widgets/Grabber.h index d535b1cf7..254461804 100644 --- a/src/widgets/Grabber.h +++ b/src/widgets/Grabber.h @@ -26,8 +26,7 @@ flicker-free use. *//**********************************************************************/ -#ifndef __AUDACITY_WIDGETS_GRABBER__ -#define __AUDACITY_WIDGETS_GRABBER__ +#pragma once @@ -170,7 +169,3 @@ class TENACITY_DLL_API AStaticBitmap : public wxStaticBitmap { }; DECLARE_EVENT_TABLE() }; - - - -#endif diff --git a/src/widgets/Grid.h b/src/widgets/Grid.h index 51b3c3dc9..2965d5ed8 100644 --- a/src/widgets/Grid.h +++ b/src/widgets/Grid.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_WIDGETS_GRID__ -#define __AUDACITY_WIDGETS_GRID__ +#pragma once #include #include // for wxUSE_* macros @@ -226,6 +225,3 @@ class TENACITY_DLL_API Grid final : public wxGrid DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/widgets/HelpSystem.h b/src/widgets/HelpSystem.h index 177e40bd1..bb32f4eca 100644 --- a/src/widgets/HelpSystem.h +++ b/src/widgets/HelpSystem.h @@ -18,8 +18,7 @@ **********************************************************************/ -#ifndef __AUDACITY_HELPSYSTEM__ -#define __AUDACITY_HELPSYSTEM__ +#pragma once @@ -155,5 +154,3 @@ public: bool mDismissed{}; DECLARE_EVENT_TABLE() }; - -#endif // __AUDACITY_HELPSYSTEM__ diff --git a/src/widgets/HtmlWindow.h b/src/widgets/HtmlWindow.h index ce2b6a902..af0c78df4 100644 --- a/src/widgets/HtmlWindow.h +++ b/src/widgets/HtmlWindow.h @@ -20,8 +20,7 @@ around to NEW positions. *//**********************************************************************/ -#ifndef __AUDACITY_WIDGETS_HtmlWindow__ -#define __AUDACITY_WIDGETS_HtmlWindow__ +#pragma once @@ -44,5 +43,3 @@ public: const wxString& name = wxT("htmlWindow")); virtual ~HtmlWindow(); }; - -#endif diff --git a/src/widgets/ImageRoll.h b/src/widgets/ImageRoll.h index 4823411f1..c43ab04fb 100644 --- a/src/widgets/ImageRoll.h +++ b/src/widgets/ImageRoll.h @@ -9,8 +9,7 @@ **********************************************************************/ -#ifndef __AUDACITY_IMAGE_ROLL__ -#define __AUDACITY_IMAGE_ROLL__ +#pragma once #include // #include // for enum wxRasterOperationMode @@ -96,5 +95,3 @@ class ImageRollPanel final : public wxPanelWrapper DECLARE_EVENT_TABLE() }; - -#endif // __AUDACITY_IMAGE_ROLL__ diff --git a/src/widgets/KeyView.h b/src/widgets/KeyView.h index 66ec1a086..d81a0e438 100644 --- a/src/widgets/KeyView.h +++ b/src/widgets/KeyView.h @@ -6,8 +6,7 @@ **********************************************************************/ -#ifndef __AUDACITY_WIDGETS_KEYVIEW__ -#define __AUDACITY_WIDGETS_KEYVIEW__ +#pragma once #include "tenacity/Types.h" @@ -167,6 +166,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif - diff --git a/src/widgets/Meter.h b/src/widgets/Meter.h index 17002f54e..8e638b418 100644 --- a/src/widgets/Meter.h +++ b/src/widgets/Meter.h @@ -13,8 +13,7 @@ **********************************************************************/ -#ifndef __AUDACITY_METER__ -#define __AUDACITY_METER__ +#pragma once #include // for wxUSE_* macros #include // member variable @@ -295,5 +294,3 @@ class TENACITY_DLL_API MeterPanel final DECLARE_EVENT_TABLE() }; - -#endif // __AUDACITY_METER__ diff --git a/src/widgets/MeterPanelBase.h b/src/widgets/MeterPanelBase.h index 647bcdc05..6e8c44667 100644 --- a/src/widgets/MeterPanelBase.h +++ b/src/widgets/MeterPanelBase.h @@ -8,8 +8,7 @@ Paul Licameli split from Meter.h **********************************************************************/ -#ifndef __AUDACITY_METER_PANEL_BASE__ -#define __AUDACITY_METER_PANEL_BASE__ +#pragma once #include "wxPanelWrapper.h" @@ -41,5 +40,3 @@ private: public: static TempAllowFocus TemporarilyAllowFocus(); }; - -#endif diff --git a/src/widgets/MultiDialog.h b/src/widgets/MultiDialog.h index 2da78a07e..2d9502503 100644 --- a/src/widgets/MultiDialog.h +++ b/src/widgets/MultiDialog.h @@ -11,8 +11,7 @@ **********************************************************************/ -#ifndef __AUDACITY_MULTIDIALOG__ -#define __AUDACITY_MULTIDIALOG__ +#pragma once #include @@ -31,5 +30,3 @@ int ShowMultiDialog(const TranslatableString &message, const TranslatableString &boxMsg = DefaultMultiDialogMessage(), bool log = true); - -#endif // __AUDACITY_MULTIDIALOG__ diff --git a/src/widgets/NumericTextCtrl.h b/src/widgets/NumericTextCtrl.h index eae48e2e3..d4ea7c0be 100644 --- a/src/widgets/NumericTextCtrl.h +++ b/src/widgets/NumericTextCtrl.h @@ -12,8 +12,7 @@ **********************************************************************/ -#ifndef __AUDACITY_TIME_TEXT_CTRL__ -#define __AUDACITY_TIME_TEXT_CTRL__ +#pragma once @@ -299,5 +298,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif // __AUDACITY_TIME_TEXT_CTRL__ diff --git a/src/widgets/Overlay.h b/src/widgets/Overlay.h index 75c36feb8..eb1f1924d 100644 --- a/src/widgets/Overlay.h +++ b/src/widgets/Overlay.h @@ -6,8 +6,7 @@ // // -#ifndef __AUDACITY_OVERLAY__ -#define __AUDACITY_OVERLAY__ +#pragma once @@ -117,5 +116,3 @@ public: // as context virtual void Draw(OverlayPanel &panel, wxDC &dc) = 0; }; - -#endif diff --git a/src/widgets/OverlayPanel.h b/src/widgets/OverlayPanel.h index 53966d8cc..a665ef06c 100644 --- a/src/widgets/OverlayPanel.h +++ b/src/widgets/OverlayPanel.h @@ -6,8 +6,7 @@ // // -#ifndef __AUDACITY_OVERLAY_PANEL__ -#define __AUDACITY_OVERLAY_PANEL__ +#pragma once #include #include @@ -75,5 +74,3 @@ public: ADCChanger() : Base{} {} ADCChanger(wxDC *pDC); }; - -#endif diff --git a/src/widgets/PopupMenuTable.h b/src/widgets/PopupMenuTable.h index 74a8c114c..d2bbc59e3 100644 --- a/src/widgets/PopupMenuTable.h +++ b/src/widgets/PopupMenuTable.h @@ -15,8 +15,7 @@ tables, and automatically attaches and detaches the event handlers. **********************************************************************/ -#ifndef __AUDACITY_POPUP_MENU_TABLE__ -#define __AUDACITY_POPUP_MENU_TABLE__ +#pragma once class wxCommandEvent; @@ -318,5 +317,3 @@ void HandlerClass::Populate() { \ // ends function #define END_POPUP_MENU() } - -#endif diff --git a/src/widgets/ProgressDialog.h b/src/widgets/ProgressDialog.h index 1cdc14ade..309a4fb0f 100644 --- a/src/widgets/ProgressDialog.h +++ b/src/widgets/ProgressDialog.h @@ -15,8 +15,7 @@ *************************************************************************/ -#ifndef __AUDACITY_WIDGETS_PROGRESSDIALOG__ -#define __AUDACITY_WIDGETS_PROGRESSDIALOG__ +#pragma once @@ -173,5 +172,3 @@ protected: // doesn't support changes of message using ProgressDialog::Update; }; - -#endif diff --git a/src/widgets/ReadOnlyText.h b/src/widgets/ReadOnlyText.h index c6b97e5a3..5a460eb1e 100644 --- a/src/widgets/ReadOnlyText.h +++ b/src/widgets/ReadOnlyText.h @@ -6,8 +6,7 @@ **********************************************************************/ -#ifndef __AUDACITY_READONLYTEXT__ -#define __AUDACITY_READONLYTEXT__ +#pragma once #include @@ -133,5 +132,3 @@ public: SetValue(value.Translation()); } }; - -#endif // __AUDACITY_READONLYTEXT__ diff --git a/src/widgets/Ruler.h b/src/widgets/Ruler.h index 8bcd1c007..92bd2bdf3 100644 --- a/src/widgets/Ruler.h +++ b/src/widgets/Ruler.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_RULER__ -#define __AUDACITY_RULER__ +#pragma once #include "wxPanelWrapper.h" // to inherit #include "../NumberScale.h" // member variable @@ -290,5 +289,3 @@ class TENACITY_DLL_API RulerPanel final : public wxPanelWrapper { private: DECLARE_EVENT_TABLE() }; - -#endif //define __AUDACITY_RULER__ diff --git a/src/widgets/Warning.h b/src/widgets/Warning.h index f6c880f11..061146175 100644 --- a/src/widgets/Warning.h +++ b/src/widgets/Warning.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_WARNING__ -#define __AUDACITY_WARNING__ +#pragma once @@ -33,5 +32,3 @@ int ShowWarningDialog(wxWindow *parent, bool showCancelButton = false, // This message appears by the checkbox: const TranslatableString &footer = DefaultWarningFooter()); - -#endif // __AUDACITY_WARNING__ diff --git a/src/widgets/WindowAccessible.h b/src/widgets/WindowAccessible.h index d9836315d..52561f210 100644 --- a/src/widgets/WindowAccessible.h +++ b/src/widgets/WindowAccessible.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_WINDOW_ACCESSIBLE__ -#define __AUDACITY_WINDOW_ACCESSIBLE__ +#pragma once #include // for wxUSE_* macros @@ -99,4 +98,3 @@ private: }; #endif // wxUSE_ACCESSIBILITY -#endif // __AUDACITY_WINDOW_ACCESSIBLE__ diff --git a/src/widgets/wxPanelWrapper.h b/src/widgets/wxPanelWrapper.h index 0d26030d4..f673dafa6 100644 --- a/src/widgets/wxPanelWrapper.h +++ b/src/widgets/wxPanelWrapper.h @@ -6,8 +6,7 @@ // // -#ifndef __AUDACITY_WXPANEL_WRAPPER__ -#define __AUDACITY_WXPANEL_WRAPPER__ +#pragma once #include #include // to inherit @@ -224,5 +223,3 @@ public: ( parent, message.Translation(), caption.Translation(), style, pos ) {} }; - -#endif diff --git a/src/widgets/wxTextCtrlWrapper.h b/src/widgets/wxTextCtrlWrapper.h index 66495d525..14176c123 100644 --- a/src/widgets/wxTextCtrlWrapper.h +++ b/src/widgets/wxTextCtrlWrapper.h @@ -8,8 +8,7 @@ **********************************************************************/ -#ifndef __AUDACITY_WXTEXTCTRLWRAPPER__ -#define __AUDACITY_WXTEXTCTRLWRAPPER__ +#pragma once @@ -71,5 +70,3 @@ public: private: bool mReadOnly; }; - -#endif // __AUDACITY_WXTEXTCTRLWRAPPER__ diff --git a/src/wxFileNameWrapper.h b/src/wxFileNameWrapper.h index b1ecf36d4..3cafccd41 100644 --- a/src/wxFileNameWrapper.h +++ b/src/wxFileNameWrapper.h @@ -8,8 +8,7 @@ Paul Licameli **********************************************************************/ -#ifndef __AUDACITY_WXFILENAMEWRAPPER__ -#define __AUDACITY_WXFILENAMEWRAPPER__ +#pragma once class wxArrayString; @@ -87,6 +86,3 @@ public: return *this; } }; - -#endif - diff --git a/src/xml/XMLFileReader.h b/src/xml/XMLFileReader.h index 8f58dac9e..4a143d61e 100644 --- a/src/xml/XMLFileReader.h +++ b/src/xml/XMLFileReader.h @@ -8,7 +8,7 @@ **********************************************************************/ - +#pragma once #include struct XML_ParserStruct; diff --git a/src/xml/XMLTagHandler.h b/src/xml/XMLTagHandler.h index 0d4f73ab4..efa0a2e11 100644 --- a/src/xml/XMLTagHandler.h +++ b/src/xml/XMLTagHandler.h @@ -15,9 +15,8 @@ input values from XML files. **********************************************************************/ -#ifndef __AUDACITY_XML_TAG_HANDLER__ -#define __AUDACITY_XML_TAG_HANDLER__ +#pragma once #include @@ -115,6 +114,3 @@ class TENACITY_DLL_API XMLTagHandler /* not final */ { void ReadXMLContent(const char *s, int len); XMLTagHandler *ReadXMLChild(const char *tag); }; - -#endif // define __AUDACITY_XML_TAG_HANDLER__ - diff --git a/src/xml/XMLWriter.h b/src/xml/XMLWriter.h index cdb2340b3..c614ba56e 100644 --- a/src/xml/XMLWriter.h +++ b/src/xml/XMLWriter.h @@ -7,8 +7,7 @@ Leland Lucius **********************************************************************/ -#ifndef __AUDACITY_XML_XML_FILE_WRITER__ -#define __AUDACITY_XML_XML_FILE_WRITER__ +#pragma once #include #include // to inherit @@ -145,5 +144,3 @@ class XMLStringWriter final : public wxString, public XMLWriter { private: }; - -#endif