From 295d125142f60b25561a179fa3416a0a03c7332b Mon Sep 17 00:00:00 2001 From: jules Date: Sat, 11 Feb 2012 14:09:23 +0000 Subject: [PATCH] Stopped using the old BEGIN_JUCE_NAMESPACE macros, and just used hard-coded namespaces where necessary instead. The macro definitions are still there, so this shouldn't affect anyone's code. --- .../Code Editor/jucer_SourceCodeEditor.cpp | 2 +- .../buffers/juce_AudioDataConverters.cpp | 5 --- .../buffers/juce_AudioSampleBuffer.cpp | 4 -- .../effects/juce_IIRFilter.cpp | 4 -- .../juce_audio_basics/juce_audio_basics.cpp | 5 +++ modules/juce_audio_basics/juce_audio_basics.h | 5 ++- .../midi/juce_MidiBuffer.cpp | 4 -- .../juce_audio_basics/midi/juce_MidiFile.cpp | 4 -- .../midi/juce_MidiKeyboardState.cpp | 5 --- .../midi/juce_MidiMessage.cpp | 3 -- .../midi/juce_MidiMessageSequence.cpp | 4 -- .../sources/juce_BufferingAudioSource.cpp | 5 --- .../juce_ChannelRemappingAudioSource.cpp | 5 --- .../sources/juce_IIRFilterAudioSource.cpp | 5 --- .../sources/juce_MixerAudioSource.cpp | 4 -- .../sources/juce_ResamplingAudioSource.cpp | 4 -- .../sources/juce_ReverbAudioSource.cpp | 5 --- .../sources/juce_ToneGeneratorAudioSource.cpp | 5 --- .../synthesisers/juce_Synthesiser.cpp | 5 --- .../audio_cd/juce_AudioCDReader.cpp | 6 --- .../audio_io/juce_AudioDeviceManager.cpp | 5 --- .../audio_io/juce_AudioIODevice.cpp | 5 --- .../audio_io/juce_AudioIODeviceType.cpp | 5 --- .../juce_audio_devices/juce_audio_devices.cpp | 10 ++++- .../juce_audio_devices/juce_audio_devices.h | 5 ++- .../midi_io/juce_MidiMessageCollector.cpp | 5 --- .../midi_io/juce_MidiOutput.cpp | 5 --- .../native/juce_mac_AudioCDBurner.mm | 5 ++- .../native/juce_win32_DirectSound.cpp | 5 ++- .../sources/juce_AudioSourcePlayer.cpp | 4 -- .../sources/juce_AudioTransportSource.cpp | 4 -- .../codecs/juce_QuickTimeAudioFormat.cpp | 5 ++- .../format/juce_AudioFormat.cpp | 2 +- .../juce_audio_formats/juce_audio_formats.cpp | 5 ++- .../juce_audio_formats/juce_audio_formats.h | 5 ++- .../VST/juce_VST_Wrapper.cpp | 5 ++- .../VST/juce_VST_Wrapper.mm | 6 +-- .../format/juce_AudioPluginFormat.cpp | 4 -- .../format/juce_AudioPluginFormatManager.cpp | 5 --- .../juce_AudioUnitPluginFormat.mm | 7 ++-- .../format_types/juce_VSTPluginFormat.cpp | 5 --- .../juce_audio_processors.cpp | 5 +++ .../juce_audio_processors.h | 5 ++- .../processors/juce_AudioProcessor.cpp | 5 --- .../processors/juce_AudioProcessorEditor.cpp | 5 --- .../processors/juce_AudioProcessorGraph.cpp | 4 -- .../juce_GenericAudioProcessorEditor.cpp | 6 --- .../processors/juce_PluginDescription.cpp | 4 -- .../scanning/juce_KnownPluginList.cpp | 4 -- .../scanning/juce_PluginDirectoryScanner.cpp | 5 --- .../scanning/juce_PluginListComponent.cpp | 4 -- .../gui/juce_AudioDeviceSelectorComponent.cpp | 5 --- .../gui/juce_AudioThumbnail.cpp | 5 --- .../gui/juce_AudioThumbnailCache.cpp | 4 -- .../gui/juce_MidiKeyboardComponent.cpp | 5 --- modules/juce_audio_utils/juce_audio_utils.cpp | 5 +++ modules/juce_audio_utils/juce_audio_utils.h | 5 ++- .../players/juce_AudioProcessorPlayer.cpp | 5 --- .../juce_browser_plugin/juce_browser_plugin.h | 7 ++-- .../containers/juce_AbstractFifo.cpp | 4 -- .../containers/juce_DynamicObject.cpp | 5 --- .../containers/juce_NamedValueSet.cpp | 5 --- .../juce_core/containers/juce_PropertySet.cpp | 4 -- modules/juce_core/containers/juce_Variant.cpp | 5 --- .../files/juce_DirectoryIterator.cpp | 4 -- modules/juce_core/files/juce_File.cpp | 8 ---- .../juce_core/files/juce_FileInputStream.cpp | 4 -- .../juce_core/files/juce_FileOutputStream.cpp | 4 -- .../juce_core/files/juce_FileSearchPath.cpp | 4 -- .../juce_core/files/juce_TemporaryFile.cpp | 4 -- modules/juce_core/json/juce_JSON.cpp | 4 -- modules/juce_core/juce_core.cpp | 41 +++++++++++++++++-- modules/juce_core/juce_core.h | 5 ++- modules/juce_core/logging/juce_FileLogger.cpp | 4 -- modules/juce_core/logging/juce_Logger.cpp | 4 -- modules/juce_core/maths/juce_BigInteger.cpp | 4 -- modules/juce_core/maths/juce_Expression.cpp | 5 --- modules/juce_core/maths/juce_Expression.h | 4 +- modules/juce_core/maths/juce_Random.cpp | 4 -- modules/juce_core/memory/juce_MemoryBlock.cpp | 5 --- modules/juce_core/misc/juce_Result.cpp | 5 --- modules/juce_core/misc/juce_Uuid.cpp | 4 -- modules/juce_core/native/juce_mac_Network.mm | 5 ++- modules/juce_core/network/juce_MACAddress.cpp | 5 --- modules/juce_core/network/juce_NamedPipe.cpp | 3 -- modules/juce_core/network/juce_Socket.cpp | 33 ++------------- modules/juce_core/network/juce_URL.cpp | 5 --- .../streams/juce_BufferedInputStream.cpp | 4 -- .../streams/juce_FileInputSource.cpp | 6 --- .../juce_core/streams/juce_InputStream.cpp | 4 -- .../streams/juce_MemoryInputStream.cpp | 4 -- .../streams/juce_MemoryOutputStream.cpp | 4 -- .../juce_core/streams/juce_OutputStream.cpp | 5 --- .../streams/juce_SubregionStream.cpp | 4 -- modules/juce_core/system/juce_PlatformDefs.h | 9 ++-- .../juce_core/system/juce_StandardHeader.h | 10 +++-- modules/juce_core/system/juce_SystemStats.cpp | 5 --- .../text/juce_CharacterFunctions.cpp | 11 ----- modules/juce_core/text/juce_Identifier.cpp | 4 -- .../juce_core/text/juce_LocalisedStrings.cpp | 5 --- modules/juce_core/text/juce_String.cpp | 7 ---- modules/juce_core/text/juce_StringArray.cpp | 4 -- .../juce_core/text/juce_StringPairArray.cpp | 4 -- modules/juce_core/text/juce_StringPool.cpp | 4 -- .../juce_core/threads/juce_ChildProcess.cpp | 4 -- .../juce_core/threads/juce_ReadWriteLock.cpp | 5 --- modules/juce_core/threads/juce_Thread.cpp | 4 -- modules/juce_core/threads/juce_ThreadPool.cpp | 4 -- .../threads/juce_TimeSliceThread.cpp | 5 --- .../time/juce_PerformanceCounter.cpp | 4 -- modules/juce_core/time/juce_RelativeTime.cpp | 5 --- modules/juce_core/time/juce_Time.cpp | 13 ------ .../juce_core/unit_tests/juce_UnitTest.cpp | 4 -- modules/juce_core/xml/juce_XmlDocument.cpp | 5 --- modules/juce_core/xml/juce_XmlElement.cpp | 4 -- .../zip/juce_GZIPCompressorOutputStream.cpp | 4 -- .../zip/juce_GZIPDecompressorInputStream.cpp | 4 -- modules/juce_core/zip/juce_ZipFile.cpp | 5 --- .../encryption/juce_BlowFish.cpp | 5 --- .../encryption/juce_Primes.cpp | 4 -- .../encryption/juce_RSAKey.cpp | 5 --- .../juce_cryptography/hashing/juce_MD5.cpp | 5 --- .../juce_cryptography/hashing/juce_SHA256.cpp | 4 -- .../juce_cryptography/juce_cryptography.cpp | 5 +++ modules/juce_cryptography/juce_cryptography.h | 5 ++- .../juce_ApplicationProperties.cpp | 5 --- .../app_properties/juce_PropertiesFile.cpp | 5 --- .../juce_data_structures.cpp | 5 +++ .../juce_data_structures.h | 5 ++- .../undomanager/juce_UndoManager.cpp | 5 --- .../values/juce_Value.cpp | 4 -- .../values/juce_ValueTree.cpp | 5 --- .../broadcasters/juce_ActionBroadcaster.cpp | 5 --- .../broadcasters/juce_AsyncUpdater.cpp | 5 --- .../broadcasters/juce_ChangeBroadcaster.cpp | 5 --- .../juce_InterprocessConnection.cpp | 5 --- .../juce_InterprocessConnectionServer.cpp | 5 --- modules/juce_events/juce_events.cpp | 9 ++-- modules/juce_events/juce_events.h | 5 ++- .../messages/juce_ApplicationBase.cpp | 3 -- .../messages/juce_DeletedAtShutdown.cpp | 4 -- .../messages/juce_MessageListener.cpp | 4 -- .../messages/juce_MessageManager.cpp | 4 -- .../native/juce_ios_MessageManager.mm | 7 ++-- .../native/juce_mac_MessageManager.mm | 6 ++- .../juce_events/timers/juce_MultiTimer.cpp | 5 --- modules/juce_events/timers/juce_Timer.cpp | 4 -- modules/juce_graphics/colour/juce_Colour.cpp | 6 --- .../colour/juce_ColourGradient.cpp | 6 --- modules/juce_graphics/colour/juce_Colours.cpp | 6 --- .../juce_graphics/colour/juce_FillType.cpp | 5 --- .../contexts/juce_GraphicsContext.cpp | 6 --- ...uce_LowLevelGraphicsPostScriptRenderer.cpp | 4 -- .../juce_LowLevelGraphicsSoftwareRenderer.cpp | 4 -- .../effects/juce_DropShadowEffect.cpp | 3 -- .../juce_graphics/effects/juce_GlowEffect.cpp | 4 -- .../fonts/juce_AttributedString.cpp | 4 -- .../fonts/juce_CustomTypeface.cpp | 5 --- modules/juce_graphics/fonts/juce_Font.cpp | 5 --- .../fonts/juce_GlyphArrangement.cpp | 4 -- .../juce_graphics/fonts/juce_TextLayout.cpp | 4 -- modules/juce_graphics/fonts/juce_Typeface.cpp | 4 -- .../geometry/juce_AffineTransform.cpp | 5 --- .../juce_graphics/geometry/juce_EdgeTable.cpp | 4 -- modules/juce_graphics/geometry/juce_Path.cpp | 4 -- .../geometry/juce_PathIterator.cpp | 4 -- .../geometry/juce_PathStrokeType.cpp | 4 -- .../geometry/juce_RectangleList.cpp | 5 --- .../image_formats/juce_GIFLoader.cpp | 5 --- .../image_formats/juce_JPEGLoader.cpp | 5 --- .../image_formats/juce_PNGLoader.cpp | 5 --- modules/juce_graphics/images/juce_Image.cpp | 5 --- .../juce_graphics/images/juce_ImageCache.cpp | 6 --- .../images/juce_ImageConvolutionKernel.cpp | 4 -- .../images/juce_ImageFileFormat.cpp | 4 -- modules/juce_graphics/juce_graphics.cpp | 7 ++-- modules/juce_graphics/juce_graphics.h | 5 ++- .../juce_graphics/native/juce_mac_Fonts.mm | 7 +++- .../placement/juce_Justification.cpp | 5 --- .../placement/juce_RectanglePlacement.cpp | 5 --- .../application/juce_Application.cpp | 3 -- .../buttons/juce_ArrowButton.cpp | 5 --- .../juce_gui_basics/buttons/juce_Button.cpp | 4 -- .../buttons/juce_DrawableButton.cpp | 4 -- .../buttons/juce_HyperlinkButton.cpp | 4 -- .../buttons/juce_ImageButton.cpp | 4 -- .../buttons/juce_ShapeButton.cpp | 4 -- .../buttons/juce_TextButton.cpp | 4 -- .../buttons/juce_ToggleButton.cpp | 4 -- .../buttons/juce_ToolbarButton.cpp | 5 --- .../commands/juce_ApplicationCommandInfo.cpp | 5 --- .../juce_ApplicationCommandManager.cpp | 5 --- .../juce_ApplicationCommandTarget.cpp | 6 --- .../commands/juce_KeyPressMappingSet.cpp | 5 --- .../components/juce_Component.cpp | 6 --- .../components/juce_ComponentListener.cpp | 3 -- .../components/juce_Desktop.cpp | 5 --- .../components/juce_ModalComponentManager.cpp | 4 -- .../drawables/juce_Drawable.cpp | 5 --- .../drawables/juce_DrawableComposite.cpp | 5 --- .../drawables/juce_DrawableImage.cpp | 5 --- .../drawables/juce_DrawablePath.cpp | 5 --- .../drawables/juce_DrawableRectangle.cpp | 4 -- .../drawables/juce_DrawableShape.cpp | 4 -- .../drawables/juce_DrawableText.cpp | 5 --- .../drawables/juce_SVGParser.cpp | 5 --- ...juce_DirectoryContentsDisplayComponent.cpp | 5 --- .../juce_DirectoryContentsList.cpp | 4 -- .../filebrowser/juce_FileBrowserComponent.cpp | 5 --- .../filebrowser/juce_FileChooser.cpp | 5 --- .../filebrowser/juce_FileChooserDialogBox.cpp | 5 --- .../filebrowser/juce_FileFilter.cpp | 6 --- .../filebrowser/juce_FileListComponent.cpp | 4 -- .../juce_FileSearchPathListComponent.cpp | 5 --- .../filebrowser/juce_FileTreeComponent.cpp | 3 -- .../filebrowser/juce_FilenameComponent.cpp | 4 -- .../juce_ImagePreviewComponent.cpp | 5 --- .../filebrowser/juce_WildcardFileFilter.cpp | 5 --- modules/juce_gui_basics/juce_gui_basics.cpp | 10 ++++- modules/juce_gui_basics/juce_gui_basics.h | 5 ++- .../keyboard/juce_CaretComponent.cpp | 4 -- .../keyboard/juce_KeyListener.cpp | 4 -- .../keyboard/juce_KeyPress.cpp | 5 --- .../keyboard/juce_KeyboardFocusTraverser.cpp | 4 -- .../keyboard/juce_ModifierKeys.cpp | 5 --- .../layout/juce_ComponentAnimator.cpp | 5 --- .../juce_ComponentBoundsConstrainer.cpp | 5 --- .../layout/juce_ComponentBuilder.cpp | 4 -- .../layout/juce_ComponentMovementWatcher.cpp | 5 --- .../layout/juce_GroupComponent.cpp | 4 -- .../layout/juce_MultiDocumentPanel.cpp | 5 --- .../layout/juce_ResizableBorderComponent.cpp | 4 -- .../layout/juce_ResizableCornerComponent.cpp | 5 --- .../layout/juce_ResizableEdgeComponent.cpp | 4 -- .../juce_gui_basics/layout/juce_ScrollBar.cpp | 4 -- .../layout/juce_StretchableLayoutManager.cpp | 4 -- .../juce_StretchableLayoutResizerBar.cpp | 4 -- .../layout/juce_StretchableObjectResizer.cpp | 5 --- .../layout/juce_TabbedButtonBar.cpp | 4 -- .../layout/juce_TabbedComponent.cpp | 5 --- .../juce_gui_basics/layout/juce_Viewport.cpp | 4 -- .../lookandfeel/juce_LookAndFeel.cpp | 4 -- .../menus/juce_MenuBarComponent.cpp | 5 --- .../menus/juce_MenuBarModel.cpp | 5 --- .../juce_gui_basics/menus/juce_PopupMenu.cpp | 5 --- .../misc/juce_BubbleComponent.cpp | 4 -- .../misc/juce_DropShadower.cpp | 4 -- .../mouse/juce_ComponentDragger.cpp | 5 --- .../mouse/juce_DragAndDropContainer.cpp | 4 -- .../mouse/juce_MouseCursor.cpp | 4 -- .../juce_gui_basics/mouse/juce_MouseEvent.cpp | 5 --- .../mouse/juce_MouseInputSource.cpp | 5 --- .../mouse/juce_MouseListener.cpp | 4 -- .../native/juce_android_Windowing.cpp | 7 +++- .../native/juce_ios_UIViewComponentPeer.mm | 10 +++-- .../native/juce_ios_Windowing.mm | 15 ++++--- .../native/juce_mac_FileChooser.mm | 8 ++-- .../native/juce_mac_MainMenu.mm | 12 ++++-- .../native/juce_mac_NSViewComponentPeer.mm | 13 +++--- .../positioning/juce_MarkerList.cpp | 4 -- .../positioning/juce_RelativeCoordinate.cpp | 4 -- .../juce_RelativeCoordinatePositioner.cpp | 5 --- .../juce_RelativeParallelogram.cpp | 5 --- .../positioning/juce_RelativePoint.cpp | 4 -- .../positioning/juce_RelativePointPath.cpp | 5 --- .../positioning/juce_RelativeRectangle.cpp | 5 --- .../juce_BooleanPropertyComponent.cpp | 4 -- .../juce_ButtonPropertyComponent.cpp | 4 -- .../juce_ChoicePropertyComponent.cpp | 5 --- .../properties/juce_PropertyComponent.cpp | 5 --- .../properties/juce_PropertyPanel.cpp | 5 --- .../juce_SliderPropertyComponent.cpp | 5 --- .../properties/juce_TextPropertyComponent.cpp | 5 --- .../juce_gui_basics/widgets/juce_ComboBox.cpp | 4 -- .../widgets/juce_ImageComponent.cpp | 4 -- .../juce_gui_basics/widgets/juce_Label.cpp | 4 -- .../juce_gui_basics/widgets/juce_ListBox.cpp | 5 --- .../widgets/juce_ProgressBar.cpp | 4 -- .../juce_gui_basics/widgets/juce_Slider.cpp | 4 -- .../widgets/juce_TableHeaderComponent.cpp | 5 --- .../widgets/juce_TableListBox.cpp | 4 -- .../widgets/juce_TextEditor.cpp | 4 -- .../juce_gui_basics/widgets/juce_Toolbar.cpp | 4 -- .../widgets/juce_ToolbarItemComponent.cpp | 5 --- .../widgets/juce_ToolbarItemPalette.cpp | 5 --- .../juce_gui_basics/widgets/juce_TreeView.cpp | 5 --- .../windows/juce_AlertWindow.cpp | 4 -- .../windows/juce_CallOutBox.cpp | 4 -- .../windows/juce_ComponentPeer.cpp | 3 -- .../windows/juce_DialogWindow.cpp | 4 -- .../windows/juce_DocumentWindow.cpp | 5 --- .../windows/juce_ResizableWindow.cpp | 4 -- .../windows/juce_ThreadWithProgressWindow.cpp | 4 -- .../windows/juce_TooltipWindow.cpp | 4 -- .../windows/juce_TopLevelWindow.cpp | 9 +--- .../juce_CPlusPlusCodeTokeniser.cpp | 4 -- .../code_editor/juce_CodeDocument.cpp | 4 -- .../code_editor/juce_CodeEditorComponent.cpp | 4 -- .../documents/juce_FileBasedDocument.cpp | 5 --- modules/juce_gui_extra/juce_gui_extra.cpp | 10 ++++- modules/juce_gui_extra/juce_gui_extra.h | 5 ++- .../lookandfeel/juce_OldSchoolLookAndFeel.cpp | 5 --- .../misc/juce_BubbleMessageComponent.cpp | 4 -- .../misc/juce_ColourSelector.cpp | 5 --- .../misc/juce_KeyMappingEditorComponent.cpp | 4 -- .../misc/juce_PreferencesPanel.cpp | 4 -- .../misc/juce_RecentlyOpenedFilesList.cpp | 5 --- .../juce_gui_extra/misc/juce_SplashScreen.cpp | 4 -- .../misc/juce_SystemTrayIconComponent.cpp | 5 --- .../native/juce_mac_WebBrowserComponent.mm | 5 ++- modules/juce_opengl/juce_opengl.cpp | 12 ++++-- modules/juce_opengl/juce_opengl.h | 6 ++- .../native/juce_ios_OpenGLComponent.mm | 5 ++- .../native/juce_mac_OpenGLComponent.mm | 6 ++- modules/juce_video/juce_video.cpp | 5 ++- modules/juce_video/juce_video.h | 5 ++- .../native/juce_mac_CameraDevice.mm | 12 ++++-- .../juce_mac_QuickTimeMovieComponent.mm | 5 ++- 318 files changed, 271 insertions(+), 1363 deletions(-) diff --git a/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.cpp b/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.cpp index 371d7034b3..ca2a03e4a1 100644 --- a/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.cpp +++ b/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.cpp @@ -52,7 +52,7 @@ SourceCodeEditor::~SourceCodeEditor() void SourceCodeEditor::resized() { - editor.setBounds (0, 0, getWidth(), getHeight()); + editor.setBounds (getLocalBounds()); } bool SourceCodeEditor::isTextFile (const File& file) diff --git a/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp b/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp index e0e9e56e17..28c2121762 100644 --- a/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp +++ b/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== void AudioDataConverters::convertFloatToInt16LE (const float* source, void* dest, int numSamples, const int destBytesPerSample) { const double maxVal = (double) 0x7fff; @@ -602,6 +600,3 @@ public: static AudioConversionTests audioConversionUnitTests; #endif - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.cpp b/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.cpp index 5c3a95610e..acec0f7466 100644 --- a/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.cpp +++ b/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AudioSampleBuffer::AudioSampleBuffer (const int numChannels_, const int numSamples) noexcept : numChannels (numChannels_), @@ -552,5 +550,3 @@ float AudioSampleBuffer::getRMSLevel (const int channel, return (float) std::sqrt (sum / numSamples); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/effects/juce_IIRFilter.cpp b/modules/juce_audio_basics/effects/juce_IIRFilter.cpp index 99769c92c6..c09b41a872 100644 --- a/modules/juce_audio_basics/effects/juce_IIRFilter.cpp +++ b/modules/juce_audio_basics/effects/juce_IIRFilter.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - #if JUCE_INTEL #define JUCE_SNAP_TO_ZERO(n) if (! (n < -1.0e-8 || n > 1.0e-8)) n = 0; #else @@ -252,5 +250,3 @@ void IIRFilter::setCoefficients (double c1, double c2, double c3, } #undef JUCE_SNAP_TO_ZERO - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/juce_audio_basics.cpp b/modules/juce_audio_basics/juce_audio_basics.cpp index f994c2db83..6dbf9b7062 100644 --- a/modules/juce_audio_basics/juce_audio_basics.cpp +++ b/modules/juce_audio_basics/juce_audio_basics.cpp @@ -38,6 +38,9 @@ #include "juce_audio_basics.h" +namespace juce +{ + // START_AUTOINCLUDE buffers/*.cpp, effects/*.cpp, midi/*.cpp, sources/*.cpp, synthesisers/*.cpp #include "buffers/juce_AudioDataConverters.cpp" #include "buffers/juce_AudioSampleBuffer.cpp" @@ -56,3 +59,5 @@ #include "sources/juce_ToneGeneratorAudioSource.cpp" #include "synthesisers/juce_Synthesiser.cpp" // END_AUTOINCLUDE + +} \ No newline at end of file diff --git a/modules/juce_audio_basics/juce_audio_basics.h b/modules/juce_audio_basics/juce_audio_basics.h index 93a99f8ebd..fe513ba074 100644 --- a/modules/juce_audio_basics/juce_audio_basics.h +++ b/modules/juce_audio_basics/juce_audio_basics.h @@ -29,7 +29,8 @@ #include "../juce_core/juce_core.h" //============================================================================= -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE buffers, effects, midi, sources, synthesisers #ifndef __JUCE_AUDIODATACONVERTERS_JUCEHEADER__ @@ -94,6 +95,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_AUDIO_BASICS_JUCEHEADER__ diff --git a/modules/juce_audio_basics/midi/juce_MidiBuffer.cpp b/modules/juce_audio_basics/midi/juce_MidiBuffer.cpp index b46d2179d9..7dcf48182a 100644 --- a/modules/juce_audio_basics/midi/juce_MidiBuffer.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiBuffer.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE namespace MidiBufferHelpers { @@ -293,6 +292,3 @@ bool MidiBuffer::Iterator::getNextEvent (MidiMessage& result, int& samplePositio return true; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/midi/juce_MidiFile.cpp b/modules/juce_audio_basics/midi/juce_MidiFile.cpp index 0470983cad..b07cb847f8 100644 --- a/modules/juce_audio_basics/midi/juce_MidiFile.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiFile.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - namespace MidiFileHelpers { @@ -428,5 +426,3 @@ void MidiFile::writeTrack (OutputStream& mainOut, const int trackNum) mainOut.writeIntBigEndian ((int) out.getDataSize()); mainOut << out; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/midi/juce_MidiKeyboardState.cpp b/modules/juce_audio_basics/midi/juce_MidiKeyboardState.cpp index bccad6c6d3..a206b64187 100644 --- a/modules/juce_audio_basics/midi/juce_MidiKeyboardState.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiKeyboardState.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MidiKeyboardState::MidiKeyboardState() { zerostruct (noteStates); @@ -185,6 +183,3 @@ void MidiKeyboardState::removeListener (MidiKeyboardStateListener* const listene const ScopedLock sl (lock); listeners.removeValue (listener); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/midi/juce_MidiMessage.cpp b/modules/juce_audio_basics/midi/juce_MidiMessage.cpp index 658d45c2b1..6faa11e76b 100644 --- a/modules/juce_audio_basics/midi/juce_MidiMessage.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiMessage.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE namespace MidiHelpers { @@ -1049,5 +1048,3 @@ String MidiMessage::getControllerName (const int n) return isPositiveAndBelow (n, (int) 128) ? names[n] : (const char*) nullptr; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp index 937dfdfec1..d9c161638e 100644 --- a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MidiMessageSequence::MidiMessageSequence() { } @@ -328,5 +326,3 @@ MidiMessageSequence::MidiEventHolder::MidiEventHolder (const MidiMessage& messag MidiMessageSequence::MidiEventHolder::~MidiEventHolder() { } - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/sources/juce_BufferingAudioSource.cpp b/modules/juce_audio_basics/sources/juce_BufferingAudioSource.cpp index 82ce2db4d8..d6b7adb47c 100644 --- a/modules/juce_audio_basics/sources/juce_BufferingAudioSource.cpp +++ b/modules/juce_audio_basics/sources/juce_BufferingAudioSource.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== BufferingAudioSource::BufferingAudioSource (PositionableAudioSource* source_, TimeSliceThread& backgroundThread_, const bool deleteSourceWhenDeleted, @@ -270,6 +268,3 @@ int BufferingAudioSource::useTimeSlice() { return readNextBufferChunk() ? 1 : 100; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.cpp b/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.cpp index 9f30c82772..6d7914f082 100644 --- a/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.cpp +++ b/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ChannelRemappingAudioSource::ChannelRemappingAudioSource (AudioSource* const source_, const bool deleteSourceWhenDeleted) : source (source_, deleteSourceWhenDeleted), @@ -191,6 +189,3 @@ void ChannelRemappingAudioSource::restoreFromXml (const XmlElement& e) remappedOutputs.add (outs[i].getIntValue()); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.cpp b/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.cpp index 0e975a8160..dfcc1eee90 100644 --- a/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.cpp +++ b/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== IIRFilterAudioSource::IIRFilterAudioSource (AudioSource* const inputSource, const bool deleteInputWhenDeleted) : input (inputSource, deleteInputWhenDeleted) @@ -73,6 +71,3 @@ void IIRFilterAudioSource::getNextAudioBlock (const AudioSourceChannelInfo& buff ->processSamples (bufferToFill.buffer->getSampleData (i, bufferToFill.startSample), bufferToFill.numSamples); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/sources/juce_MixerAudioSource.cpp b/modules/juce_audio_basics/sources/juce_MixerAudioSource.cpp index 873e1bd513..337fd47dc1 100644 --- a/modules/juce_audio_basics/sources/juce_MixerAudioSource.cpp +++ b/modules/juce_audio_basics/sources/juce_MixerAudioSource.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MixerAudioSource::MixerAudioSource() : tempBuffer (2, 0), currentSampleRate (0.0), @@ -161,5 +159,3 @@ void MixerAudioSource::getNextAudioBlock (const AudioSourceChannelInfo& info) info.clearActiveBufferRegion(); } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.cpp b/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.cpp index e8b9671bea..8d1d3be7a8 100644 --- a/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.cpp +++ b/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ResamplingAudioSource::ResamplingAudioSource (AudioSource* const inputSource, const bool deleteInputWhenDeleted, const int numChannels_) @@ -259,5 +257,3 @@ void ResamplingAudioSource::applyFilter (float* samples, int num, FilterState& f *samples++ = (float) out; } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/sources/juce_ReverbAudioSource.cpp b/modules/juce_audio_basics/sources/juce_ReverbAudioSource.cpp index 67d9d554e6..eb7ecd7cef 100644 --- a/modules/juce_audio_basics/sources/juce_ReverbAudioSource.cpp +++ b/modules/juce_audio_basics/sources/juce_ReverbAudioSource.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ReverbAudioSource::ReverbAudioSource (AudioSource* const inputSource, const bool deleteInputWhenDeleted) : input (inputSource, deleteInputWhenDeleted), bypass (false) @@ -82,6 +80,3 @@ void ReverbAudioSource::setBypassed (bool b) noexcept reverb.reset(); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.cpp b/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.cpp index 0d0d7318fe..1fafaed9c4 100644 --- a/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.cpp +++ b/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ToneGeneratorAudioSource::ToneGeneratorAudioSource() : frequency (1000.0), sampleRate (44100.0), @@ -78,6 +76,3 @@ void ToneGeneratorAudioSource::getNextAudioBlock (const AudioSourceChannelInfo& *info.buffer->getSampleData (j, info.startSample + i) = sample; } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp index b81c89ddfc..b9b6fc95e0 100644 --- a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp +++ b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== SynthesiserSound::SynthesiserSound() { } @@ -434,6 +432,3 @@ SynthesiserVoice* Synthesiser::findFreeVoice (SynthesiserSound* soundToPlay, return nullptr; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.cpp b/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.cpp index 98ffb14421..58c87faef2 100644 --- a/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.cpp +++ b/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.cpp @@ -25,9 +25,6 @@ #if JUCE_USE_CDREADER -BEGIN_JUCE_NAMESPACE - -//============================================================================== int AudioCDReader::getNumTracks() const { return trackStartSamples.size() - 1; @@ -58,7 +55,4 @@ int AudioCDReader::getCDDBId() return ((checksum & 0xff) << 24) | (length << 8) | numTracks; } - -END_JUCE_NAMESPACE - #endif diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp index 5f225a8fb7..9c461fcb41 100644 --- a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp +++ b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AudioDeviceManager::AudioDeviceSetup::AudioDeviceSetup() : sampleRate (0), bufferSize (0), @@ -932,6 +930,3 @@ double AudioDeviceManager::getCurrentInputLevel() const jassert (inputLevelMeasurementEnabledCount > 0); // you need to call enableInputLevelMeasurement() before using this! return inputLevel; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_devices/audio_io/juce_AudioIODevice.cpp b/modules/juce_audio_devices/audio_io/juce_AudioIODevice.cpp index d0a6bb3ae2..f09c122c45 100644 --- a/modules/juce_audio_devices/audio_io/juce_AudioIODevice.cpp +++ b/modules/juce_audio_devices/audio_io/juce_AudioIODevice.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AudioIODevice::AudioIODevice (const String& deviceName, const String& typeName_) : name (deviceName), typeName (typeName_) @@ -50,6 +48,3 @@ bool AudioIODevice::showControlPanel() //============================================================================== void AudioIODeviceCallback::audioDeviceError (const String&) {} - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp b/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp index d8b32083d1..37b0f27bc8 100644 --- a/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp +++ b/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AudioIODeviceType::AudioIODeviceType (const String& name) : typeName (name) { @@ -76,6 +74,3 @@ AudioIODeviceType* AudioIODeviceType::createAudioIODeviceType_JACK() #if ! JUCE_ANDROID AudioIODeviceType* AudioIODeviceType::createAudioIODeviceType_Android() { return nullptr; } #endif - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_devices/juce_audio_devices.cpp b/modules/juce_audio_devices/juce_audio_devices.cpp index 22af16c03a..487cc4203e 100644 --- a/modules/juce_audio_devices/juce_audio_devices.cpp +++ b/modules/juce_audio_devices/juce_audio_devices.cpp @@ -129,6 +129,9 @@ #endif +namespace juce +{ + // START_AUTOINCLUDE audio_io/*.cpp, midi_io/*.cpp, audio_cd/*.cpp, sources/*.cpp #include "audio_io/juce_AudioDeviceManager.cpp" #include "audio_io/juce_AudioIODevice.cpp" @@ -140,10 +143,13 @@ #include "sources/juce_AudioTransportSource.cpp" // END_AUTOINCLUDE +} + //============================================================================== using namespace juce; -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== #if JUCE_MAC @@ -219,4 +225,4 @@ BEGIN_JUCE_NAMESPACE #endif -END_JUCE_NAMESPACE +} diff --git a/modules/juce_audio_devices/juce_audio_devices.h b/modules/juce_audio_devices/juce_audio_devices.h index 31c89abeff..81285e9148 100644 --- a/modules/juce_audio_devices/juce_audio_devices.h +++ b/modules/juce_audio_devices/juce_audio_devices.h @@ -89,7 +89,8 @@ #endif //============================================================================= -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE audio_io, midi_io, sources, audio_cd #ifndef __JUCE_AUDIODEVICEMANAGER_JUCEHEADER__ @@ -124,6 +125,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_AUDIO_DEVICES_JUCEHEADER__ diff --git a/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp b/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp index 0cc3eb5552..a78a1c4a03 100644 --- a/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp +++ b/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MidiMessageCollector::MidiMessageCollector() : lastCallbackTime (0), sampleRate (44100.0001) @@ -154,6 +152,3 @@ void MidiMessageCollector::handleIncomingMidiMessage (MidiInput*, const MidiMess { addMessageToQueue (message); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp b/modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp index 8abb289a63..fc149469fc 100644 --- a/modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp +++ b/modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== struct MidiOutput::PendingMessage { PendingMessage (const void* const data, const int len, const double timeStamp) @@ -164,6 +162,3 @@ void MidiOutput::run() clearAllPendingMessages(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm b/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm index 5507c12d0e..b4519fb3d4 100644 --- a/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm +++ b/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm @@ -25,7 +25,7 @@ const int kilobytesPerSecond1x = 176; -END_JUCE_NAMESPACE +} // (juce namespace) #define OpenDiskDevice MakeObjCClassName(OpenDiskDevice) @@ -326,7 +326,8 @@ END_JUCE_NAMESPACE @end -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== class AudioCDBurner::Pimpl : public Timer diff --git a/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp b/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp index 2f3ae0ae46..87d7b98363 100644 --- a/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp +++ b/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp @@ -23,7 +23,7 @@ ============================================================================== */ -END_JUCE_NAMESPACE +} // (juce namespace) extern "C" { @@ -128,7 +128,8 @@ extern "C" } //============================================================================== -BEGIN_JUCE_NAMESPACE +namespace juce +{ namespace { diff --git a/modules/juce_audio_devices/sources/juce_AudioSourcePlayer.cpp b/modules/juce_audio_devices/sources/juce_AudioSourcePlayer.cpp index d3299de4ee..159b7df51f 100644 --- a/modules/juce_audio_devices/sources/juce_AudioSourcePlayer.cpp +++ b/modules/juce_audio_devices/sources/juce_AudioSourcePlayer.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AudioSourcePlayer::AudioSourcePlayer() : source (nullptr), sampleRate (0), @@ -183,5 +181,3 @@ void AudioSourcePlayer::audioDeviceStopped() tempBuffer.setSize (2, 8); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp b/modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp index da9cf78356..b7a7711a7a 100644 --- a/modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp +++ b/modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AudioTransportSource::AudioTransportSource() : source (nullptr), resamplerSource (nullptr), @@ -303,5 +301,3 @@ void AudioTransportSource::getNextAudioBlock (const AudioSourceChannelInfo& info lastGain = gain; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp index 494326a036..66584e5871 100644 --- a/modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp @@ -25,7 +25,7 @@ #if JUCE_QUICKTIME && ! (JUCE_64BIT || JUCE_IOS) -END_JUCE_NAMESPACE +} // (juce namespace) #if ! JUCE_WINDOWS #define Point CarbonDummyPointName // (workaround to avoid definition of "Point" by old Carbon headers) @@ -61,7 +61,8 @@ END_JUCE_NAMESPACE #endif #endif -BEGIN_JUCE_NAMESPACE +namespace juce +{ bool juce_OpenQuickTimeMovieFromStream (InputStream* input, Movie& movie, Handle& dataHandle); diff --git a/modules/juce_audio_formats/format/juce_AudioFormat.cpp b/modules/juce_audio_formats/format/juce_AudioFormat.cpp index 189c95eac5..0156306e46 100644 --- a/modules/juce_audio_formats/format/juce_AudioFormat.cpp +++ b/modules/juce_audio_formats/format/juce_AudioFormat.cpp @@ -23,7 +23,7 @@ ============================================================================== */ -//============================================================================== + AudioFormat::AudioFormat (const String& name, const StringArray& extensions) : formatName (name), fileExtensions (extensions) diff --git a/modules/juce_audio_formats/juce_audio_formats.cpp b/modules/juce_audio_formats/juce_audio_formats.cpp index 5156dafc42..7e6031472e 100644 --- a/modules/juce_audio_formats/juce_audio_formats.cpp +++ b/modules/juce_audio_formats/juce_audio_formats.cpp @@ -84,7 +84,8 @@ #endif //============================================================================== -BEGIN_JUCE_NAMESPACE +namespace juce +{ #if JUCE_ANDROID #include "../juce_core/native/juce_android_JNIHelpers.h" @@ -113,4 +114,4 @@ BEGIN_JUCE_NAMESPACE #include "codecs/juce_WindowsMediaAudioFormat.cpp" // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} diff --git a/modules/juce_audio_formats/juce_audio_formats.h b/modules/juce_audio_formats/juce_audio_formats.h index 65c5b7ecdd..835c855b98 100644 --- a/modules/juce_audio_formats/juce_audio_formats.h +++ b/modules/juce_audio_formats/juce_audio_formats.h @@ -64,7 +64,8 @@ #endif //============================================================================= -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE format, codecs, sampler #ifndef __JUCE_AUDIOFORMAT_JUCEHEADER__ @@ -98,6 +99,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_AUDIO_FORMATS_JUCEHEADER__ diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp index eda2a3ef7d..41bf79a765 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp @@ -95,7 +95,8 @@ class JuceVSTWrapper; static bool recursionCheck = false; static juce::uint32 lastMasterIdleCall = 0; -BEGIN_JUCE_NAMESPACE +namespace juce +{ #if JUCE_MAC extern void initialiseMac(); extern void* attachComponentToWindowRef (Component* component, void* windowRef); @@ -108,7 +109,7 @@ BEGIN_JUCE_NAMESPACE #if JUCE_LINUX extern Display* display; #endif -END_JUCE_NAMESPACE +} //============================================================================== diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm index bd7710d4d0..8f4efc3134 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm @@ -40,7 +40,8 @@ #include "../utility/juce_PluginHostType.h" //============================================================================== -BEGIN_JUCE_NAMESPACE +namespace juce +{ #if ! JUCE_64BIT static void updateComponentPos (Component* const comp) @@ -251,7 +252,6 @@ bool forwardCurrentKeyEventToHost (Component* comp) #endif } - -END_JUCE_NAMESPACE +} // (juce namespace) #endif diff --git a/modules/juce_audio_processors/format/juce_AudioPluginFormat.cpp b/modules/juce_audio_processors/format/juce_AudioPluginFormat.cpp index de92f5bb79..5f307c7e0e 100644 --- a/modules/juce_audio_processors/format/juce_AudioPluginFormat.cpp +++ b/modules/juce_audio_processors/format/juce_AudioPluginFormat.cpp @@ -23,10 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AudioPluginFormat::AudioPluginFormat() noexcept {} AudioPluginFormat::~AudioPluginFormat() {} - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp b/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp index 356f75f7ad..1d5c3262c3 100644 --- a/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp +++ b/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AudioPluginFormatManager::AudioPluginFormatManager() { } @@ -126,6 +124,3 @@ bool AudioPluginFormatManager::doesPluginStillExist (const PluginDescription& de return false; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm index cce0ee2558..74e24c751d 100644 --- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm +++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm @@ -25,6 +25,8 @@ #if JUCE_PLUGINHOST_AU && JUCE_MAC +} // (juce namespace) + #include #include #include @@ -34,7 +36,8 @@ #include #endif -BEGIN_JUCE_NAMESPACE +namespace juce +{ #if JUCE_SUPPORT_CARBON #include "../../juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" @@ -1457,8 +1460,6 @@ FileSearchPath AudioUnitPluginFormat::getDefaultLocationsToSearch() return FileSearchPath ("/(Default AudioUnit locations)"); } -END_JUCE_NAMESPACE - #undef log #endif diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp index 6cb698b66e..0bee55f76e 100644 --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp @@ -28,8 +28,6 @@ //============================================================================== #if ! (JUCE_MAC && JUCE_64BIT) -BEGIN_JUCE_NAMESPACE - #if JUCE_MAC && JUCE_SUPPORT_CARBON #include "../../juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h" #endif @@ -2917,9 +2915,6 @@ FileSearchPath VSTPluginFormat::getDefaultLocationsToSearch() #endif } - -END_JUCE_NAMESPACE - #endif #undef log #endif diff --git a/modules/juce_audio_processors/juce_audio_processors.cpp b/modules/juce_audio_processors/juce_audio_processors.cpp index 62c082370f..10d98ed21c 100644 --- a/modules/juce_audio_processors/juce_audio_processors.cpp +++ b/modules/juce_audio_processors/juce_audio_processors.cpp @@ -53,6 +53,9 @@ #endif //============================================================================== +namespace juce +{ + // START_AUTOINCLUDE format/*.cpp, processors/*.cpp, format_types/*.cpp, // format_types/*.mm, scanning/*.cpp #include "format/juce_AudioPluginFormat.cpp" @@ -68,3 +71,5 @@ #include "scanning/juce_PluginDirectoryScanner.cpp" #include "scanning/juce_PluginListComponent.cpp" // END_AUTOINCLUDE + +} diff --git a/modules/juce_audio_processors/juce_audio_processors.h b/modules/juce_audio_processors/juce_audio_processors.h index 152a3f63c3..ef99f606ba 100644 --- a/modules/juce_audio_processors/juce_audio_processors.h +++ b/modules/juce_audio_processors/juce_audio_processors.h @@ -62,7 +62,8 @@ //============================================================================= #include "../juce_core/system/juce_StandardHeader.h" -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE processors, format, format_types, scanning #ifndef __JUCE_AUDIOPLAYHEAD_JUCEHEADER__ @@ -119,6 +120,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_AUDIO_PROCESSORS_JUCEHEADER__ diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp b/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp index a5061bc1db..03e0ab4e9a 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp +++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AudioProcessor::AudioProcessor() : playHead (nullptr), sampleRate (0), @@ -312,6 +310,3 @@ void AudioPlayHead::CurrentPositionInfo::resetToDefault() timeSigDenominator = 4; bpm = 120; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp index b012d5fb2d..4303a7864d 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AudioProcessorEditor::AudioProcessorEditor (AudioProcessor* const owner_) : owner (owner_) { @@ -39,6 +37,3 @@ AudioProcessorEditor::~AudioProcessorEditor() // filter for some reason.. jassert (owner->getActiveEditor() != this); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp index 6300c1584c..7387d40005 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE const int AudioProcessorGraph::midiChannelIndex = 0x1000; @@ -1516,6 +1515,3 @@ void AudioProcessorGraph::AudioGraphIOProcessor::setParentGraph (AudioProcessorG updateHostDisplay(); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp index 7c3cef2e25..161167b790 100644 --- a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp +++ b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp @@ -23,10 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== class ProcessorParameterPropertyComp : public PropertyComponent, public AudioProcessorListener, public Timer @@ -164,6 +161,3 @@ void GenericAudioProcessorEditor::resized() { panel.setBounds (getLocalBounds()); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_processors/processors/juce_PluginDescription.cpp b/modules/juce_audio_processors/processors/juce_PluginDescription.cpp index 1519082b6d..698b5a2c0c 100644 --- a/modules/juce_audio_processors/processors/juce_PluginDescription.cpp +++ b/modules/juce_audio_processors/processors/juce_PluginDescription.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== PluginDescription::PluginDescription() : uid (0), isInstrument (false), @@ -129,5 +127,3 @@ bool PluginDescription::loadFromXml (const XmlElement& xml) return false; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_processors/scanning/juce_KnownPluginList.cpp b/modules/juce_audio_processors/scanning/juce_KnownPluginList.cpp index 3077fa21c0..5f0ff2d0c1 100644 --- a/modules/juce_audio_processors/scanning/juce_KnownPluginList.cpp +++ b/modules/juce_audio_processors/scanning/juce_KnownPluginList.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== KnownPluginList::KnownPluginList() {} KnownPluginList::~KnownPluginList() {} @@ -437,5 +435,3 @@ int KnownPluginList::getIndexChosenByMenu (const int menuResultCode) const return isPositiveAndBelow (i, types.size()) ? i : -1; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.cpp b/modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.cpp index 5abd4415b4..d3d3a5f753 100644 --- a/modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.cpp +++ b/modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== PluginDirectoryScanner::PluginDirectoryScanner (KnownPluginList& listToAddTo, AudioPluginFormat& formatToLookFor, FileSearchPath directoriesToSearch, @@ -122,6 +120,3 @@ void PluginDirectoryScanner::setDeadMansPedalFile (const StringArray& newContent if (deadMansPedalFile != File::nonexistent) deadMansPedalFile.replaceWithText (newContents.joinIntoString ("\n"), true, true); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp b/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp index e9ea822ed2..028a6f169b 100644 --- a/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp +++ b/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== PluginListComponent::PluginListComponent (KnownPluginList& listToEdit, const File& deadMansPedalFile_, PropertiesFile* const propertiesToUse_) @@ -298,5 +296,3 @@ void PluginListComponent::scanFor (AudioPluginFormat* format) jassertfalse; // this method needs refactoring to work without modal loops.. #endif } - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp index ca6d1bcd11..0b62cb8641 100644 --- a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp +++ b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class SimpleDeviceManagerInputLevelMeter : public Component, public Timer { @@ -1122,6 +1120,3 @@ void AudioDeviceSelectorComponent::updateAllControls() resized(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp b/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp index 21add7e2ae..190e72c382 100644 --- a/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp +++ b/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== struct AudioThumbnail::MinMaxValue { MinMaxValue() noexcept @@ -803,6 +801,3 @@ void AudioThumbnail::drawChannels (Graphics& g, const Rectangle& area, doub startTimeSeconds, endTimeSeconds, i, verticalZoomFactor); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.cpp b/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.cpp index 8b6cfe58f8..86ae082e52 100644 --- a/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.cpp +++ b/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class AudioThumbnailCache::ThumbnailCacheEntry { public: @@ -172,5 +170,3 @@ void AudioThumbnailCache::writeToStream (OutputStream& out) for (int i = 0; i < thumbs.size(); ++i) thumbs.getUnchecked(i)->write (out); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp index 62c4424024..3504eb8068 100644 --- a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp +++ b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class MidiKeyboardUpDownButton : public Button { public: @@ -873,6 +871,3 @@ void MidiKeyboardComponent::focusLost (FocusChangeType) { resetAnyKeysInUse(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_audio_utils/juce_audio_utils.cpp b/modules/juce_audio_utils/juce_audio_utils.cpp index 6e89f957ff..9941ca0d18 100644 --- a/modules/juce_audio_utils/juce_audio_utils.cpp +++ b/modules/juce_audio_utils/juce_audio_utils.cpp @@ -39,6 +39,9 @@ #include "../juce_core/native/juce_BasicNativeHeaders.h" #include "juce_audio_utils.h" +namespace juce +{ + // START_AUTOINCLUDE gui/*.cpp, players/*.cpp #include "gui/juce_AudioDeviceSelectorComponent.cpp" #include "gui/juce_AudioThumbnail.cpp" @@ -46,3 +49,5 @@ #include "gui/juce_MidiKeyboardComponent.cpp" #include "players/juce_AudioProcessorPlayer.cpp" // END_AUTOINCLUDE + +} diff --git a/modules/juce_audio_utils/juce_audio_utils.h b/modules/juce_audio_utils/juce_audio_utils.h index 0cabd9f044..4a83e7e538 100644 --- a/modules/juce_audio_utils/juce_audio_utils.h +++ b/modules/juce_audio_utils/juce_audio_utils.h @@ -32,7 +32,8 @@ #include "../juce_audio_processors/juce_audio_processors.h" //============================================================================= -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE gui, players #ifndef __JUCE_AUDIODEVICESELECTORCOMPONENT_JUCEHEADER__ @@ -52,6 +53,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_AUDIO_UTILS_JUCEHEADER__ diff --git a/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.cpp b/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.cpp index 52868e67c2..95652c10f4 100644 --- a/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.cpp +++ b/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AudioProcessorPlayer::AudioProcessorPlayer() : processor (nullptr), sampleRate (0), @@ -182,6 +180,3 @@ void AudioProcessorPlayer::handleIncomingMidiMessage (MidiInput*, const MidiMess { messageCollector.addMessageToQueue (message); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_browser_plugin/juce_browser_plugin.h b/modules/juce_browser_plugin/juce_browser_plugin.h index 07630784ce..3483ae794e 100644 --- a/modules/juce_browser_plugin/juce_browser_plugin.h +++ b/modules/juce_browser_plugin/juce_browser_plugin.h @@ -128,9 +128,10 @@ //============================================================================= -BEGIN_JUCE_NAMESPACE -#include "wrapper/juce_BrowserPluginComponent.h" -END_JUCE_NAMESPACE +namespace juce +{ + #include "wrapper/juce_BrowserPluginComponent.h" +} //============================================================================== /** diff --git a/modules/juce_core/containers/juce_AbstractFifo.cpp b/modules/juce_core/containers/juce_AbstractFifo.cpp index 05ef3578e9..64731f0560 100644 --- a/modules/juce_core/containers/juce_AbstractFifo.cpp +++ b/modules/juce_core/containers/juce_AbstractFifo.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AbstractFifo::AbstractFifo (const int capacity) noexcept : bufferSize (capacity) { @@ -234,5 +232,3 @@ public: static AbstractFifoTests fifoUnitTests; #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/containers/juce_DynamicObject.cpp b/modules/juce_core/containers/juce_DynamicObject.cpp index 88d25e422e..2e5cee3f3a 100644 --- a/modules/juce_core/containers/juce_DynamicObject.cpp +++ b/modules/juce_core/containers/juce_DynamicObject.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== DynamicObject::DynamicObject() { } @@ -77,6 +75,3 @@ void DynamicObject::clear() { properties.clear(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/containers/juce_NamedValueSet.cpp b/modules/juce_core/containers/juce_NamedValueSet.cpp index f87eb5730c..cfc780405a 100644 --- a/modules/juce_core/containers/juce_NamedValueSet.cpp +++ b/modules/juce_core/containers/juce_NamedValueSet.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== NamedValueSet::NamedValue::NamedValue() noexcept { } @@ -278,6 +276,3 @@ void NamedValueSet::copyToXmlAttributes (XmlElement& xml) const i->value.toString()); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/containers/juce_PropertySet.cpp b/modules/juce_core/containers/juce_PropertySet.cpp index 062302e387..68c03c346f 100644 --- a/modules/juce_core/containers/juce_PropertySet.cpp +++ b/modules/juce_core/containers/juce_PropertySet.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== PropertySet::PropertySet (const bool ignoreCaseOfKeyNames) : properties (ignoreCaseOfKeyNames), fallbackProperties (nullptr), @@ -221,5 +219,3 @@ void PropertySet::restoreFromXml (const XmlElement& xml) void PropertySet::propertyChanged() { } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/containers/juce_Variant.cpp b/modules/juce_core/containers/juce_Variant.cpp index 376fbaca6b..af09205b65 100644 --- a/modules/juce_core/containers/juce_Variant.cpp +++ b/modules/juce_core/containers/juce_Variant.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - enum VariantStreamMarkers { varMarker_Int = 1, @@ -647,6 +645,3 @@ var var::readFromStream (InputStream& input) return var::null; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/files/juce_DirectoryIterator.cpp b/modules/juce_core/files/juce_DirectoryIterator.cpp index cc34d4a2f7..242e88f9dc 100644 --- a/modules/juce_core/files/juce_DirectoryIterator.cpp +++ b/modules/juce_core/files/juce_DirectoryIterator.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - DirectoryIterator::DirectoryIterator (const File& directory, bool isRecursive_, @@ -138,5 +136,3 @@ float DirectoryIterator::getEstimatedProgress() const return detailedIndex / totalNumFiles; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/files/juce_File.cpp b/modules/juce_core/files/juce_File.cpp index 598717e5aa..d02180d0f2 100644 --- a/modules/juce_core/files/juce_File.cpp +++ b/modules/juce_core/files/juce_File.cpp @@ -23,13 +23,7 @@ ============================================================================== */ -#if ! JUCE_WINDOWS - #include -#endif -BEGIN_JUCE_NAMESPACE - -//============================================================================== File::File (const String& fullPathName) : fullPath (parseAbsolutePath (fullPathName)) { @@ -1078,5 +1072,3 @@ public: static FileTests fileUnitTests; #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/files/juce_FileInputStream.cpp b/modules/juce_core/files/juce_FileInputStream.cpp index 714573f060..887380eb3d 100644 --- a/modules/juce_core/files/juce_FileInputStream.cpp +++ b/modules/juce_core/files/juce_FileInputStream.cpp @@ -23,11 +23,9 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE int64 juce_fileSetPosition (void* handle, int64 pos); - //============================================================================== FileInputStream::FileInputStream (const File& f) : file (f), @@ -88,5 +86,3 @@ bool FileInputStream::setPosition (int64 pos) return true; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/files/juce_FileOutputStream.cpp b/modules/juce_core/files/juce_FileOutputStream.cpp index fcfb0d3e4d..32fa52fdfc 100644 --- a/modules/juce_core/files/juce_FileOutputStream.cpp +++ b/modules/juce_core/files/juce_FileOutputStream.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE int64 juce_fileSetPosition (void* handle, int64 pos); @@ -131,6 +130,3 @@ void FileOutputStream::writeRepeatedByte (uint8 byte, int numBytes) OutputStream::writeRepeatedByte (byte, numBytes); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/files/juce_FileSearchPath.cpp b/modules/juce_core/files/juce_FileSearchPath.cpp index 0b2efadc51..40a382ad47 100644 --- a/modules/juce_core/files/juce_FileSearchPath.cpp +++ b/modules/juce_core/files/juce_FileSearchPath.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== FileSearchPath::FileSearchPath() { } @@ -169,5 +167,3 @@ bool FileSearchPath::isFileInPath (const File& fileToCheck, return false; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/files/juce_TemporaryFile.cpp b/modules/juce_core/files/juce_TemporaryFile.cpp index 0b8afad2a2..e43a5ca89d 100644 --- a/modules/juce_core/files/juce_TemporaryFile.cpp +++ b/modules/juce_core/files/juce_TemporaryFile.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== TemporaryFile::TemporaryFile (const String& suffix, const int optionFlags) { createTempFile (File::getSpecialLocation (File::tempDirectory), @@ -113,5 +111,3 @@ bool TemporaryFile::deleteTemporaryFile() const return false; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/json/juce_JSON.cpp b/modules/juce_core/json/juce_JSON.cpp index ff48b5ab76..31dfbe00c8 100644 --- a/modules/juce_core/json/juce_JSON.cpp +++ b/modules/juce_core/json/juce_JSON.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class JSONParser { public: @@ -635,5 +633,3 @@ public: static JSONTests JSONUnitTests; #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/juce_core.cpp b/modules/juce_core/juce_core.cpp index bbb47d4989..d270928255 100644 --- a/modules/juce_core/juce_core.cpp +++ b/modules/juce_core/juce_core.cpp @@ -40,7 +40,44 @@ #include "native/juce_BasicNativeHeaders.h" #include "juce_core.h" +#include +#include +#include + +#if ! JUCE_ANDROID + #include +#endif + +#if JUCE_WINDOWS + #include + #include + #include + + #if JUCE_MINGW + #include + #endif + +#else + #if JUCE_LINUX || JUCE_ANDROID + #include + #include + #include + #include + #include + #endif + + #include + #include + #include + #include + #include + #include +#endif + //============================================================================== +namespace juce +{ + // START_AUTOINCLUDE containers/*.cpp, files/*.cpp, json/*.cpp, logging/*.cpp, maths/*.cpp, // memory/*.cpp, misc/*.cpp, network/*.cpp, streams/*.cpp, system/*.cpp, text/*.cpp, threads/*.cpp, // time/*.cpp, unit_tests/*.cpp, xml/*.cpp, zip/juce_GZIPD*.cpp, zip/juce_GZIPC*.cpp, zip/juce_Zip*.cpp @@ -99,8 +136,6 @@ #include "zip/juce_ZipFile.cpp" // END_AUTOINCLUDE -BEGIN_JUCE_NAMESPACE - //============================================================================== #if JUCE_MAC || JUCE_IOS #include "native/juce_osx_ObjCHelpers.h" @@ -148,4 +183,4 @@ BEGIN_JUCE_NAMESPACE #endif -END_JUCE_NAMESPACE +} \ No newline at end of file diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h index 2d37140697..ef3cf963fd 100644 --- a/modules/juce_core/juce_core.h +++ b/modules/juce_core/juce_core.h @@ -113,7 +113,8 @@ #include "system/juce_StandardHeader.h" -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE containers, files, json, logging, maths, memory, misc, network, // streams, system, text, threads, time, unit_tests, xml, zip @@ -407,7 +408,7 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #if JUCE_MSVC #pragma warning (pop) diff --git a/modules/juce_core/logging/juce_FileLogger.cpp b/modules/juce_core/logging/juce_FileLogger.cpp index 4d59f4d59f..a260d4cbc5 100644 --- a/modules/juce_core/logging/juce_FileLogger.cpp +++ b/modules/juce_core/logging/juce_FileLogger.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== FileLogger::FileLogger (const File& logFile_, const String& welcomeMessage, const int maxInitialFileSizeBytes) @@ -133,5 +131,3 @@ FileLogger* FileLogger::createDefaultAppLogger (const String& logFileSubDirector return new FileLogger (logFile, welcomeMessage, maxInitialFileSizeBytes); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/logging/juce_Logger.cpp b/modules/juce_core/logging/juce_Logger.cpp index 187c2d01f0..e848f44c51 100644 --- a/modules/juce_core/logging/juce_Logger.cpp +++ b/modules/juce_core/logging/juce_Logger.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== Logger::Logger() { } @@ -64,5 +62,3 @@ void JUCE_API juce_LogAssertion (const char* filename, const int lineNum) noexce Logger::writeToLog (m); } #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/maths/juce_BigInteger.cpp b/modules/juce_core/maths/juce_BigInteger.cpp index 6fff69962f..804d9724c5 100644 --- a/modules/juce_core/maths/juce_BigInteger.cpp +++ b/modules/juce_core/maths/juce_BigInteger.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== namespace { inline size_t bitToIndex (const int bit) noexcept { return (size_t) (bit >> 5); } @@ -1018,5 +1016,3 @@ void BigInteger::loadFromMemoryBlock (const MemoryBlock& data) for (int i = (int) data.getSize(); --i >= 0;) this->setBitRangeAsInt (i << 3, 8, (uint32) data [i]); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/maths/juce_Expression.cpp b/modules/juce_core/maths/juce_Expression.cpp index 5c58a7f0be..a4c7aff957 100644 --- a/modules/juce_core/maths/juce_Expression.cpp +++ b/modules/juce_core/maths/juce_Expression.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class Expression::Term : public SingleThreadedReferenceCountedObject { public: @@ -1173,6 +1171,3 @@ String Expression::Scope::getScopeUID() const { return String::empty; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/maths/juce_Expression.h b/modules/juce_core/maths/juce_Expression.h index 1ecd3324b4..da2c5e51dd 100644 --- a/modules/juce_core/maths/juce_Expression.h +++ b/modules/juce_core/maths/juce_Expression.h @@ -258,9 +258,9 @@ public: private: //============================================================================== class Term; - class Helpers; + struct Helpers; friend class Term; - friend class Helpers; + friend struct Helpers; friend class ScopedPointer; friend class ReferenceCountedObjectPtr; ReferenceCountedObjectPtr term; diff --git a/modules/juce_core/maths/juce_Random.cpp b/modules/juce_core/maths/juce_Random.cpp index 3b4118d376..ba3f4205a7 100644 --- a/modules/juce_core/maths/juce_Random.cpp +++ b/modules/juce_core/maths/juce_Random.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== Random::Random (const int64 seedValue) noexcept : seed (seedValue) { @@ -174,5 +172,3 @@ public: static RandomTests randomTests; #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/memory/juce_MemoryBlock.cpp b/modules/juce_core/memory/juce_MemoryBlock.cpp index 81d396b71e..409b9f3007 100644 --- a/modules/juce_core/memory/juce_MemoryBlock.cpp +++ b/modules/juce_core/memory/juce_MemoryBlock.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MemoryBlock::MemoryBlock() noexcept : size (0) { @@ -409,6 +407,3 @@ bool MemoryBlock::fromBase64Encoding (const String& s) return true; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/misc/juce_Result.cpp b/modules/juce_core/misc/juce_Result.cpp index f92da69da2..01636345f0 100644 --- a/modules/juce_core/misc/juce_Result.cpp +++ b/modules/juce_core/misc/juce_Result.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== Result::Result (const String& message) noexcept : errorMessage (message) { @@ -84,6 +82,3 @@ bool Result::wasOk() const noexcept { return errorMessage.isEmpty(); } Result::operator bool() const noexcept { return errorMessage.isEmpty(); } bool Result::failed() const noexcept { return errorMessage.isNotEmpty(); } bool Result::operator!() const noexcept { return errorMessage.isNotEmpty(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/misc/juce_Uuid.cpp b/modules/juce_core/misc/juce_Uuid.cpp index 27456a730e..e3cf4526e0 100644 --- a/modules/juce_core/misc/juce_Uuid.cpp +++ b/modules/juce_core/misc/juce_Uuid.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE namespace { @@ -123,6 +122,3 @@ Uuid& Uuid::operator= (const uint8* const rawData) return *this; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/native/juce_mac_Network.mm b/modules/juce_core/native/juce_mac_Network.mm index 540d5865d7..fb8a1f0088 100644 --- a/modules/juce_core/native/juce_mac_Network.mm +++ b/modules/juce_core/native/juce_mac_Network.mm @@ -98,7 +98,7 @@ bool Process::openEmailWithAttachments (const String& targetEmailAddress, } //============================================================================== -END_JUCE_NAMESPACE +} // (juce namespace) using namespace juce; @@ -320,7 +320,8 @@ private: @end -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== class WebInputStream : public InputStream diff --git a/modules/juce_core/network/juce_MACAddress.cpp b/modules/juce_core/network/juce_MACAddress.cpp index 347114da10..0a0fc9bf15 100644 --- a/modules/juce_core/network/juce_MACAddress.cpp +++ b/modules/juce_core/network/juce_MACAddress.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MACAddress::MACAddress() : asInt64 (0) { @@ -77,6 +75,3 @@ bool MACAddress::isNull() const noexcept { return bool MACAddress::operator== (const MACAddress& other) const noexcept { return asInt64 == other.asInt64; } bool MACAddress::operator!= (const MACAddress& other) const noexcept { return asInt64 != other.asInt64; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/network/juce_NamedPipe.cpp b/modules/juce_core/network/juce_NamedPipe.cpp index d257f16deb..d160e04366 100644 --- a/modules/juce_core/network/juce_NamedPipe.cpp +++ b/modules/juce_core/network/juce_NamedPipe.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE bool NamedPipe::openExisting (const String& pipeName) { @@ -48,5 +47,3 @@ String NamedPipe::getName() const } // other methods for this class are implemented in the platform-specific files - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/network/juce_Socket.cpp b/modules/juce_core/network/juce_Socket.cpp index 0b0d311b7d..77e458cbd4 100644 --- a/modules/juce_core/network/juce_Socket.cpp +++ b/modules/juce_core/network/juce_Socket.cpp @@ -23,40 +23,15 @@ ============================================================================== */ -#if JUCE_WINDOWS - #include - #include - - #if JUCE_MINGW - #include - #endif - - #if JUCE_MSVC - #pragma warning (push) - #pragma warning (disable : 4127 4389 4018) - #endif - -#else - #if JUCE_LINUX || JUCE_ANDROID - #include - #include - #include - #include - #include - #endif - - #include - #include - #include - #include +#if JUCE_MSVC + #pragma warning (push) + #pragma warning (disable : 4127 4389 4018) #endif #ifndef AI_NUMERICSERV // (missing in older Mac SDKs) #define AI_NUMERICSERV 0x1000 #endif -BEGIN_JUCE_NAMESPACE - #if JUCE_WINDOWS typedef int juce_socklen_t; #else @@ -606,5 +581,3 @@ bool DatagramSocket::isLocal() const noexcept #if JUCE_MSVC #pragma warning (pop) #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/network/juce_URL.cpp b/modules/juce_core/network/juce_URL.cpp index f74cd19d8a..30f71d0926 100644 --- a/modules/juce_core/network/juce_URL.cpp +++ b/modules/juce_core/network/juce_URL.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== URL::URL() { } @@ -475,6 +473,3 @@ bool URL::launchInDefaultBrowser() const return Process::openDocument (u, String::empty); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/streams/juce_BufferedInputStream.cpp b/modules/juce_core/streams/juce_BufferedInputStream.cpp index 420fb8c661..05d64b51dc 100644 --- a/modules/juce_core/streams/juce_BufferedInputStream.cpp +++ b/modules/juce_core/streams/juce_BufferedInputStream.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - namespace { int calcBufferStreamBufferSize (int requestedSize, InputStream* const source) noexcept @@ -196,5 +194,3 @@ String BufferedInputStream::readString() return InputStream::readString(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/streams/juce_FileInputSource.cpp b/modules/juce_core/streams/juce_FileInputSource.cpp index e0487b6217..e803a3fff4 100644 --- a/modules/juce_core/streams/juce_FileInputSource.cpp +++ b/modules/juce_core/streams/juce_FileInputSource.cpp @@ -23,9 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== FileInputSource::FileInputSource (const File& file_, bool useFileTimeInHashGeneration_) : file (file_), useFileTimeInHashGeneration (useFileTimeInHashGeneration_) { @@ -54,6 +51,3 @@ int64 FileInputSource::hashCode() const return h; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/streams/juce_InputStream.cpp b/modules/juce_core/streams/juce_InputStream.cpp index d40ebbf843..2bc2d33de0 100644 --- a/modules/juce_core/streams/juce_InputStream.cpp +++ b/modules/juce_core/streams/juce_InputStream.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== char InputStream::readByte() { char temp = 0; @@ -224,5 +222,3 @@ void InputStream::skipNextBytes (int64 numBytesToSkip) numBytesToSkip -= read (temp, (int) jmin (numBytesToSkip, (int64) skipBufferSize)); } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/streams/juce_MemoryInputStream.cpp b/modules/juce_core/streams/juce_MemoryInputStream.cpp index 6382afbe10..b7e1aaa626 100644 --- a/modules/juce_core/streams/juce_MemoryInputStream.cpp +++ b/modules/juce_core/streams/juce_MemoryInputStream.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MemoryInputStream::MemoryInputStream (const void* const sourceData, const size_t sourceDataSize, const bool keepInternalCopy) @@ -158,5 +156,3 @@ public: static MemoryStreamTests memoryInputStreamUnitTests; #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/streams/juce_MemoryOutputStream.cpp b/modules/juce_core/streams/juce_MemoryOutputStream.cpp index 50536a54f6..0ef67a4fcc 100644 --- a/modules/juce_core/streams/juce_MemoryOutputStream.cpp +++ b/modules/juce_core/streams/juce_MemoryOutputStream.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MemoryOutputStream::MemoryOutputStream (const size_t initialSize) : data (internalBlock), position (0), @@ -165,5 +163,3 @@ OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const MemoryOutput stream.write (streamToRead.getData(), (int) streamToRead.getDataSize()); return stream; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/streams/juce_OutputStream.cpp b/modules/juce_core/streams/juce_OutputStream.cpp index b532e8be16..b64dd40e0f 100644 --- a/modules/juce_core/streams/juce_OutputStream.cpp +++ b/modules/juce_core/streams/juce_OutputStream.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== #if JUCE_DEBUG struct DanglingStreamChecker @@ -312,6 +310,3 @@ OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const NewLine&) { return stream << stream.getNewLineString(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/streams/juce_SubregionStream.cpp b/modules/juce_core/streams/juce_SubregionStream.cpp index 9cef91cc9e..f8faa90ef1 100644 --- a/modules/juce_core/streams/juce_SubregionStream.cpp +++ b/modules/juce_core/streams/juce_SubregionStream.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== SubregionStream::SubregionStream (InputStream* const sourceStream, const int64 startPositionInSourceStream_, const int64 lengthOfSourceStream_, @@ -85,5 +83,3 @@ bool SubregionStream::isExhausted() else return source->isExhausted(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/system/juce_PlatformDefs.h b/modules/juce_core/system/juce_PlatformDefs.h index a2de6238fd..6eb8ba0b9b 100644 --- a/modules/juce_core/system/juce_PlatformDefs.h +++ b/modules/juce_core/system/juce_PlatformDefs.h @@ -121,10 +121,11 @@ //============================================================================== #ifndef DOXYGEN - BEGIN_JUCE_NAMESPACE - template struct JuceStaticAssert; - template <> struct JuceStaticAssert { static void dummy() {} }; - END_JUCE_NAMESPACE +namespace juce +{ + template struct JuceStaticAssert; + template <> struct JuceStaticAssert { static void dummy() {} }; +} #endif /** A compile-time assertion macro. diff --git a/modules/juce_core/system/juce_StandardHeader.h b/modules/juce_core/system/juce_StandardHeader.h index df52120d73..44beb5c9e8 100644 --- a/modules/juce_core/system/juce_StandardHeader.h +++ b/modules/juce_core/system/juce_StandardHeader.h @@ -50,10 +50,12 @@ #include "juce_TargetPlatform.h" // (sets up the various JUCE_WINDOWS, JUCE_MAC, etc flags) //============================================================================== -#define JUCE_NAMESPACE juce - -#define BEGIN_JUCE_NAMESPACE namespace juce { -#define END_JUCE_NAMESPACE } +#ifndef DOXYGEN + // These are old macros that are now deprecated: you should just use the juce namespace directly. + #define JUCE_NAMESPACE juce + #define BEGIN_JUCE_NAMESPACE namespace juce { + #define END_JUCE_NAMESPACE } +#endif //============================================================================== #include "juce_PlatformDefs.h" diff --git a/modules/juce_core/system/juce_SystemStats.cpp b/modules/juce_core/system/juce_SystemStats.cpp index d9cabe9e99..35804142db 100644 --- a/modules/juce_core/system/juce_SystemStats.cpp +++ b/modules/juce_core/system/juce_SystemStats.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== const SystemStats::CPUFlags& SystemStats::getCPUFlags() { static CPUFlags cpuFlags; @@ -62,6 +60,3 @@ String SystemStats::getJUCEVersion() static JuceVersionPrinter juceVersionPrinter; #endif - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/text/juce_CharacterFunctions.cpp b/modules/juce_core/text/juce_CharacterFunctions.cpp index bd6f002e61..e58814f7b9 100644 --- a/modules/juce_core/text/juce_CharacterFunctions.cpp +++ b/modules/juce_core/text/juce_CharacterFunctions.cpp @@ -23,14 +23,6 @@ ============================================================================== */ -#if ! JUCE_ANDROID - #include -#endif - -#include - -BEGIN_JUCE_NAMESPACE - //============================================================================== #if JUCE_MSVC #pragma warning (push) @@ -157,6 +149,3 @@ double CharacterFunctions::mulexp10 (const double value, int exponent) noexcept return negative ? (value / result) : (value * result); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/text/juce_Identifier.cpp b/modules/juce_core/text/juce_Identifier.cpp index efa6562565..732499bb77 100644 --- a/modules/juce_core/text/juce_Identifier.cpp +++ b/modules/juce_core/text/juce_Identifier.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== StringPool& Identifier::getPool() { static StringPool pool; @@ -73,5 +71,3 @@ bool Identifier::isValidIdentifier (const String& possibleIdentifier) noexcept return possibleIdentifier.isNotEmpty() && possibleIdentifier.containsOnly ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-:#@$%"); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/text/juce_LocalisedStrings.cpp b/modules/juce_core/text/juce_LocalisedStrings.cpp index d38cb3273a..b94cc7d1a4 100644 --- a/modules/juce_core/text/juce_LocalisedStrings.cpp +++ b/modules/juce_core/text/juce_LocalisedStrings.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== LocalisedStrings::LocalisedStrings (const String& fileContents) { loadFromText (fileContents); @@ -189,6 +187,3 @@ String translate (const String& text, const String& resultIfNotFound) return resultIfNotFound; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/text/juce_String.cpp b/modules/juce_core/text/juce_String.cpp index a08b147c2f..d99cf6461d 100644 --- a/modules/juce_core/text/juce_String.cpp +++ b/modules/juce_core/text/juce_String.cpp @@ -28,10 +28,6 @@ #pragma warning (disable: 4514 4996) #endif -#include - -BEGIN_JUCE_NAMESPACE - NewLine newLine; #if defined (JUCE_STRINGS_ARE_UNICODE) && ! JUCE_STRINGS_ARE_UNICODE @@ -2395,6 +2391,3 @@ public: static StringTests stringUnitTests; #endif - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/text/juce_StringArray.cpp b/modules/juce_core/text/juce_StringArray.cpp index 7d95b4a3fc..81407e60d7 100644 --- a/modules/juce_core/text/juce_StringArray.cpp +++ b/modules/juce_core/text/juce_StringArray.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - //============================================================================== StringArray::StringArray() noexcept { @@ -487,5 +485,3 @@ void StringArray::minimiseStorageOverheads() { strings.minimiseStorageOverheads(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/text/juce_StringPairArray.cpp b/modules/juce_core/text/juce_StringPairArray.cpp index 152cd240da..cde40ba0b9 100644 --- a/modules/juce_core/text/juce_StringPairArray.cpp +++ b/modules/juce_core/text/juce_StringPairArray.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== StringPairArray::StringPairArray (const bool ignoreCase_) : ignoreCase (ignoreCase_) { @@ -140,5 +138,3 @@ void StringPairArray::minimiseStorageOverheads() keys.minimiseStorageOverheads(); values.minimiseStorageOverheads(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/text/juce_StringPool.cpp b/modules/juce_core/text/juce_StringPool.cpp index decf8a85a6..ee02559c86 100644 --- a/modules/juce_core/text/juce_StringPool.cpp +++ b/modules/juce_core/text/juce_StringPool.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== StringPool::StringPool() noexcept {} StringPool::~StringPool() {} @@ -109,5 +107,3 @@ String::CharPointerType StringPool::operator[] (const int index) const noexcept { return strings [index].getCharPointer(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/threads/juce_ChildProcess.cpp b/modules/juce_core/threads/juce_ChildProcess.cpp index b109e68a8e..b1d240790a 100644 --- a/modules/juce_core/threads/juce_ChildProcess.cpp +++ b/modules/juce_core/threads/juce_ChildProcess.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE ChildProcess::ChildProcess() {} ChildProcess::~ChildProcess() {} @@ -90,6 +89,3 @@ public: static ChildProcessTests childProcessUnitTests; #endif - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/threads/juce_ReadWriteLock.cpp b/modules/juce_core/threads/juce_ReadWriteLock.cpp index 588a81d82f..a263e2a9fa 100644 --- a/modules/juce_core/threads/juce_ReadWriteLock.cpp +++ b/modules/juce_core/threads/juce_ReadWriteLock.cpp @@ -23,9 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== ReadWriteLock::ReadWriteLock() noexcept : numWaitingWriters (0), numWriters (0), @@ -162,5 +159,3 @@ void ReadWriteLock::exitWrite() const noexcept waitEvent.signal(); } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/threads/juce_Thread.cpp b/modules/juce_core/threads/juce_Thread.cpp index 7890b13d39..d95b0629c6 100644 --- a/modules/juce_core/threads/juce_Thread.cpp +++ b/modules/juce_core/threads/juce_Thread.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class RunningThreadsList { public: @@ -434,5 +432,3 @@ public: static AtomicTests atomicUnitTests; #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/threads/juce_ThreadPool.cpp b/modules/juce_core/threads/juce_ThreadPool.cpp index 2ac6ff63ef..5aa2c5bf5d 100644 --- a/modules/juce_core/threads/juce_ThreadPool.cpp +++ b/modules/juce_core/threads/juce_ThreadPool.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ThreadPoolJob::ThreadPoolJob (const String& name) : jobName (name), pool (nullptr), @@ -403,5 +401,3 @@ bool ThreadPool::runNextJob() return true; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/threads/juce_TimeSliceThread.cpp b/modules/juce_core/threads/juce_TimeSliceThread.cpp index d4e0827b15..d824c9101c 100644 --- a/modules/juce_core/threads/juce_TimeSliceThread.cpp +++ b/modules/juce_core/threads/juce_TimeSliceThread.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== TimeSliceThread::TimeSliceThread (const String& threadName) : Thread (threadName), clientBeingCalled (nullptr) @@ -170,6 +168,3 @@ void TimeSliceThread::run() wait (timeToWait); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/time/juce_PerformanceCounter.cpp b/modules/juce_core/time/juce_PerformanceCounter.cpp index 647162e1c3..1c005c8320 100644 --- a/modules/juce_core/time/juce_PerformanceCounter.cpp +++ b/modules/juce_core/time/juce_PerformanceCounter.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== PerformanceCounter::PerformanceCounter (const String& name_, const int runsPerPrintout, const File& loggingFile) @@ -93,5 +91,3 @@ void PerformanceCounter::printStatistics() totalTime = 0; } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/time/juce_RelativeTime.cpp b/modules/juce_core/time/juce_RelativeTime.cpp index d6adac67db..d3fb2dbad6 100644 --- a/modules/juce_core/time/juce_RelativeTime.cpp +++ b/modules/juce_core/time/juce_RelativeTime.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== RelativeTime::RelativeTime (const double seconds_) noexcept : seconds (seconds_) { @@ -168,6 +166,3 @@ bool operator<= (const RelativeTime& t1, const RelativeTime& t2) noexcept { retu RelativeTime operator+ (const RelativeTime& t1, const RelativeTime& t2) noexcept { RelativeTime t (t1); return t += t2; } RelativeTime operator- (const RelativeTime& t1, const RelativeTime& t2) noexcept { RelativeTime t (t1); return t -= t2; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/time/juce_Time.cpp b/modules/juce_core/time/juce_Time.cpp index b20e415b2a..baf57ca824 100644 --- a/modules/juce_core/time/juce_Time.cpp +++ b/modules/juce_core/time/juce_Time.cpp @@ -28,14 +28,6 @@ #pragma warning (disable: 4514) #endif -#ifndef JUCE_WINDOWS - #include -#else - #include -#endif - -#include - #if JUCE_MSVC #pragma warning (pop) @@ -44,8 +36,6 @@ #endif #endif -BEGIN_JUCE_NAMESPACE - //============================================================================== namespace TimeHelpers { @@ -492,6 +482,3 @@ bool operator< (const Time& time1, const Time& time2) { return time1.toMil bool operator> (const Time& time1, const Time& time2) { return time1.toMilliseconds() > time2.toMilliseconds(); } bool operator<= (const Time& time1, const Time& time2) { return time1.toMilliseconds() <= time2.toMilliseconds(); } bool operator>= (const Time& time1, const Time& time2) { return time1.toMilliseconds() >= time2.toMilliseconds(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/unit_tests/juce_UnitTest.cpp b/modules/juce_core/unit_tests/juce_UnitTest.cpp index 10a0fefb06..a32ac3691d 100644 --- a/modules/juce_core/unit_tests/juce_UnitTest.cpp +++ b/modules/juce_core/unit_tests/juce_UnitTest.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== UnitTest::UnitTest (const String& name_) : name (name_), runner (nullptr) { @@ -235,5 +233,3 @@ void UnitTestRunner::addFail (const String& failureMessage) if (assertOnFailure) { jassertfalse } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/xml/juce_XmlDocument.cpp b/modules/juce_core/xml/juce_XmlDocument.cpp index 1811e80cac..2a15bc1ed9 100644 --- a/modules/juce_core/xml/juce_XmlDocument.cpp +++ b/modules/juce_core/xml/juce_XmlDocument.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== XmlDocument::XmlDocument (const String& documentText) : originalText (documentText), input (nullptr), @@ -853,6 +851,3 @@ String XmlDocument::getParameterEntity (const String& entity) return entity; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/xml/juce_XmlElement.cpp b/modules/juce_core/xml/juce_XmlElement.cpp index db53c86a4b..9db7d0e51c 100644 --- a/modules/juce_core/xml/juce_XmlElement.cpp +++ b/modules/juce_core/xml/juce_XmlElement.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== XmlElement::XmlAttributeNode::XmlAttributeNode (const XmlAttributeNode& other) noexcept : name (other.name), value (other.value) @@ -839,5 +837,3 @@ void XmlElement::deleteAllTextElements() noexcept child = next; } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp b/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp index 858ceccc25..2c509944d6 100644 --- a/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp +++ b/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class GZIPCompressorOutputStream::GZIPCompressorHelper { public: @@ -210,5 +208,3 @@ public: static GZIPTests gzipTests; #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp index 635036f35f..7f78ff781e 100644 --- a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp +++ b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp @@ -64,8 +64,6 @@ namespace zlibNamespace #pragma warning (pop) #endif -BEGIN_JUCE_NAMESPACE - //============================================================================== // internal helper object that holds the zlib structures so they don't have to be // included publicly. @@ -274,5 +272,3 @@ unsigned long juce_crc32 (unsigned long crc, const unsigned char* buf, unsigned { return zlibNamespace::crc32 (crc, buf, len); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_core/zip/juce_ZipFile.cpp b/modules/juce_core/zip/juce_ZipFile.cpp index 556c77ddca..de0bd45775 100644 --- a/modules/juce_core/zip/juce_ZipFile.cpp +++ b/modules/juce_core/zip/juce_ZipFile.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class ZipFile::ZipEntryHolder { public: @@ -572,6 +570,3 @@ bool ZipFile::Builder::writeToStream (OutputStream& target) const return true; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_cryptography/encryption/juce_BlowFish.cpp b/modules/juce_cryptography/encryption/juce_BlowFish.cpp index e4765774b4..9d3b6a13c9 100644 --- a/modules/juce_cryptography/encryption/juce_BlowFish.cpp +++ b/modules/juce_cryptography/encryption/juce_BlowFish.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== BlowFish::BlowFish (const void* const keyData, const int keyBytes) { jassert (keyData != nullptr); @@ -273,6 +271,3 @@ void BlowFish::decrypt (uint32& data1, uint32& data2) const noexcept data1 = r ^ p[0]; data2 = l ^ p[1]; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_cryptography/encryption/juce_Primes.cpp b/modules/juce_cryptography/encryption/juce_Primes.cpp index 29413c39d1..559b9cb0ad 100644 --- a/modules/juce_cryptography/encryption/juce_Primes.cpp +++ b/modules/juce_cryptography/encryption/juce_Primes.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== namespace PrimesHelpers { void createSmallSieve (const int numBits, BigInteger& result) @@ -240,5 +238,3 @@ bool Primes::isProbablyPrime (const BigInteger& number, const int certainty) return passesMillerRabin (number, certainty); } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_cryptography/encryption/juce_RSAKey.cpp b/modules/juce_cryptography/encryption/juce_RSAKey.cpp index 56ade91869..33b5509a5f 100644 --- a/modules/juce_cryptography/encryption/juce_RSAKey.cpp +++ b/modules/juce_cryptography/encryption/juce_RSAKey.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== RSAKey::RSAKey() { } @@ -132,6 +130,3 @@ void RSAKey::createKeyPair (RSAKey& publicKey, RSAKey& privateKey, privateKey.part1 = d; privateKey.part2 = n; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_cryptography/hashing/juce_MD5.cpp b/modules/juce_cryptography/hashing/juce_MD5.cpp index a68321c9f4..6a06a3ec38 100644 --- a/modules/juce_cryptography/hashing/juce_MD5.cpp +++ b/modules/juce_cryptography/hashing/juce_MD5.cpp @@ -23,10 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== class MD5Generator { public: @@ -302,5 +299,3 @@ String MD5::toHexString() const //============================================================================== bool MD5::operator== (const MD5& other) const noexcept { return memcmp (result, other.result, sizeof (result)) == 0; } bool MD5::operator!= (const MD5& other) const noexcept { return ! operator== (other); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_cryptography/hashing/juce_SHA256.cpp b/modules/juce_cryptography/hashing/juce_SHA256.cpp index 670f34e508..ca62066a79 100644 --- a/modules/juce_cryptography/hashing/juce_SHA256.cpp +++ b/modules/juce_cryptography/hashing/juce_SHA256.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class SHA256Processor { public: @@ -267,5 +265,3 @@ public: static SHA256Tests sha256UnitTests; #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_cryptography/juce_cryptography.cpp b/modules/juce_cryptography/juce_cryptography.cpp index 1927ec432b..eaac9d6469 100644 --- a/modules/juce_cryptography/juce_cryptography.cpp +++ b/modules/juce_cryptography/juce_cryptography.cpp @@ -38,6 +38,9 @@ #include "juce_cryptography.h" +namespace juce +{ + // START_AUTOINCLUDE encryption/*.cpp, hashing/*.cpp #include "encryption/juce_BlowFish.cpp" #include "encryption/juce_Primes.cpp" @@ -45,3 +48,5 @@ #include "hashing/juce_MD5.cpp" #include "hashing/juce_SHA256.cpp" // END_AUTOINCLUDE + +} \ No newline at end of file diff --git a/modules/juce_cryptography/juce_cryptography.h b/modules/juce_cryptography/juce_cryptography.h index d3e953015b..da841c2bdd 100644 --- a/modules/juce_cryptography/juce_cryptography.h +++ b/modules/juce_cryptography/juce_cryptography.h @@ -29,7 +29,8 @@ //============================================================================= #include "../juce_core/juce_core.h" -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE encryption, hashing #ifndef __JUCE_BLOWFISH_JUCEHEADER__ @@ -49,6 +50,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_CRYPTOGRAPHY_JUCEHEADER__ diff --git a/modules/juce_data_structures/app_properties/juce_ApplicationProperties.cpp b/modules/juce_data_structures/app_properties/juce_ApplicationProperties.cpp index 316fee5905..749442aae0 100644 --- a/modules/juce_data_structures/app_properties/juce_ApplicationProperties.cpp +++ b/modules/juce_data_structures/app_properties/juce_ApplicationProperties.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ApplicationProperties::ApplicationProperties() : commonSettingsAreReadOnly (0) { @@ -104,6 +102,3 @@ void ApplicationProperties::closeFiles() userProps = nullptr; commonProps = nullptr; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp b/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp index b991d57266..1baf5c9cff 100644 --- a/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp +++ b/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== namespace PropertyFileConstants { static const int magicNumber = (int) ByteOrder::littleEndianInt ("PROP"); @@ -340,6 +338,3 @@ void PropertiesFile::propertyChanged() else if (options.millisecondsBeforeSaving == 0) saveIfNeeded(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_data_structures/juce_data_structures.cpp b/modules/juce_data_structures/juce_data_structures.cpp index 5ef2cebd37..c8b5189f21 100644 --- a/modules/juce_data_structures/juce_data_structures.cpp +++ b/modules/juce_data_structures/juce_data_structures.cpp @@ -38,6 +38,9 @@ #include "juce_data_structures.h" +namespace juce +{ + // START_AUTOINCLUDE values/*.cpp, undomanager/*.cpp, app_properties/*.cpp #include "values/juce_Value.cpp" #include "values/juce_ValueTree.cpp" @@ -45,3 +48,5 @@ #include "app_properties/juce_ApplicationProperties.cpp" #include "app_properties/juce_PropertiesFile.cpp" // END_AUTOINCLUDE + +} diff --git a/modules/juce_data_structures/juce_data_structures.h b/modules/juce_data_structures/juce_data_structures.h index 6078ae024f..7ee82334e0 100644 --- a/modules/juce_data_structures/juce_data_structures.h +++ b/modules/juce_data_structures/juce_data_structures.h @@ -29,7 +29,8 @@ //============================================================================= #include "../juce_events/juce_events.h" -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE values, undomanager, app_properties #ifndef __JUCE_VALUE_JUCEHEADER__ @@ -52,6 +53,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_DATA_STRUCTURES_JUCEHEADER__ diff --git a/modules/juce_data_structures/undomanager/juce_UndoManager.cpp b/modules/juce_data_structures/undomanager/juce_UndoManager.cpp index 103feaffd3..aa894d798e 100644 --- a/modules/juce_data_structures/undomanager/juce_UndoManager.cpp +++ b/modules/juce_data_structures/undomanager/juce_UndoManager.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== UndoManager::UndoManager (const int maxNumberOfUnitsToKeep, const int minimumTransactions) : totalUnitsStored (0), @@ -274,6 +272,3 @@ int UndoManager::getNumActionsInCurrentTransaction() const return 0; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_data_structures/values/juce_Value.cpp b/modules/juce_data_structures/values/juce_Value.cpp index 066152f047..807043e6f8 100644 --- a/modules/juce_data_structures/values/juce_Value.cpp +++ b/modules/juce_data_structures/values/juce_Value.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== Value::ValueSource::ValueSource() { } @@ -229,5 +227,3 @@ OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const Value& value { return stream << value.toString(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_data_structures/values/juce_ValueTree.cpp b/modules/juce_data_structures/values/juce_ValueTree.cpp index 74f2cde178..9b0d0b0832 100644 --- a/modules/juce_data_structures/values/juce_ValueTree.cpp +++ b/modules/juce_data_structures/values/juce_ValueTree.cpp @@ -23,10 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== class ValueTree::SharedObject : public SingleThreadedReferenceCountedObject { public: @@ -1103,5 +1100,3 @@ public: static ValueTreeTests valueTreeTests; #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_events/broadcasters/juce_ActionBroadcaster.cpp b/modules/juce_events/broadcasters/juce_ActionBroadcaster.cpp index d4cde465d4..89d7cd57ca 100644 --- a/modules/juce_events/broadcasters/juce_ActionBroadcaster.cpp +++ b/modules/juce_events/broadcasters/juce_ActionBroadcaster.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class ActionMessage : public Message { public: @@ -94,6 +92,3 @@ void ActionBroadcaster::sendActionMessage (const String& message) const for (int i = actionListeners.size(); --i >= 0;) callback.postMessage (new ActionMessage (message, actionListeners.getUnchecked(i))); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_events/broadcasters/juce_AsyncUpdater.cpp b/modules/juce_events/broadcasters/juce_AsyncUpdater.cpp index a21a6d8346..09244d953e 100644 --- a/modules/juce_events/broadcasters/juce_AsyncUpdater.cpp +++ b/modules/juce_events/broadcasters/juce_AsyncUpdater.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class AsyncUpdater::AsyncUpdaterMessage : public CallbackMessage { public: @@ -87,6 +85,3 @@ bool AsyncUpdater::isUpdatePending() const noexcept { return message->shouldDeliver.value != 0; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_events/broadcasters/juce_ChangeBroadcaster.cpp b/modules/juce_events/broadcasters/juce_ChangeBroadcaster.cpp index f8a2f7b62d..ff126b7534 100644 --- a/modules/juce_events/broadcasters/juce_ChangeBroadcaster.cpp +++ b/modules/juce_events/broadcasters/juce_ChangeBroadcaster.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ChangeBroadcaster::ChangeBroadcaster() noexcept { // are you trying to create this object before or after juce has been intialised?? @@ -103,6 +101,3 @@ void ChangeBroadcaster::ChangeBroadcasterCallback::handleAsyncUpdate() jassert (owner != nullptr); owner->callListeners(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_events/interprocess/juce_InterprocessConnection.cpp b/modules/juce_events/interprocess/juce_InterprocessConnection.cpp index 3359bd914b..ed3bd78bfe 100644 --- a/modules/juce_events/interprocess/juce_InterprocessConnection.cpp +++ b/modules/juce_events/interprocess/juce_InterprocessConnection.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== InterprocessConnection::InterprocessConnection (const bool callbacksOnMessageThread, const uint32 magicMessageHeaderNumber) : Thread ("Juce IPC connection"), @@ -370,6 +368,3 @@ void InterprocessConnection::run() } } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_events/interprocess/juce_InterprocessConnectionServer.cpp b/modules/juce_events/interprocess/juce_InterprocessConnectionServer.cpp index 411d7e57e2..b1dea941e8 100644 --- a/modules/juce_events/interprocess/juce_InterprocessConnectionServer.cpp +++ b/modules/juce_events/interprocess/juce_InterprocessConnectionServer.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== InterprocessConnectionServer::InterprocessConnectionServer() : Thread ("Juce IPC server") { @@ -79,6 +77,3 @@ void InterprocessConnectionServer::run() } } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_events/juce_events.cpp b/modules/juce_events/juce_events.cpp index 69f2e67e80..abcb892e93 100644 --- a/modules/juce_events/juce_events.cpp +++ b/modules/juce_events/juce_events.cpp @@ -59,6 +59,9 @@ #endif //============================================================================== +namespace juce +{ + // START_AUTOINCLUDE messages/*.cpp, broadcasters/*.cpp, // timers/*.cpp, interprocess/*.cpp #include "messages/juce_ApplicationBase.cpp" @@ -75,10 +78,6 @@ // END_AUTOINCLUDE //============================================================================== -using namespace juce; - -BEGIN_JUCE_NAMESPACE - #if JUCE_MAC #include "../juce_core/native/juce_osx_ObjCHelpers.h" #include "../juce_core/native/juce_mac_ObjCSuffix.h" @@ -104,4 +103,4 @@ BEGIN_JUCE_NAMESPACE #endif -END_JUCE_NAMESPACE +} \ No newline at end of file diff --git a/modules/juce_events/juce_events.h b/modules/juce_events/juce_events.h index 0865420c54..778ccf22ae 100644 --- a/modules/juce_events/juce_events.h +++ b/modules/juce_events/juce_events.h @@ -29,7 +29,8 @@ //============================================================================= #include "../juce_core/juce_core.h" -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE messages, broadcasters, timers, // interprocess, native/juce_ScopedXLock* @@ -86,6 +87,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_EVENTS_JUCEHEADER__ diff --git a/modules/juce_events/messages/juce_ApplicationBase.cpp b/modules/juce_events/messages/juce_ApplicationBase.cpp index 2389e8292e..4ee1d5c114 100644 --- a/modules/juce_events/messages/juce_ApplicationBase.cpp +++ b/modules/juce_events/messages/juce_ApplicationBase.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE JUCEApplicationBase::CreateInstanceFunction JUCEApplicationBase::createInstance = 0; JUCEApplicationBase* JUCEApplicationBase::appInstance = nullptr; @@ -55,5 +54,3 @@ void JUCEApplicationBase::appWillTerminateByForce() DeletedAtShutdown::deleteAll(); MessageManager::deleteInstance(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_events/messages/juce_DeletedAtShutdown.cpp b/modules/juce_events/messages/juce_DeletedAtShutdown.cpp index cc5202e713..37e47f96fa 100644 --- a/modules/juce_events/messages/juce_DeletedAtShutdown.cpp +++ b/modules/juce_events/messages/juce_DeletedAtShutdown.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== static SpinLock deletedAtShutdownLock; DeletedAtShutdown::DeletedAtShutdown() @@ -81,5 +79,3 @@ Array & DeletedAtShutdown::getObjects() static Array objects; return objects; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_events/messages/juce_MessageListener.cpp b/modules/juce_events/messages/juce_MessageListener.cpp index afd7525afb..778ec2543f 100644 --- a/modules/juce_events/messages/juce_MessageListener.cpp +++ b/modules/juce_events/messages/juce_MessageListener.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MessageListener::MessageListener() noexcept { // are you trying to create a messagelistener before or after juce has been intialised?? @@ -56,5 +54,3 @@ bool MessageListener::isValidMessageListener() const noexcept return MessageManager::instance != nullptr && MessageManager::instance->messageListeners.contains (this); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_events/messages/juce_MessageManager.cpp b/modules/juce_events/messages/juce_MessageManager.cpp index 32b8caa911..0e96e310cb 100644 --- a/modules/juce_events/messages/juce_MessageManager.cpp +++ b/modules/juce_events/messages/juce_MessageManager.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== Message::Message() noexcept : messageRecipient (nullptr) {} Message::~Message() {} @@ -325,5 +323,3 @@ JUCE_API void JUCE_CALLTYPE shutdownJuce_GUI() DeletedAtShutdown::deleteAll(); MessageManager::deleteInstance(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_events/native/juce_ios_MessageManager.mm b/modules/juce_events/native/juce_ios_MessageManager.mm index 6e8cb5c652..422bc6339e 100644 --- a/modules/juce_events/native/juce_ios_MessageManager.mm +++ b/modules/juce_events/native/juce_ios_MessageManager.mm @@ -31,7 +31,7 @@ struct CallbackMessagePayload bool volatile hasBeenExecuted; }; -END_JUCE_NAMESPACE +} // (juce namespace) //============================================================================== @interface JuceCustomMessageHandler : NSObject @@ -65,9 +65,10 @@ END_JUCE_NAMESPACE @end -BEGIN_JUCE_NAMESPACE - //============================================================================== +namespace juce +{ + void MessageManager::runDispatchLoop() { jassert (isThisTheMessageThread()); // must only be called by the message thread diff --git a/modules/juce_events/native/juce_mac_MessageManager.mm b/modules/juce_events/native/juce_mac_MessageManager.mm index 6b0b88e531..71dc23d769 100644 --- a/modules/juce_events/native/juce_mac_MessageManager.mm +++ b/modules/juce_events/native/juce_mac_MessageManager.mm @@ -136,7 +136,8 @@ private: }; -END_JUCE_NAMESPACE +} // (juce namespace) + using namespace juce; #define JuceAppDelegate MakeObjCClassName(JuceAppDelegate) @@ -288,7 +289,8 @@ using namespace juce; @end //============================================================================== -BEGIN_JUCE_NAMESPACE +namespace juce +{ static JuceAppDelegate* juceAppDelegate = nil; diff --git a/modules/juce_events/timers/juce_MultiTimer.cpp b/modules/juce_events/timers/juce_MultiTimer.cpp index 49a5fdb01f..15cb1fb12a 100644 --- a/modules/juce_events/timers/juce_MultiTimer.cpp +++ b/modules/juce_events/timers/juce_MultiTimer.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class MultiTimer::MultiTimerCallback : public Timer { public: @@ -122,6 +120,3 @@ int MultiTimer::getTimerInterval (const int timerId) const noexcept return 0; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_events/timers/juce_Timer.cpp b/modules/juce_events/timers/juce_Timer.cpp index d8e1dd11c6..e18712918d 100644 --- a/modules/juce_events/timers/juce_Timer.cpp +++ b/modules/juce_events/timers/juce_Timer.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class Timer::TimerThread : private Thread, private MessageListener, private DeletedAtShutdown, @@ -382,5 +380,3 @@ void JUCE_CALLTYPE Timer::callPendingTimersSynchronously() if (TimerThread::instance != nullptr) TimerThread::instance->callTimersSynchronously(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/colour/juce_Colour.cpp b/modules/juce_graphics/colour/juce_Colour.cpp index f6bfe06d76..99c5009c20 100644 --- a/modules/juce_graphics/colour/juce_Colour.cpp +++ b/modules/juce_graphics/colour/juce_Colour.cpp @@ -23,9 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== namespace ColourHelpers { uint8 floatToUInt8 (const float n) noexcept @@ -406,6 +403,3 @@ String Colour::toDisplayString (const bool includeAlphaValue) const .paddedLeft ('0', includeAlphaValue ? 8 : 6) .toUpperCase(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/colour/juce_ColourGradient.cpp b/modules/juce_graphics/colour/juce_ColourGradient.cpp index df015d3196..3ad8392930 100644 --- a/modules/juce_graphics/colour/juce_ColourGradient.cpp +++ b/modules/juce_graphics/colour/juce_ColourGradient.cpp @@ -23,9 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== ColourGradient::ColourGradient() noexcept { #if JUCE_DEBUG @@ -222,6 +219,3 @@ bool ColourGradient::ColourPoint::operator!= (const ColourPoint& other) const no { return position != other.position || colour != other.colour; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/colour/juce_Colours.cpp b/modules/juce_graphics/colour/juce_Colours.cpp index a977b68546..382bdc9070 100644 --- a/modules/juce_graphics/colour/juce_Colours.cpp +++ b/modules/juce_graphics/colour/juce_Colours.cpp @@ -23,9 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== const Colour Colours::transparentBlack (0); const Colour Colours::transparentWhite (0x00ffffff); @@ -322,6 +319,3 @@ Colour Colours::findColourForName (const String& colourName, return defaultColour; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/colour/juce_FillType.cpp b/modules/juce_graphics/colour/juce_FillType.cpp index 64b26de80e..9e2806ca6e 100644 --- a/modules/juce_graphics/colour/juce_FillType.cpp +++ b/modules/juce_graphics/colour/juce_FillType.cpp @@ -23,9 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== FillType::FillType() noexcept : colour (0xff000000) { @@ -150,5 +147,3 @@ FillType FillType::transformed (const AffineTransform& t) const f.transform = f.transform.followedBy (t); return f; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/contexts/juce_GraphicsContext.cpp b/modules/juce_graphics/contexts/juce_GraphicsContext.cpp index 8e2acd1e32..5686e4ec8e 100644 --- a/modules/juce_graphics/contexts/juce_GraphicsContext.cpp +++ b/modules/juce_graphics/contexts/juce_GraphicsContext.cpp @@ -23,9 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== namespace { template @@ -729,6 +726,3 @@ Graphics::ScopedSaveState::~ScopedSaveState() { context.restoreState(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp b/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp index e786567c84..faec1c8a66 100644 --- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp +++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - // this will throw an assertion if you try to draw something that's not // possible in postscript #define WARN_ABOUT_NON_POSTSCRIPT_OPERATIONS 0 @@ -542,5 +540,3 @@ void LowLevelGraphicsPostScriptRenderer::drawGlyph (int glyphNumber, const Affin font.getTypeface()->getOutlineForGlyph (glyphNumber, p); fillPath (p, AffineTransform::scale (font.getHeight() * font.getHorizontalScale(), font.getHeight()).followedBy (transform)); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp b/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp index 0ed25e75c4..439ca0c7d0 100644 --- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp +++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - #if JUCE_MSVC #pragma warning (push) #pragma warning (disable: 4127) // "expression is constant" warning @@ -2237,5 +2235,3 @@ const Font& LowLevelGraphicsSoftwareRenderer::getFont() { return #pragma optimize ("", on) // resets optimisations to the project defaults #endif #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/effects/juce_DropShadowEffect.cpp b/modules/juce_graphics/effects/juce_DropShadowEffect.cpp index 356d0632b9..de83e4a562 100644 --- a/modules/juce_graphics/effects/juce_DropShadowEffect.cpp +++ b/modules/juce_graphics/effects/juce_DropShadowEffect.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE #if JUCE_MSVC && JUCE_DEBUG #pragma optimize ("t", on) @@ -107,5 +106,3 @@ void DropShadowEffect::applyEffect (Image& image, Graphics& g, float alpha) #if JUCE_MSVC && JUCE_DEBUG #pragma optimize ("", on) // resets optimisations to the project defaults #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/effects/juce_GlowEffect.cpp b/modules/juce_graphics/effects/juce_GlowEffect.cpp index bc719a4ac2..784d960307 100644 --- a/modules/juce_graphics/effects/juce_GlowEffect.cpp +++ b/modules/juce_graphics/effects/juce_GlowEffect.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== GlowEffect::GlowEffect() : radius (2.0f), colour (Colours::white) @@ -60,5 +58,3 @@ void GlowEffect::applyEffect (Image& image, Graphics& g, float alpha) g.setOpacity (alpha); g.drawImageAt (image, 0, 0, false); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/fonts/juce_AttributedString.cpp b/modules/juce_graphics/fonts/juce_AttributedString.cpp index 4630d2a061..bb709785a1 100644 --- a/modules/juce_graphics/fonts/juce_AttributedString.cpp +++ b/modules/juce_graphics/fonts/juce_AttributedString.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AttributedString::Attribute::Attribute (const Range& range_, const Colour& colour_) : range (range_), colour (new Colour (colour_)) { @@ -218,5 +216,3 @@ void AttributedString::draw (Graphics& g, const Rectangle& area) const } } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/fonts/juce_CustomTypeface.cpp b/modules/juce_graphics/fonts/juce_CustomTypeface.cpp index ad08233926..a562968646 100644 --- a/modules/juce_graphics/fonts/juce_CustomTypeface.cpp +++ b/modules/juce_graphics/fonts/juce_CustomTypeface.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class CustomTypeface::GlyphInfo { public: @@ -409,6 +407,3 @@ EdgeTable* CustomTypeface::getEdgeTableForGlyph (int glyphNumber, const AffineTr return nullptr; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/fonts/juce_Font.cpp b/modules/juce_graphics/fonts/juce_Font.cpp index 634815768e..33d5993474 100644 --- a/modules/juce_graphics/fonts/juce_Font.cpp +++ b/modules/juce_graphics/fonts/juce_Font.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== namespace FontValues { float limitFontHeight (const float height) noexcept @@ -546,6 +544,3 @@ Typeface* Font::getTypeface() const return font->typeface; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/fonts/juce_GlyphArrangement.cpp b/modules/juce_graphics/fonts/juce_GlyphArrangement.cpp index 6d720236c0..c8188bab0f 100644 --- a/modules/juce_graphics/fonts/juce_GlyphArrangement.cpp +++ b/modules/juce_graphics/fonts/juce_GlyphArrangement.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== PositionedGlyph::PositionedGlyph (const Font& font_, const juce_wchar character_, const int glyph_, const float x_, const float y_, const float w_, const bool whitespace_) : font (font_), character (character_), glyph (glyph_), @@ -802,5 +800,3 @@ int GlyphArrangement::findGlyphIndexAt (float x, float y) const return -1; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/fonts/juce_TextLayout.cpp b/modules/juce_graphics/fonts/juce_TextLayout.cpp index 052e11fd00..8f7384b915 100644 --- a/modules/juce_graphics/fonts/juce_TextLayout.cpp +++ b/modules/juce_graphics/fonts/juce_TextLayout.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - TextLayout::Glyph::Glyph (const int glyphCode_, const Point& anchor_, float width_) noexcept : glyphCode (glyphCode_), anchor (anchor_), width (width_) { @@ -617,5 +615,3 @@ void TextLayout::recalculateWidth() width = range.getLength(); } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/fonts/juce_Typeface.cpp b/modules/juce_graphics/fonts/juce_Typeface.cpp index a0c9dd1fd9..6163f503d6 100644 --- a/modules/juce_graphics/fonts/juce_Typeface.cpp +++ b/modules/juce_graphics/fonts/juce_Typeface.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== Typeface::Typeface (const String& name_) noexcept : name (name_) { @@ -51,5 +49,3 @@ EdgeTable* Typeface::getEdgeTableForGlyph (int glyphNumber, const AffineTransfor return nullptr; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/geometry/juce_AffineTransform.cpp b/modules/juce_graphics/geometry/juce_AffineTransform.cpp index 6accbd5709..ad9780e04f 100644 --- a/modules/juce_graphics/geometry/juce_AffineTransform.cpp +++ b/modules/juce_graphics/geometry/juce_AffineTransform.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== AffineTransform::AffineTransform() noexcept : mat00 (1.0f), mat01 (0), mat02 (0), mat10 (0), mat11 (1.0f), mat12 (0) @@ -248,6 +246,3 @@ float AffineTransform::getScaleFactor() const noexcept { return juce_hypot (mat00 + mat01, mat10 + mat11); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/geometry/juce_EdgeTable.cpp b/modules/juce_graphics/geometry/juce_EdgeTable.cpp index bf4a8e17c3..4882390975 100644 --- a/modules/juce_graphics/geometry/juce_EdgeTable.cpp +++ b/modules/juce_graphics/geometry/juce_EdgeTable.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - const int juce_edgeTableDefaultEdgesPerLine = 32; //============================================================================== @@ -741,5 +739,3 @@ bool EdgeTable::isEmpty() noexcept return bounds.getHeight() == 0; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/geometry/juce_Path.cpp b/modules/juce_graphics/geometry/juce_Path.cpp index 72454ca69d..360140e2c9 100644 --- a/modules/juce_graphics/geometry/juce_Path.cpp +++ b/modules/juce_graphics/geometry/juce_Path.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - // tests that some co-ords aren't NaNs #define JUCE_CHECK_COORDS_ARE_VALID(x, y) \ jassert (x == x && y == y); @@ -1586,5 +1584,3 @@ bool Path::Iterator::next() } #undef JUCE_CHECK_COORDS_ARE_VALID - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/geometry/juce_PathIterator.cpp b/modules/juce_graphics/geometry/juce_PathIterator.cpp index 2bb1c6d195..849708ef6a 100644 --- a/modules/juce_graphics/geometry/juce_PathIterator.cpp +++ b/modules/juce_graphics/geometry/juce_PathIterator.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - #if JUCE_MSVC && JUCE_DEBUG #pragma optimize ("t", on) #endif @@ -289,5 +287,3 @@ bool PathFlatteningIterator::next() #if JUCE_MSVC && JUCE_DEBUG #pragma optimize ("", on) // resets optimisations to the project defaults #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/geometry/juce_PathStrokeType.cpp b/modules/juce_graphics/geometry/juce_PathStrokeType.cpp index 9b7b858304..7d9b0c9fce 100644 --- a/modules/juce_graphics/geometry/juce_PathStrokeType.cpp +++ b/modules/juce_graphics/geometry/juce_PathStrokeType.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== PathStrokeType::PathStrokeType (const float strokeThickness, const JointStyle jointStyle_, const EndCapStyle endStyle_) noexcept @@ -742,5 +740,3 @@ void PathStrokeType::createStrokeWithArrowheads (Path& destPath, PathStrokeHelpers::createStroke (thickness, jointStyle, endStyle, destPath, sourcePath, transform, extraAccuracy, &head); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/geometry/juce_RectangleList.cpp b/modules/juce_graphics/geometry/juce_RectangleList.cpp index 0efddf02d3..c219a662f8 100644 --- a/modules/juce_graphics/geometry/juce_RectangleList.cpp +++ b/modules/juce_graphics/geometry/juce_RectangleList.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== RectangleList::RectangleList() noexcept { } @@ -516,6 +514,3 @@ Path RectangleList::toPath() const return p; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/image_formats/juce_GIFLoader.cpp b/modules/juce_graphics/image_formats/juce_GIFLoader.cpp index 50cbfc84a4..b97f0a4dc8 100644 --- a/modules/juce_graphics/image_formats/juce_GIFLoader.cpp +++ b/modules/juce_graphics/image_formats/juce_GIFLoader.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - #if (JUCE_MAC || JUCE_IOS) && USE_COREGRAPHICS_RENDERING && JUCE_USE_COREIMAGE_LOADER Image juce_loadWithCoreImage (InputStream& input); #else @@ -444,6 +442,3 @@ bool GIFImageFormat::writeImageToStream (const Image& /*sourceImage*/, OutputStr jassertfalse; // writing isn't implemented for GIFs! return false; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp b/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp index 446927a79f..5d52e196cf 100644 --- a/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp +++ b/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp @@ -120,8 +120,6 @@ namespace jpeglibNamespace #pragma warning (pop) #endif -BEGIN_JUCE_NAMESPACE - //============================================================================== namespace JPEGHelpers { @@ -421,6 +419,3 @@ bool JPEGImageFormat::writeImageToStream (const Image& image, OutputStream& out) return true; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/image_formats/juce_PNGLoader.cpp b/modules/juce_graphics/image_formats/juce_PNGLoader.cpp index cb3330267e..faa0ded8db 100644 --- a/modules/juce_graphics/image_formats/juce_PNGLoader.cpp +++ b/modules/juce_graphics/image_formats/juce_PNGLoader.cpp @@ -95,8 +95,6 @@ namespace pnglibNamespace #pragma warning (pop) #endif -BEGIN_JUCE_NAMESPACE - using ::calloc; using ::malloc; using ::free; @@ -354,6 +352,3 @@ bool PNGImageFormat::writeImageToStream (const Image& image, OutputStream& out) return true; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/images/juce_Image.cpp b/modules/juce_graphics/images/juce_Image.cpp index 452f08c707..cf49ccbd62 100644 --- a/modules/juce_graphics/images/juce_Image.cpp +++ b/modules/juce_graphics/images/juce_Image.cpp @@ -23,9 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== ImagePixelData::ImagePixelData (const Image::PixelFormat format, const int w, const int h) : pixelFormat (format), width (w), height (h) { @@ -640,5 +637,3 @@ void Image::moveImageSection (int dx, int dy, } } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/images/juce_ImageCache.cpp b/modules/juce_graphics/images/juce_ImageCache.cpp index d05985f9b1..a39cfebf3c 100644 --- a/modules/juce_graphics/images/juce_ImageCache.cpp +++ b/modules/juce_graphics/images/juce_ImageCache.cpp @@ -23,9 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== class ImageCache::Pimpl : public Timer, public DeletedAtShutdown { @@ -164,6 +161,3 @@ void ImageCache::setCacheTimeout (const int millisecs) { Pimpl::getInstance()->cacheTimeout = millisecs; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/images/juce_ImageConvolutionKernel.cpp b/modules/juce_graphics/images/juce_ImageConvolutionKernel.cpp index ee74e0d93a..1f8b17cf7f 100644 --- a/modules/juce_graphics/images/juce_ImageConvolutionKernel.cpp +++ b/modules/juce_graphics/images/juce_ImageConvolutionKernel.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ImageConvolutionKernel::ImageConvolutionKernel (const int size_) : values ((size_t) (size_ * size_)), size (size_) @@ -245,5 +243,3 @@ void ImageConvolutionKernel::applyToImage (Image& destImage, } } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/images/juce_ImageFileFormat.cpp b/modules/juce_graphics/images/juce_ImageFileFormat.cpp index 81a2ddd1af..f508f2bc17 100644 --- a/modules/juce_graphics/images/juce_ImageFileFormat.cpp +++ b/modules/juce_graphics/images/juce_ImageFileFormat.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ImageFileFormat* ImageFileFormat::findImageFormatForStream (InputStream& input) { struct DefaultImageFormats @@ -89,5 +87,3 @@ Image ImageFileFormat::loadFrom (const void* rawData, const size_t numBytes) return Image::null; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/juce_graphics.cpp b/modules/juce_graphics/juce_graphics.cpp index fdcfefc86b..c0c7c7ceab 100644 --- a/modules/juce_graphics/juce_graphics.cpp +++ b/modules/juce_graphics/juce_graphics.cpp @@ -64,6 +64,9 @@ #endif //============================================================================== +namespace juce +{ + // START_AUTOINCLUDE colour/*.cpp, geometry/*.cpp, placement/*.cpp, contexts/*.cpp, images/*.cpp, // image_formats/*.cpp, fonts/*.cpp, effects/*.cpp #include "colour/juce_Colour.cpp" @@ -99,8 +102,6 @@ // END_AUTOINCLUDE //============================================================================== -BEGIN_JUCE_NAMESPACE - #if JUCE_MAC || JUCE_IOS #include "../juce_core/native/juce_osx_ObjCHelpers.h" #include "../juce_core/native/juce_mac_ObjCSuffix.h" @@ -127,4 +128,4 @@ BEGIN_JUCE_NAMESPACE #endif -END_JUCE_NAMESPACE +} diff --git a/modules/juce_graphics/juce_graphics.h b/modules/juce_graphics/juce_graphics.h index 8cbbcb96de..cd08b4c1b1 100644 --- a/modules/juce_graphics/juce_graphics.h +++ b/modules/juce_graphics/juce_graphics.h @@ -62,7 +62,8 @@ #endif //============================================================================= -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE colour, geometry, placement, contexts, images, // image_formats, fonts, effects @@ -170,6 +171,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_GRAPHICS_JUCEHEADER__ diff --git a/modules/juce_graphics/native/juce_mac_Fonts.mm b/modules/juce_graphics/native/juce_mac_Fonts.mm index 1495e25914..e966f0108c 100644 --- a/modules/juce_graphics/native/juce_mac_Fonts.mm +++ b/modules/juce_graphics/native/juce_mac_Fonts.mm @@ -600,11 +600,14 @@ private: #define SUPPORT_ONLY_10_4_FONTS 1 #endif - END_JUCE_NAMESPACE + } // (juce namespace) + @interface NSFont (PrivateHack) - (NSGlyph) _defaultGlyphForChar: (unichar) theChar; @end - BEGIN_JUCE_NAMESPACE + + namespace juce + { #endif //============================================================================== diff --git a/modules/juce_graphics/placement/juce_Justification.cpp b/modules/juce_graphics/placement/juce_Justification.cpp index 2f67908d8d..9cbe1792ce 100644 --- a/modules/juce_graphics/placement/juce_Justification.cpp +++ b/modules/juce_graphics/placement/juce_Justification.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== Justification::Justification (const Justification& other) noexcept : flags (other.flags) { @@ -46,6 +44,3 @@ int Justification::getOnlyHorizontalFlags() const noexcept { return flags & (left | right | horizontallyCentred | horizontallyJustified); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_graphics/placement/juce_RectanglePlacement.cpp b/modules/juce_graphics/placement/juce_RectanglePlacement.cpp index a19454cc5c..0a318f9d09 100644 --- a/modules/juce_graphics/placement/juce_RectanglePlacement.cpp +++ b/modules/juce_graphics/placement/juce_RectanglePlacement.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== RectanglePlacement::RectanglePlacement (const RectanglePlacement& other) noexcept : flags (other.flags) { @@ -129,6 +127,3 @@ const AffineTransform RectanglePlacement::getTransformToFit (const RectanglekeyStateChanged (false); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/components/juce_Component.cpp b/modules/juce_gui_basics/components/juce_Component.cpp index 88c96508e4..6f62e03122 100644 --- a/modules/juce_gui_basics/components/juce_Component.cpp +++ b/modules/juce_gui_basics/components/juce_Component.cpp @@ -23,9 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== #define CHECK_MESSAGE_MANAGER_IS_LOCKED jassert (MessageManager::getInstance()->currentThreadHasLockedMessageManager()); Component* Component::currentlyFocusedComponent = nullptr; @@ -3041,6 +3038,3 @@ bool Component::BailOutChecker::shouldBailOut() const noexcept { return safePointer == nullptr; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/components/juce_ComponentListener.cpp b/modules/juce_gui_basics/components/juce_ComponentListener.cpp index 745d1f54c1..3357cac507 100644 --- a/modules/juce_gui_basics/components/juce_ComponentListener.cpp +++ b/modules/juce_gui_basics/components/juce_ComponentListener.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE void ComponentListener::componentMovedOrResized (Component&, bool, bool) {} void ComponentListener::componentBroughtToFront (Component&) {} @@ -32,5 +31,3 @@ void ComponentListener::componentChildrenChanged (Component&) {} void ComponentListener::componentParentHierarchyChanged (Component&) {} void ComponentListener::componentNameChanged (Component&) {} void ComponentListener::componentBeingDeleted (Component&) {} - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/components/juce_Desktop.cpp b/modules/juce_gui_basics/components/juce_Desktop.cpp index 337d677b21..852147f30c 100644 --- a/modules/juce_gui_basics/components/juce_Desktop.cpp +++ b/modules/juce_gui_basics/components/juce_Desktop.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== Desktop::Desktop() : mouseClickCounter (0), kioskModeComponent (nullptr), @@ -448,6 +446,3 @@ bool Desktop::isOrientationEnabled (const DisplayOrientation orientation) const return (allowedOrientations & orientation) != 0; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp b/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp index 3cf37af612..9c4178c69c 100644 --- a/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp +++ b/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class ModalComponentManager::ModalItem : public ComponentMovementWatcher { public: @@ -286,5 +284,3 @@ int ModalComponentManager::runEventLoopForCurrentComponent() return returnValue; } #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/drawables/juce_Drawable.cpp b/modules/juce_gui_basics/drawables/juce_Drawable.cpp index a65c0e8b87..af9963d8c0 100644 --- a/modules/juce_gui_basics/drawables/juce_Drawable.cpp +++ b/modules/juce_gui_basics/drawables/juce_Drawable.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== Drawable::Drawable() { setInterceptsMouseClicks (false, false); @@ -228,6 +226,3 @@ void Drawable::ValueTreeWrapperBase::setID (const String& newID) else state.setProperty (ComponentBuilder::idProperty, newID, nullptr); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/drawables/juce_DrawableComposite.cpp b/modules/juce_gui_basics/drawables/juce_DrawableComposite.cpp index 7e7c67c2f4..88bca0fc5d 100644 --- a/modules/juce_gui_basics/drawables/juce_DrawableComposite.cpp +++ b/modules/juce_gui_basics/drawables/juce_DrawableComposite.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== DrawableComposite::DrawableComposite() : bounds (Point(), Point (100.0f, 0.0f), Point (0.0f, 100.0f)), updateBoundsReentrant (false) @@ -340,6 +338,3 @@ ValueTree DrawableComposite::createValueTree (ComponentBuilder::ImageProvider* i return tree; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/drawables/juce_DrawableImage.cpp b/modules/juce_gui_basics/drawables/juce_DrawableImage.cpp index 0464b1fbec..cc41608f07 100644 --- a/modules/juce_gui_basics/drawables/juce_DrawableImage.cpp +++ b/modules/juce_gui_basics/drawables/juce_DrawableImage.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== DrawableImage::DrawableImage() : opacity (1.0f), overlayColour (0x00000000) @@ -290,6 +288,3 @@ ValueTree DrawableImage::createValueTree (ComponentBuilder::ImageProvider* image return tree; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/drawables/juce_DrawablePath.cpp b/modules/juce_gui_basics/drawables/juce_DrawablePath.cpp index af2738ec46..83bfc465ff 100644 --- a/modules/juce_gui_basics/drawables/juce_DrawablePath.cpp +++ b/modules/juce_gui_basics/drawables/juce_DrawablePath.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== DrawablePath::DrawablePath() { } @@ -572,6 +570,3 @@ ValueTree DrawablePath::createValueTree (ComponentBuilder::ImageProvider* imageP return tree; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/drawables/juce_DrawableRectangle.cpp b/modules/juce_gui_basics/drawables/juce_DrawableRectangle.cpp index 975bbc00eb..534926cc0c 100644 --- a/modules/juce_gui_basics/drawables/juce_DrawableRectangle.cpp +++ b/modules/juce_gui_basics/drawables/juce_DrawableRectangle.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== DrawableRectangle::DrawableRectangle() { } @@ -184,5 +182,3 @@ ValueTree DrawableRectangle::createValueTree (ComponentBuilder::ImageProvider* i return tree; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/drawables/juce_DrawableShape.cpp b/modules/juce_gui_basics/drawables/juce_DrawableShape.cpp index 70659bbd8e..854a1511f2 100644 --- a/modules/juce_gui_basics/drawables/juce_DrawableShape.cpp +++ b/modules/juce_gui_basics/drawables/juce_DrawableShape.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== DrawableShape::DrawableShape() : strokeType (0.0f), mainFill (Colours::black), @@ -455,5 +453,3 @@ void DrawableShape::FillAndStrokeState::setStrokeType (const PathStrokeType& new state.setProperty (capStyle, newStrokeType.getEndStyle() == PathStrokeType::butt ? "butt" : (newStrokeType.getEndStyle() == PathStrokeType::square ? "square" : "round"), undoManager); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/drawables/juce_DrawableText.cpp b/modules/juce_gui_basics/drawables/juce_DrawableText.cpp index e82c9e7813..d34df42565 100644 --- a/modules/juce_gui_basics/drawables/juce_DrawableText.cpp +++ b/modules/juce_gui_basics/drawables/juce_DrawableText.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== DrawableText::DrawableText() : colour (Colours::black), justification (Justification::centredLeft) @@ -341,6 +339,3 @@ ValueTree DrawableText::createValueTree (ComponentBuilder::ImageProvider*) const return tree; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/drawables/juce_SVGParser.cpp b/modules/juce_gui_basics/drawables/juce_SVGParser.cpp index 61f3a9ca52..d7b21bf916 100644 --- a/modules/juce_gui_basics/drawables/juce_SVGParser.cpp +++ b/modules/juce_gui_basics/drawables/juce_SVGParser.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class SVGState { public: @@ -1297,6 +1295,3 @@ Drawable* Drawable::createFromSVG (const XmlElement& svgDocument) SVGState state (&svgDocument); return state.parseSVGElement (svgDocument); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp index 3195201787..f6a5418914 100644 --- a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== DirectoryContentsDisplayComponent::DirectoryContentsDisplayComponent (DirectoryContentsList& listToShow) : fileList (listToShow) { @@ -73,6 +71,3 @@ void DirectoryContentsDisplayComponent::sendDoubleClickMessage (const File& file listeners.callChecked (checker, &FileBrowserListener::fileDoubleClicked, file); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp index 282dcccfce..ef3eda597b 100644 --- a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== DirectoryContentsList::DirectoryContentsList (const FileFilter* const fileFilter_, TimeSliceThread& thread_) : fileFilter (fileFilter_), @@ -268,5 +266,3 @@ bool DirectoryContentsList::addFile (const File& file, return false; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp index e71e483823..2ffa072c73 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== FileBrowserComponent::FileBrowserComponent (int flags_, const File& initialFileOrDirectory, const FileFilter* fileFilter_, @@ -570,6 +568,3 @@ void FileBrowserComponent::getRoots (StringArray& rootNames, StringArray& rootPa rootNames.add ("Desktop"); #endif } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/filebrowser/juce_FileChooser.cpp b/modules/juce_gui_basics/filebrowser/juce_FileChooser.cpp index 4dd43b7f44..5ae4b1faea 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileChooser.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileChooser.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== FileChooser::FileChooser (const String& chooserBoxTitle, const File& currentFileOrDirectory, const String& fileFilters, @@ -171,6 +169,3 @@ FilePreviewComponent::FilePreviewComponent() FilePreviewComponent::~FilePreviewComponent() { } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp b/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp index 89b6fe86a8..8bf86a4dec 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class FileChooserDialogBox::ContentComponent : public Component { public: @@ -276,6 +274,3 @@ void FileChooserDialogBox::createNewFolderConfirmed (const String& nameFromDialo content->chooserComponent.refresh(); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/filebrowser/juce_FileFilter.cpp b/modules/juce_gui_basics/filebrowser/juce_FileFilter.cpp index eed466ea94..9247c5477f 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileFilter.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileFilter.cpp @@ -23,15 +23,12 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== FileFilter::FileFilter (const String& filterDescription) : description (filterDescription) { } - FileFilter::~FileFilter() { } @@ -40,6 +37,3 @@ const String& FileFilter::getDescription() const noexcept { return description; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp index 482d7a9dbc..1bb6b5944d 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE Image juce_createIconForFile (const File& file); @@ -259,6 +258,3 @@ void FileListComponent::returnKeyPressed (int currentSelectedRow) { sendDoubleClickMessage (fileList.getFile (currentSelectedRow)); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.cpp index 4b38b10928..6787c91f20 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== FileSearchPathListComponent::FileSearchPathListComponent() : addButton ("+"), removeButton ("-"), @@ -266,6 +264,3 @@ void FileSearchPathListComponent::buttonClicked (Button* button) changed(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp index d124d8e42d..5a9b25cdfa 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE Image juce_createIconForFile (const File& file); @@ -269,5 +268,3 @@ void FileTreeComponent::setSelectedFile (const File& target) clearSelectedItems(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.cpp index 639630eae8..b77b510248 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== FilenameComponent::FilenameComponent (const String& name, const File& currentFile, const bool canEditFilename, @@ -246,5 +244,3 @@ void FilenameComponent::handleAsyncUpdate() Component::BailOutChecker checker (this); listeners.callChecked (checker, &FilenameComponentListener::filenameComponentChanged, this); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.cpp index 92a7c2e97c..dc86b5c0ba 100644 --- a/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ImagePreviewComponent::ImagePreviewComponent() { } @@ -118,6 +116,3 @@ void ImagePreviewComponent::paint (Graphics& g) Justification::centredTop, numLines); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/filebrowser/juce_WildcardFileFilter.cpp b/modules/juce_gui_basics/filebrowser/juce_WildcardFileFilter.cpp index 1aeb1a1e75..3ebe4c725d 100644 --- a/modules/juce_gui_basics/filebrowser/juce_WildcardFileFilter.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_WildcardFileFilter.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== WildcardFileFilter::WildcardFileFilter (const String& fileWildcardPatterns, const String& directoryWildcardPatterns, const String& description_) @@ -75,6 +73,3 @@ bool WildcardFileFilter::match (const File& file, const StringArray& wildcards) return false; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp index 1e5b467961..67699b0ee2 100644 --- a/modules/juce_gui_basics/juce_gui_basics.cpp +++ b/modules/juce_gui_basics/juce_gui_basics.cpp @@ -125,6 +125,9 @@ #endif //============================================================================== +namespace juce +{ + // START_AUTOINCLUDE components/*.cpp, mouse/*.cpp, keyboard/*.cpp, buttons/*.cpp, // drawables/*.cpp, filebrowser/*.cpp, layout/*.cpp, lookandfeel/*.cpp, // menus/*.cpp, positioning/*.cpp, properties/*.cpp, widgets/*.cpp, @@ -238,10 +241,13 @@ #include "misc/juce_DropShadower.cpp" // END_AUTOINCLUDE +} + using namespace juce; //============================================================================== -BEGIN_JUCE_NAMESPACE +namespace juce +{ #if JUCE_MAC || JUCE_IOS #include "../juce_core/native/juce_osx_ObjCHelpers.h" @@ -282,4 +288,4 @@ BEGIN_JUCE_NAMESPACE #endif -END_JUCE_NAMESPACE +} diff --git a/modules/juce_gui_basics/juce_gui_basics.h b/modules/juce_gui_basics/juce_gui_basics.h index 2529be1026..6b2bfd70f9 100644 --- a/modules/juce_gui_basics/juce_gui_basics.h +++ b/modules/juce_gui_basics/juce_gui_basics.h @@ -70,7 +70,8 @@ #endif //============================================================================= -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE components, mouse, keyboard, buttons, drawables, // filebrowser, layout, lookandfeel, menus, positioning, properties, @@ -440,6 +441,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_GUI_BASICS_JUCEHEADER__ diff --git a/modules/juce_gui_basics/keyboard/juce_CaretComponent.cpp b/modules/juce_gui_basics/keyboard/juce_CaretComponent.cpp index 1fdbbb17f4..4281a3862b 100644 --- a/modules/juce_gui_basics/keyboard/juce_CaretComponent.cpp +++ b/modules/juce_gui_basics/keyboard/juce_CaretComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== CaretComponent::CaretComponent (Component* const keyFocusOwner) : owner (keyFocusOwner) { @@ -59,5 +57,3 @@ bool CaretComponent::shouldBeShown() const return owner == nullptr || (owner->hasKeyboardFocus (true) && ! owner->isCurrentlyBlockedByAnotherModalComponent()); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/keyboard/juce_KeyListener.cpp b/modules/juce_gui_basics/keyboard/juce_KeyListener.cpp index ea985322f1..a7928979f4 100644 --- a/modules/juce_gui_basics/keyboard/juce_KeyListener.cpp +++ b/modules/juce_gui_basics/keyboard/juce_KeyListener.cpp @@ -23,12 +23,8 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== bool KeyListener::keyStateChanged (const bool, Component*) { return false; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/keyboard/juce_KeyPress.cpp b/modules/juce_gui_basics/keyboard/juce_KeyPress.cpp index b3a9cf0355..a7dd7af717 100644 --- a/modules/juce_gui_basics/keyboard/juce_KeyPress.cpp +++ b/modules/juce_gui_basics/keyboard/juce_KeyPress.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== KeyPress::KeyPress() noexcept : keyCode (0), textCharacter (0) @@ -306,6 +304,3 @@ String KeyPress::getTextDescriptionWithIcons() const return getTextDescription(); #endif } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.cpp b/modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.cpp index 7ce72cde0b..f439a54a53 100644 --- a/modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.cpp +++ b/modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE namespace KeyboardFocusHelpers { @@ -137,6 +136,3 @@ Component* KeyboardFocusTraverser::getDefaultComponent (Component* parentCompone return comps.getFirst(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/keyboard/juce_ModifierKeys.cpp b/modules/juce_gui_basics/keyboard/juce_ModifierKeys.cpp index 46a463b4fc..b42b3c4cae 100644 --- a/modules/juce_gui_basics/keyboard/juce_ModifierKeys.cpp +++ b/modules/juce_gui_basics/keyboard/juce_ModifierKeys.cpp @@ -23,8 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - ModifierKeys::ModifierKeys() noexcept : flags (0) @@ -64,6 +62,3 @@ int ModifierKeys::getNumMouseButtonsDown() const noexcept return num; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp b/modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp index 6a5aa12318..02993171e6 100644 --- a/modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp +++ b/modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class ComponentAnimator::AnimationTask { public: @@ -341,6 +339,3 @@ void ComponentAnimator::timerCallback() if (tasks.size() == 0) stopTimer(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.cpp b/modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.cpp index e68f224cad..b37057c195 100644 --- a/modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.cpp +++ b/modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ComponentBoundsConstrainer::ComponentBoundsConstrainer() noexcept : minW (0), maxW (0x3fffffff), @@ -328,6 +326,3 @@ void ComponentBoundsConstrainer::checkBounds (Rectangle& bounds, jassert (! bounds.isEmpty()); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_ComponentBuilder.cpp b/modules/juce_gui_basics/layout/juce_ComponentBuilder.cpp index 2a98be646c..ddd9eb5a73 100644 --- a/modules/juce_gui_basics/layout/juce_ComponentBuilder.cpp +++ b/modules/juce_gui_basics/layout/juce_ComponentBuilder.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================= namespace ComponentBuilderHelpers { String getStateId (const ValueTree& state) @@ -442,5 +440,3 @@ void ComponentBuilder::refreshBasicComponentProperties (Component& comp, const V ComponentBuilderHelpers::updateComponentColours (comp, state.getChildWithName ("COLOURS")); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.cpp b/modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.cpp index 22009ad789..16043fe04f 100644 --- a/modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.cpp +++ b/modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ComponentMovementWatcher::ComponentMovementWatcher (Component* const component_) : component (component_), lastPeerID (0), @@ -138,6 +136,3 @@ void ComponentMovementWatcher::unregister() registeredParentComps.clear(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_GroupComponent.cpp b/modules/juce_gui_basics/layout/juce_GroupComponent.cpp index 3ff47a2168..e06935de51 100644 --- a/modules/juce_gui_basics/layout/juce_GroupComponent.cpp +++ b/modules/juce_gui_basics/layout/juce_GroupComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== GroupComponent::GroupComponent (const String& name, const String& labelText) : Component (name), @@ -93,5 +91,3 @@ void GroupComponent::refreshFromValueTree (const ValueTree& state, ComponentBuil setText (state [Ids::text].toString()); setTextLabelPosition (static_cast (state [Ids::justification])); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp b/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp index 1ce1a42ca1..2a678e9625 100644 --- a/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp +++ b/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MultiDocumentPanelWindow::MultiDocumentPanelWindow (const Colour& backgroundColour) : DocumentWindow (String::empty, backgroundColour, DocumentWindow::maximiseButton | DocumentWindow::closeButton, false) @@ -533,6 +531,3 @@ void MultiDocumentPanel::updateOrder() if (components != oldList) activeDocumentChanged(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.cpp b/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.cpp index 30c18fc36d..b112633f09 100644 --- a/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.cpp +++ b/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ResizableBorderComponent::Zone::Zone (const int zoneFlags) noexcept : zone (zoneFlags) {} @@ -201,5 +199,3 @@ void ResizableBorderComponent::updateMouseZone (const MouseEvent& e) setMouseCursor (newZone.getMouseCursor()); } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_ResizableCornerComponent.cpp b/modules/juce_gui_basics/layout/juce_ResizableCornerComponent.cpp index 04f84c76b5..b4759e1d22 100644 --- a/modules/juce_gui_basics/layout/juce_ResizableCornerComponent.cpp +++ b/modules/juce_gui_basics/layout/juce_ResizableCornerComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ResizableCornerComponent::ResizableCornerComponent (Component* const componentToResize, ComponentBoundsConstrainer* const constrainer_) : component (componentToResize), @@ -103,6 +101,3 @@ bool ResizableCornerComponent::hitTest (int x, int y) return y >= yAtX - getHeight() / 4; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.cpp b/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.cpp index 3f37be3c78..1b8ce9585b 100644 --- a/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.cpp +++ b/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ResizableEdgeComponent::ResizableEdgeComponent (Component* const componentToResize, ComponentBoundsConstrainer* const constrainer_, Edge edge_) @@ -111,5 +109,3 @@ void ResizableEdgeComponent::mouseUp (const MouseEvent&) if (constrainer != nullptr) constrainer->resizeEnd(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_ScrollBar.cpp b/modules/juce_gui_basics/layout/juce_ScrollBar.cpp index 3cd6384b6d..259b6df718 100644 --- a/modules/juce_gui_basics/layout/juce_ScrollBar.cpp +++ b/modules/juce_gui_basics/layout/juce_ScrollBar.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class ScrollBar::ScrollbarButton : public Button { public: @@ -431,5 +429,3 @@ bool ScrollBar::keyPressed (const KeyPress& key) return true; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_StretchableLayoutManager.cpp b/modules/juce_gui_basics/layout/juce_StretchableLayoutManager.cpp index 418970abf0..e2f64b10c4 100644 --- a/modules/juce_gui_basics/layout/juce_StretchableLayoutManager.cpp +++ b/modules/juce_gui_basics/layout/juce_StretchableLayoutManager.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== StretchableLayoutManager::StretchableLayoutManager() : totalSize (0) { @@ -359,5 +357,3 @@ int StretchableLayoutManager::sizeToRealSize (double size, int totalSpace) return roundToInt (size); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.cpp b/modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.cpp index 63821f383b..4f7101d4ef 100644 --- a/modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.cpp +++ b/modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== StretchableLayoutResizerBar::StretchableLayoutResizerBar (StretchableLayoutManager* layout_, const int itemIndex_, const bool isVertical_) @@ -75,5 +73,3 @@ void StretchableLayoutResizerBar::hasBeenMoved() if (getParentComponent() != nullptr) getParentComponent()->resized(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_StretchableObjectResizer.cpp b/modules/juce_gui_basics/layout/juce_StretchableObjectResizer.cpp index 6b02b63518..6044ad4f5a 100644 --- a/modules/juce_gui_basics/layout/juce_StretchableObjectResizer.cpp +++ b/modules/juce_gui_basics/layout/juce_StretchableObjectResizer.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== StretchableObjectResizer::StretchableObjectResizer() { } @@ -122,6 +120,3 @@ void StretchableObjectResizer::resizeToFit (const double targetSize) break; } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp b/modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp index ce31dbc621..269bf95440 100644 --- a/modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp +++ b/modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== TabBarButton::TabBarButton (const String& name, TabbedButtonBar& owner_) : Button (name), owner (owner_), @@ -497,5 +495,3 @@ void TabbedButtonBar::currentTabChanged (const int, const String&) void TabbedButtonBar::popupMenuClickOnTab (const int, const String&) { } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_TabbedComponent.cpp b/modules/juce_gui_basics/layout/juce_TabbedComponent.cpp index faac202dd3..adad5390f7 100644 --- a/modules/juce_gui_basics/layout/juce_TabbedComponent.cpp +++ b/modules/juce_gui_basics/layout/juce_TabbedComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== namespace TabbedComponentHelpers { const Identifier deleteComponentId ("deleteByTabComp_"); @@ -307,6 +305,3 @@ void TabbedComponent::changeCallback (const int newCurrentTabIndex, const String void TabbedComponent::currentTabChanged (const int, const String&) {} void TabbedComponent::popupMenuClickOnTab (const int, const String&) {} - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/layout/juce_Viewport.cpp b/modules/juce_gui_basics/layout/juce_Viewport.cpp index de38ff26e4..57c641418a 100644 --- a/modules/juce_gui_basics/layout/juce_Viewport.cpp +++ b/modules/juce_gui_basics/layout/juce_Viewport.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== Viewport::Viewport (const String& name) : Component (name), scrollBarThickness (0), @@ -443,5 +441,3 @@ void Viewport::refreshFromValueTree (const ValueTree& state, ComponentBuilder&) setScrollBarsShown (state [Ids::showScrollBarV], state [Ids::showScrollBarH]); setScrollBarThickness (state [Ids::scrollBarWidth]); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp index acf5d8013d..75268a7414 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== namespace LookAndFeelHelpers { void createRoundedPath (Path& p, @@ -3057,5 +3055,3 @@ void LookAndFeel::drawGlassLozenge (Graphics& g, g.setColour (colour.darker().withMultipliedAlpha (1.5f)); g.strokePath (outline, PathStrokeType (outlineThickness)); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/menus/juce_MenuBarComponent.cpp b/modules/juce_gui_basics/menus/juce_MenuBarComponent.cpp index ab2ac8facf..a9368d2b3d 100644 --- a/modules/juce_gui_basics/menus/juce_MenuBarComponent.cpp +++ b/modules/juce_gui_basics/menus/juce_MenuBarComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MenuBarComponent::MenuBarComponent (MenuBarModel* model_) : model (nullptr), itemUnderMouse (-1), @@ -345,6 +343,3 @@ void MenuBarComponent::timerCallback() stopTimer(); updateItemUnderMouse (getMouseXYRelative()); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/menus/juce_MenuBarModel.cpp b/modules/juce_gui_basics/menus/juce_MenuBarModel.cpp index fbe7b9af95..24015cb3ba 100644 --- a/modules/juce_gui_basics/menus/juce_MenuBarModel.cpp +++ b/modules/juce_gui_basics/menus/juce_MenuBarModel.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MenuBarModel::MenuBarModel() noexcept : manager (nullptr) { @@ -86,6 +84,3 @@ void MenuBarModel::applicationCommandListChanged() { menuItemsChanged(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp index 5f2e735a55..9ceca6792c 100644 --- a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp +++ b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class PopupMenu::Item { public: @@ -1699,6 +1697,3 @@ bool PopupMenu::MenuItemIterator::next() return true; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/misc/juce_BubbleComponent.cpp b/modules/juce_gui_basics/misc/juce_BubbleComponent.cpp index 7c25f66931..8abf331a66 100644 --- a/modules/juce_gui_basics/misc/juce_BubbleComponent.cpp +++ b/modules/juce_gui_basics/misc/juce_BubbleComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== BubbleComponent::BubbleComponent() : side (0), allowablePlacements (above | below | left | right), @@ -191,5 +189,3 @@ void BubbleComponent::setPosition (const Rectangle& rectangleToPointTo) setBounds (x, y, w, h); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/misc/juce_DropShadower.cpp b/modules/juce_gui_basics/misc/juce_DropShadower.cpp index 6cc54897e5..ca60d9f285 100644 --- a/modules/juce_gui_basics/misc/juce_DropShadower.cpp +++ b/modules/juce_gui_basics/misc/juce_DropShadower.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class ShadowWindow : public Component { public: @@ -298,5 +296,3 @@ void DropShadower::bringShadowWindowsToFront() shadowWindows.getUnchecked(i)->toBehind (owner); } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp b/modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp index 61eade77e0..5676f33485 100644 --- a/modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp +++ b/modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ComponentDragger::ComponentDragger() {} ComponentDragger::~ComponentDragger() {} @@ -63,6 +61,3 @@ void ComponentDragger::dragComponent (Component* const componentToDrag, const Mo componentToDrag->setBounds (bounds); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp index e04f3c13e2..7dfa11254e 100644 --- a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp +++ b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE bool juce_performDragDropFiles (const StringArray&, const bool copyFiles, bool& shouldStop); bool juce_performDragDropText (const String&, bool& shouldStop); @@ -437,6 +436,3 @@ bool DragAndDropTarget::shouldDrawDragImageWhenOver() { return true; } void FileDragAndDropTarget::fileDragEnter (const StringArray&, int, int) {} void FileDragAndDropTarget::fileDragMove (const StringArray&, int, int) {} void FileDragAndDropTarget::fileDragExit (const StringArray&) {} - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/mouse/juce_MouseCursor.cpp b/modules/juce_gui_basics/mouse/juce_MouseCursor.cpp index 83839f743d..df6e4aab69 100644 --- a/modules/juce_gui_basics/mouse/juce_MouseCursor.cpp +++ b/modules/juce_gui_basics/mouse/juce_MouseCursor.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class MouseCursor::SharedCursorHandle { public: @@ -186,5 +184,3 @@ void MouseCursor::hideWaitCursor() { Desktop::getInstance().getMainMouseSource().revealCursor(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/mouse/juce_MouseEvent.cpp b/modules/juce_gui_basics/mouse/juce_MouseEvent.cpp index 57de466335..d068a8ccb6 100644 --- a/modules/juce_gui_basics/mouse/juce_MouseEvent.cpp +++ b/modules/juce_gui_basics/mouse/juce_MouseEvent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MouseEvent::MouseEvent (MouseInputSource& source_, const Point& position, const ModifierKeys& mods_, @@ -113,6 +111,3 @@ static int doubleClickTimeOutMs = 400; int MouseEvent::getDoubleClickTimeout() noexcept { return doubleClickTimeOutMs; } void MouseEvent::setDoubleClickTimeout (const int newTime) noexcept { doubleClickTimeOutMs = newTime; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp b/modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp index d6712d8b46..483a0eb6f2 100644 --- a/modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp +++ b/modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class MouseInputSourceInternal : public AsyncUpdater { public: @@ -534,6 +532,3 @@ void MouseInputSource::handleWheel (ComponentPeer* const peer, const Point& { pimpl->handleWheel (peer, positionWithinPeer, Time (time), x, y); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/mouse/juce_MouseListener.cpp b/modules/juce_gui_basics/mouse/juce_MouseListener.cpp index b5f4a1c5ca..96a49facfe 100644 --- a/modules/juce_gui_basics/mouse/juce_MouseListener.cpp +++ b/modules/juce_gui_basics/mouse/juce_MouseListener.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== void MouseListener::mouseEnter (const MouseEvent&) {} void MouseListener::mouseExit (const MouseEvent&) {} void MouseListener::mouseDown (const MouseEvent&) {} @@ -34,5 +32,3 @@ void MouseListener::mouseDrag (const MouseEvent&) {} void MouseListener::mouseMove (const MouseEvent&) {} void MouseListener::mouseDoubleClick (const MouseEvent&) {} void MouseListener::mouseWheelMove (const MouseEvent&, float, float) {} - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/native/juce_android_Windowing.cpp b/modules/juce_gui_basics/native/juce_android_Windowing.cpp index 9b1e6ac0b8..a1c53e4ddc 100644 --- a/modules/juce_gui_basics/native/juce_android_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_android_Windowing.cpp @@ -23,9 +23,12 @@ ============================================================================== */ -END_JUCE_NAMESPACE +} // (juce namespace) + extern juce::JUCEApplicationBase* juce_CreateApplication(); // (from START_JUCE_APPLICATION) -BEGIN_JUCE_NAMESPACE + +namespace juce +{ //============================================================================== JUCE_JNI_CALLBACK (JuceAppActivity, launchApp, void, (JNIEnv* env, jobject activity, diff --git a/modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm b/modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm index deacfb3b3c..fb8b8c13a5 100644 --- a/modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm +++ b/modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm @@ -26,7 +26,7 @@ class UIViewComponentPeer; //============================================================================== -END_JUCE_NAMESPACE +} // (juce namespace) #define JuceUIView MakeObjCClassName(JuceUIView) @@ -79,7 +79,8 @@ END_JUCE_NAMESPACE - (void) becomeKeyWindow; @end -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== class UIViewComponentPeer : public ComponentPeer, @@ -219,7 +220,7 @@ private: }; //============================================================================== -END_JUCE_NAMESPACE +} // (juce namespace) @implementation JuceUIViewController @@ -370,7 +371,8 @@ juce::Point juce_lastMousePos; //============================================================================== //============================================================================== -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== UIViewComponentPeer::UIViewComponentPeer (Component* const component, diff --git a/modules/juce_gui_basics/native/juce_ios_Windowing.mm b/modules/juce_gui_basics/native/juce_ios_Windowing.mm index 83ad17a752..ce27ccb6ba 100644 --- a/modules/juce_gui_basics/native/juce_ios_Windowing.mm +++ b/modules/juce_gui_basics/native/juce_ios_Windowing.mm @@ -23,7 +23,7 @@ ============================================================================== */ -END_JUCE_NAMESPACE +} // (juce namespace) @interface JuceAppStartupDelegate : NSObject { @@ -52,7 +52,8 @@ END_JUCE_NAMESPACE @end -BEGIN_JUCE_NAMESPACE +namespace juce +{ int juce_iOSMain (int argc, const char* argv[]) { @@ -69,7 +70,7 @@ void LookAndFeel::playAlertSound() //============================================================================== class iOSMessageBox; -END_JUCE_NAMESPACE +} // (juce namespace) @interface JuceAlertBoxDelegate : NSObject { @@ -81,7 +82,8 @@ END_JUCE_NAMESPACE @end -BEGIN_JUCE_NAMESPACE +namespace juce +{ class iOSMessageBox { @@ -142,7 +144,7 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (iOSMessageBox); }; -END_JUCE_NAMESPACE +} // (juce namespace) @implementation JuceAlertBoxDelegate @@ -153,8 +155,9 @@ END_JUCE_NAMESPACE } @end -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== void JUCE_CALLTYPE NativeMessageBox::showMessageBox (AlertWindow::AlertIconType iconType, diff --git a/modules/juce_gui_basics/native/juce_mac_FileChooser.mm b/modules/juce_gui_basics/native/juce_mac_FileChooser.mm index c26d393a7c..9aa153a41f 100644 --- a/modules/juce_gui_basics/native/juce_mac_FileChooser.mm +++ b/modules/juce_gui_basics/native/juce_mac_FileChooser.mm @@ -25,8 +25,8 @@ #if JUCE_MAC -//============================================================================== -END_JUCE_NAMESPACE +} // (juce namespace) + using namespace juce; #define JuceFileChooserDelegate MakeObjCClassName(JuceFileChooserDelegate) @@ -90,7 +90,9 @@ using namespace juce; } @end -BEGIN_JUCE_NAMESPACE + +namespace juce +{ //============================================================================== bool FileChooser::isPlatformDialogAvailable() diff --git a/modules/juce_gui_basics/native/juce_mac_MainMenu.mm b/modules/juce_gui_basics/native/juce_mac_MainMenu.mm index 994851ff13..b383079ed2 100644 --- a/modules/juce_gui_basics/native/juce_mac_MainMenu.mm +++ b/modules/juce_gui_basics/native/juce_mac_MainMenu.mm @@ -25,7 +25,8 @@ class JuceMainMenuHandler; -END_JUCE_NAMESPACE +} // (juce namespace) + using namespace juce; #define JuceMenuCallback MakeObjCClassName(JuceMenuCallback) @@ -44,8 +45,9 @@ using namespace juce; - (void) menuItemInvoked: (id) menu; - (void) menuNeedsUpdate: (NSMenu*) menu; @end -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== class JuceMainMenuHandler : private MenuBarModel::Listener, @@ -418,7 +420,7 @@ private: JuceMainMenuHandler* JuceMainMenuHandler::instance = nullptr; -END_JUCE_NAMESPACE +} // (juce namespace) //============================================================================== @implementation JuceMenuCallback @@ -479,7 +481,9 @@ END_JUCE_NAMESPACE } @end -BEGIN_JUCE_NAMESPACE + +namespace juce +{ //============================================================================== namespace MainMenuHelpers diff --git a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm index 8bf6906d84..043e8b0251 100644 --- a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm +++ b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm @@ -30,8 +30,7 @@ extern AppFocusChangeCallback appFocusChangeCallback; typedef bool (*CheckEventBlockedByModalComps) (NSEvent*); extern CheckEventBlockedByModalComps isEventBlockedByModalComps; -//============================================================================== -END_JUCE_NAMESPACE +} // (juce namespace) @interface NSEvent (JuceDeviceDelta) - (CGFloat) deviceDeltaX; @@ -141,7 +140,8 @@ END_JUCE_NAMESPACE - (void) zoom: (id) sender; @end -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== class NSViewComponentPeer : public ComponentPeer @@ -419,9 +419,9 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (NSViewComponentPeer); }; -//============================================================================== -END_JUCE_NAMESPACE +} // (juce namespace) +//============================================================================== @implementation JuceNSView - (JuceNSView*) initWithOwner: (NSViewComponentPeer*) owner_ @@ -851,7 +851,8 @@ END_JUCE_NAMESPACE //============================================================================== //============================================================================== -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== ModifierKeys NSViewComponentPeer::currentModifiers; diff --git a/modules/juce_gui_basics/positioning/juce_MarkerList.cpp b/modules/juce_gui_basics/positioning/juce_MarkerList.cpp index 4d6479bf21..af98adfd3c 100644 --- a/modules/juce_gui_basics/positioning/juce_MarkerList.cpp +++ b/modules/juce_gui_basics/positioning/juce_MarkerList.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== MarkerList::MarkerList() { } @@ -287,5 +285,3 @@ void MarkerList::ValueTreeWrapper::readFrom (const MarkerList& markerList, UndoM for (int i = 0; i < markerList.getNumMarkers(); ++i) setMarker (*markerList.getMarker(i), undoManager); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.cpp b/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.cpp index deac225d51..cbb03e22ea 100644 --- a/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.cpp +++ b/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== const String RelativeCoordinate::Strings::parent ("parent"); const String RelativeCoordinate::Strings::left ("left"); const String RelativeCoordinate::Strings::right ("right"); @@ -172,5 +170,3 @@ String RelativeCoordinate::toString() const { return term.toString(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/positioning/juce_RelativeCoordinatePositioner.cpp b/modules/juce_gui_basics/positioning/juce_RelativeCoordinatePositioner.cpp index def5f728ec..838d826d41 100644 --- a/modules/juce_gui_basics/positioning/juce_RelativeCoordinatePositioner.cpp +++ b/modules/juce_gui_basics/positioning/juce_RelativeCoordinatePositioner.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class MarkerListScope : public Expression::Scope { public: @@ -338,6 +336,3 @@ void RelativeCoordinatePositionerBase::unregisterListeners() sourceComponents.clear(); sourceMarkerLists.clear(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/positioning/juce_RelativeParallelogram.cpp b/modules/juce_gui_basics/positioning/juce_RelativeParallelogram.cpp index f975ebce86..d3f84a7659 100644 --- a/modules/juce_gui_basics/positioning/juce_RelativeParallelogram.cpp +++ b/modules/juce_gui_basics/positioning/juce_RelativeParallelogram.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== RelativeParallelogram::RelativeParallelogram() { } @@ -136,6 +134,3 @@ const Rectangle RelativeParallelogram::getBoundingBox (const Point const Point points[] = { p[0], p[1], p[2], p[1] + (p[2] - p[0]) }; return Rectangle::findAreaContainingPoints (points, 4); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/positioning/juce_RelativePoint.cpp b/modules/juce_gui_basics/positioning/juce_RelativePoint.cpp index 6202d4364a..6544d52ebb 100644 --- a/modules/juce_gui_basics/positioning/juce_RelativePoint.cpp +++ b/modules/juce_gui_basics/positioning/juce_RelativePoint.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE namespace RelativePointHelpers { @@ -95,6 +94,3 @@ bool RelativePoint::isDynamic() const { return x.isDynamic() || y.isDynamic(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/positioning/juce_RelativePointPath.cpp b/modules/juce_gui_basics/positioning/juce_RelativePointPath.cpp index 4b4431a7d9..ea20d30b90 100644 --- a/modules/juce_gui_basics/positioning/juce_RelativePointPath.cpp +++ b/modules/juce_gui_basics/positioning/juce_RelativePointPath.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== RelativePointPath::RelativePointPath() : usesNonZeroWinding (true), containsDynamicPoints (false) @@ -294,6 +292,3 @@ RelativePointPath::ElementBase* RelativePointPath::CubicTo::clone() const { return new CubicTo (controlPoints[0], controlPoints[1], controlPoints[2]); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/positioning/juce_RelativeRectangle.cpp b/modules/juce_gui_basics/positioning/juce_RelativeRectangle.cpp index 6b0f7d1614..6e8f7500df 100644 --- a/modules/juce_gui_basics/positioning/juce_RelativeRectangle.cpp +++ b/modules/juce_gui_basics/positioning/juce_RelativeRectangle.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== namespace RelativeRectangleHelpers { inline void skipComma (String::CharPointerType& s) @@ -263,6 +261,3 @@ void RelativeRectangle::applyToComponent (Component& component) const component.setBounds (resolve (nullptr).getSmallestIntegerContainer()); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.cpp index 5cd8ec44ec..c08ed54ca4 100644 --- a/modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.cpp +++ b/modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== BooleanPropertyComponent::BooleanPropertyComponent (const String& name, const String& buttonTextWhenTrue, const String& buttonTextWhenFalse) @@ -87,5 +85,3 @@ void BooleanPropertyComponent::buttonClicked (Button*) { setState (! getState()); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.cpp index 81400508fe..e5c6c8b060 100644 --- a/modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.cpp +++ b/modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ButtonPropertyComponent::ButtonPropertyComponent (const String& name, const bool triggerOnMouseDown) : PropertyComponent (name) @@ -48,5 +46,3 @@ void ButtonPropertyComponent::buttonClicked (Button*) { buttonClicked(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp index 8481467c67..b9734f961f 100644 --- a/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp +++ b/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class ChoicePropertyComponent::RemapperValueSource : public Value::ValueSource, public ValueListener { @@ -151,6 +149,3 @@ void ChoicePropertyComponent::comboBoxChanged (ComboBox*) setIndex (newIndex); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/properties/juce_PropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_PropertyComponent.cpp index 992f9b0c86..21d795d11f 100644 --- a/modules/juce_gui_basics/properties/juce_PropertyComponent.cpp +++ b/modules/juce_gui_basics/properties/juce_PropertyComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== PropertyComponent::PropertyComponent (const String& name, const int preferredHeight_) : Component (name), @@ -55,6 +53,3 @@ void PropertyComponent::enablementChanged() { repaint(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/properties/juce_PropertyPanel.cpp b/modules/juce_gui_basics/properties/juce_PropertyPanel.cpp index 95756abf4f..f03b908a70 100644 --- a/modules/juce_gui_basics/properties/juce_PropertyPanel.cpp +++ b/modules/juce_gui_basics/properties/juce_PropertyPanel.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class PropertySectionComponent : public Component { public: @@ -398,6 +396,3 @@ const String& PropertyPanel::getMessageWhenEmpty() const { return messageWhenEmpty; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/properties/juce_SliderPropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_SliderPropertyComponent.cpp index c5592fa4ce..1fbc3835d8 100644 --- a/modules/juce_gui_basics/properties/juce_SliderPropertyComponent.cpp +++ b/modules/juce_gui_basics/properties/juce_SliderPropertyComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== SliderPropertyComponent::SliderPropertyComponent (const String& name, const double rangeMin, const double rangeMax, @@ -82,6 +80,3 @@ void SliderPropertyComponent::sliderValueChanged (Slider*) if (getValue() != slider.getValue()) setValue (slider.getValue()); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp index 4b41e1fe2b..642658a2ff 100644 --- a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp +++ b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class TextPropLabel : public Label { public: @@ -124,6 +122,3 @@ void TextPropertyComponent::textWasEdited() if (getText() != newText) setText (newText); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_ComboBox.cpp b/modules/juce_gui_basics/widgets/juce_ComboBox.cpp index 3e7f147dfb..ee2892f90f 100644 --- a/modules/juce_gui_basics/widgets/juce_ComboBox.cpp +++ b/modules/juce_gui_basics/widgets/juce_ComboBox.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ComboBox::ItemInfo::ItemInfo (const String& name_, int itemId_, bool isEnabled_, bool isHeading_) : name (name_), itemId (itemId_), isEnabled (isEnabled_), isHeading (isHeading_) { @@ -637,5 +635,3 @@ void ComboBox::refreshFromValueTree (const ValueTree& state, ComponentBuilder&) setTextWhenNothingSelected (state [Ids::unselectedText].toString()); setTextWhenNoChoicesAvailable (state [Ids::noItemsText].toString()); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_ImageComponent.cpp b/modules/juce_gui_basics/widgets/juce_ImageComponent.cpp index 3e94b95b4d..f04d0fd5c3 100644 --- a/modules/juce_gui_basics/widgets/juce_ImageComponent.cpp +++ b/modules/juce_gui_basics/widgets/juce_ImageComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ImageComponent::ImageComponent (const String& name) : Component (name), placement (RectanglePlacement::centred) @@ -104,5 +102,3 @@ RectanglePlacement ImageComponent::getPlacement (const ValueTree& state) { return RectanglePlacement (static_cast (state [Ids::placement])); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_Label.cpp b/modules/juce_gui_basics/widgets/juce_Label.cpp index 4426baa98b..6a3cccb0b1 100644 --- a/modules/juce_gui_basics/widgets/juce_Label.cpp +++ b/modules/juce_gui_basics/widgets/juce_Label.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== Label::Label (const String& name, const String& labelText) : Component (name), @@ -470,5 +468,3 @@ void Label::refreshFromValueTree (const ValueTree& state, ComponentBuilder&) setEditable (editMode == 2, editMode == 3, static_cast (state [Ids::focusLossDiscardsChanges])); setJustificationType (static_cast (state [Ids::justification])); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_ListBox.cpp b/modules/juce_gui_basics/widgets/juce_ListBox.cpp index 76aa8cbaff..e2645b052d 100644 --- a/modules/juce_gui_basics/widgets/juce_ListBox.cpp +++ b/modules/juce_gui_basics/widgets/juce_ListBox.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class ListBoxRowComponent : public Component, public TooltipClient { @@ -946,6 +944,3 @@ void ListBoxModel::returnKeyPressed (int) {} void ListBoxModel::listWasScrolled() {} var ListBoxModel::getDragSourceDescription (const SparseSet&) { return var::null; } String ListBoxModel::getTooltipForRow (int) { return String::empty; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_ProgressBar.cpp b/modules/juce_gui_basics/widgets/juce_ProgressBar.cpp index 9f31c0b2e7..9eb9680b1d 100644 --- a/modules/juce_gui_basics/widgets/juce_ProgressBar.cpp +++ b/modules/juce_gui_basics/widgets/juce_ProgressBar.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ProgressBar::ProgressBar (double& progress_) : progress (progress_), displayPercentage (true), @@ -113,5 +111,3 @@ void ProgressBar::timerCallback() repaint(); } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_Slider.cpp b/modules/juce_gui_basics/widgets/juce_Slider.cpp index 5d86154514..7f0d936cfa 100644 --- a/modules/juce_gui_basics/widgets/juce_Slider.cpp +++ b/modules/juce_gui_basics/widgets/juce_Slider.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class Slider::PopupDisplayComponent : public BubbleComponent, public Timer { @@ -1447,5 +1445,3 @@ void Slider::refreshFromValueTree (const ValueTree& state, ComponentBuilder&) setSkewFactor (static_cast (state [Ids::skew])); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp index b8b630098d..10268bf585 100644 --- a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp +++ b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class DragOverlayComp : public Component { public: @@ -930,6 +928,3 @@ void TableHeaderComponent::showColumnChooserMenu (const int columnIdClicked) void TableHeaderComponent::Listener::tableColumnDraggingChanged (TableHeaderComponent*, int) { } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_TableListBox.cpp b/modules/juce_gui_basics/widgets/juce_TableListBox.cpp index ec474f61bd..55a2ee9a73 100644 --- a/modules/juce_gui_basics/widgets/juce_TableListBox.cpp +++ b/modules/juce_gui_basics/widgets/juce_TableListBox.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class TableListRowComp : public Component, public TooltipClient { @@ -486,5 +484,3 @@ Component* TableListBoxModel::refreshComponentForCell (int, int, bool, Component jassert (existingComponentToUpdate == nullptr); // indicates a failure in the code the recycles the components return nullptr; } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp index fe4af03bcd..0a7a901c41 100644 --- a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp +++ b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== // a word or space that can't be broken down any further struct TextAtom { @@ -2674,5 +2672,3 @@ void TextEditor::refreshFromValueTree (const ValueTree& state, ComponentBuilder& setText (state [Ids::text].toString()); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_Toolbar.cpp b/modules/juce_gui_basics/widgets/juce_Toolbar.cpp index 6f99d13448..ecfcca10cc 100644 --- a/modules/juce_gui_basics/widgets/juce_Toolbar.cpp +++ b/modules/juce_gui_basics/widgets/juce_Toolbar.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE const char* const Toolbar::toolbarDragDescriptor = "_toolbarItem_"; @@ -829,6 +828,3 @@ void Toolbar::showCustomisationDialog (ToolbarItemFactory& factory, const int op (new ToolbarCustomisationDialog (factory, this, optionFlags)) ->enterModalState (true, 0, true); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp index f6c053ac71..5b09267049 100644 --- a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp +++ b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ToolbarItemFactory::ToolbarItemFactory() { } @@ -244,6 +242,3 @@ void ToolbarItemComponent::setEditingMode (const ToolbarEditingMode newMode) resized(); } } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_ToolbarItemPalette.cpp b/modules/juce_gui_basics/widgets/juce_ToolbarItemPalette.cpp index 7bed7a2c6f..9c4cfc2ea1 100644 --- a/modules/juce_gui_basics/widgets/juce_ToolbarItemPalette.cpp +++ b/modules/juce_gui_basics/widgets/juce_ToolbarItemPalette.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ToolbarItemPalette::ToolbarItemPalette (ToolbarItemFactory& factory_, Toolbar* const toolbar_) : factory (factory_), @@ -109,6 +107,3 @@ void ToolbarItemPalette::resized() itemHolder->setSize (maxX, y + height + 8); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/widgets/juce_TreeView.cpp b/modules/juce_gui_basics/widgets/juce_TreeView.cpp index 5c31c139d2..e522e3ad00 100644 --- a/modules/juce_gui_basics/widgets/juce_TreeView.cpp +++ b/modules/juce_gui_basics/widgets/juce_TreeView.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class TreeViewContentComponent : public Component, public TooltipClient, public AsyncUpdater @@ -1839,6 +1837,3 @@ TreeViewItem::OpennessRestorer::~OpennessRestorer() if (oldOpenness != nullptr) treeViewItem.restoreOpennessState (*oldOpenness); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/windows/juce_AlertWindow.cpp b/modules/juce_gui_basics/windows/juce_AlertWindow.cpp index 3fe94f9e25..0f97c5e5b3 100644 --- a/modules/juce_gui_basics/windows/juce_AlertWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_AlertWindow.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class AlertWindowTextEditor : public TextEditor { public: @@ -760,5 +758,3 @@ bool AlertWindow::showNativeDialogBox (const String& title, } } #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/windows/juce_CallOutBox.cpp b/modules/juce_gui_basics/windows/juce_CallOutBox.cpp index e2377771b7..0044bad6b7 100644 --- a/modules/juce_gui_basics/windows/juce_CallOutBox.cpp +++ b/modules/juce_gui_basics/windows/juce_CallOutBox.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== CallOutBox::CallOutBox (Component& contentComponent, Component& componentToPointTo, Component* const parent) @@ -262,5 +260,3 @@ void CallOutBox::refreshPath() outline.closeSubPath(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp b/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp index c834eeae27..eb2b4056cb 100644 --- a/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp +++ b/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE //#define JUCE_ENABLE_REPAINT_DEBUGGING 1 @@ -575,5 +574,3 @@ int ComponentPeer::getCurrentRenderingEngine() const void ComponentPeer::setCurrentRenderingEngine (int /*index*/) { } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/windows/juce_DialogWindow.cpp b/modules/juce_gui_basics/windows/juce_DialogWindow.cpp index 3b776ceff4..339814c4ce 100644 --- a/modules/juce_gui_basics/windows/juce_DialogWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_DialogWindow.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== DialogWindow::DialogWindow (const String& name, const Colour& backgroundColour_, const bool escapeKeyTriggersCloseButton_, @@ -117,5 +115,3 @@ int DialogWindow::showModalDialog (const String& dialogTitle, return dw.runModalLoop(); } #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp b/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp index 1addacd18d..1adda9aa6e 100644 --- a/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class DocumentWindow::ButtonListenerProxy : public ButtonListener // (can't use Button::Listener due to idiotic VC2005 bug) { public: @@ -383,6 +381,3 @@ void DocumentWindow::userTriedToCloseWindow() { closeButtonPressed(); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp b/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp index 700c8ab52a..4a1cfcead1 100644 --- a/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ResizableWindow::ResizableWindow (const String& name, const bool addToDesktop_) : TopLevelWindow (name, addToDesktop_), @@ -621,5 +619,3 @@ void ResizableWindow::addAndMakeVisible (Component* const child, int zOrder) Component::addAndMakeVisible (child, zOrder); } #endif - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp b/modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp index 5bd1e6f4c4..25419722e5 100644 --- a/modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== ThreadWithProgressWindow::ThreadWithProgressWindow (const String& title, const bool hasProgressBar, const bool hasCancelButton, @@ -100,5 +98,3 @@ void ThreadWithProgressWindow::timerCallback() alertWindow->setMessage (message); } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp b/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp index e2a2f095d3..51e75f9097 100644 --- a/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== TooltipWindow::TooltipWindow (Component* const parent_, const int millisecondsBeforeTipAppears_) : Component ("tooltip"), @@ -189,5 +187,3 @@ void TooltipWindow::timerCallback() } } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp b/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp index 91adab9405..ed603961e8 100644 --- a/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp @@ -23,11 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE - -//============================================================================== -/** Keeps track of the active top level window. -*/ +/** Keeps track of the active top level window. */ class TopLevelWindowManager : public Timer, public DeletedAtShutdown { @@ -343,6 +339,3 @@ TopLevelWindow* TopLevelWindow::getActiveTopLevelWindow() noexcept return best; } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.cpp b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.cpp index 3f3bbeaecf..99bcf15d14 100644 --- a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.cpp +++ b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== CPlusPlusCodeTokeniser::CPlusPlusCodeTokeniser() {} CPlusPlusCodeTokeniser::~CPlusPlusCodeTokeniser() {} @@ -609,5 +607,3 @@ bool CPlusPlusCodeTokeniser::isReservedKeyword (const String& token) noexcept { return CppTokeniser::isReservedKeyword (token.getCharPointer(), token.length()); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_extra/code_editor/juce_CodeDocument.cpp b/modules/juce_gui_extra/code_editor/juce_CodeDocument.cpp index 1ca11f8425..40504aa6c3 100644 --- a/modules/juce_gui_extra/code_editor/juce_CodeDocument.cpp +++ b/modules/juce_gui_extra/code_editor/juce_CodeDocument.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class CodeDocumentLine { public: @@ -965,5 +963,3 @@ void CodeDocument::remove (const int startPos, const int endPos, const bool undo sendListenerChangeMessage (firstAffectedLine, lastAffectedLine); } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp index 6d5bfb4832..a79fa75fe1 100644 --- a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp +++ b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class CodeEditorComponent::CodeEditorLine { public: @@ -1189,5 +1187,3 @@ void CodeEditorComponent::getIteratorForPosition (int position, CodeDocument::It } } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp b/modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp index 950329a8b0..c8dada061e 100644 --- a/modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp +++ b/modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== FileBasedDocument::FileBasedDocument (const String& fileExtension_, const String& fileWildcard_, const String& openFileDialogTitle_, @@ -286,6 +284,3 @@ FileBasedDocument::SaveResult FileBasedDocument::saveAsInteractive (const bool w return userCancelledSave; } #endif - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_extra/juce_gui_extra.cpp b/modules/juce_gui_extra/juce_gui_extra.cpp index 04ea7eb18b..009914ab64 100644 --- a/modules/juce_gui_extra/juce_gui_extra.cpp +++ b/modules/juce_gui_extra/juce_gui_extra.cpp @@ -76,6 +76,9 @@ #endif //============================================================================== +namespace juce +{ + // START_AUTOINCLUDE documents/*.cpp, code_editor/*.cpp, embedding/*.cpp, lookandfeel/*.cpp, misc/*.cpp #include "documents/juce_FileBasedDocument.cpp" #include "code_editor/juce_CodeDocument.cpp" @@ -91,9 +94,12 @@ #include "misc/juce_SystemTrayIconComponent.cpp" // END_AUTOINCLUDE +} + using namespace juce; -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== #if JUCE_MAC || JUCE_IOS @@ -138,4 +144,4 @@ BEGIN_JUCE_NAMESPACE #endif #endif -END_JUCE_NAMESPACE +} diff --git a/modules/juce_gui_extra/juce_gui_extra.h b/modules/juce_gui_extra/juce_gui_extra.h index f34eca11b4..6c4f0346ea 100644 --- a/modules/juce_gui_extra/juce_gui_extra.h +++ b/modules/juce_gui_extra/juce_gui_extra.h @@ -39,7 +39,8 @@ #endif //============================================================================= -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE documents, code_editor, embedding, lookandfeel, misc #ifndef __JUCE_FILEBASEDDOCUMENT_JUCEHEADER__ @@ -98,6 +99,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_GUI_EXTRA_JUCEHEADER__ diff --git a/modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp b/modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp index 89ffa9eb00..c415d61388 100644 --- a/modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp +++ b/modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== OldSchoolLookAndFeel::OldSchoolLookAndFeel() { setColour (TextButton::buttonColourId, Colour (0xffbbbbff)); @@ -594,6 +592,3 @@ void OldSchoolLookAndFeel::positionDocumentWindowButtons (DocumentWindow&, if (minimiseButton != nullptr) minimiseButton->setBounds (x, titleBarY - 2, buttonW, titleBarH); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_extra/misc/juce_BubbleMessageComponent.cpp b/modules/juce_gui_extra/misc/juce_BubbleMessageComponent.cpp index fc457070b6..af0f8e3df7 100644 --- a/modules/juce_gui_extra/misc/juce_BubbleMessageComponent.cpp +++ b/modules/juce_gui_extra/misc/juce_BubbleMessageComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== BubbleMessageComponent::BubbleMessageComponent (int fadeOutLengthMs) : fadeOutLength (fadeOutLengthMs), deleteAfterUse (false) @@ -124,5 +122,3 @@ void BubbleMessageComponent::timerCallback() Desktop::getInstance().getAnimator().fadeOut (this, fadeOutLength); } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_extra/misc/juce_ColourSelector.cpp b/modules/juce_gui_extra/misc/juce_ColourSelector.cpp index b2ebc73c0d..fb08940858 100644 --- a/modules/juce_gui_extra/misc/juce_ColourSelector.cpp +++ b/modules/juce_gui_extra/misc/juce_ColourSelector.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class ColourComponentSlider : public Slider { public: @@ -580,6 +578,3 @@ void ColourSelector::setSwatchColour (const int, const Colour&) const { jassertfalse; // if you've overridden getNumSwatches(), you also need to implement this method } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp b/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp index 8c07d21e96..89ce38b5a3 100644 --- a/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp +++ b/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== class KeyMappingEditorComponent::ChangeKeyButton : public Button { public: @@ -488,5 +486,3 @@ String KeyMappingEditorComponent::getDescriptionForKeyPress (const KeyPress& key { return key.getTextDescription(); } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp b/modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp index c7fec6fe08..154e28e91f 100644 --- a/modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp +++ b/modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== PreferencesPanel::PreferencesPanel() : buttonSize (70) { @@ -143,5 +141,3 @@ void PreferencesPanel::buttonClicked (Button*) } } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.cpp b/modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.cpp index 3370625240..c21920efd8 100644 --- a/modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.cpp +++ b/modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== RecentlyOpenedFilesList::RecentlyOpenedFilesList() : maxNumberOfItems (10) { @@ -133,6 +131,3 @@ void RecentlyOpenedFilesList::restoreFromString (const String& stringifiedVersio setMaxNumberOfItems (maxNumberOfItems); } - - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_extra/misc/juce_SplashScreen.cpp b/modules/juce_gui_extra/misc/juce_SplashScreen.cpp index 225c76bdae..f9888ba750 100644 --- a/modules/juce_gui_extra/misc/juce_SplashScreen.cpp +++ b/modules/juce_gui_extra/misc/juce_SplashScreen.cpp @@ -23,9 +23,7 @@ ============================================================================== */ -BEGIN_JUCE_NAMESPACE -//============================================================================== SplashScreen::SplashScreen() { setOpaque (true); @@ -107,5 +105,3 @@ void SplashScreen::timerCallback() delete this; } } - -END_JUCE_NAMESPACE diff --git a/modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.cpp b/modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.cpp index eff79cf754..615e122c51 100644 --- a/modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.cpp +++ b/modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.cpp @@ -25,9 +25,6 @@ #if JUCE_WINDOWS || JUCE_LINUX -BEGIN_JUCE_NAMESPACE - -//============================================================================== SystemTrayIconComponent::SystemTrayIconComponent() { addToDesktop (0); @@ -37,6 +34,4 @@ SystemTrayIconComponent::~SystemTrayIconComponent() { } -END_JUCE_NAMESPACE - #endif diff --git a/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm b/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm index 735f7221fb..5ebd6bf6ce 100644 --- a/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm +++ b/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm @@ -23,7 +23,7 @@ ============================================================================== */ -END_JUCE_NAMESPACE +} // (juce namespace) class WebBrowserComponentInternal; @@ -128,7 +128,8 @@ class WebBrowserComponentInternal; @end #endif -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== class WebBrowserComponentInternal diff --git a/modules/juce_opengl/juce_opengl.cpp b/modules/juce_opengl/juce_opengl.cpp index 6659423a09..1e53c7a1ce 100644 --- a/modules/juce_opengl/juce_opengl.cpp +++ b/modules/juce_opengl/juce_opengl.cpp @@ -121,7 +121,8 @@ #include #endif -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== #include "native/juce_MissingGLDefinitions.h" @@ -166,9 +167,12 @@ void OpenGLExtensionFunctions::initialise() #include "opengl/juce_OpenGLTexture.cpp" // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} + using namespace juce; -BEGIN_JUCE_NAMESPACE + +namespace juce +{ //============================================================================== #if JUCE_MAC || JUCE_IOS @@ -193,4 +197,4 @@ BEGIN_JUCE_NAMESPACE #endif -END_JUCE_NAMESPACE +} diff --git a/modules/juce_opengl/juce_opengl.h b/modules/juce_opengl/juce_opengl.h index 39e10ba1ce..33729e80e6 100644 --- a/modules/juce_opengl/juce_opengl.h +++ b/modules/juce_opengl/juce_opengl.h @@ -75,7 +75,9 @@ #endif //============================================================================= -BEGIN_JUCE_NAMESPACE +namespace juce +{ + #include "opengl/juce_OpenGLHelpers.h" // START_AUTOINCLUDE opengl @@ -120,6 +122,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_OPENGL_JUCEHEADER__ diff --git a/modules/juce_opengl/native/juce_ios_OpenGLComponent.mm b/modules/juce_opengl/native/juce_ios_OpenGLComponent.mm index 47089af298..4005ca2cdc 100644 --- a/modules/juce_opengl/native/juce_ios_OpenGLComponent.mm +++ b/modules/juce_opengl/native/juce_ios_OpenGLComponent.mm @@ -23,7 +23,7 @@ ============================================================================== */ -END_JUCE_NAMESPACE +} // (juce namespace) @interface JuceGLView : UIView { @@ -38,7 +38,8 @@ END_JUCE_NAMESPACE } @end -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== class GLESContext : public OpenGLContext diff --git a/modules/juce_opengl/native/juce_mac_OpenGLComponent.mm b/modules/juce_opengl/native/juce_mac_OpenGLComponent.mm index 6b4f807b37..1fc795492f 100644 --- a/modules/juce_opengl/native/juce_mac_OpenGLComponent.mm +++ b/modules/juce_opengl/native/juce_mac_OpenGLComponent.mm @@ -23,7 +23,7 @@ ============================================================================== */ -END_JUCE_NAMESPACE +} // (juce namespace) #define ThreadSafeNSOpenGLView MakeObjCClassName(ThreadSafeNSOpenGLView) @@ -112,7 +112,9 @@ END_JUCE_NAMESPACE - (void) rightMouseUp: (NSEvent*) ev { [[self superview] rightMouseUp: ev]; } @end -BEGIN_JUCE_NAMESPACE + +namespace juce +{ //============================================================================== class WindowedGLContext : public OpenGLContext diff --git a/modules/juce_video/juce_video.cpp b/modules/juce_video/juce_video.cpp index 7ad65ac961..f0a5704143 100644 --- a/modules/juce_video/juce_video.cpp +++ b/modules/juce_video/juce_video.cpp @@ -118,7 +118,8 @@ //============================================================================== using namespace juce; -BEGIN_JUCE_NAMESPACE +namespace juce +{ #if JUCE_MAC || JUCE_IOS #include "../juce_core/native/juce_osx_ObjCHelpers.h" @@ -155,4 +156,4 @@ BEGIN_JUCE_NAMESPACE #endif #endif -END_JUCE_NAMESPACE +} diff --git a/modules/juce_video/juce_video.h b/modules/juce_video/juce_video.h index ed1bcaa18a..e6c7e5dce3 100644 --- a/modules/juce_video/juce_video.h +++ b/modules/juce_video/juce_video.h @@ -71,7 +71,8 @@ #endif //============================================================================= -BEGIN_JUCE_NAMESPACE +namespace juce +{ // START_AUTOINCLUDE playback, capture #ifndef __JUCE_DIRECTSHOWCOMPONENT_JUCEHEADER__ @@ -85,6 +86,6 @@ BEGIN_JUCE_NAMESPACE #endif // END_AUTOINCLUDE -END_JUCE_NAMESPACE +} #endif // __JUCE_VIDEO_JUCEHEADER__ diff --git a/modules/juce_video/native/juce_mac_CameraDevice.mm b/modules/juce_video/native/juce_mac_CameraDevice.mm index 68306f43ed..817fc377f6 100644 --- a/modules/juce_video/native/juce_mac_CameraDevice.mm +++ b/modules/juce_video/native/juce_mac_CameraDevice.mm @@ -32,7 +32,7 @@ class QTCameraDeviceInteral; -END_JUCE_NAMESPACE +} // (juce namespace) @interface QTCaptureCallbackDelegate : NSObject { @@ -56,7 +56,8 @@ END_JUCE_NAMESPACE fromConnection: (QTCaptureConnection*) connection; @end -BEGIN_JUCE_NAMESPACE +namespace juce +{ extern Image juce_createImageFromCIImage (CIImage* im, int w, int h); @@ -207,7 +208,8 @@ public: CriticalSection listenerLock; }; -END_JUCE_NAMESPACE +} // (juce namespace) + @implementation QTCaptureCallbackDelegate - (QTCaptureCallbackDelegate*) initWithOwner: (CameraDevice*) owner_ @@ -271,7 +273,9 @@ END_JUCE_NAMESPACE } @end -BEGIN_JUCE_NAMESPACE + +namespace juce +{ //============================================================================== class QTCaptureViewerComp : public NSViewComponent diff --git a/modules/juce_video/native/juce_mac_QuickTimeMovieComponent.mm b/modules/juce_video/native/juce_mac_QuickTimeMovieComponent.mm index 6b611de5e3..c1a8057b90 100644 --- a/modules/juce_video/native/juce_mac_QuickTimeMovieComponent.mm +++ b/modules/juce_video/native/juce_mac_QuickTimeMovieComponent.mm @@ -25,7 +25,7 @@ #if JUCE_QUICKTIME -END_JUCE_NAMESPACE +} // (juce namespace) //============================================================================== #define NonInterceptingQTMovieView MakeObjCClassName(NonInterceptingQTMovieView) @@ -66,7 +66,8 @@ END_JUCE_NAMESPACE @end -BEGIN_JUCE_NAMESPACE +namespace juce +{ //============================================================================== #define theMovie (static_cast (movie))