mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

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.

Browse source
This commit is contained in:
jules 2012-02-11 14:09:23 +00:00
parent b8397a9888
commit 295d125142
318 changed files with 271 additions and 1363 deletions
Download patch file Download diff file Expand all files Collapse all files

2
extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.cpp
View file

@ -52,7 +52,7 @@ SourceCodeEditor::~SourceCodeEditor()
void SourceCodeEditor::resized()
{
editor.setBounds (0, 0, getWidth(), getHeight());
editor.setBounds (getLocalBounds());
}
bool SourceCodeEditor::isTextFile (const File& file)

5
modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp
View file

@ -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

4
modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.cpp
View file

@ -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

4
modules/juce_audio_basics/effects/juce_IIRFilter.cpp
View file

@ -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

5
modules/juce_audio_basics/juce_audio_basics.cpp
View file

@ -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
}

5
modules/juce_audio_basics/juce_audio_basics.h
View file

@ -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__

4
modules/juce_audio_basics/midi/juce_MidiBuffer.cpp
View file

@ -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

4
modules/juce_audio_basics/midi/juce_MidiFile.cpp
View file

@ -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

5
modules/juce_audio_basics/midi/juce_MidiKeyboardState.cpp
View file

@ -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

3
modules/juce_audio_basics/midi/juce_MidiMessage.cpp
View file

@ -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

4
modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp
View file

@ -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

5
modules/juce_audio_basics/sources/juce_BufferingAudioSource.cpp
View file

@ -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

5
modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.cpp
View file

@ -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

5
modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.cpp
View file

@ -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

4
modules/juce_audio_basics/sources/juce_MixerAudioSource.cpp
View file

@ -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

4
modules/juce_audio_basics/sources/juce_ResamplingAudioSource.cpp
View file

@ -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

5
modules/juce_audio_basics/sources/juce_ReverbAudioSource.cpp
View file

@ -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

5
modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.cpp
View file

@ -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

5
modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp
View file

@ -23,9 +23,7 @@
==============================================================================
*/
BEGIN_JUCE_NAMESPACE
//==============================================================================
SynthesiserSound::SynthesiserSound()
{
}
@ -434,6 +432,3 @@ SynthesiserVoice* Synthesiser::findFreeVoice (SynthesiserSound* soundToPlay,
return nullptr;
}
END_JUCE_NAMESPACE

6
modules/juce_audio_devices/audio_cd/juce_AudioCDReader.cpp
View file

@ -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

5
modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
View file

@ -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

5
modules/juce_audio_devices/audio_io/juce_AudioIODevice.cpp
View file

@ -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

5
modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp
View file

@ -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

10
modules/juce_audio_devices/juce_audio_devices.cpp
View file

@ -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
}

5
modules/juce_audio_devices/juce_audio_devices.h
View file

@ -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__

5
modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp
View file

@ -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

5
modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp
View file

@ -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

5
modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm
View file

@ -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

5
modules/juce_audio_devices/native/juce_win32_DirectSound.cpp
View file

@ -23,7 +23,7 @@
==============================================================================
*/
END_JUCE_NAMESPACE
} // (juce namespace)
extern "C"
{
@ -128,7 +128,8 @@ extern "C"
}
//==============================================================================
BEGIN_JUCE_NAMESPACE
namespace juce
{
namespace
{

4
modules/juce_audio_devices/sources/juce_AudioSourcePlayer.cpp
View file

@ -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

4
modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp
View file

@ -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

5
modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp
View file

@ -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);

2
modules/juce_audio_formats/format/juce_AudioFormat.cpp
View file

@ -23,7 +23,7 @@
==============================================================================
*/
//==============================================================================
AudioFormat::AudioFormat (const String& name, const StringArray& extensions)
: formatName (name),
fileExtensions (extensions)

5
modules/juce_audio_formats/juce_audio_formats.cpp
View file

@ -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
}

5
modules/juce_audio_formats/juce_audio_formats.h
View file

@ -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__

5
modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
View file

@ -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
}
//==============================================================================

6
modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm
View file

@ -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

4
modules/juce_audio_processors/format/juce_AudioPluginFormat.cpp
View file

@ -23,10 +23,6 @@
==============================================================================
*/
BEGIN_JUCE_NAMESPACE
//==============================================================================
AudioPluginFormat::AudioPluginFormat() noexcept {}
AudioPluginFormat::~AudioPluginFormat() {}
END_JUCE_NAMESPACE

5
modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp
View file

@ -23,9 +23,7 @@
==============================================================================
*/
BEGIN_JUCE_NAMESPACE
//==============================================================================
AudioPluginFormatManager::AudioPluginFormatManager()
{
}
@ -126,6 +124,3 @@ bool AudioPluginFormatManager::doesPluginStillExist (const PluginDescription& de
return false;
}
END_JUCE_NAMESPACE

7
modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
View file

@ -25,6 +25,8 @@
#if JUCE_PLUGINHOST_AU && JUCE_MAC
} // (juce namespace)
#include <AudioUnit/AudioUnit.h>
#include <AudioUnit/AUCocoaUIView.h>
#include <CoreAudioKit/AUGenericView.h>
@ -34,7 +36,8 @@
#include <AudioUnit/AudioUnitCarbonView.h>
#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

5
modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
View file

@ -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

5
modules/juce_audio_processors/juce_audio_processors.cpp
View file

@ -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
}

5
modules/juce_audio_processors/juce_audio_processors.h
View file

@ -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__

5
modules/juce_audio_processors/processors/juce_AudioProcessor.cpp
View file

@ -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

5
modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp
View file

@ -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

4
modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp
View file

@ -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

6
modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp
View file

@ -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

4
modules/juce_audio_processors/processors/juce_PluginDescription.cpp
View file

@ -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

4
modules/juce_audio_processors/scanning/juce_KnownPluginList.cpp
View file

@ -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

5
modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.cpp
View file

@ -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

4
modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp
View file

@ -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

5
modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp
View file

@ -23,9 +23,7 @@
==============================================================================
*/
BEGIN_JUCE_NAMESPACE
//==============================================================================
class SimpleDeviceManagerInputLevelMeter : public Component,
public Timer
{
@ -1122,6 +1120,3 @@ void AudioDeviceSelectorComponent::updateAllControls()
resized();
}
END_JUCE_NAMESPACE

5
modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp
View file

@ -23,9 +23,7 @@
==============================================================================
*/
BEGIN_JUCE_NAMESPACE
//==============================================================================
struct AudioThumbnail::MinMaxValue
{
MinMaxValue() noexcept
@ -803,6 +801,3 @@ void AudioThumbnail::drawChannels (Graphics& g, const Rectangle<int>& area, doub
startTimeSeconds, endTimeSeconds, i, verticalZoomFactor);
}
}
END_JUCE_NAMESPACE

4
modules/juce_audio_utils/gui/juce_AudioThumbnailCache.cpp
View file

@ -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

5
modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp
View file

@ -23,9 +23,7 @@
==============================================================================
*/
BEGIN_JUCE_NAMESPACE
//==============================================================================
class MidiKeyboardUpDownButton : public Button
{
public:
@ -873,6 +871,3 @@ void MidiKeyboardComponent::focusLost (FocusChangeType)
{
resetAnyKeysInUse();
}
END_JUCE_NAMESPACE

5
modules/juce_audio_utils/juce_audio_utils.cpp
View file

@ -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
}

5
modules/juce_audio_utils/juce_audio_utils.h
View file

@ -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__

5
modules/juce_audio_utils/players/juce_AudioProcessorPlayer.cpp
View file

@ -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

7
modules/juce_browser_plugin/juce_browser_plugin.h
View file

@ -128,9 +128,10 @@
//=============================================================================
BEGIN_JUCE_NAMESPACE
#include "wrapper/juce_BrowserPluginComponent.h"
END_JUCE_NAMESPACE
namespace juce
{
#include "wrapper/juce_BrowserPluginComponent.h"
}
//==============================================================================
/**

4
modules/juce_core/containers/juce_AbstractFifo.cpp
View file

@ -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

5
modules/juce_core/containers/juce_DynamicObject.cpp
View file

@ -23,9 +23,7 @@
==============================================================================
*/
BEGIN_JUCE_NAMESPACE
//==============================================================================
DynamicObject::DynamicObject()
{
}
@ -77,6 +75,3 @@ void DynamicObject::clear()
{
properties.clear();
}
END_JUCE_NAMESPACE

5
modules/juce_core/containers/juce_NamedValueSet.cpp
View file

@ -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

4
modules/juce_core/containers/juce_PropertySet.cpp
View file

@ -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

5
modules/juce_core/containers/juce_Variant.cpp
View file

@ -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

4
modules/juce_core/files/juce_DirectoryIterator.cpp
View file

@ -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

8
modules/juce_core/files/juce_File.cpp
View file

@ -23,13 +23,7 @@
==============================================================================
*/
#if ! JUCE_WINDOWS
#include <pwd.h>
#endif
BEGIN_JUCE_NAMESPACE
//==============================================================================
File::File (const String& fullPathName)
: fullPath (parseAbsolutePath (fullPathName))
{
@ -1078,5 +1072,3 @@ public:
static FileTests fileUnitTests;
#endif
END_JUCE_NAMESPACE

4
modules/juce_core/files/juce_FileInputStream.cpp
View file

@ -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

4
modules/juce_core/files/juce_FileOutputStream.cpp
View file

@ -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

4
modules/juce_core/files/juce_FileSearchPath.cpp
View file

@ -23,9 +23,7 @@
==============================================================================
*/
BEGIN_JUCE_NAMESPACE
//==============================================================================
FileSearchPath::FileSearchPath()
{
}
@ -169,5 +167,3 @@ bool FileSearchPath::isFileInPath (const File& fileToCheck,
return false;
}
END_JUCE_NAMESPACE

4
modules/juce_core/files/juce_TemporaryFile.cpp
View file

@ -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

4
modules/juce_core/json/juce_JSON.cpp
View file

@ -23,9 +23,7 @@
==============================================================================
*/
BEGIN_JUCE_NAMESPACE
//==============================================================================
class JSONParser
{
public:
@ -635,5 +633,3 @@ public:
static JSONTests JSONUnitTests;
#endif
END_JUCE_NAMESPACE

41
modules/juce_core/juce_core.cpp
View file

@ -40,7 +40,44 @@
#include "native/juce_BasicNativeHeaders.h"
#include "juce_core.h"
#include <locale>
#include <cctype>
#include <sys/timeb.h>
#if ! JUCE_ANDROID
#include <cwctype>
#endif
#if JUCE_WINDOWS
#include <ctime>
#include <winsock2.h>
#include <ws2tcpip.h>
#if JUCE_MINGW
#include <wspiapi.h>
#endif
#else
#if JUCE_LINUX || JUCE_ANDROID
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/errno.h>
#include <unistd.h>
#include <netinet/in.h>
#endif
#include <pwd.h>
#include <fcntl.h>
#include <netdb.h>
#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <sys/time.h>
#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
}

5
modules/juce_core/juce_core.h
View file

@ -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)

4
modules/juce_core/logging/juce_FileLogger.cpp
View file

@ -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

4
modules/juce_core/logging/juce_Logger.cpp
View file

@ -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

4
modules/juce_core/maths/juce_BigInteger.cpp
View file

@ -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

5
modules/juce_core/maths/juce_Expression.cpp
View file

@ -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

4
modules/juce_core/maths/juce_Expression.h
View file

@ -258,9 +258,9 @@ public:
private:
//==============================================================================
class Term;
class Helpers;
struct Helpers;
friend class Term;
friend class Helpers;
friend struct Helpers;
friend class ScopedPointer<Term>;
friend class ReferenceCountedObjectPtr<Term>;
ReferenceCountedObjectPtr<Term> term;

4
modules/juce_core/maths/juce_Random.cpp
View file

@ -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

5
modules/juce_core/memory/juce_MemoryBlock.cpp
View file

@ -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

5
modules/juce_core/misc/juce_Result.cpp
View file

@ -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

4
modules/juce_core/misc/juce_Uuid.cpp
View file

@ -23,7 +23,6 @@
==============================================================================
*/
BEGIN_JUCE_NAMESPACE
namespace
{
@ -123,6 +122,3 @@ Uuid& Uuid::operator= (const uint8* const rawData)
return *this;
}
END_JUCE_NAMESPACE

5
modules/juce_core/native/juce_mac_Network.mm
View file

@ -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

5
modules/juce_core/network/juce_MACAddress.cpp
View file

@ -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

3
modules/juce_core/network/juce_NamedPipe.cpp
View file

@ -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

29
modules/juce_core/network/juce_Socket.cpp
View file

@ -23,40 +23,15 @@
==============================================================================
*/
#if JUCE_WINDOWS
#include <winsock2.h>
#include <ws2tcpip.h>
#if JUCE_MINGW
#include <wspiapi.h>
#endif
#if JUCE_MSVC
#if JUCE_MSVC
#pragma warning (push)
#pragma warning (disable : 4127 4389 4018)
#endif
#else
#if JUCE_LINUX || JUCE_ANDROID
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/errno.h>
#include <unistd.h>
#include <netinet/in.h>
#endif
#include <fcntl.h>
#include <netdb.h>
#include <arpa/inet.h>
#include <netinet/tcp.h>
#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

5
modules/juce_core/network/juce_URL.cpp
View file

@ -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

4
modules/juce_core/streams/juce_BufferedInputStream.cpp
View file

@ -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

6
modules/juce_core/streams/juce_FileInputSource.cpp
View file

@ -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

4
modules/juce_core/streams/juce_InputStream.cpp
View file

@ -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

4
modules/juce_core/streams/juce_MemoryInputStream.cpp
View file

@ -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

4
modules/juce_core/streams/juce_MemoryOutputStream.cpp
View file

@ -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

5
modules/juce_core/streams/juce_OutputStream.cpp
View file

@ -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

4
modules/juce_core/streams/juce_SubregionStream.cpp
View file

@ -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

5
modules/juce_core/system/juce_PlatformDefs.h
View file

@ -121,10 +121,11 @@
//==============================================================================
#ifndef DOXYGEN
BEGIN_JUCE_NAMESPACE
namespace juce
{
template <bool b> struct JuceStaticAssert;
template <> struct JuceStaticAssert <true> { static void dummy() {} };
END_JUCE_NAMESPACE
}
#endif
/** A compile-time assertion macro.

10
modules/juce_core/system/juce_StandardHeader.h
View file

@ -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"

5
modules/juce_core/system/juce_SystemStats.cpp
View file

@ -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

11
modules/juce_core/text/juce_CharacterFunctions.cpp
View file

@ -23,14 +23,6 @@
==============================================================================
*/
#if ! JUCE_ANDROID
#include <cwctype>
#endif
#include <cctype>
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

4
modules/juce_core/text/juce_Identifier.cpp
View file

@ -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

5
modules/juce_core/text/juce_LocalisedStrings.cpp
View file

@ -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

Some files were not shown because too many files have changed in this diff Show more