mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-10 23:44:24 +00:00
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.
This commit is contained in:
parent
b8397a9888
commit
295d125142
318 changed files with 271 additions and 1363 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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__
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue