Replace header guards with #pragma once

Signed-off-by: Leon Marz <main@lmarz.org>

include/tenacity/ComponentInterface.h

@@ -39,8 +39,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_COMPONENT_INTERFACE_H__
+#pragma once
-#define __AUDACITY_COMPONENT_INTERFACE_H__
 
 #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__

include/tenacity/ConfigInterface.h

@@ -39,8 +39,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_CONFIGINTERFACE_H__
+#pragma once
-#define __AUDACITY_CONFIGINTERFACE_H__
 
 #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__

include/tenacity/EffectAutomationParameters.h

@@ -40,8 +40,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_COMMAND_PARAMETERS_H__
+#pragma once
-#define __AUDACITY_COMMAND_PARAMETERS_H__
 
 #include <locale.h>
 
@@ -338,5 +337,3 @@ public:
       return val;
    }
 };
-
-#endif

include/tenacity/EffectInterface.h

@@ -39,8 +39,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_EFFECTINTERFACE_H__
+#pragma once
-#define __AUDACITY_EFFECTINTERFACE_H__
 
 #include <functional>
 
@@ -246,5 +245,3 @@ public:
    virtual bool HasOptions() = 0;
    virtual void ShowOptions() = 0;
 };
-
-#endif // __AUDACITY_EFFECTINTERFACE_H__

include/tenacity/ModuleInterface.h

@@ -39,8 +39,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_MODULEINTERFACE_H__
+#pragma once
-#define __AUDACITY_MODULEINTERFACE_H__
 
 #include <functional>
 #include <memory>
@@ -177,5 +176,3 @@ void name::Unregister()                               \
 {                                                     \
    UnregisterProvider(AudacityModule);                \
 }
-
-#endif // __AUDACITY_MODULEINTERFACE_H__

include/tenacity/PluginInterface.h

@@ -39,8 +39,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PLUGININTERFACE_H__
+#pragma once
-#define __AUDACITY_PLUGININTERFACE_H__
 
 #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__

include/tenacity/Types.h

@@ -39,8 +39,7 @@
    
 **********************************************************************/
 
-#ifndef __AUDACITY_TYPES_H__
+#pragma once
-#define __AUDACITY_TYPES_H__
 
 #include <algorithm>
 #include <functional>
@@ -255,5 +254,3 @@ typedef enum
    ChannelNameBottomFrontLeft,
    ChannelNameBottomFrontRight,
 } ChannelName, *ChannelNames;
-
-#endif // __AUDACITY_TYPES_H__

libraries/lib-strings/Identifier.h

@@ -8,8 +8,7 @@
  
  **********************************************************************/
 
-#ifndef __AUDACITY_IDENTIFIER__
+#pragma once
-#define __AUDACITY_IDENTIFIER__
 
 #include <vector>
 #include <wx/string.h>
@@ -234,6 +233,3 @@ using CommandIDs = std::vector<CommandID>;
 
 struct ManualPageIDTag;
 using ManualPageID = TaggedIdentifier< ManualPageIDTag >;
-
-#endif
-

libraries/lib-strings/Internat.h

@@ -9,8 +9,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_INTERNAT__
+#pragma once
-#define __AUDACITY_INTERNAT__
 
 #include <vector>
 #include <wx/longlong.h>
@@ -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

libraries/lib-strings/Languages.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_LANGUAGES__
+#pragma once
-#define __AUDACITY_LANGUAGES__
 
 class wxArrayString;
 class wxString;
@@ -56,5 +55,3 @@ STRINGS_API
 wxString GetLocaleName();
 
 }
-
-#endif // __AUDACITY_LANGUAGES__

libraries/lib-strings/TranslatableString.h

@@ -8,8 +8,7 @@
  
  **********************************************************************/
 
-#ifndef __AUDACITY_TRANSLATABLE_STRING__
+#pragma once
-#define __AUDACITY_TRANSLATABLE_STRING__
 
 #include <stddef.h> // for size_t
 #include <functional>
@@ -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

libraries/lib-strings/wxArrayStringEx.h

@@ -8,8 +8,7 @@
  
  **********************************************************************/
 
-#ifndef __AUDACITY_WX_ARRAY_STRING_EX__
+#pragma once
-#define __AUDACITY_WX_ARRAY_STRING_EX__
 
 #include <wx/arrstr.h>
 
@@ -69,5 +68,3 @@ public:
       return result;
    }
 };
-
-#endif

libraries/lib-utility/MemoryX.h

@@ -1,5 +1,4 @@
-#ifndef __AUDACITY_MEMORY_X_H__
+#pragma once
-#define __AUDACITY_MEMORY_X_H__
 
 // C++ standard header <memory> with a few extensions
 #include <iterator>
@@ -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__

libraries/lib-utility/ModuleConstants.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_MODULE_CONSTANTS__
+#pragma once
-#define __AUDACITY_MODULE_CONSTANTS__
 
 #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

src/AColor.h

@@ -11,8 +11,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_COLOR__
+#pragma once
-#define __AUDACITY_COLOR__
 
 #include <memory>
 #include <wx/brush.h> // 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

src/AboutDialog.h

@@ -6,8 +6,7 @@
 
 **********************************************************************/
 
-#ifndef TENACITY_ABOUT_DLG
+#pragma once
-#define TENACITY_ABOUT_DLG
 
 #include <vector>
 #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

src/ActiveProjects.h

@@ -6,8 +6,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_ACTIVE_PROJECTS__
+#pragma once
-#define __AUDACITY_ACTIVE_PROJECTS__
 
 
 #include "Identifier.h"
@@ -19,5 +18,3 @@ namespace ActiveProjects
    void Remove(const FilePath &path);
    wxString Find(const FilePath &path);
 };
-
-#endif

src/AdornedRulerPanel.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_ADORNED_RULER_PANEL__
+#pragma once
-#define __AUDACITY_ADORNED_RULER_PANEL__
 
 #include "CellularPanel.h"
 #include "widgets/Ruler.h" // member variable
@@ -237,5 +236,3 @@ private:
    double mLastDrawnZoom{};
    bool mDirtySelectedRegion{};
 };
-
-#endif //define __AUDACITY_ADORNED_RULER_PANEL__

src/AttachedVirtualFunction.h

@@ -9,8 +9,7 @@ Paul Licameli
 
 **********************************************************************/
 
-#ifndef __AUDACITY_ATTACHED_VIRTUAL_FUNCTION__
+#pragma once
-#define __AUDACITY_ATTACHED_VIRTUAL_FUNCTION__
 
 
 #include <functional>
@@ -286,5 +285,3 @@ private:
       return registry;
    }
 };
-
-#endif

src/AudacityApp.h

@@ -11,8 +11,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_APP__
+#pragma once
-#define __AUDACITY_APP__
 
 
 #include "Identifier.h"
@@ -118,5 +117,3 @@ class AudacityApp final : public wxApp {
 };
 
 extern AudacityApp & wxGetApp();
-
-#endif

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 <wx/app.h> // used in inline function template
 #include <exception>
@@ -227,5 +227,3 @@ R GuardedCall(
       return handler( nullptr );
    }
 }
-
-#endif

src/AudacityFileConfig.h

@@ -9,8 +9,7 @@ Paul Licameli split from Prefs.h
 
 **********************************************************************/
 
-#ifndef __AUDACITY_FILE_CONFIG__
+#pragma once
-#define __AUDACITY_FILE_CONFIG__
 
 #include <memory>
 #include "widgets/FileConfig.h" // to inherit
@@ -45,4 +44,3 @@ private:
       const wxMBConv& conv
    );
 };
-#endif

src/AudacityLogger.h

@@ -11,8 +11,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_LOGGER__
+#pragma once
-#define __AUDACITY_LOGGER__
 
 
 
@@ -64,5 +63,3 @@ class TENACITY_DLL_API AudacityLogger final : public wxEvtHandler,
    wxString mBuffer;
    bool mUpdated;
 };
-
-#endif

src/AudioIO.h

@@ -10,8 +10,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_AUDIO_IO__
+#pragma once
-#define __AUDACITY_AUDIO_IO__
 
 
 
@@ -789,5 +788,3 @@ private:
 };
 
 static constexpr unsigned ScrubPollInterval_ms = 50;
-
-#endif

src/AudioIOBase.h

@@ -8,8 +8,7 @@ Paul Licameli split from AudioIO.h
 
 **********************************************************************/
 
-#ifndef __AUDACITY_AUDIO_IO_BASE__
+#pragma once
-#define __AUDACITY_AUDIO_IO_BASE__
 
 
 
@@ -340,8 +339,6 @@ protected:
    static const int NumRatesToTry;
 };
 
-#endif
-
 #include "Prefs.h"
 
 extern TENACITY_DLL_API StringSetting AudioIOHost;

src/AudioIOBufferHelper.h

@@ -1,5 +1,4 @@
-#ifndef AUDIOIO_BUFFER_HELPER_H
+#pragma once
-#define AUDIOIO_BUFFER_HELPER_H
 
 #include "AudioIO.h"
 #include "../libraries/lib-utility/MemoryX.h"
@@ -38,5 +37,3 @@ class AudioIOBufferHelper
             delete[] chans;
         }
 };
-
-#endif

src/AudioIOListener.h

@@ -10,8 +10,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_AUDIO_IO_LISTENER__
+#pragma once
-#define __AUDACITY_AUDIO_IO_LISTENER__
 
 
 
@@ -39,5 +38,3 @@ public:
    virtual void OnSoundActivationThreshold() = 0;
 
 };
-
-#endif

src/AutoRecoveryDialog.h

@@ -8,8 +8,7 @@ Paul Licameli split from AutoRecovery.h
 
 **********************************************************************/
 
-#ifndef __AUDACITY_AUTO_RECOVERY_DIALOG__
+#pragma once
-#define __AUDACITY_AUTO_RECOVERY_DIALOG__
 
 class AudacityProject;
 
@@ -28,5 +27,3 @@ class AudacityProject;
 //
 bool ShowAutoRecoveryDialogIfNeeded(AudacityProject*& pproj,
                                     bool *didRecoverAnything);
-
-#endif

src/BatchCommandDialog.h

@@ -9,8 +9,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_MACRO_COMMAND_DIALOG__
+#pragma once
-#define __AUDACITY_MACRO_COMMAND_DIALOG__
 
 #include <wx/defs.h>
 
@@ -61,6 +60,3 @@ class MacroCommandDialog final : public wxDialogWrapper {
 
    DECLARE_EVENT_TABLE()
 };
-
-
-#endif

src/BatchCommands.h

@@ -9,8 +9,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_BATCH_COMMANDS_DIALOG__
+#pragma once
-#define __AUDACITY_BATCH_COMMANDS_DIALOG__
 
 #include <wx/defs.h>
 
@@ -125,5 +124,3 @@ private:
    Exporter mExporter;
    wxString mFileName;
 };
-
-#endif

src/BatchProcessDialog.h

@@ -9,8 +9,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_MACROS_WINDOW__
+#pragma once
-#define __AUDACITY_MACROS_WINDOW__
 
 #include <wx/defs.h>
 
@@ -145,5 +144,3 @@ private:
 
    DECLARE_EVENT_TABLE()
 };
-
-#endif

src/Benchmark.h

@@ -8,13 +8,10 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_BENCHMARK__
+#pragma once
-#define __AUDACITY_BENCHMARK__
 
 class wxWindow;
 class AudacityProject;
 
 TENACITY_DLL_API
 void RunBenchmark( wxWindow *parent, AudacityProject &project );
-
-#endif // define __AUDACITY_BENCHMARK__

src/BuildInfo.h

@@ -6,8 +6,7 @@
 
 **********************************************************************/
 
-#ifndef BUILD_INFO_H
+#pragma once
-#define BUILD_INFO_H
 
 #include "wx/cpp.h"
 #include <wx/ctrlsub.h>
@@ -140,4 +139,3 @@ public:
             return o.GetString();
         }
 };
-#endif

src/CellularPanel.h

@@ -8,8 +8,7 @@
 
  **********************************************************************/
 
-#ifndef __AUDACITY_CELLULAR_PANEL__
+#pragma once
-#define __AUDACITY_CELLULAR_PANEL__
 
 #include "widgets/OverlayPanel.h" // to inherit
 
@@ -171,5 +170,3 @@ private:
    
    DECLARE_EVENT_TABLE()
 };
-
-#endif

src/ClientData.h

@@ -9,8 +9,7 @@ Paul Licameli
 
 **********************************************************************/
 
-#ifndef __AUDACITY_CLIENT_DATA__
+#pragma once
-#define __AUDACITY_CLIENT_DATA__
 
 #include "ClientDataHelpers.h"
 
@@ -564,5 +563,3 @@ private:
 };
 
 }
-
-#endif

src/ClientDataHelpers.h

@@ -9,8 +9,7 @@ Paul Licameli
 
 **********************************************************************/
 
-#ifndef __AUDACITY_CLIENT_DATA_HELPERS__
+#pragma once
-#define __AUDACITY_CLIENT_DATA_HELPERS__
 
 #include <memory>
 #include <mutex>
@@ -149,5 +148,3 @@ template< typename Container > struct Copyable< Container, DeepCopying >
 };
 
 }
-
-#endif

src/Clipboard.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_CLIPBOARD__
+#pragma once
-#define __AUDACITY_CLIPBOARD__
 
 
 
@@ -55,5 +54,3 @@ private:
    double mT0{ 0 };
    double mT1{ 0 };
 };
-
-#endif

src/CommonCommandFlags.h

@@ -8,8 +8,7 @@ Paul Licameli split from Menus.cpp
 
 **********************************************************************/
 
-#ifndef __AUDACITY_COMMON_COMMAND_FLAGS__
+#pragma once
-#define __AUDACITY_COMMON_COMMAND_FLAGS__
 
 
 
@@ -62,5 +61,3 @@ extern TENACITY_DLL_API const ReservedCommandFlag
    &AudioTracksSelectedFlag(),
    &NoAutoSelect() // jkc
 ;
-
-#endif

src/ComponentInterfaceSymbol.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_COMPONENT_INTERFACE_SYMBOL__
+#pragma once
-#define __AUDACITY_COMPONENT_INTERFACE_SYMBOL__
 
 #include "Identifier.h"
 #include "Internat.h"
@@ -78,5 +77,3 @@ private:
 using EnumValueSymbol = ComponentInterfaceSymbol;
 using NumericFormatSymbol = EnumValueSymbol;
 using EffectFamilySymbol = ComponentInterfaceSymbol;
-
-#endif

src/CrossFade.h

@@ -8,8 +8,7 @@
   Licensed under the GPL version 2.0
 
 **********************************************************************/
-#ifndef __AUDACITY_CROSSFADE__
+#pragma once
-#define __AUDACITY_CROSSFADE__
 
 /// This defines a crossfader class that
 /// accepts a list of WaveClips and can do a mini-mixing
@@ -54,7 +53,3 @@ class CrossFader
 
 
 };
-
-
-
-#endif

src/DBConnection.h

@@ -9,8 +9,7 @@ Paul Licameli -- split from ProjectFileIO.h
 
 **********************************************************************/
 
-#ifndef __AUDACITY_DB_CONNECTION__
+#pragma once
-#define __AUDACITY_DB_CONNECTION__
 
 #include <atomic>
 #include <condition_variable>
@@ -168,5 +167,3 @@ public:
 
    Connection mpConnection;
 };
-
-#endif

src/Dependencies.h

@@ -11,8 +11,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_DEPENDENCIES__
+#pragma once
-#define __AUDACITY_DEPENDENCIES__
 
 #include <list>
 #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

src/DeviceChange.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_DEVICECHANGE_H__
+#pragma once
-#define __AUDACITY_DEVICECHANGE_H__
 
 
 
@@ -59,5 +58,3 @@ private:
 #endif
 
 #endif
-
-#endif

src/DeviceManager.h

@@ -15,8 +15,7 @@
 
 *//*******************************************************************/
 
-#ifndef __AUDACITY_DEVICEMANAGER__
+#pragma once
-#define __AUDACITY_DEVICEMANAGER__
 
 #include <chrono>
 #include <vector>
@@ -97,6 +96,3 @@ private:
 
    static DeviceManager dm;
 };
-
-#endif
-

src/Diags.h

@@ -12,8 +12,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_DIAGS__
+#pragma once
-#define __AUDACITY_DIAGS__
 
 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

src/Dither.h

@@ -7,8 +7,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_DITHER_H__
+#pragma once
-#define __AUDACITY_DITHER_H__
 
 #include "tenacity/Types.h" // for samplePtr
 
@@ -61,5 +60,3 @@ private:
     float mTriangleState;
     float mBuffer[8 /* = BUF_SIZE */];
 };
-
-#endif /* __AUDACITY_DITHER_H__ */

src/Envelope.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_ENVELOPE__
+#pragma once
-#define __AUDACITY_ENVELOPE__
 
 #include <stdlib.h>
 #include <algorithm>
@@ -294,5 +293,3 @@ public:
 private:
    double mRangeLower{}, mRangeUpper{};
 };
-
-#endif

src/EnvelopeEditor.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_ENVELOPE_EDITOR__
+#pragma once
-#define __AUDACITY_ENVELOPE_EDITOR__
 
 class wxMouseEvent;
 class wxRect;
@@ -68,6 +67,3 @@ private:
    int mButton;
    bool mDirty;
 };
-
-
-#endif

src/FFT.h

@@ -29,8 +29,7 @@
   you need to use doubles.
 
 **********************************************************************/
-#ifndef __AUDACITY_FFT_H__
+#pragma once
-#define __AUDACITY_FFT_H__
 
 #include <wx/defs.h>
 
@@ -155,5 +154,3 @@ TENACITY_DLL_API const TranslatableString WindowFuncName(int whichFunction);
 TENACITY_DLL_API int NumWindowFuncs();
 
 void DeinitFFT();
-
-#endif

src/FFmpeg.h

@@ -13,8 +13,7 @@ Describes shared object that is used to access FFmpeg libraries.
 
 *//*******************************************************************/
 
-#if !defined(__AUDACITY_FFMPEG__)
+#pragma once
-#define __AUDACITY_FFMPEG__
 
 
 
@@ -1038,5 +1037,3 @@ using ScsPtr = std::shared_ptr<Scs>;
 extern FFmpegLibs *FFmpegLibsInst();
 
 #endif // USE_FFMPEG
-#endif // __AUDACITY_FFMPEG__
-

src/FileException.h

@@ -7,8 +7,7 @@
 
 */
 
-#ifndef __AUDACITY_FILE_EXCEPTION__
+#pragma once
-#define __AUDACITY_FILE_EXCEPTION__
 
 #include "AudacityException.h"
 #include <wx/filename.h> // wxFileName member variable
@@ -63,5 +62,3 @@ public:
    wxFileName fileName;
    wxFileName renameTarget;
 };
-
-#endif

src/FileFormats.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_FILE_FORMATS__
+#pragma once
-#define __AUDACITY_FILE_FORMATS__
 
 
 
@@ -157,5 +156,3 @@ struct SFFile : public std::unique_ptr<SNDFILE, ::SFFileCloser>
 
 extern ChoiceSetting FileFormatsCopyOrEditSetting;
 extern ChoiceSetting FileFormatsSaveWithDependenciesSetting;
-
-#endif

src/FileIO.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_FILEIO__
+#pragma once
-#define __AUDACITY_FILEIO__
 
 #include <memory>
 
@@ -46,5 +45,3 @@ class TENACITY_DLL_API FileIO
    std::unique_ptr<wxFFileOutputStream> mOutputStream;
    bool mOpen;
 };
-
-#endif

src/FileNames.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_FILE_NAMES__
+#pragma once
-#define __AUDACITY_FILE_NAMES__
 
 
 
@@ -264,5 +263,3 @@ namespace FileNames
 #define OSINPUT(X) OSFILENAME(X)
 #define OSOUTPUT(X) OSFILENAME(X)
 #endif
-
-#endif

src/FreqWindow.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_FREQ_WINDOW__
+#pragma once
-#define __AUDACITY_FREQ_WINDOW__
 
 #include <vector>
 #include <wx/font.h> // member variable
@@ -170,5 +169,3 @@ private:
 
    friend class FreqPlot;
 };
-
-#endif

src/HelpText.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_HELP_TEXT__
+#pragma once
-#define __AUDACITY_HELP_TEXT__
 
 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

src/HistoryWindow.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_HISTORY_WINDOW__
+#pragma once
-#define __AUDACITY_HISTORY_WINDOW__
 
 #include "Prefs.h"
 #include "widgets/wxPanelWrapper.h" // to inherit
@@ -70,5 +69,3 @@ class HistoryDialog final : public wxDialogWrapper,
  public:
    DECLARE_EVENT_TABLE()
 };
-
-#endif

src/HitTestResult.h

@@ -8,8 +8,7 @@ Paul Licameli
 
 **********************************************************************/
 
-#ifndef __AUDACITY_HIT_TEST_RESULT__
+#pragma once
-#define __AUDACITY_HIT_TEST_RESULT__
 
 #include <memory>
 #include "Internat.h" // for TranslatableString
@@ -30,5 +29,3 @@ struct HitTestPreview
    wxCursor *cursor {};
    TranslatableString tooltip{};
 };
-
-#endif

src/ImageManipulation.h

@@ -8,6 +8,8 @@
 
 **********************************************************************/
 
+#pragma once
+
 #include <memory>
 #include <wx/defs.h>
 

src/InconsistencyException.h

@@ -6,8 +6,7 @@
 
 */
 
-#ifndef __AUDACITY_INCONSISTENCY_EXCEPTION__
+#pragma once
-#define __AUDACITY_INCONSISTENCY_EXCEPTION__
 
 #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

src/InterpolateAudio.h

@@ -22,8 +22,7 @@
 
 *//*******************************************************************/
 
-#ifndef __AUDACITY_INTERPOLATE_AUDIO__
+#pragma once
-#define __AUDACITY_INTERPOLATE_AUDIO__
 
 
 #include <cstddef>
@@ -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__

src/KeyboardCapture.h

@@ -8,9 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_KEYBOARD_CAPTURE__
+#pragma once
-#define __AUDACITY_KEYBOARD_CAPTURE__
-
 
 
 #include <functional>
@@ -60,5 +58,3 @@ namespace KeyboardCapture
    TENACITY_DLL_API
    void OnFocus( wxWindow &window, wxFocusEvent &event );
 }
-
-#endif

src/LabelDialog.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_LABELDIALOG__
+#pragma once
-#define __AUDACITY_LABELDIALOG__
 
 #include <vector>
 #include <wx/defs.h>
@@ -114,5 +113,3 @@ class LabelDialog final : public wxDialogWrapper
 
    DECLARE_EVENT_TABLE()
 };
-
-#endif

src/LabelTrack.h

@@ -10,8 +10,7 @@
 
 **********************************************************************/
 
-#ifndef _LABELTRACK_
+#pragma once
-#define _LABELTRACK_
 
 #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

src/LangChoice.h

@@ -12,12 +12,9 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_LANG_CHOICE__
+#pragma once
-#define __AUDACITY_LANG_CHOICE__
 
 class wxString;
 class wxWindow;
 
 wxString ChooseLanguage(wxWindow *parent);
-
-#endif // __AUDACITY_LANG_CHOICE__

src/Legacy.h

@@ -8,6 +8,8 @@
 
 **********************************************************************/
 
+#pragma once
+
 #include <wx/defs.h>
 
 class wxFileName;

src/Lyrics.h

@@ -9,8 +9,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_LYRICS__
+#pragma once
-#define __AUDACITY_LYRICS__
 
 
 
@@ -161,5 +160,3 @@ private:
 
    DECLARE_EVENT_TABLE()
 };
-
-#endif // __AUDACITY_LYRICS__

src/LyricsWindow.h

@@ -9,8 +9,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_LYRICS_WINDOW__
+#pragma once
-#define __AUDACITY_LYRICS_WINDOW__
 
 #include <wx/frame.h> // to inherit
 
@@ -46,5 +45,3 @@ class LyricsWindow final : public wxFrame,
  public:
    DECLARE_EVENT_TABLE()
 };
-
-#endif

src/Matrix.h

@@ -23,8 +23,7 @@
 
 *//*******************************************************************/
 
-#ifndef __AUDACITY_MATRIX__
+#pragma once
-#define __AUDACITY_MATRIX__
 
 #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__

src/Menus.h

@@ -7,8 +7,7 @@
   Dominic Mazzoni
 
 **********************************************************************/
-#ifndef __AUDACITY_MENUS__
+#pragma once
-#define __AUDACITY_MENUS__
 
 #include "Identifier.h"
 
@@ -122,5 +121,3 @@ public:
    int  mWhatIfNoSelection;
    bool mStopIfWasPaused;
 };
-
-#endif

src/Mix.h

@@ -17,8 +17,7 @@
 
 *//********************************************************************/
 
-#ifndef __AUDACITY_MIX__
+#pragma once
-#define __AUDACITY_MIX__
 
 #include "SampleFormat.h"
 #include <vector>
@@ -196,6 +195,3 @@ class TENACITY_DLL_API Mixer {
 
    const bool       mMayThrow;
 };
-
-#endif
-

src/MixerBoard.h

@@ -11,8 +11,7 @@
 
 
 
-#ifndef __AUDACITY_MIXER_BOARD__
+#pragma once
-#define __AUDACITY_MIXER_BOARD__
 
 #include <wx/frame.h> // to inherit
 #include <wx/scrolwin.h> // to inherit
@@ -288,7 +287,3 @@ public:
 public:
    DECLARE_EVENT_TABLE()
 };
-
-#endif // __AUDACITY_MIXER_BOARD__
-
-

src/ModuleManager.h

@@ -9,8 +9,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_MODULEMANAGER_H__
+#pragma once
-#define __AUDACITY_MODULEMANAGER_H__
 
 #include "MemoryX.h"
 #include <functional>
@@ -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__ */

src/ModuleSettings.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_MODULE_SETTINGS__
+#pragma once
-#define __AUDACITY_MODULE_SETTINGS__
 
 #include "Identifier.h"
 
@@ -27,5 +26,3 @@ int GetModuleStatus( const FilePath &fname );
 void SetModuleStatus( const FilePath &fname, int iStatus );
 
 }
-
-#endif

src/NoteTrack.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_NOTETRACK__
+#pragma once
-#define __AUDACITY_NOTETRACK__
 
 
 
@@ -290,6 +289,3 @@ public:
 #define SonifyBeginModifyState()
 #define SonifyEndModifyState()
 #endif
-
-
-#endif

src/NumberScale.h

@@ -8,8 +8,7 @@ Paul Licameli
 
 **********************************************************************/
 
-#ifndef __AUDACITY_NUMBER_SCALE__
+#pragma once
-#define __AUDACITY_NUMBER_SCALE__
 
 #include <algorithm>
 #include <cmath>
@@ -279,5 +278,3 @@ private:
    float mValue0;
    float mValue1;
 };
-
-#endif

src/PitchName.h

@@ -15,8 +15,7 @@
 *//*******************************************************************/
 
 
-#ifndef __AUDACITY_PITCHNAME__
+#pragma once
-#define __AUDACITY_PITCHNAME__
 
 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__

src/PlatformCompatibility.h

@@ -17,8 +17,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_COMPATIBILITY__
+#pragma once
-#define __AUDACITY_COMPATIBILITY__
 
 #include "Identifier.h"
 
@@ -40,5 +39,3 @@ public:
    //
    static const FilePath &GetExecutablePath();
 };
-
-#endif

src/PlaybackSchedule.h

@@ -8,8 +8,7 @@
  
  **********************************************************************/
 
-#ifndef __AUDACITY_PLAYBACK_SCHEDULE__
+#pragma once
-#define __AUDACITY_PLAYBACK_SCHEDULE__
 
 #include <atomic>
 #include <vector>
@@ -163,5 +162,3 @@ struct TENACITY_DLL_API PlaybackSchedule {
    void RealTimeRestart();
 
 };
-
-#endif

src/PluginManager.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PLUGINMANAGER_H__
+#pragma once
-#define __AUDACITY_PLUGINMANAGER_H__
 
 #include <wx/defs.h>
 
@@ -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__ */

src/PluginRegistrationDialog.h

@@ -7,8 +7,7 @@
   Paul Licameli split from PluginManager.cpp
 
 **********************************************************************/
-#ifndef __AUDACITY_PLUGIN_REGISTRATION_DIALOG__
+#pragma once
-#define __AUDACITY_PLUGIN_REGISTRATION_DIALOG__
 
 #include "widgets/wxPanelWrapper.h" // to inherit
 #include <vector>
@@ -80,6 +79,3 @@ private:
 
    DECLARE_EVENT_TABLE()
 };
-
-
-#endif

src/Prefs.h

@@ -26,8 +26,7 @@
   track of...
 
 **********************************************************************/
-#ifndef __AUDACITY_PREFS__
+#pragma once
-#define __AUDACITY_PREFS__
 
 
 
@@ -423,5 +422,3 @@ struct TENACITY_DLL_API PreferenceInitializer {
 
    static void ReinitializeAll();
 };
-
-#endif

src/Printing.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PRINTING__
+#pragma once
-#define __AUDACITY_PRINTING__
 
 #include <wx/defs.h>
 
@@ -22,6 +21,3 @@ void HandlePageSetup(wxWindow *parent);
 void HandlePrint(
    wxWindow *parent, const wxString &name, TrackList *tracks,
    TrackPanel &panel);
-
-#endif // __AUDACITY_PRINTING__
-

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 <mutex>
 #include <vector>
 #include "MemoryX.h"
@@ -85,7 +84,3 @@ class Profiler
       clock_t mCumTime;
       clock_t mLastTime;
    };
-
-
-#endif
-

src/Project.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT__
+#pragma once
-#define __AUDACITY_PROJECT__
 
 #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

src/ProjectAudioIO.h

@@ -8,8 +8,7 @@ Paul Licameli split from AudacityProject.h
 
 **********************************************************************/
 
-#ifndef __PROJECT_AUDIO_IO__
+#pragma once
-#define __PROJECT_AUDIO_IO__
 
 #include "ClientData.h" // to inherit
 #include <wx/weakref.h>
@@ -52,5 +51,3 @@ private:
 
    int  mAudioIOToken{ -1 };
 };
-
-#endif

src/ProjectAudioManager.h

@@ -8,8 +8,7 @@ Paul Licameli split from ProjectManager.h
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT_AUDIO_MANAGER__
+#pragma once
-#define __AUDACITY_PROJECT_AUDIO_MANAGER__
 
 #include <memory>
 #include <vector>
@@ -182,5 +181,3 @@ PropertiesOfSelected GetPropertiesOfSelected(const AudacityProject &proj);
 
 extern TENACITY_DLL_API const ReservedCommandFlag
    &CanStopAudioStreamFlag();
-
-#endif

src/ProjectFSCK.h

@@ -10,8 +10,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT_FSCK__
+#pragma once
-#define __AUDACITY_PROJECT_FSCK__
 
 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

src/ProjectFileIO.h

@@ -8,8 +8,7 @@ Paul Licameli split from AudacityProject.h
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT_FILE_IO__
+#pragma once
-#define __AUDACITY_PROJECT_FILE_IO__
 
 #include <memory>
 #include <unordered_set>
@@ -339,5 +338,3 @@ public:
 private:
    std::shared_ptr<AudacityProject> mpProject;
 };
-
-#endif

src/ProjectFileIORegistry.h

@@ -8,8 +8,7 @@
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT_FILE_IO_REGISTRY__
+#pragma once
-#define __AUDACITY_PROJECT_FILE_IO_REGISTRY__
 
 #include <functional>
 
@@ -31,5 +30,3 @@ struct TENACITY_DLL_API Entry{
 TagHandlerFactory Lookup( const wxString &tag );
 
 }
-
-#endif

src/ProjectFileManager.h

@@ -8,8 +8,7 @@ Paul Licameli split from AudacityProject.h
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT_FILE_MANAGER__
+#pragma once
-#define __AUDACITY_PROJECT_FILE_MANAGER__
 
 #include <functional>
 #include <memory>
@@ -134,5 +133,3 @@ private:
    // Are we currently closing as the result of a menu command?
    bool mMenuClose{ false };
 };
-
-#endif

src/ProjectHistory.h

@@ -8,8 +8,7 @@ Paul Licameli split from ProjectManager.h
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT_HISTORY__
+#pragma once
-#define __AUDACITY_PROJECT_HISTORY__
 
 #include "ClientData.h"
 
@@ -56,5 +55,3 @@ private:
 
    bool mDirty{ false };
 };
-
-#endif

src/ProjectManager.h

@@ -8,8 +8,7 @@ Paul Licameli split from AudacityProject.h
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT_MANAGER__
+#pragma once
-#define __AUDACITY_PROJECT_MANAGER__
 
 #include <memory>
 
@@ -128,5 +127,3 @@ private:
    static bool sbWindowRectAlreadySaved;
    static bool sbSkipPromptingForSave;
 };
-
-#endif

src/ProjectSelectionManager.h

@@ -8,8 +8,7 @@ Paul Licameli split from ProjectManager.cpp
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT_SELECTION_MANAGER__
+#pragma once
-#define __AUDACITY_PROJECT_SELECTION_MANAGER__
 
 #include "ClientData.h" // to inherit
 #include "toolbars/SelectionBarListener.h" // to inherit
@@ -61,5 +60,3 @@ private:
 
    AudacityProject &mProject;
 };
-
-#endif

src/ProjectSerializer.h

@@ -8,8 +8,7 @@
 
 *******************************************************************/
 
-#ifndef __AUDACITY_PROJECTSERIALIZER__
+#pragma once
-#define __AUDACITY_PROJECTSERIALIZER__
 
 #include "xml/XMLTagHandler.h"
 
@@ -78,5 +77,3 @@ private:
    static NameMap mNames;
    static wxMemoryBuffer mDict;
 };
-
-#endif

src/ProjectSettings.h

@@ -8,8 +8,7 @@ Paul Licameli split from AudacityProject.h
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT_SETTINGS__
+#pragma once
-#define __AUDACITY_PROJECT_SETTINGS__
 
 #include <atomic>
 #include <wx/event.h> // to declare custom event type
@@ -146,5 +145,3 @@ private:
    bool mEmptyCanBeDirty;
    bool mShowSplashScreen;
 };
-
-#endif

src/ProjectStatus.h

@@ -8,9 +8,7 @@ Paul Licameli
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT_STATUS__
+#pragma once
-#define __AUDACITY_PROJECT_STATUS__
-#endif
 
 #include <utility>
 #include <vector>

src/ProjectWindow.h

@@ -8,8 +8,7 @@ Paul Licameli split from AudacityProject.h
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT_WINDOW__
+#pragma once
-#define __AUDACITY_PROJECT_WINDOW__
 
 #include <memory>
 #include "ProjectWindowBase.h" // to inherit
@@ -204,5 +203,3 @@ private:
 
 void GetDefaultWindowRect(wxRect *defRect);
 void GetNextWindowPlacement(wxRect *nextRect, bool *pMaximized, bool *pIconized);
-
-#endif

src/ProjectWindowBase.h

@@ -8,8 +8,7 @@ Paul Licameli split from ProjectWindow.h
 
 **********************************************************************/
 
-#ifndef __AUDACITY_PROJECT_WINDOW_BASE__
+#pragma once
-#define __AUDACITY_PROJECT_WINDOW_BASE__
 
 #include <wx/frame.h> // to inherit
 
@@ -35,6 +34,3 @@ protected:
 
 TENACITY_DLL_API AudacityProject *FindProjectFromWindow( wxWindow *pWindow );
 const AudacityProject *FindProjectFromWindow( const wxWindow *pWindow );
-
-#endif
-

src/RealFFTf.h

@@ -1,5 +1,4 @@
-#ifndef __realfftf_h
+#pragma once
-#define __realfftf_h
 
 
 
@@ -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
-