Reorganised some of the juce source tree folders. Added a new JUCE_DEPRECATED macro, and tested it by renaming Button::addButtonListener to Button::addListener for consistency with other widgets. Added Samplitude to the AudioHostType class. Fixed window maximising in win32.

Builds/Linux/Makefile

@@ -95,11 +95,7 @@ OBJECTS := \
   $(OBJDIR)/juce_Sampler_98f716a4.o \
   $(OBJDIR)/juce_Synthesiser_2bffa1dd.o \
   $(OBJDIR)/juce_AbstractFifo_dfc0bd23.o \
-  $(OBJDIR)/juce_BigInteger_63589133.o \
   $(OBJDIR)/juce_DynamicObject_69d02ab3.o \
-  $(OBJDIR)/juce_Expression_1e9a5aad.o \
-  $(OBJDIR)/juce_Identifier_89fa043e.o \
-  $(OBJDIR)/juce_MemoryBlock_edd65761.o \
   $(OBJDIR)/juce_NamedValueSet_6b0793df.o \
   $(OBJDIR)/juce_PropertySet_914b5922.o \
   $(OBJDIR)/juce_Value_16231646.o \
@@ -109,7 +105,6 @@ OBJECTS := \
   $(OBJDIR)/juce_Initialisation_fec765a9.o \
   $(OBJDIR)/juce_Logger_4f4f7f72.o \
   $(OBJDIR)/juce_PerformanceCounter_6422080e.o \
-  $(OBJDIR)/juce_Random_36899d25.o \
   $(OBJDIR)/juce_RelativeTime_bc5ef35b.o \
   $(OBJDIR)/juce_SystemStats_c00d8758.o \
   $(OBJDIR)/juce_Time_16acdd6f.o \
@@ -286,6 +281,10 @@ OBJECTS := \
   $(OBJDIR)/juce_MemoryOutputStream_8003c78f.o \
   $(OBJDIR)/juce_OutputStream_9a068a6e.o \
   $(OBJDIR)/juce_SubregionStream_9156f331.o \
+  $(OBJDIR)/juce_BigInteger_b44f43d6.o \
+  $(OBJDIR)/juce_Expression_6f910d50.o \
+  $(OBJDIR)/juce_Random_a529cb7b.o \
+  $(OBJDIR)/juce_MemoryBlock_52f17c52.o \
   $(OBJDIR)/juce_linux_NativeCode_b464a4a9.o \
   $(OBJDIR)/juce_win32_NativeCode_2eaaf382.o \
   $(OBJDIR)/juce_posix_NamedPipe_aa308c65.o \
@@ -329,6 +328,7 @@ OBJECTS := \
   $(OBJDIR)/juce_win32_WebBrowserComponent_2a4dd461.o \
   $(OBJDIR)/juce_win32_Windowing_635b4f6a.o \
   $(OBJDIR)/juce_CharacterFunctions_b1a5ac62.o \
+  $(OBJDIR)/juce_Identifier_e99ee619.o \
   $(OBJDIR)/juce_LocalisedStrings_3ddfa55e.o \
   $(OBJDIR)/juce_String_80587b01.o \
   $(OBJDIR)/juce_StringArray_4aaa67a2.o \
@@ -642,31 +642,11 @@ $(OBJDIR)/juce_AbstractFifo_dfc0bd23.o: ../../src/containers/juce_AbstractFifo.c
 	@echo "Compiling juce_AbstractFifo.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_BigInteger_63589133.o: ../../src/containers/juce_BigInteger.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_BigInteger.cpp"
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_DynamicObject_69d02ab3.o: ../../src/containers/juce_DynamicObject.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling juce_DynamicObject.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_Expression_1e9a5aad.o: ../../src/containers/juce_Expression.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_Expression.cpp"
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_Identifier_89fa043e.o: ../../src/containers/juce_Identifier.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_Identifier.cpp"
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-$(OBJDIR)/juce_MemoryBlock_edd65761.o: ../../src/containers/juce_MemoryBlock.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_MemoryBlock.cpp"
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_NamedValueSet_6b0793df.o: ../../src/containers/juce_NamedValueSet.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling juce_NamedValueSet.cpp"
@@ -712,11 +692,6 @@ $(OBJDIR)/juce_PerformanceCounter_6422080e.o: ../../src/core/juce_PerformanceCou
 	@echo "Compiling juce_PerformanceCounter.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_Random_36899d25.o: ../../src/core/juce_Random.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_Random.cpp"
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_RelativeTime_bc5ef35b.o: ../../src/core/juce_RelativeTime.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling juce_RelativeTime.cpp"
@@ -1597,6 +1572,26 @@ $(OBJDIR)/juce_SubregionStream_9156f331.o: ../../src/io/streams/juce_SubregionSt
 	@echo "Compiling juce_SubregionStream.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_BigInteger_b44f43d6.o: ../../src/maths/juce_BigInteger.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling juce_BigInteger.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_Expression_6f910d50.o: ../../src/maths/juce_Expression.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling juce_Expression.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_Random_a529cb7b.o: ../../src/maths/juce_Random.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling juce_Random.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_MemoryBlock_52f17c52.o: ../../src/memory/juce_MemoryBlock.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling juce_MemoryBlock.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_linux_NativeCode_b464a4a9.o: ../../src/native/juce_linux_NativeCode.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling juce_linux_NativeCode.cpp"
@@ -1812,6 +1807,11 @@ $(OBJDIR)/juce_CharacterFunctions_b1a5ac62.o: ../../src/text/juce_CharacterFunct
 	@echo "Compiling juce_CharacterFunctions.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/juce_Identifier_e99ee619.o: ../../src/text/juce_Identifier.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling juce_Identifier.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/juce_LocalisedStrings_3ddfa55e.o: ../../src/text/juce_LocalisedStrings.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling juce_LocalisedStrings.cpp"

Builds/MacOSX/Juce.xcodeproj/project.pbxproj

@@ -64,11 +64,7 @@
 		07E6E11A658930554FF0C56A = { isa = PBXBuildFile; fileRef = ED5966B95F865C586A3CE08F; };
 		E8DFABC1603D55B97429A8E4 = { isa = PBXBuildFile; fileRef = 35668D8EEA19957C6C9AC83A; };
 		1F905F44E5FA23A2D5CCDA0A = { isa = PBXBuildFile; fileRef = 4F22276689685D839BD252EA; };
-		BE25871C34D79FEFFD1B94B6 = { isa = PBXBuildFile; fileRef = 895D742F49DA9F100990879C; };
 		4AB5E55BDF79028F82F83D8E = { isa = PBXBuildFile; fileRef = F77C9170829579FABA5679AD; };
-		25018C91F79D918FEA084630 = { isa = PBXBuildFile; fileRef = 199DFD1C5A282FE13A585FEA; };
-		95577AE91AA6CBA7FE9434F3 = { isa = PBXBuildFile; fileRef = 1CF7CC0EB057F995BBBEFC90; };
-		21BA256CBCC9C15265928A23 = { isa = PBXBuildFile; fileRef = FF40DA899AE16A5E1D8AA54A; };
 		9D2D1BA65C27BDA1F7C44769 = { isa = PBXBuildFile; fileRef = 70E5409425A76782B6188B31; };
 		43B3119E2F1B559263AE956C = { isa = PBXBuildFile; fileRef = 9BD379D2F7995BFE0B3E5369; };
 		4A7952C0A4EEE13296EEED5E = { isa = PBXBuildFile; fileRef = 1809284DD05B56309D7EA24F; };
@@ -78,7 +74,6 @@
 		77104E86801B6CAD01F963F4 = { isa = PBXBuildFile; fileRef = 5B789AAC295BA4BB6D5AD4A3; };
 		6A53DA58B55E2DE7241BF2C8 = { isa = PBXBuildFile; fileRef = 4555F03DBD059EEDECEF9F85; };
 		0FF71870483AC46D5B7AC5B0 = { isa = PBXBuildFile; fileRef = DF6CAC67C0F2D379BDA03062; };
-		029702B3954F6968AE804B21 = { isa = PBXBuildFile; fileRef = 2C6C4AB5D82221AB303FBB34; };
 		FA01B3EABA192AE041D4FE4D = { isa = PBXBuildFile; fileRef = CFAECB6551F48A1695DEC243; };
 		5BF44F954E56B7C2DD15EAEA = { isa = PBXBuildFile; fileRef = 18B170E96511BBA1019C66F8; };
 		B14EB5F3829CA26DA906D5C0 = { isa = PBXBuildFile; fileRef = 8D2DE1F3CB15D003C90042E7; };
@@ -255,6 +250,10 @@
 		1008A8A446B9BCADBB853056 = { isa = PBXBuildFile; fileRef = B3F5E7A708350F72E7C77153; };
 		0FB1AED6E5AB5CEA95E70950 = { isa = PBXBuildFile; fileRef = BBE79494A818EF83F52A4C7B; };
 		103A3B11DFE35E9088ECE933 = { isa = PBXBuildFile; fileRef = AE5A7EC70F288E7EA682081D; };
+		DAC7AB8D9EA70D99A1C1287E = { isa = PBXBuildFile; fileRef = 7A039686F4F852E26936CA53; };
+		B3D08D9E24CC369E4838E6FF = { isa = PBXBuildFile; fileRef = 868E43A4BB7015579789E4F8; };
+		15932C8039A59B0431FBB93E = { isa = PBXBuildFile; fileRef = D99C977ACCD09262F06F6624; };
+		3BBC410C79D2F53D32ED7466 = { isa = PBXBuildFile; fileRef = AD655AA04981173716022D8D; };
 		7BBDAAAFBC81C90E6212C6C4 = { isa = PBXBuildFile; fileRef = 1C4E5F07F277AE37C71EA547; };
 		63BEDDA4009950B131FCCA83 = { isa = PBXBuildFile; fileRef = 3BC24CC03A2F940A615FE935; };
 		056129CB247F785CC536A779 = { isa = PBXBuildFile; fileRef = 9DFCF3F7BB734C8AABD83D8D; };
@@ -324,6 +323,7 @@
 		B0B82AB2D9B0950F67B11BEA = { isa = PBXBuildFile; fileRef = 8758E6857070D7E5406FDE3F; };
 		379B4A89E5403B57A2009E76 = { isa = PBXBuildFile; fileRef = 8E8BE2F1C182E418BBA6903C; };
 		2AC6F3BFAAA21E21076A9F8D = { isa = PBXBuildFile; fileRef = 76E2084D2148068F9138A816; };
+		B8DD4DB0BD1A6B38BBF92413 = { isa = PBXBuildFile; fileRef = 8273A206FB309671284959DD; };
 		63BEC07A51CB8E516B38ECD4 = { isa = PBXBuildFile; fileRef = 4A97C8D2FF6454DDD3AF4BE5; };
 		C8F81E843F446868FAD88197 = { isa = PBXBuildFile; fileRef = B507B4A8712A54D7A8C03223; };
 		50D91A2EC0ABF894E612D936 = { isa = PBXBuildFile; fileRef = 23252E4C97AEFAE0C5EEAA77; };
@@ -487,27 +487,15 @@
 		9584B84F23A4251755D49213 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AbstractFifo.h; path = ../../src/containers/juce_AbstractFifo.h; sourceTree = SOURCE_ROOT; };
 		839BE8047CF2F8EBE43ED34F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Array.h; path = ../../src/containers/juce_Array.h; sourceTree = SOURCE_ROOT; };
 		EDF52FDF87ACD33FE933142C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ArrayAllocationBase.h; path = ../../src/containers/juce_ArrayAllocationBase.h; sourceTree = SOURCE_ROOT; };
-		895D742F49DA9F100990879C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_BigInteger.cpp; path = ../../src/containers/juce_BigInteger.cpp; sourceTree = SOURCE_ROOT; };
-		96DDC0A32624DA76036824D3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_BigInteger.h; path = ../../src/containers/juce_BigInteger.h; sourceTree = SOURCE_ROOT; };
 		F77C9170829579FABA5679AD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_DynamicObject.cpp; path = ../../src/containers/juce_DynamicObject.cpp; sourceTree = SOURCE_ROOT; };
 		34C402EF9ADCAD34FB657D43 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_DynamicObject.h; path = ../../src/containers/juce_DynamicObject.h; sourceTree = SOURCE_ROOT; };
 		7DA9AC75A4D9227C8FC4B2F7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ElementComparator.h; path = ../../src/containers/juce_ElementComparator.h; sourceTree = SOURCE_ROOT; };
-		199DFD1C5A282FE13A585FEA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Expression.cpp; path = ../../src/containers/juce_Expression.cpp; sourceTree = SOURCE_ROOT; };
-		3C12A5E0EBBB0916C01CFC58 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Expression.h; path = ../../src/containers/juce_Expression.h; sourceTree = SOURCE_ROOT; };
-		F364AA2637B7CB89D3657DFF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_HeapBlock.h; path = ../../src/containers/juce_HeapBlock.h; sourceTree = SOURCE_ROOT; };
-		1CF7CC0EB057F995BBBEFC90 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Identifier.cpp; path = ../../src/containers/juce_Identifier.cpp; sourceTree = SOURCE_ROOT; };
-		C16848F86DF014F1CBECE248 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Identifier.h; path = ../../src/containers/juce_Identifier.h; sourceTree = SOURCE_ROOT; };
-		FF40DA899AE16A5E1D8AA54A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MemoryBlock.cpp; path = ../../src/containers/juce_MemoryBlock.cpp; sourceTree = SOURCE_ROOT; };
-		2E5D896B8DB2B357D7440F60 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MemoryBlock.h; path = ../../src/containers/juce_MemoryBlock.h; sourceTree = SOURCE_ROOT; };
 		70E5409425A76782B6188B31 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_NamedValueSet.cpp; path = ../../src/containers/juce_NamedValueSet.cpp; sourceTree = SOURCE_ROOT; };
 		BB4A73064B0FC74ECCA19116 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_NamedValueSet.h; path = ../../src/containers/juce_NamedValueSet.h; sourceTree = SOURCE_ROOT; };
 		C1913C90ED7BE51E823887CD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_OwnedArray.h; path = ../../src/containers/juce_OwnedArray.h; sourceTree = SOURCE_ROOT; };
 		9BD379D2F7995BFE0B3E5369 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PropertySet.cpp; path = ../../src/containers/juce_PropertySet.cpp; sourceTree = SOURCE_ROOT; };
 		C8F0F54CA3D913E7B8D559CF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PropertySet.h; path = ../../src/containers/juce_PropertySet.h; sourceTree = SOURCE_ROOT; };
-		71A501DD68F55A8BDC779E57 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Range.h; path = ../../src/containers/juce_Range.h; sourceTree = SOURCE_ROOT; };
 		D7612CE51ED4F9D3F960F922 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ReferenceCountedArray.h; path = ../../src/containers/juce_ReferenceCountedArray.h; sourceTree = SOURCE_ROOT; };
-		AF6EF2E3ACA8479A7E47C016 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ReferenceCountedObject.h; path = ../../src/containers/juce_ReferenceCountedObject.h; sourceTree = SOURCE_ROOT; };
-		C1F3BCAD6E3683B2DA91C5C4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ScopedPointer.h; path = ../../src/containers/juce_ScopedPointer.h; sourceTree = SOURCE_ROOT; };
 		2F5FD1DEFAE549553A8BE3B1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_SortedSet.h; path = ../../src/containers/juce_SortedSet.h; sourceTree = SOURCE_ROOT; };
 		989E03031D341649B4A296F5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_SparseSet.h; path = ../../src/containers/juce_SparseSet.h; sourceTree = SOURCE_ROOT; };
 		1809284DD05B56309D7EA24F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Value.cpp; path = ../../src/containers/juce_Value.cpp; sourceTree = SOURCE_ROOT; };
@@ -516,24 +504,16 @@
 		7CABDD863B47D8ADC900A4D8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ValueTree.h; path = ../../src/containers/juce_ValueTree.h; sourceTree = SOURCE_ROOT; };
 		4DF9D333038A442870668D31 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Variant.cpp; path = ../../src/containers/juce_Variant.cpp; sourceTree = SOURCE_ROOT; };
 		A81B4FC81A75E21E5B96E506 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Variant.h; path = ../../src/containers/juce_Variant.h; sourceTree = SOURCE_ROOT; };
-		35D32D0A21ABDB7861E3E5B8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_WeakReference.h; path = ../../src/containers/juce_WeakReference.h; sourceTree = SOURCE_ROOT; };
-		149E6ECBA264A264C7BB3FB3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Atomic.h; path = ../../src/core/juce_Atomic.h; sourceTree = SOURCE_ROOT; };
-		45AFA4791D59FBB1B548FB2C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ByteOrder.h; path = ../../src/core/juce_ByteOrder.h; sourceTree = SOURCE_ROOT; };
 		D66C00E06B06EAD3B5257DD6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_FileLogger.cpp; path = ../../src/core/juce_FileLogger.cpp; sourceTree = SOURCE_ROOT; };
 		C8441B7B3E4CCD4A257B4BFE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_FileLogger.h; path = ../../src/core/juce_FileLogger.h; sourceTree = SOURCE_ROOT; };
 		5B789AAC295BA4BB6D5AD4A3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Initialisation.cpp; path = ../../src/core/juce_Initialisation.cpp; sourceTree = SOURCE_ROOT; };
 		92ACFFCCCD1C85A0F8C6F80F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Initialisation.h; path = ../../src/core/juce_Initialisation.h; sourceTree = SOURCE_ROOT; };
-		DFE0DF77674CB28A2485FFDF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_LeakedObjectDetector.h; path = ../../src/core/juce_LeakedObjectDetector.h; sourceTree = SOURCE_ROOT; };
 		4555F03DBD059EEDECEF9F85 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Logger.cpp; path = ../../src/core/juce_Logger.cpp; sourceTree = SOURCE_ROOT; };
 		63F44EC0485FCA050814967E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Logger.h; path = ../../src/core/juce_Logger.h; sourceTree = SOURCE_ROOT; };
-		94BDD1E20915D83AA6729D94 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MathsFunctions.h; path = ../../src/core/juce_MathsFunctions.h; sourceTree = SOURCE_ROOT; };
-		09C02A692734116F30059E9F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Memory.h; path = ../../src/core/juce_Memory.h; sourceTree = SOURCE_ROOT; };
 		DF6CAC67C0F2D379BDA03062 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PerformanceCounter.cpp; path = ../../src/core/juce_PerformanceCounter.cpp; sourceTree = SOURCE_ROOT; };
 		1159C6BB0D33EE8E1A96B083 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PerformanceCounter.h; path = ../../src/core/juce_PerformanceCounter.h; sourceTree = SOURCE_ROOT; };
 		8292AE37F99FCC1E5BF63A28 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PlatformDefs.h; path = ../../src/core/juce_PlatformDefs.h; sourceTree = SOURCE_ROOT; };
 		8D499CED6DCF525ACD6E39B2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PlatformUtilities.h; path = ../../src/core/juce_PlatformUtilities.h; sourceTree = SOURCE_ROOT; };
-		2C6C4AB5D82221AB303FBB34 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Random.cpp; path = ../../src/core/juce_Random.cpp; sourceTree = SOURCE_ROOT; };
-		4921086FBB82248D0E9EDDBF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Random.h; path = ../../src/core/juce_Random.h; sourceTree = SOURCE_ROOT; };
 		CFAECB6551F48A1695DEC243 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RelativeTime.cpp; path = ../../src/core/juce_RelativeTime.cpp; sourceTree = SOURCE_ROOT; };
 		B4137E4612C1D161894D0D27 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_RelativeTime.h; path = ../../src/core/juce_RelativeTime.h; sourceTree = SOURCE_ROOT; };
 		C25D6136DF9CE441D6EB4C42 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Singleton.h; path = ../../src/core/juce_Singleton.h; sourceTree = SOURCE_ROOT; };
@@ -911,6 +891,24 @@
 		5F27172FD963C1A748AA625A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_OutputStream.h; path = ../../src/io/streams/juce_OutputStream.h; sourceTree = SOURCE_ROOT; };
 		AE5A7EC70F288E7EA682081D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_SubregionStream.cpp; path = ../../src/io/streams/juce_SubregionStream.cpp; sourceTree = SOURCE_ROOT; };
 		6F7CA1B3AD09C76271FED3D6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_SubregionStream.h; path = ../../src/io/streams/juce_SubregionStream.h; sourceTree = SOURCE_ROOT; };
+		7A039686F4F852E26936CA53 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_BigInteger.cpp; path = ../../src/maths/juce_BigInteger.cpp; sourceTree = SOURCE_ROOT; };
+		161894D0D279595D88F470A6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_BigInteger.h; path = ../../src/maths/juce_BigInteger.h; sourceTree = SOURCE_ROOT; };
+		868E43A4BB7015579789E4F8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Expression.cpp; path = ../../src/maths/juce_Expression.cpp; sourceTree = SOURCE_ROOT; };
+		8E0874D93125C2DC34255EDB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Expression.h; path = ../../src/maths/juce_Expression.h; sourceTree = SOURCE_ROOT; };
+		7C2A4084A267F57F2E27F3F7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MathsFunctions.h; path = ../../src/maths/juce_MathsFunctions.h; sourceTree = SOURCE_ROOT; };
+		D99C977ACCD09262F06F6624 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Random.cpp; path = ../../src/maths/juce_Random.cpp; sourceTree = SOURCE_ROOT; };
+		A978BD4031CAE24FB0FE26E1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Random.h; path = ../../src/maths/juce_Random.h; sourceTree = SOURCE_ROOT; };
+		1A656E62C071C54D28343AC2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Range.h; path = ../../src/maths/juce_Range.h; sourceTree = SOURCE_ROOT; };
+		252632F3F97DF57C0781BEAD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Atomic.h; path = ../../src/memory/juce_Atomic.h; sourceTree = SOURCE_ROOT; };
+		8FB80383DF3BAD7227DF465A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ByteOrder.h; path = ../../src/memory/juce_ByteOrder.h; sourceTree = SOURCE_ROOT; };
+		FE76B46873DE20DFDC5A94BE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_HeapBlock.h; path = ../../src/memory/juce_HeapBlock.h; sourceTree = SOURCE_ROOT; };
+		28C4C81039B42A399F5B7320 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_LeakedObjectDetector.h; path = ../../src/memory/juce_LeakedObjectDetector.h; sourceTree = SOURCE_ROOT; };
+		341631A7E86BF1C0E49093C6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Memory.h; path = ../../src/memory/juce_Memory.h; sourceTree = SOURCE_ROOT; };
+		AD655AA04981173716022D8D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MemoryBlock.cpp; path = ../../src/memory/juce_MemoryBlock.cpp; sourceTree = SOURCE_ROOT; };
+		F1D085B5F12E814BF1D5C395 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MemoryBlock.h; path = ../../src/memory/juce_MemoryBlock.h; sourceTree = SOURCE_ROOT; };
+		524A70C9F23954F8F2A3F99B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ReferenceCountedObject.h; path = ../../src/memory/juce_ReferenceCountedObject.h; sourceTree = SOURCE_ROOT; };
+		E05812E3CC31875A202D6B30 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ScopedPointer.h; path = ../../src/memory/juce_ScopedPointer.h; sourceTree = SOURCE_ROOT; };
+		224C989BF83B6EA867814BFF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_WeakReference.h; path = ../../src/memory/juce_WeakReference.h; sourceTree = SOURCE_ROOT; };
 		1C4E5F07F277AE37C71EA547 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_linux_NativeCode.cpp; path = ../../src/native/juce_linux_NativeCode.cpp; sourceTree = SOURCE_ROOT; };
 		3BC24CC03A2F940A615FE935 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_NativeCode.mm; path = ../../src/native/juce_mac_NativeCode.mm; sourceTree = SOURCE_ROOT; };
 		9DFCF3F7BB734C8AABD83D8D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_win32_NativeCode.cpp; path = ../../src/native/juce_win32_NativeCode.cpp; sourceTree = SOURCE_ROOT; };
@@ -990,8 +988,11 @@
 		8E8BE2F1C182E418BBA6903C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_win32_Windowing.cpp; path = ../../src/native/windows/juce_win32_Windowing.cpp; sourceTree = SOURCE_ROOT; };
 		76E2084D2148068F9138A816 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_CharacterFunctions.cpp; path = ../../src/text/juce_CharacterFunctions.cpp; sourceTree = SOURCE_ROOT; };
 		33F16EE4F38C9B76E7FAEF78 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_CharacterFunctions.h; path = ../../src/text/juce_CharacterFunctions.h; sourceTree = SOURCE_ROOT; };
+		8273A206FB309671284959DD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Identifier.cpp; path = ../../src/text/juce_Identifier.cpp; sourceTree = SOURCE_ROOT; };
+		BF888BC540B64D5C61E46A34 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Identifier.h; path = ../../src/text/juce_Identifier.h; sourceTree = SOURCE_ROOT; };
 		4A97C8D2FF6454DDD3AF4BE5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_LocalisedStrings.cpp; path = ../../src/text/juce_LocalisedStrings.cpp; sourceTree = SOURCE_ROOT; };
 		2AA21CDC91EA122266EBD780 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_LocalisedStrings.h; path = ../../src/text/juce_LocalisedStrings.h; sourceTree = SOURCE_ROOT; };
+		35DA3E75DDB03BB35794289B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_NewLine.h; path = ../../src/text/juce_NewLine.h; sourceTree = SOURCE_ROOT; };
 		B507B4A8712A54D7A8C03223 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_String.cpp; path = ../../src/text/juce_String.cpp; sourceTree = SOURCE_ROOT; };
 		1EE2A763E06AF4951024950F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_String.h; path = ../../src/text/juce_String.h; sourceTree = SOURCE_ROOT; };
 		23252E4C97AEFAE0C5EEAA77 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_StringArray.cpp; path = ../../src/text/juce_StringArray.cpp; sourceTree = SOURCE_ROOT; };
@@ -1213,27 +1214,15 @@
 				9584B84F23A4251755D49213,
 				839BE8047CF2F8EBE43ED34F,
 				EDF52FDF87ACD33FE933142C,
-				895D742F49DA9F100990879C,
-				96DDC0A32624DA76036824D3,
 				F77C9170829579FABA5679AD,
 				34C402EF9ADCAD34FB657D43,
 				7DA9AC75A4D9227C8FC4B2F7,
-				199DFD1C5A282FE13A585FEA,
-				3C12A5E0EBBB0916C01CFC58,
-				F364AA2637B7CB89D3657DFF,
-				1CF7CC0EB057F995BBBEFC90,
-				C16848F86DF014F1CBECE248,
-				FF40DA899AE16A5E1D8AA54A,
-				2E5D896B8DB2B357D7440F60,
 				70E5409425A76782B6188B31,
 				BB4A73064B0FC74ECCA19116,
 				C1913C90ED7BE51E823887CD,
 				9BD379D2F7995BFE0B3E5369,
 				C8F0F54CA3D913E7B8D559CF,
-				71A501DD68F55A8BDC779E57,
 				D7612CE51ED4F9D3F960F922,
-				AF6EF2E3ACA8479A7E47C016,
-				C1F3BCAD6E3683B2DA91C5C4,
 				2F5FD1DEFAE549553A8BE3B1,
 				989E03031D341649B4A296F5,
 				1809284DD05B56309D7EA24F,
@@ -1241,26 +1230,18 @@
 				5D27EE211D9BFF6A58C4DC42,
 				7CABDD863B47D8ADC900A4D8,
 				4DF9D333038A442870668D31,
-				A81B4FC81A75E21E5B96E506,
-				35D32D0A21ABDB7861E3E5B8 ); name = containers; sourceTree = "<group>"; };
+				A81B4FC81A75E21E5B96E506 ); name = containers; sourceTree = "<group>"; };
 		1AF37A533ABDD889670F9349 = { isa = PBXGroup; children = (
-				149E6ECBA264A264C7BB3FB3,
-				45AFA4791D59FBB1B548FB2C,
 				D66C00E06B06EAD3B5257DD6,
 				C8441B7B3E4CCD4A257B4BFE,
 				5B789AAC295BA4BB6D5AD4A3,
 				92ACFFCCCD1C85A0F8C6F80F,
-				DFE0DF77674CB28A2485FFDF,
 				4555F03DBD059EEDECEF9F85,
 				63F44EC0485FCA050814967E,
-				94BDD1E20915D83AA6729D94,
-				09C02A692734116F30059E9F,
 				DF6CAC67C0F2D379BDA03062,
 				1159C6BB0D33EE8E1A96B083,
 				8292AE37F99FCC1E5BF63A28,
 				8D499CED6DCF525ACD6E39B2,
-				2C6C4AB5D82221AB303FBB34,
-				4921086FBB82248D0E9EDDBF,
 				CFAECB6551F48A1695DEC243,
 				B4137E4612C1D161894D0D27,
 				C25D6136DF9CE441D6EB4C42,
@@ -1692,6 +1673,26 @@
 				3C4DE044AE46D5AE2388C827,
 				13FBF71BD76A08C8971C6351,
 				177636E4EEEBBB139F934897 ); name = io; sourceTree = "<group>"; };
+		F5A63AD86C7C0A9A2C33D74D = { isa = PBXGroup; children = (
+				7A039686F4F852E26936CA53,
+				161894D0D279595D88F470A6,
+				868E43A4BB7015579789E4F8,
+				8E0874D93125C2DC34255EDB,
+				7C2A4084A267F57F2E27F3F7,
+				D99C977ACCD09262F06F6624,
+				A978BD4031CAE24FB0FE26E1,
+				1A656E62C071C54D28343AC2 ); name = maths; sourceTree = "<group>"; };
+		9518033FC989E104DDB02E8A = { isa = PBXGroup; children = (
+				252632F3F97DF57C0781BEAD,
+				8FB80383DF3BAD7227DF465A,
+				FE76B46873DE20DFDC5A94BE,
+				28C4C81039B42A399F5B7320,
+				341631A7E86BF1C0E49093C6,
+				AD655AA04981173716022D8D,
+				F1D085B5F12E814BF1D5C395,
+				524A70C9F23954F8F2A3F99B,
+				E05812E3CC31875A202D6B30,
+				224C989BF83B6EA867814BFF ); name = memory; sourceTree = "<group>"; };
 		DDB94A7300C3D1F2E9E51C47 = { isa = PBXGroup; children = (
 				213F0A7BF38AF6AB34414A45,
 				21B2342B75097AB93CFF7E97,
@@ -1781,8 +1782,11 @@
 		C6B52BCD0CB1B809D6DE555A = { isa = PBXGroup; children = (
 				76E2084D2148068F9138A816,
 				33F16EE4F38C9B76E7FAEF78,
+				8273A206FB309671284959DD,
+				BF888BC540B64D5C61E46A34,
 				4A97C8D2FF6454DDD3AF4BE5,
 				2AA21CDC91EA122266EBD780,
+				35DA3E75DDB03BB35794289B,
 				B507B4A8712A54D7A8C03223,
 				1EE2A763E06AF4951024950F,
 				23252E4C97AEFAE0C5EEAA77,
@@ -1837,6 +1841,8 @@
 				89F308FD85F378E278C98884,
 				A11081920ACF526B1320CA42,
 				0C54591C1E8594B59F4701FE,
+				F5A63AD86C7C0A9A2C33D74D,
+				9518033FC989E104DDB02E8A,
 				B3E58752D519C56B78A95ACE,
 				C6B52BCD0CB1B809D6DE555A,
 				723AC5B999F1EC8F4A101AAF,
@@ -1985,11 +1991,7 @@
 				07E6E11A658930554FF0C56A,
 				E8DFABC1603D55B97429A8E4,
 				1F905F44E5FA23A2D5CCDA0A,
-				BE25871C34D79FEFFD1B94B6,
 				4AB5E55BDF79028F82F83D8E,
-				25018C91F79D918FEA084630,
-				95577AE91AA6CBA7FE9434F3,
-				21BA256CBCC9C15265928A23,
 				9D2D1BA65C27BDA1F7C44769,
 				43B3119E2F1B559263AE956C,
 				4A7952C0A4EEE13296EEED5E,
@@ -1999,7 +2001,6 @@
 				77104E86801B6CAD01F963F4,
 				6A53DA58B55E2DE7241BF2C8,
 				0FF71870483AC46D5B7AC5B0,
-				029702B3954F6968AE804B21,
 				FA01B3EABA192AE041D4FE4D,
 				5BF44F954E56B7C2DD15EAEA,
 				B14EB5F3829CA26DA906D5C0,
@@ -2176,6 +2177,10 @@
 				1008A8A446B9BCADBB853056,
 				0FB1AED6E5AB5CEA95E70950,
 				103A3B11DFE35E9088ECE933,
+				DAC7AB8D9EA70D99A1C1287E,
+				B3D08D9E24CC369E4838E6FF,
+				15932C8039A59B0431FBB93E,
+				3BBC410C79D2F53D32ED7466,
 				7BBDAAAFBC81C90E6212C6C4,
 				63BEDDA4009950B131FCCA83,
 				056129CB247F785CC536A779,
@@ -2245,6 +2250,7 @@
 				B0B82AB2D9B0950F67B11BEA,
 				379B4A89E5403B57A2009E76,
 				2AC6F3BFAAA21E21076A9F8D,
+				B8DD4DB0BD1A6B38BBF92413,
 				63BEC07A51CB8E516B38ECD4,
 				C8F81E843F446868FAD88197,
 				50D91A2EC0ABF894E612D936,

Builds/VisualStudio2005/Juce.vcproj

@@ -350,27 +350,15 @@
           <File RelativePath="..\..\src\containers\juce_AbstractFifo.h"/>
           <File RelativePath="..\..\src\containers\juce_Array.h"/>
           <File RelativePath="..\..\src\containers\juce_ArrayAllocationBase.h"/>
-          <File RelativePath="..\..\src\containers\juce_BigInteger.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_BigInteger.h"/>
           <File RelativePath="..\..\src\containers\juce_DynamicObject.cpp"/>
           <File RelativePath="..\..\src\containers\juce_DynamicObject.h"/>
           <File RelativePath="..\..\src\containers\juce_ElementComparator.h"/>
-          <File RelativePath="..\..\src\containers\juce_Expression.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_Expression.h"/>
-          <File RelativePath="..\..\src\containers\juce_HeapBlock.h"/>
-          <File RelativePath="..\..\src\containers\juce_Identifier.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_Identifier.h"/>
-          <File RelativePath="..\..\src\containers\juce_MemoryBlock.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_MemoryBlock.h"/>
           <File RelativePath="..\..\src\containers\juce_NamedValueSet.cpp"/>
           <File RelativePath="..\..\src\containers\juce_NamedValueSet.h"/>
           <File RelativePath="..\..\src\containers\juce_OwnedArray.h"/>
           <File RelativePath="..\..\src\containers\juce_PropertySet.cpp"/>
           <File RelativePath="..\..\src\containers\juce_PropertySet.h"/>
-          <File RelativePath="..\..\src\containers\juce_Range.h"/>
           <File RelativePath="..\..\src\containers\juce_ReferenceCountedArray.h"/>
-          <File RelativePath="..\..\src\containers\juce_ReferenceCountedObject.h"/>
-          <File RelativePath="..\..\src\containers\juce_ScopedPointer.h"/>
           <File RelativePath="..\..\src\containers\juce_SortedSet.h"/>
           <File RelativePath="..\..\src\containers\juce_SparseSet.h"/>
           <File RelativePath="..\..\src\containers\juce_Value.cpp"/>
@@ -379,26 +367,18 @@
           <File RelativePath="..\..\src\containers\juce_ValueTree.h"/>
           <File RelativePath="..\..\src\containers\juce_Variant.cpp"/>
           <File RelativePath="..\..\src\containers\juce_Variant.h"/>
-          <File RelativePath="..\..\src\containers\juce_WeakReference.h"/>
         </Filter>
         <Filter Name="core">
-          <File RelativePath="..\..\src\core\juce_Atomic.h"/>
-          <File RelativePath="..\..\src\core\juce_ByteOrder.h"/>
           <File RelativePath="..\..\src\core\juce_FileLogger.cpp"/>
           <File RelativePath="..\..\src\core\juce_FileLogger.h"/>
           <File RelativePath="..\..\src\core\juce_Initialisation.cpp"/>
           <File RelativePath="..\..\src\core\juce_Initialisation.h"/>
-          <File RelativePath="..\..\src\core\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\src\core\juce_Logger.cpp"/>
           <File RelativePath="..\..\src\core\juce_Logger.h"/>
-          <File RelativePath="..\..\src\core\juce_MathsFunctions.h"/>
-          <File RelativePath="..\..\src\core\juce_Memory.h"/>
           <File RelativePath="..\..\src\core\juce_PerformanceCounter.cpp"/>
           <File RelativePath="..\..\src\core\juce_PerformanceCounter.h"/>
           <File RelativePath="..\..\src\core\juce_PlatformDefs.h"/>
           <File RelativePath="..\..\src\core\juce_PlatformUtilities.h"/>
-          <File RelativePath="..\..\src\core\juce_Random.cpp"/>
-          <File RelativePath="..\..\src\core\juce_Random.h"/>
           <File RelativePath="..\..\src\core\juce_RelativeTime.cpp"/>
           <File RelativePath="..\..\src\core\juce_RelativeTime.h"/>
           <File RelativePath="..\..\src\core\juce_Singleton.h"/>
@@ -835,6 +815,28 @@
             <File RelativePath="..\..\src\io\streams\juce_SubregionStream.h"/>
           </Filter>
         </Filter>
+        <Filter Name="maths">
+          <File RelativePath="..\..\src\maths\juce_BigInteger.cpp"/>
+          <File RelativePath="..\..\src\maths\juce_BigInteger.h"/>
+          <File RelativePath="..\..\src\maths\juce_Expression.cpp"/>
+          <File RelativePath="..\..\src\maths\juce_Expression.h"/>
+          <File RelativePath="..\..\src\maths\juce_MathsFunctions.h"/>
+          <File RelativePath="..\..\src\maths\juce_Random.cpp"/>
+          <File RelativePath="..\..\src\maths\juce_Random.h"/>
+          <File RelativePath="..\..\src\maths\juce_Range.h"/>
+        </Filter>
+        <Filter Name="memory">
+          <File RelativePath="..\..\src\memory\juce_Atomic.h"/>
+          <File RelativePath="..\..\src\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\src\memory\juce_HeapBlock.h"/>
+          <File RelativePath="..\..\src\memory\juce_LeakedObjectDetector.h"/>
+          <File RelativePath="..\..\src\memory\juce_Memory.h"/>
+          <File RelativePath="..\..\src\memory\juce_MemoryBlock.cpp"/>
+          <File RelativePath="..\..\src\memory\juce_MemoryBlock.h"/>
+          <File RelativePath="..\..\src\memory\juce_ReferenceCountedObject.h"/>
+          <File RelativePath="..\..\src\memory\juce_ScopedPointer.h"/>
+          <File RelativePath="..\..\src\memory\juce_WeakReference.h"/>
+        </Filter>
         <Filter Name="native">
           <File RelativePath="..\..\src\native\juce_linux_NativeCode.cpp"/>
           <File RelativePath="..\..\src\native\juce_mac_NativeCode.mm"/>
@@ -925,8 +927,11 @@
         <Filter Name="text">
           <File RelativePath="..\..\src\text\juce_CharacterFunctions.cpp"/>
           <File RelativePath="..\..\src\text\juce_CharacterFunctions.h"/>
+          <File RelativePath="..\..\src\text\juce_Identifier.cpp"/>
+          <File RelativePath="..\..\src\text\juce_Identifier.h"/>
           <File RelativePath="..\..\src\text\juce_LocalisedStrings.cpp"/>
           <File RelativePath="..\..\src\text\juce_LocalisedStrings.h"/>
+          <File RelativePath="..\..\src\text\juce_NewLine.h"/>
           <File RelativePath="..\..\src\text\juce_String.cpp"/>
           <File RelativePath="..\..\src\text\juce_String.h"/>
           <File RelativePath="..\..\src\text\juce_StringArray.cpp"/>

Builds/VisualStudio2008/Juce.vcproj

@@ -350,27 +350,15 @@
           <File RelativePath="..\..\src\containers\juce_AbstractFifo.h"/>
           <File RelativePath="..\..\src\containers\juce_Array.h"/>
           <File RelativePath="..\..\src\containers\juce_ArrayAllocationBase.h"/>
-          <File RelativePath="..\..\src\containers\juce_BigInteger.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_BigInteger.h"/>
           <File RelativePath="..\..\src\containers\juce_DynamicObject.cpp"/>
           <File RelativePath="..\..\src\containers\juce_DynamicObject.h"/>
           <File RelativePath="..\..\src\containers\juce_ElementComparator.h"/>
-          <File RelativePath="..\..\src\containers\juce_Expression.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_Expression.h"/>
-          <File RelativePath="..\..\src\containers\juce_HeapBlock.h"/>
-          <File RelativePath="..\..\src\containers\juce_Identifier.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_Identifier.h"/>
-          <File RelativePath="..\..\src\containers\juce_MemoryBlock.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_MemoryBlock.h"/>
           <File RelativePath="..\..\src\containers\juce_NamedValueSet.cpp"/>
           <File RelativePath="..\..\src\containers\juce_NamedValueSet.h"/>
           <File RelativePath="..\..\src\containers\juce_OwnedArray.h"/>
           <File RelativePath="..\..\src\containers\juce_PropertySet.cpp"/>
           <File RelativePath="..\..\src\containers\juce_PropertySet.h"/>
-          <File RelativePath="..\..\src\containers\juce_Range.h"/>
           <File RelativePath="..\..\src\containers\juce_ReferenceCountedArray.h"/>
-          <File RelativePath="..\..\src\containers\juce_ReferenceCountedObject.h"/>
-          <File RelativePath="..\..\src\containers\juce_ScopedPointer.h"/>
           <File RelativePath="..\..\src\containers\juce_SortedSet.h"/>
           <File RelativePath="..\..\src\containers\juce_SparseSet.h"/>
           <File RelativePath="..\..\src\containers\juce_Value.cpp"/>
@@ -379,26 +367,18 @@
           <File RelativePath="..\..\src\containers\juce_ValueTree.h"/>
           <File RelativePath="..\..\src\containers\juce_Variant.cpp"/>
           <File RelativePath="..\..\src\containers\juce_Variant.h"/>
-          <File RelativePath="..\..\src\containers\juce_WeakReference.h"/>
         </Filter>
         <Filter Name="core">
-          <File RelativePath="..\..\src\core\juce_Atomic.h"/>
-          <File RelativePath="..\..\src\core\juce_ByteOrder.h"/>
           <File RelativePath="..\..\src\core\juce_FileLogger.cpp"/>
           <File RelativePath="..\..\src\core\juce_FileLogger.h"/>
           <File RelativePath="..\..\src\core\juce_Initialisation.cpp"/>
           <File RelativePath="..\..\src\core\juce_Initialisation.h"/>
-          <File RelativePath="..\..\src\core\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\src\core\juce_Logger.cpp"/>
           <File RelativePath="..\..\src\core\juce_Logger.h"/>
-          <File RelativePath="..\..\src\core\juce_MathsFunctions.h"/>
-          <File RelativePath="..\..\src\core\juce_Memory.h"/>
           <File RelativePath="..\..\src\core\juce_PerformanceCounter.cpp"/>
           <File RelativePath="..\..\src\core\juce_PerformanceCounter.h"/>
           <File RelativePath="..\..\src\core\juce_PlatformDefs.h"/>
           <File RelativePath="..\..\src\core\juce_PlatformUtilities.h"/>
-          <File RelativePath="..\..\src\core\juce_Random.cpp"/>
-          <File RelativePath="..\..\src\core\juce_Random.h"/>
           <File RelativePath="..\..\src\core\juce_RelativeTime.cpp"/>
           <File RelativePath="..\..\src\core\juce_RelativeTime.h"/>
           <File RelativePath="..\..\src\core\juce_Singleton.h"/>
@@ -835,6 +815,28 @@
             <File RelativePath="..\..\src\io\streams\juce_SubregionStream.h"/>
           </Filter>
         </Filter>
+        <Filter Name="maths">
+          <File RelativePath="..\..\src\maths\juce_BigInteger.cpp"/>
+          <File RelativePath="..\..\src\maths\juce_BigInteger.h"/>
+          <File RelativePath="..\..\src\maths\juce_Expression.cpp"/>
+          <File RelativePath="..\..\src\maths\juce_Expression.h"/>
+          <File RelativePath="..\..\src\maths\juce_MathsFunctions.h"/>
+          <File RelativePath="..\..\src\maths\juce_Random.cpp"/>
+          <File RelativePath="..\..\src\maths\juce_Random.h"/>
+          <File RelativePath="..\..\src\maths\juce_Range.h"/>
+        </Filter>
+        <Filter Name="memory">
+          <File RelativePath="..\..\src\memory\juce_Atomic.h"/>
+          <File RelativePath="..\..\src\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\src\memory\juce_HeapBlock.h"/>
+          <File RelativePath="..\..\src\memory\juce_LeakedObjectDetector.h"/>
+          <File RelativePath="..\..\src\memory\juce_Memory.h"/>
+          <File RelativePath="..\..\src\memory\juce_MemoryBlock.cpp"/>
+          <File RelativePath="..\..\src\memory\juce_MemoryBlock.h"/>
+          <File RelativePath="..\..\src\memory\juce_ReferenceCountedObject.h"/>
+          <File RelativePath="..\..\src\memory\juce_ScopedPointer.h"/>
+          <File RelativePath="..\..\src\memory\juce_WeakReference.h"/>
+        </Filter>
         <Filter Name="native">
           <File RelativePath="..\..\src\native\juce_linux_NativeCode.cpp"/>
           <File RelativePath="..\..\src\native\juce_mac_NativeCode.mm"/>
@@ -925,8 +927,11 @@
         <Filter Name="text">
           <File RelativePath="..\..\src\text\juce_CharacterFunctions.cpp"/>
           <File RelativePath="..\..\src\text\juce_CharacterFunctions.h"/>
+          <File RelativePath="..\..\src\text\juce_Identifier.cpp"/>
+          <File RelativePath="..\..\src\text\juce_Identifier.h"/>
           <File RelativePath="..\..\src\text\juce_LocalisedStrings.cpp"/>
           <File RelativePath="..\..\src\text\juce_LocalisedStrings.h"/>
+          <File RelativePath="..\..\src\text\juce_NewLine.h"/>
           <File RelativePath="..\..\src\text\juce_String.cpp"/>
           <File RelativePath="..\..\src\text\juce_String.h"/>
           <File RelativePath="..\..\src\text\juce_StringArray.cpp"/>

Builds/VisualStudio2008_DLL/Juce.vcproj

@@ -352,27 +352,15 @@
           <File RelativePath="..\..\src\containers\juce_AbstractFifo.h"/>
           <File RelativePath="..\..\src\containers\juce_Array.h"/>
           <File RelativePath="..\..\src\containers\juce_ArrayAllocationBase.h"/>
-          <File RelativePath="..\..\src\containers\juce_BigInteger.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_BigInteger.h"/>
           <File RelativePath="..\..\src\containers\juce_DynamicObject.cpp"/>
           <File RelativePath="..\..\src\containers\juce_DynamicObject.h"/>
           <File RelativePath="..\..\src\containers\juce_ElementComparator.h"/>
-          <File RelativePath="..\..\src\containers\juce_Expression.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_Expression.h"/>
-          <File RelativePath="..\..\src\containers\juce_HeapBlock.h"/>
-          <File RelativePath="..\..\src\containers\juce_Identifier.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_Identifier.h"/>
-          <File RelativePath="..\..\src\containers\juce_MemoryBlock.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_MemoryBlock.h"/>
           <File RelativePath="..\..\src\containers\juce_NamedValueSet.cpp"/>
           <File RelativePath="..\..\src\containers\juce_NamedValueSet.h"/>
           <File RelativePath="..\..\src\containers\juce_OwnedArray.h"/>
           <File RelativePath="..\..\src\containers\juce_PropertySet.cpp"/>
           <File RelativePath="..\..\src\containers\juce_PropertySet.h"/>
-          <File RelativePath="..\..\src\containers\juce_Range.h"/>
           <File RelativePath="..\..\src\containers\juce_ReferenceCountedArray.h"/>
-          <File RelativePath="..\..\src\containers\juce_ReferenceCountedObject.h"/>
-          <File RelativePath="..\..\src\containers\juce_ScopedPointer.h"/>
           <File RelativePath="..\..\src\containers\juce_SortedSet.h"/>
           <File RelativePath="..\..\src\containers\juce_SparseSet.h"/>
           <File RelativePath="..\..\src\containers\juce_Value.cpp"/>
@@ -381,26 +369,18 @@
           <File RelativePath="..\..\src\containers\juce_ValueTree.h"/>
           <File RelativePath="..\..\src\containers\juce_Variant.cpp"/>
           <File RelativePath="..\..\src\containers\juce_Variant.h"/>
-          <File RelativePath="..\..\src\containers\juce_WeakReference.h"/>
         </Filter>
         <Filter Name="core">
-          <File RelativePath="..\..\src\core\juce_Atomic.h"/>
-          <File RelativePath="..\..\src\core\juce_ByteOrder.h"/>
           <File RelativePath="..\..\src\core\juce_FileLogger.cpp"/>
           <File RelativePath="..\..\src\core\juce_FileLogger.h"/>
           <File RelativePath="..\..\src\core\juce_Initialisation.cpp"/>
           <File RelativePath="..\..\src\core\juce_Initialisation.h"/>
-          <File RelativePath="..\..\src\core\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\src\core\juce_Logger.cpp"/>
           <File RelativePath="..\..\src\core\juce_Logger.h"/>
-          <File RelativePath="..\..\src\core\juce_MathsFunctions.h"/>
-          <File RelativePath="..\..\src\core\juce_Memory.h"/>
           <File RelativePath="..\..\src\core\juce_PerformanceCounter.cpp"/>
           <File RelativePath="..\..\src\core\juce_PerformanceCounter.h"/>
           <File RelativePath="..\..\src\core\juce_PlatformDefs.h"/>
           <File RelativePath="..\..\src\core\juce_PlatformUtilities.h"/>
-          <File RelativePath="..\..\src\core\juce_Random.cpp"/>
-          <File RelativePath="..\..\src\core\juce_Random.h"/>
           <File RelativePath="..\..\src\core\juce_RelativeTime.cpp"/>
           <File RelativePath="..\..\src\core\juce_RelativeTime.h"/>
           <File RelativePath="..\..\src\core\juce_Singleton.h"/>
@@ -837,6 +817,28 @@
             <File RelativePath="..\..\src\io\streams\juce_SubregionStream.h"/>
           </Filter>
         </Filter>
+        <Filter Name="maths">
+          <File RelativePath="..\..\src\maths\juce_BigInteger.cpp"/>
+          <File RelativePath="..\..\src\maths\juce_BigInteger.h"/>
+          <File RelativePath="..\..\src\maths\juce_Expression.cpp"/>
+          <File RelativePath="..\..\src\maths\juce_Expression.h"/>
+          <File RelativePath="..\..\src\maths\juce_MathsFunctions.h"/>
+          <File RelativePath="..\..\src\maths\juce_Random.cpp"/>
+          <File RelativePath="..\..\src\maths\juce_Random.h"/>
+          <File RelativePath="..\..\src\maths\juce_Range.h"/>
+        </Filter>
+        <Filter Name="memory">
+          <File RelativePath="..\..\src\memory\juce_Atomic.h"/>
+          <File RelativePath="..\..\src\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\src\memory\juce_HeapBlock.h"/>
+          <File RelativePath="..\..\src\memory\juce_LeakedObjectDetector.h"/>
+          <File RelativePath="..\..\src\memory\juce_Memory.h"/>
+          <File RelativePath="..\..\src\memory\juce_MemoryBlock.cpp"/>
+          <File RelativePath="..\..\src\memory\juce_MemoryBlock.h"/>
+          <File RelativePath="..\..\src\memory\juce_ReferenceCountedObject.h"/>
+          <File RelativePath="..\..\src\memory\juce_ScopedPointer.h"/>
+          <File RelativePath="..\..\src\memory\juce_WeakReference.h"/>
+        </Filter>
         <Filter Name="native">
           <File RelativePath="..\..\src\native\juce_linux_NativeCode.cpp"/>
           <File RelativePath="..\..\src\native\juce_mac_NativeCode.mm"/>
@@ -927,8 +929,11 @@
         <Filter Name="text">
           <File RelativePath="..\..\src\text\juce_CharacterFunctions.cpp"/>
           <File RelativePath="..\..\src\text\juce_CharacterFunctions.h"/>
+          <File RelativePath="..\..\src\text\juce_Identifier.cpp"/>
+          <File RelativePath="..\..\src\text\juce_Identifier.h"/>
           <File RelativePath="..\..\src\text\juce_LocalisedStrings.cpp"/>
           <File RelativePath="..\..\src\text\juce_LocalisedStrings.h"/>
+          <File RelativePath="..\..\src\text\juce_NewLine.h"/>
           <File RelativePath="..\..\src\text\juce_String.cpp"/>
           <File RelativePath="..\..\src\text\juce_String.h"/>
           <File RelativePath="..\..\src\text\juce_StringArray.cpp"/>

Builds/VisualStudio2010/Juce.vcxproj

@@ -178,11 +178,7 @@
     <ClCompile Include="..\..\src\audio\synthesisers\juce_Sampler.cpp"/>
     <ClCompile Include="..\..\src\audio\synthesisers\juce_Synthesiser.cpp"/>
     <ClCompile Include="..\..\src\containers\juce_AbstractFifo.cpp"/>
-    <ClCompile Include="..\..\src\containers\juce_BigInteger.cpp"/>
     <ClCompile Include="..\..\src\containers\juce_DynamicObject.cpp"/>
-    <ClCompile Include="..\..\src\containers\juce_Expression.cpp"/>
-    <ClCompile Include="..\..\src\containers\juce_Identifier.cpp"/>
-    <ClCompile Include="..\..\src\containers\juce_MemoryBlock.cpp"/>
     <ClCompile Include="..\..\src\containers\juce_NamedValueSet.cpp"/>
     <ClCompile Include="..\..\src\containers\juce_PropertySet.cpp"/>
     <ClCompile Include="..\..\src\containers\juce_Value.cpp"/>
@@ -192,7 +188,6 @@
     <ClCompile Include="..\..\src\core\juce_Initialisation.cpp"/>
     <ClCompile Include="..\..\src\core\juce_Logger.cpp"/>
     <ClCompile Include="..\..\src\core\juce_PerformanceCounter.cpp"/>
-    <ClCompile Include="..\..\src\core\juce_Random.cpp"/>
     <ClCompile Include="..\..\src\core\juce_RelativeTime.cpp"/>
     <ClCompile Include="..\..\src\core\juce_SystemStats.cpp"/>
     <ClCompile Include="..\..\src\core\juce_Time.cpp"/>
@@ -369,6 +364,10 @@
     <ClCompile Include="..\..\src\io\streams\juce_MemoryOutputStream.cpp"/>
     <ClCompile Include="..\..\src\io\streams\juce_OutputStream.cpp"/>
     <ClCompile Include="..\..\src\io\streams\juce_SubregionStream.cpp"/>
+    <ClCompile Include="..\..\src\maths\juce_BigInteger.cpp"/>
+    <ClCompile Include="..\..\src\maths\juce_Expression.cpp"/>
+    <ClCompile Include="..\..\src\maths\juce_Random.cpp"/>
+    <ClCompile Include="..\..\src\memory\juce_MemoryBlock.cpp"/>
     <ClCompile Include="..\..\src\native\juce_linux_NativeCode.cpp"/>
     <ClCompile Include="..\..\src\native\juce_win32_NativeCode.cpp"/>
     <ClCompile Include="..\..\src\native\common\juce_posix_NamedPipe.cpp"/>
@@ -412,6 +411,7 @@
     <ClCompile Include="..\..\src\native\windows\juce_win32_WebBrowserComponent.cpp"/>
     <ClCompile Include="..\..\src\native\windows\juce_win32_Windowing.cpp"/>
     <ClCompile Include="..\..\src\text\juce_CharacterFunctions.cpp"/>
+    <ClCompile Include="..\..\src\text\juce_Identifier.cpp"/>
     <ClCompile Include="..\..\src\text\juce_LocalisedStrings.cpp"/>
     <ClCompile Include="..\..\src\text\juce_String.cpp"/>
     <ClCompile Include="..\..\src\text\juce_StringArray.cpp"/>
@@ -507,38 +507,23 @@
     <ClInclude Include="..\..\src\containers\juce_AbstractFifo.h"/>
     <ClInclude Include="..\..\src\containers\juce_Array.h"/>
     <ClInclude Include="..\..\src\containers\juce_ArrayAllocationBase.h"/>
-    <ClInclude Include="..\..\src\containers\juce_BigInteger.h"/>
     <ClInclude Include="..\..\src\containers\juce_DynamicObject.h"/>
     <ClInclude Include="..\..\src\containers\juce_ElementComparator.h"/>
-    <ClInclude Include="..\..\src\containers\juce_Expression.h"/>
-    <ClInclude Include="..\..\src\containers\juce_HeapBlock.h"/>
-    <ClInclude Include="..\..\src\containers\juce_Identifier.h"/>
-    <ClInclude Include="..\..\src\containers\juce_MemoryBlock.h"/>
     <ClInclude Include="..\..\src\containers\juce_NamedValueSet.h"/>
     <ClInclude Include="..\..\src\containers\juce_OwnedArray.h"/>
     <ClInclude Include="..\..\src\containers\juce_PropertySet.h"/>
-    <ClInclude Include="..\..\src\containers\juce_Range.h"/>
     <ClInclude Include="..\..\src\containers\juce_ReferenceCountedArray.h"/>
-    <ClInclude Include="..\..\src\containers\juce_ReferenceCountedObject.h"/>
-    <ClInclude Include="..\..\src\containers\juce_ScopedPointer.h"/>
     <ClInclude Include="..\..\src\containers\juce_SortedSet.h"/>
     <ClInclude Include="..\..\src\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\src\containers\juce_Value.h"/>
     <ClInclude Include="..\..\src\containers\juce_ValueTree.h"/>
     <ClInclude Include="..\..\src\containers\juce_Variant.h"/>
-    <ClInclude Include="..\..\src\containers\juce_WeakReference.h"/>
-    <ClInclude Include="..\..\src\core\juce_Atomic.h"/>
-    <ClInclude Include="..\..\src\core\juce_ByteOrder.h"/>
     <ClInclude Include="..\..\src\core\juce_FileLogger.h"/>
     <ClInclude Include="..\..\src\core\juce_Initialisation.h"/>
-    <ClInclude Include="..\..\src\core\juce_LeakedObjectDetector.h"/>
     <ClInclude Include="..\..\src\core\juce_Logger.h"/>
-    <ClInclude Include="..\..\src\core\juce_MathsFunctions.h"/>
-    <ClInclude Include="..\..\src\core\juce_Memory.h"/>
     <ClInclude Include="..\..\src\core\juce_PerformanceCounter.h"/>
     <ClInclude Include="..\..\src\core\juce_PlatformDefs.h"/>
     <ClInclude Include="..\..\src\core\juce_PlatformUtilities.h"/>
-    <ClInclude Include="..\..\src\core\juce_Random.h"/>
     <ClInclude Include="..\..\src\core\juce_RelativeTime.h"/>
     <ClInclude Include="..\..\src\core\juce_Singleton.h"/>
     <ClInclude Include="..\..\src\core\juce_StandardHeader.h"/>
@@ -740,6 +725,20 @@
     <ClInclude Include="..\..\src\io\streams\juce_MemoryOutputStream.h"/>
     <ClInclude Include="..\..\src\io\streams\juce_OutputStream.h"/>
     <ClInclude Include="..\..\src\io\streams\juce_SubregionStream.h"/>
+    <ClInclude Include="..\..\src\maths\juce_BigInteger.h"/>
+    <ClInclude Include="..\..\src\maths\juce_Expression.h"/>
+    <ClInclude Include="..\..\src\maths\juce_MathsFunctions.h"/>
+    <ClInclude Include="..\..\src\maths\juce_Random.h"/>
+    <ClInclude Include="..\..\src\maths\juce_Range.h"/>
+    <ClInclude Include="..\..\src\memory\juce_Atomic.h"/>
+    <ClInclude Include="..\..\src\memory\juce_ByteOrder.h"/>
+    <ClInclude Include="..\..\src\memory\juce_HeapBlock.h"/>
+    <ClInclude Include="..\..\src\memory\juce_LeakedObjectDetector.h"/>
+    <ClInclude Include="..\..\src\memory\juce_Memory.h"/>
+    <ClInclude Include="..\..\src\memory\juce_MemoryBlock.h"/>
+    <ClInclude Include="..\..\src\memory\juce_ReferenceCountedObject.h"/>
+    <ClInclude Include="..\..\src\memory\juce_ScopedPointer.h"/>
+    <ClInclude Include="..\..\src\memory\juce_WeakReference.h"/>
     <ClInclude Include="..\..\src\native\common\juce_MidiDataConcatenator.h"/>
     <ClInclude Include="..\..\src\native\common\juce_posix_SharedCode.h"/>
     <ClInclude Include="..\..\src\native\linux\juce_linux_NativeIncludes.h"/>
@@ -750,7 +749,9 @@
     <ClInclude Include="..\..\src\native\windows\juce_win32_DynamicLibraryLoader.h"/>
     <ClInclude Include="..\..\src\native\windows\juce_win32_NativeIncludes.h"/>
     <ClInclude Include="..\..\src\text\juce_CharacterFunctions.h"/>
+    <ClInclude Include="..\..\src\text\juce_Identifier.h"/>
     <ClInclude Include="..\..\src\text\juce_LocalisedStrings.h"/>
+    <ClInclude Include="..\..\src\text\juce_NewLine.h"/>
     <ClInclude Include="..\..\src\text\juce_String.h"/>
     <ClInclude Include="..\..\src\text\juce_StringArray.h"/>
     <ClInclude Include="..\..\src\text\juce_StringPairArray.h"/>

Builds/VisualStudio2010/Juce.vcxproj.filters

@@ -149,6 +149,12 @@
     <Filter Include="Juce\Source\io\streams">
       <UniqueIdentifier>{C2308939-D584-9814-C8E8-EFA033FFC652}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Juce\Source\maths">
+      <UniqueIdentifier>{61F03A35-213F-52B3-6C8B-3C71CDEFBE96}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Juce\Source\memory">
+      <UniqueIdentifier>{A9DDD283-8C5F-BBFD-E0C3-1ACD2FF8EB74}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Juce\Source\native">
       <UniqueIdentifier>{A5F8397A-22E0-232C-6BDB-9A112412C424}</UniqueIdentifier>
     </Filter>
@@ -382,21 +388,9 @@
     <ClCompile Include="..\..\src\containers\juce_AbstractFifo.cpp">
       <Filter>Juce\Source\containers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\containers\juce_BigInteger.cpp">
-      <Filter>Juce\Source\containers</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\containers\juce_DynamicObject.cpp">
       <Filter>Juce\Source\containers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\containers\juce_Expression.cpp">
-      <Filter>Juce\Source\containers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\containers\juce_Identifier.cpp">
-      <Filter>Juce\Source\containers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\containers\juce_MemoryBlock.cpp">
-      <Filter>Juce\Source\containers</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\containers\juce_NamedValueSet.cpp">
       <Filter>Juce\Source\containers</Filter>
     </ClCompile>
@@ -424,9 +418,6 @@
     <ClCompile Include="..\..\src\core\juce_PerformanceCounter.cpp">
       <Filter>Juce\Source\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\juce_Random.cpp">
-      <Filter>Juce\Source\core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\core\juce_RelativeTime.cpp">
       <Filter>Juce\Source\core</Filter>
     </ClCompile>
@@ -955,6 +946,18 @@
     <ClCompile Include="..\..\src\io\streams\juce_SubregionStream.cpp">
       <Filter>Juce\Source\io\streams</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\maths\juce_BigInteger.cpp">
+      <Filter>Juce\Source\maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\maths\juce_Expression.cpp">
+      <Filter>Juce\Source\maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\maths\juce_Random.cpp">
+      <Filter>Juce\Source\maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\memory\juce_MemoryBlock.cpp">
+      <Filter>Juce\Source\memory</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\native\juce_linux_NativeCode.cpp">
       <Filter>Juce\Source\native</Filter>
     </ClCompile>
@@ -1162,6 +1165,9 @@
     <ClCompile Include="..\..\src\text\juce_CharacterFunctions.cpp">
       <Filter>Juce\Source\text</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\text\juce_Identifier.cpp">
+      <Filter>Juce\Source\text</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\text\juce_LocalisedStrings.cpp">
       <Filter>Juce\Source\text</Filter>
     </ClCompile>
@@ -1443,27 +1449,12 @@
     <ClInclude Include="..\..\src\containers\juce_ArrayAllocationBase.h">
       <Filter>Juce\Source\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\containers\juce_BigInteger.h">
-      <Filter>Juce\Source\containers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\containers\juce_DynamicObject.h">
       <Filter>Juce\Source\containers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\containers\juce_ElementComparator.h">
       <Filter>Juce\Source\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\containers\juce_Expression.h">
-      <Filter>Juce\Source\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\containers\juce_HeapBlock.h">
-      <Filter>Juce\Source\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\containers\juce_Identifier.h">
-      <Filter>Juce\Source\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\containers\juce_MemoryBlock.h">
-      <Filter>Juce\Source\containers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\containers\juce_NamedValueSet.h">
       <Filter>Juce\Source\containers</Filter>
     </ClInclude>
@@ -1473,18 +1464,9 @@
     <ClInclude Include="..\..\src\containers\juce_PropertySet.h">
       <Filter>Juce\Source\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\containers\juce_Range.h">
-      <Filter>Juce\Source\containers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\containers\juce_ReferenceCountedArray.h">
       <Filter>Juce\Source\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\containers\juce_ReferenceCountedObject.h">
-      <Filter>Juce\Source\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\containers\juce_ScopedPointer.h">
-      <Filter>Juce\Source\containers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\containers\juce_SortedSet.h">
       <Filter>Juce\Source\containers</Filter>
     </ClInclude>
@@ -1500,33 +1482,15 @@
     <ClInclude Include="..\..\src\containers\juce_Variant.h">
       <Filter>Juce\Source\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\containers\juce_WeakReference.h">
-      <Filter>Juce\Source\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\core\juce_Atomic.h">
-      <Filter>Juce\Source\core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\core\juce_ByteOrder.h">
-      <Filter>Juce\Source\core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\core\juce_FileLogger.h">
       <Filter>Juce\Source\core</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\core\juce_Initialisation.h">
       <Filter>Juce\Source\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\core\juce_LeakedObjectDetector.h">
-      <Filter>Juce\Source\core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\core\juce_Logger.h">
       <Filter>Juce\Source\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\core\juce_MathsFunctions.h">
-      <Filter>Juce\Source\core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\core\juce_Memory.h">
-      <Filter>Juce\Source\core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\core\juce_PerformanceCounter.h">
       <Filter>Juce\Source\core</Filter>
     </ClInclude>
@@ -1536,9 +1500,6 @@
     <ClInclude Include="..\..\src\core\juce_PlatformUtilities.h">
       <Filter>Juce\Source\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\core\juce_Random.h">
-      <Filter>Juce\Source\core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\core\juce_RelativeTime.h">
       <Filter>Juce\Source\core</Filter>
     </ClInclude>
@@ -2142,6 +2103,48 @@
     <ClInclude Include="..\..\src\io\streams\juce_SubregionStream.h">
       <Filter>Juce\Source\io\streams</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\maths\juce_BigInteger.h">
+      <Filter>Juce\Source\maths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\maths\juce_Expression.h">
+      <Filter>Juce\Source\maths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\maths\juce_MathsFunctions.h">
+      <Filter>Juce\Source\maths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\maths\juce_Random.h">
+      <Filter>Juce\Source\maths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\maths\juce_Range.h">
+      <Filter>Juce\Source\maths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\memory\juce_Atomic.h">
+      <Filter>Juce\Source\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\memory\juce_ByteOrder.h">
+      <Filter>Juce\Source\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\memory\juce_HeapBlock.h">
+      <Filter>Juce\Source\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\memory\juce_LeakedObjectDetector.h">
+      <Filter>Juce\Source\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\memory\juce_Memory.h">
+      <Filter>Juce\Source\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\memory\juce_MemoryBlock.h">
+      <Filter>Juce\Source\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\memory\juce_ReferenceCountedObject.h">
+      <Filter>Juce\Source\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\memory\juce_ScopedPointer.h">
+      <Filter>Juce\Source\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\memory\juce_WeakReference.h">
+      <Filter>Juce\Source\memory</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\native\common\juce_MidiDataConcatenator.h">
       <Filter>Juce\Source\native\common</Filter>
     </ClInclude>
@@ -2172,9 +2175,15 @@
     <ClInclude Include="..\..\src\text\juce_CharacterFunctions.h">
       <Filter>Juce\Source\text</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\text\juce_Identifier.h">
+      <Filter>Juce\Source\text</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\text\juce_LocalisedStrings.h">
       <Filter>Juce\Source\text</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\text\juce_NewLine.h">
+      <Filter>Juce\Source\text</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\text\juce_String.h">
       <Filter>Juce\Source\text</Filter>
     </ClInclude>

Builds/iPhone/Juce.xcodeproj/project.pbxproj

@@ -64,11 +64,7 @@
 		07E6E11A658930554FF0C56A = { isa = PBXBuildFile; fileRef = ED5966B95F865C586A3CE08F; };
 		E8DFABC1603D55B97429A8E4 = { isa = PBXBuildFile; fileRef = 35668D8EEA19957C6C9AC83A; };
 		1F905F44E5FA23A2D5CCDA0A = { isa = PBXBuildFile; fileRef = 4F22276689685D839BD252EA; };
-		BE25871C34D79FEFFD1B94B6 = { isa = PBXBuildFile; fileRef = 895D742F49DA9F100990879C; };
 		4AB5E55BDF79028F82F83D8E = { isa = PBXBuildFile; fileRef = F77C9170829579FABA5679AD; };
-		25018C91F79D918FEA084630 = { isa = PBXBuildFile; fileRef = 199DFD1C5A282FE13A585FEA; };
-		95577AE91AA6CBA7FE9434F3 = { isa = PBXBuildFile; fileRef = 1CF7CC0EB057F995BBBEFC90; };
-		21BA256CBCC9C15265928A23 = { isa = PBXBuildFile; fileRef = FF40DA899AE16A5E1D8AA54A; };
 		9D2D1BA65C27BDA1F7C44769 = { isa = PBXBuildFile; fileRef = 70E5409425A76782B6188B31; };
 		43B3119E2F1B559263AE956C = { isa = PBXBuildFile; fileRef = 9BD379D2F7995BFE0B3E5369; };
 		4A7952C0A4EEE13296EEED5E = { isa = PBXBuildFile; fileRef = 1809284DD05B56309D7EA24F; };
@@ -78,7 +74,6 @@
 		77104E86801B6CAD01F963F4 = { isa = PBXBuildFile; fileRef = 5B789AAC295BA4BB6D5AD4A3; };
 		6A53DA58B55E2DE7241BF2C8 = { isa = PBXBuildFile; fileRef = 4555F03DBD059EEDECEF9F85; };
 		0FF71870483AC46D5B7AC5B0 = { isa = PBXBuildFile; fileRef = DF6CAC67C0F2D379BDA03062; };
-		029702B3954F6968AE804B21 = { isa = PBXBuildFile; fileRef = 2C6C4AB5D82221AB303FBB34; };
 		FA01B3EABA192AE041D4FE4D = { isa = PBXBuildFile; fileRef = CFAECB6551F48A1695DEC243; };
 		5BF44F954E56B7C2DD15EAEA = { isa = PBXBuildFile; fileRef = 18B170E96511BBA1019C66F8; };
 		B14EB5F3829CA26DA906D5C0 = { isa = PBXBuildFile; fileRef = 8D2DE1F3CB15D003C90042E7; };
@@ -255,6 +250,10 @@
 		1008A8A446B9BCADBB853056 = { isa = PBXBuildFile; fileRef = B3F5E7A708350F72E7C77153; };
 		0FB1AED6E5AB5CEA95E70950 = { isa = PBXBuildFile; fileRef = BBE79494A818EF83F52A4C7B; };
 		103A3B11DFE35E9088ECE933 = { isa = PBXBuildFile; fileRef = AE5A7EC70F288E7EA682081D; };
+		DAC7AB8D9EA70D99A1C1287E = { isa = PBXBuildFile; fileRef = 7A039686F4F852E26936CA53; };
+		B3D08D9E24CC369E4838E6FF = { isa = PBXBuildFile; fileRef = 868E43A4BB7015579789E4F8; };
+		15932C8039A59B0431FBB93E = { isa = PBXBuildFile; fileRef = D99C977ACCD09262F06F6624; };
+		3BBC410C79D2F53D32ED7466 = { isa = PBXBuildFile; fileRef = AD655AA04981173716022D8D; };
 		7BBDAAAFBC81C90E6212C6C4 = { isa = PBXBuildFile; fileRef = 1C4E5F07F277AE37C71EA547; };
 		63BEDDA4009950B131FCCA83 = { isa = PBXBuildFile; fileRef = 3BC24CC03A2F940A615FE935; };
 		056129CB247F785CC536A779 = { isa = PBXBuildFile; fileRef = 9DFCF3F7BB734C8AABD83D8D; };
@@ -324,6 +323,7 @@
 		B0B82AB2D9B0950F67B11BEA = { isa = PBXBuildFile; fileRef = 8758E6857070D7E5406FDE3F; };
 		379B4A89E5403B57A2009E76 = { isa = PBXBuildFile; fileRef = 8E8BE2F1C182E418BBA6903C; };
 		2AC6F3BFAAA21E21076A9F8D = { isa = PBXBuildFile; fileRef = 76E2084D2148068F9138A816; };
+		B8DD4DB0BD1A6B38BBF92413 = { isa = PBXBuildFile; fileRef = 8273A206FB309671284959DD; };
 		63BEC07A51CB8E516B38ECD4 = { isa = PBXBuildFile; fileRef = 4A97C8D2FF6454DDD3AF4BE5; };
 		C8F81E843F446868FAD88197 = { isa = PBXBuildFile; fileRef = B507B4A8712A54D7A8C03223; };
 		50D91A2EC0ABF894E612D936 = { isa = PBXBuildFile; fileRef = 23252E4C97AEFAE0C5EEAA77; };
@@ -487,27 +487,15 @@
 		9584B84F23A4251755D49213 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AbstractFifo.h; path = ../../src/containers/juce_AbstractFifo.h; sourceTree = SOURCE_ROOT; };
 		839BE8047CF2F8EBE43ED34F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Array.h; path = ../../src/containers/juce_Array.h; sourceTree = SOURCE_ROOT; };
 		EDF52FDF87ACD33FE933142C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ArrayAllocationBase.h; path = ../../src/containers/juce_ArrayAllocationBase.h; sourceTree = SOURCE_ROOT; };
-		895D742F49DA9F100990879C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_BigInteger.cpp; path = ../../src/containers/juce_BigInteger.cpp; sourceTree = SOURCE_ROOT; };
-		96DDC0A32624DA76036824D3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_BigInteger.h; path = ../../src/containers/juce_BigInteger.h; sourceTree = SOURCE_ROOT; };
 		F77C9170829579FABA5679AD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_DynamicObject.cpp; path = ../../src/containers/juce_DynamicObject.cpp; sourceTree = SOURCE_ROOT; };
 		34C402EF9ADCAD34FB657D43 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_DynamicObject.h; path = ../../src/containers/juce_DynamicObject.h; sourceTree = SOURCE_ROOT; };
 		7DA9AC75A4D9227C8FC4B2F7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ElementComparator.h; path = ../../src/containers/juce_ElementComparator.h; sourceTree = SOURCE_ROOT; };
-		199DFD1C5A282FE13A585FEA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Expression.cpp; path = ../../src/containers/juce_Expression.cpp; sourceTree = SOURCE_ROOT; };
-		3C12A5E0EBBB0916C01CFC58 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Expression.h; path = ../../src/containers/juce_Expression.h; sourceTree = SOURCE_ROOT; };
-		F364AA2637B7CB89D3657DFF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_HeapBlock.h; path = ../../src/containers/juce_HeapBlock.h; sourceTree = SOURCE_ROOT; };
-		1CF7CC0EB057F995BBBEFC90 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Identifier.cpp; path = ../../src/containers/juce_Identifier.cpp; sourceTree = SOURCE_ROOT; };
-		C16848F86DF014F1CBECE248 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Identifier.h; path = ../../src/containers/juce_Identifier.h; sourceTree = SOURCE_ROOT; };
-		FF40DA899AE16A5E1D8AA54A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MemoryBlock.cpp; path = ../../src/containers/juce_MemoryBlock.cpp; sourceTree = SOURCE_ROOT; };
-		2E5D896B8DB2B357D7440F60 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MemoryBlock.h; path = ../../src/containers/juce_MemoryBlock.h; sourceTree = SOURCE_ROOT; };
 		70E5409425A76782B6188B31 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_NamedValueSet.cpp; path = ../../src/containers/juce_NamedValueSet.cpp; sourceTree = SOURCE_ROOT; };
 		BB4A73064B0FC74ECCA19116 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_NamedValueSet.h; path = ../../src/containers/juce_NamedValueSet.h; sourceTree = SOURCE_ROOT; };
 		C1913C90ED7BE51E823887CD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_OwnedArray.h; path = ../../src/containers/juce_OwnedArray.h; sourceTree = SOURCE_ROOT; };
 		9BD379D2F7995BFE0B3E5369 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PropertySet.cpp; path = ../../src/containers/juce_PropertySet.cpp; sourceTree = SOURCE_ROOT; };
 		C8F0F54CA3D913E7B8D559CF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PropertySet.h; path = ../../src/containers/juce_PropertySet.h; sourceTree = SOURCE_ROOT; };
-		71A501DD68F55A8BDC779E57 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Range.h; path = ../../src/containers/juce_Range.h; sourceTree = SOURCE_ROOT; };
 		D7612CE51ED4F9D3F960F922 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ReferenceCountedArray.h; path = ../../src/containers/juce_ReferenceCountedArray.h; sourceTree = SOURCE_ROOT; };
-		AF6EF2E3ACA8479A7E47C016 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ReferenceCountedObject.h; path = ../../src/containers/juce_ReferenceCountedObject.h; sourceTree = SOURCE_ROOT; };
-		C1F3BCAD6E3683B2DA91C5C4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ScopedPointer.h; path = ../../src/containers/juce_ScopedPointer.h; sourceTree = SOURCE_ROOT; };
 		2F5FD1DEFAE549553A8BE3B1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_SortedSet.h; path = ../../src/containers/juce_SortedSet.h; sourceTree = SOURCE_ROOT; };
 		989E03031D341649B4A296F5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_SparseSet.h; path = ../../src/containers/juce_SparseSet.h; sourceTree = SOURCE_ROOT; };
 		1809284DD05B56309D7EA24F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Value.cpp; path = ../../src/containers/juce_Value.cpp; sourceTree = SOURCE_ROOT; };
@@ -516,24 +504,16 @@
 		7CABDD863B47D8ADC900A4D8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ValueTree.h; path = ../../src/containers/juce_ValueTree.h; sourceTree = SOURCE_ROOT; };
 		4DF9D333038A442870668D31 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Variant.cpp; path = ../../src/containers/juce_Variant.cpp; sourceTree = SOURCE_ROOT; };
 		A81B4FC81A75E21E5B96E506 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Variant.h; path = ../../src/containers/juce_Variant.h; sourceTree = SOURCE_ROOT; };
-		35D32D0A21ABDB7861E3E5B8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_WeakReference.h; path = ../../src/containers/juce_WeakReference.h; sourceTree = SOURCE_ROOT; };
-		149E6ECBA264A264C7BB3FB3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Atomic.h; path = ../../src/core/juce_Atomic.h; sourceTree = SOURCE_ROOT; };
-		45AFA4791D59FBB1B548FB2C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ByteOrder.h; path = ../../src/core/juce_ByteOrder.h; sourceTree = SOURCE_ROOT; };
 		D66C00E06B06EAD3B5257DD6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_FileLogger.cpp; path = ../../src/core/juce_FileLogger.cpp; sourceTree = SOURCE_ROOT; };
 		C8441B7B3E4CCD4A257B4BFE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_FileLogger.h; path = ../../src/core/juce_FileLogger.h; sourceTree = SOURCE_ROOT; };
 		5B789AAC295BA4BB6D5AD4A3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Initialisation.cpp; path = ../../src/core/juce_Initialisation.cpp; sourceTree = SOURCE_ROOT; };
 		92ACFFCCCD1C85A0F8C6F80F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Initialisation.h; path = ../../src/core/juce_Initialisation.h; sourceTree = SOURCE_ROOT; };
-		DFE0DF77674CB28A2485FFDF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_LeakedObjectDetector.h; path = ../../src/core/juce_LeakedObjectDetector.h; sourceTree = SOURCE_ROOT; };
 		4555F03DBD059EEDECEF9F85 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Logger.cpp; path = ../../src/core/juce_Logger.cpp; sourceTree = SOURCE_ROOT; };
 		63F44EC0485FCA050814967E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Logger.h; path = ../../src/core/juce_Logger.h; sourceTree = SOURCE_ROOT; };
-		94BDD1E20915D83AA6729D94 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MathsFunctions.h; path = ../../src/core/juce_MathsFunctions.h; sourceTree = SOURCE_ROOT; };
-		09C02A692734116F30059E9F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Memory.h; path = ../../src/core/juce_Memory.h; sourceTree = SOURCE_ROOT; };
 		DF6CAC67C0F2D379BDA03062 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PerformanceCounter.cpp; path = ../../src/core/juce_PerformanceCounter.cpp; sourceTree = SOURCE_ROOT; };
 		1159C6BB0D33EE8E1A96B083 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PerformanceCounter.h; path = ../../src/core/juce_PerformanceCounter.h; sourceTree = SOURCE_ROOT; };
 		8292AE37F99FCC1E5BF63A28 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PlatformDefs.h; path = ../../src/core/juce_PlatformDefs.h; sourceTree = SOURCE_ROOT; };
 		8D499CED6DCF525ACD6E39B2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PlatformUtilities.h; path = ../../src/core/juce_PlatformUtilities.h; sourceTree = SOURCE_ROOT; };
-		2C6C4AB5D82221AB303FBB34 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Random.cpp; path = ../../src/core/juce_Random.cpp; sourceTree = SOURCE_ROOT; };
-		4921086FBB82248D0E9EDDBF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Random.h; path = ../../src/core/juce_Random.h; sourceTree = SOURCE_ROOT; };
 		CFAECB6551F48A1695DEC243 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RelativeTime.cpp; path = ../../src/core/juce_RelativeTime.cpp; sourceTree = SOURCE_ROOT; };
 		B4137E4612C1D161894D0D27 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_RelativeTime.h; path = ../../src/core/juce_RelativeTime.h; sourceTree = SOURCE_ROOT; };
 		C25D6136DF9CE441D6EB4C42 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Singleton.h; path = ../../src/core/juce_Singleton.h; sourceTree = SOURCE_ROOT; };
@@ -911,6 +891,24 @@
 		5F27172FD963C1A748AA625A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_OutputStream.h; path = ../../src/io/streams/juce_OutputStream.h; sourceTree = SOURCE_ROOT; };
 		AE5A7EC70F288E7EA682081D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_SubregionStream.cpp; path = ../../src/io/streams/juce_SubregionStream.cpp; sourceTree = SOURCE_ROOT; };
 		6F7CA1B3AD09C76271FED3D6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_SubregionStream.h; path = ../../src/io/streams/juce_SubregionStream.h; sourceTree = SOURCE_ROOT; };
+		7A039686F4F852E26936CA53 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_BigInteger.cpp; path = ../../src/maths/juce_BigInteger.cpp; sourceTree = SOURCE_ROOT; };
+		161894D0D279595D88F470A6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_BigInteger.h; path = ../../src/maths/juce_BigInteger.h; sourceTree = SOURCE_ROOT; };
+		868E43A4BB7015579789E4F8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Expression.cpp; path = ../../src/maths/juce_Expression.cpp; sourceTree = SOURCE_ROOT; };
+		8E0874D93125C2DC34255EDB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Expression.h; path = ../../src/maths/juce_Expression.h; sourceTree = SOURCE_ROOT; };
+		7C2A4084A267F57F2E27F3F7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MathsFunctions.h; path = ../../src/maths/juce_MathsFunctions.h; sourceTree = SOURCE_ROOT; };
+		D99C977ACCD09262F06F6624 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Random.cpp; path = ../../src/maths/juce_Random.cpp; sourceTree = SOURCE_ROOT; };
+		A978BD4031CAE24FB0FE26E1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Random.h; path = ../../src/maths/juce_Random.h; sourceTree = SOURCE_ROOT; };
+		1A656E62C071C54D28343AC2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Range.h; path = ../../src/maths/juce_Range.h; sourceTree = SOURCE_ROOT; };
+		252632F3F97DF57C0781BEAD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Atomic.h; path = ../../src/memory/juce_Atomic.h; sourceTree = SOURCE_ROOT; };
+		8FB80383DF3BAD7227DF465A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ByteOrder.h; path = ../../src/memory/juce_ByteOrder.h; sourceTree = SOURCE_ROOT; };
+		FE76B46873DE20DFDC5A94BE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_HeapBlock.h; path = ../../src/memory/juce_HeapBlock.h; sourceTree = SOURCE_ROOT; };
+		28C4C81039B42A399F5B7320 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_LeakedObjectDetector.h; path = ../../src/memory/juce_LeakedObjectDetector.h; sourceTree = SOURCE_ROOT; };
+		341631A7E86BF1C0E49093C6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Memory.h; path = ../../src/memory/juce_Memory.h; sourceTree = SOURCE_ROOT; };
+		AD655AA04981173716022D8D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MemoryBlock.cpp; path = ../../src/memory/juce_MemoryBlock.cpp; sourceTree = SOURCE_ROOT; };
+		F1D085B5F12E814BF1D5C395 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MemoryBlock.h; path = ../../src/memory/juce_MemoryBlock.h; sourceTree = SOURCE_ROOT; };
+		524A70C9F23954F8F2A3F99B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ReferenceCountedObject.h; path = ../../src/memory/juce_ReferenceCountedObject.h; sourceTree = SOURCE_ROOT; };
+		E05812E3CC31875A202D6B30 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ScopedPointer.h; path = ../../src/memory/juce_ScopedPointer.h; sourceTree = SOURCE_ROOT; };
+		224C989BF83B6EA867814BFF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_WeakReference.h; path = ../../src/memory/juce_WeakReference.h; sourceTree = SOURCE_ROOT; };
 		1C4E5F07F277AE37C71EA547 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_linux_NativeCode.cpp; path = ../../src/native/juce_linux_NativeCode.cpp; sourceTree = SOURCE_ROOT; };
 		3BC24CC03A2F940A615FE935 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_NativeCode.mm; path = ../../src/native/juce_mac_NativeCode.mm; sourceTree = SOURCE_ROOT; };
 		9DFCF3F7BB734C8AABD83D8D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_win32_NativeCode.cpp; path = ../../src/native/juce_win32_NativeCode.cpp; sourceTree = SOURCE_ROOT; };
@@ -990,8 +988,11 @@
 		8E8BE2F1C182E418BBA6903C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_win32_Windowing.cpp; path = ../../src/native/windows/juce_win32_Windowing.cpp; sourceTree = SOURCE_ROOT; };
 		76E2084D2148068F9138A816 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_CharacterFunctions.cpp; path = ../../src/text/juce_CharacterFunctions.cpp; sourceTree = SOURCE_ROOT; };
 		33F16EE4F38C9B76E7FAEF78 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_CharacterFunctions.h; path = ../../src/text/juce_CharacterFunctions.h; sourceTree = SOURCE_ROOT; };
+		8273A206FB309671284959DD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Identifier.cpp; path = ../../src/text/juce_Identifier.cpp; sourceTree = SOURCE_ROOT; };
+		BF888BC540B64D5C61E46A34 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Identifier.h; path = ../../src/text/juce_Identifier.h; sourceTree = SOURCE_ROOT; };
 		4A97C8D2FF6454DDD3AF4BE5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_LocalisedStrings.cpp; path = ../../src/text/juce_LocalisedStrings.cpp; sourceTree = SOURCE_ROOT; };
 		2AA21CDC91EA122266EBD780 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_LocalisedStrings.h; path = ../../src/text/juce_LocalisedStrings.h; sourceTree = SOURCE_ROOT; };
+		35DA3E75DDB03BB35794289B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_NewLine.h; path = ../../src/text/juce_NewLine.h; sourceTree = SOURCE_ROOT; };
 		B507B4A8712A54D7A8C03223 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_String.cpp; path = ../../src/text/juce_String.cpp; sourceTree = SOURCE_ROOT; };
 		1EE2A763E06AF4951024950F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_String.h; path = ../../src/text/juce_String.h; sourceTree = SOURCE_ROOT; };
 		23252E4C97AEFAE0C5EEAA77 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_StringArray.cpp; path = ../../src/text/juce_StringArray.cpp; sourceTree = SOURCE_ROOT; };
@@ -1213,27 +1214,15 @@
 				9584B84F23A4251755D49213,
 				839BE8047CF2F8EBE43ED34F,
 				EDF52FDF87ACD33FE933142C,
-				895D742F49DA9F100990879C,
-				96DDC0A32624DA76036824D3,
 				F77C9170829579FABA5679AD,
 				34C402EF9ADCAD34FB657D43,
 				7DA9AC75A4D9227C8FC4B2F7,
-				199DFD1C5A282FE13A585FEA,
-				3C12A5E0EBBB0916C01CFC58,
-				F364AA2637B7CB89D3657DFF,
-				1CF7CC0EB057F995BBBEFC90,
-				C16848F86DF014F1CBECE248,
-				FF40DA899AE16A5E1D8AA54A,
-				2E5D896B8DB2B357D7440F60,
 				70E5409425A76782B6188B31,
 				BB4A73064B0FC74ECCA19116,
 				C1913C90ED7BE51E823887CD,
 				9BD379D2F7995BFE0B3E5369,
 				C8F0F54CA3D913E7B8D559CF,
-				71A501DD68F55A8BDC779E57,
 				D7612CE51ED4F9D3F960F922,
-				AF6EF2E3ACA8479A7E47C016,
-				C1F3BCAD6E3683B2DA91C5C4,
 				2F5FD1DEFAE549553A8BE3B1,
 				989E03031D341649B4A296F5,
 				1809284DD05B56309D7EA24F,
@@ -1241,26 +1230,18 @@
 				5D27EE211D9BFF6A58C4DC42,
 				7CABDD863B47D8ADC900A4D8,
 				4DF9D333038A442870668D31,
-				A81B4FC81A75E21E5B96E506,
-				35D32D0A21ABDB7861E3E5B8 ); name = containers; sourceTree = "<group>"; };
+				A81B4FC81A75E21E5B96E506 ); name = containers; sourceTree = "<group>"; };
 		1AF37A533ABDD889670F9349 = { isa = PBXGroup; children = (
-				149E6ECBA264A264C7BB3FB3,
-				45AFA4791D59FBB1B548FB2C,
 				D66C00E06B06EAD3B5257DD6,
 				C8441B7B3E4CCD4A257B4BFE,
 				5B789AAC295BA4BB6D5AD4A3,
 				92ACFFCCCD1C85A0F8C6F80F,
-				DFE0DF77674CB28A2485FFDF,
 				4555F03DBD059EEDECEF9F85,
 				63F44EC0485FCA050814967E,
-				94BDD1E20915D83AA6729D94,
-				09C02A692734116F30059E9F,
 				DF6CAC67C0F2D379BDA03062,
 				1159C6BB0D33EE8E1A96B083,
 				8292AE37F99FCC1E5BF63A28,
 				8D499CED6DCF525ACD6E39B2,
-				2C6C4AB5D82221AB303FBB34,
-				4921086FBB82248D0E9EDDBF,
 				CFAECB6551F48A1695DEC243,
 				B4137E4612C1D161894D0D27,
 				C25D6136DF9CE441D6EB4C42,
@@ -1692,6 +1673,26 @@
 				3C4DE044AE46D5AE2388C827,
 				13FBF71BD76A08C8971C6351,
 				177636E4EEEBBB139F934897 ); name = io; sourceTree = "<group>"; };
+		F5A63AD86C7C0A9A2C33D74D = { isa = PBXGroup; children = (
+				7A039686F4F852E26936CA53,
+				161894D0D279595D88F470A6,
+				868E43A4BB7015579789E4F8,
+				8E0874D93125C2DC34255EDB,
+				7C2A4084A267F57F2E27F3F7,
+				D99C977ACCD09262F06F6624,
+				A978BD4031CAE24FB0FE26E1,
+				1A656E62C071C54D28343AC2 ); name = maths; sourceTree = "<group>"; };
+		9518033FC989E104DDB02E8A = { isa = PBXGroup; children = (
+				252632F3F97DF57C0781BEAD,
+				8FB80383DF3BAD7227DF465A,
+				FE76B46873DE20DFDC5A94BE,
+				28C4C81039B42A399F5B7320,
+				341631A7E86BF1C0E49093C6,
+				AD655AA04981173716022D8D,
+				F1D085B5F12E814BF1D5C395,
+				524A70C9F23954F8F2A3F99B,
+				E05812E3CC31875A202D6B30,
+				224C989BF83B6EA867814BFF ); name = memory; sourceTree = "<group>"; };
 		DDB94A7300C3D1F2E9E51C47 = { isa = PBXGroup; children = (
 				213F0A7BF38AF6AB34414A45,
 				21B2342B75097AB93CFF7E97,
@@ -1781,8 +1782,11 @@
 		C6B52BCD0CB1B809D6DE555A = { isa = PBXGroup; children = (
 				76E2084D2148068F9138A816,
 				33F16EE4F38C9B76E7FAEF78,
+				8273A206FB309671284959DD,
+				BF888BC540B64D5C61E46A34,
 				4A97C8D2FF6454DDD3AF4BE5,
 				2AA21CDC91EA122266EBD780,
+				35DA3E75DDB03BB35794289B,
 				B507B4A8712A54D7A8C03223,
 				1EE2A763E06AF4951024950F,
 				23252E4C97AEFAE0C5EEAA77,
@@ -1837,6 +1841,8 @@
 				89F308FD85F378E278C98884,
 				A11081920ACF526B1320CA42,
 				0C54591C1E8594B59F4701FE,
+				F5A63AD86C7C0A9A2C33D74D,
+				9518033FC989E104DDB02E8A,
 				B3E58752D519C56B78A95ACE,
 				C6B52BCD0CB1B809D6DE555A,
 				723AC5B999F1EC8F4A101AAF,
@@ -1985,11 +1991,7 @@
 				07E6E11A658930554FF0C56A,
 				E8DFABC1603D55B97429A8E4,
 				1F905F44E5FA23A2D5CCDA0A,
-				BE25871C34D79FEFFD1B94B6,
 				4AB5E55BDF79028F82F83D8E,
-				25018C91F79D918FEA084630,
-				95577AE91AA6CBA7FE9434F3,
-				21BA256CBCC9C15265928A23,
 				9D2D1BA65C27BDA1F7C44769,
 				43B3119E2F1B559263AE956C,
 				4A7952C0A4EEE13296EEED5E,
@@ -1999,7 +2001,6 @@
 				77104E86801B6CAD01F963F4,
 				6A53DA58B55E2DE7241BF2C8,
 				0FF71870483AC46D5B7AC5B0,
-				029702B3954F6968AE804B21,
 				FA01B3EABA192AE041D4FE4D,
 				5BF44F954E56B7C2DD15EAEA,
 				B14EB5F3829CA26DA906D5C0,
@@ -2176,6 +2177,10 @@
 				1008A8A446B9BCADBB853056,
 				0FB1AED6E5AB5CEA95E70950,
 				103A3B11DFE35E9088ECE933,
+				DAC7AB8D9EA70D99A1C1287E,
+				B3D08D9E24CC369E4838E6FF,
+				15932C8039A59B0431FBB93E,
+				3BBC410C79D2F53D32ED7466,
 				7BBDAAAFBC81C90E6212C6C4,
 				63BEDDA4009950B131FCCA83,
 				056129CB247F785CC536A779,
@@ -2245,6 +2250,7 @@
 				B0B82AB2D9B0950F67B11BEA,
 				379B4A89E5403B57A2009E76,
 				2AC6F3BFAAA21E21076A9F8D,
+				B8DD4DB0BD1A6B38BBF92413,
 				63BEC07A51CB8E516B38ECD4,
 				C8F81E843F446868FAD88197,
 				50D91A2EC0ABF894E612D936,

Juce.jucer

@@ -359,30 +359,12 @@
         <FILE id="MMVvnl2oo" name="juce_Array.h" compile="0" resource="0" file="src/containers/juce_Array.h"/>
         <FILE id="I2LILZNlU" name="juce_ArrayAllocationBase.h" compile="0"
               resource="0" file="src/containers/juce_ArrayAllocationBase.h"/>
-        <FILE id="T2Ys7NAuy" name="juce_BigInteger.cpp" compile="1" resource="0"
-              file="src/containers/juce_BigInteger.cpp"/>
-        <FILE id="yo9C7IDcf" name="juce_BigInteger.h" compile="0" resource="0"
-              file="src/containers/juce_BigInteger.h"/>
         <FILE id="1cwWOJ3Mv" name="juce_DynamicObject.cpp" compile="1" resource="0"
               file="src/containers/juce_DynamicObject.cpp"/>
         <FILE id="e3gh56Kq6" name="juce_DynamicObject.h" compile="0" resource="0"
               file="src/containers/juce_DynamicObject.h"/>
         <FILE id="RNHQjBFmS" name="juce_ElementComparator.h" compile="0" resource="0"
               file="src/containers/juce_ElementComparator.h"/>
-        <FILE id="01ekjVT" name="juce_Expression.cpp" compile="1" resource="0"
-              file="src/containers/juce_Expression.cpp"/>
-        <FILE id="MpE62KG" name="juce_Expression.h" compile="0" resource="0"
-              file="src/containers/juce_Expression.h"/>
-        <FILE id="ssHjnrvya" name="juce_HeapBlock.h" compile="0" resource="0"
-              file="src/containers/juce_HeapBlock.h"/>
-        <FILE id="3Wo76GZwg" name="juce_Identifier.cpp" compile="1" resource="0"
-              file="src/containers/juce_Identifier.cpp"/>
-        <FILE id="8q7r0YE6b" name="juce_Identifier.h" compile="0" resource="0"
-              file="src/containers/juce_Identifier.h"/>
-        <FILE id="GJt7L3I14" name="juce_MemoryBlock.cpp" compile="1" resource="0"
-              file="src/containers/juce_MemoryBlock.cpp"/>
-        <FILE id="09FY4g3q" name="juce_MemoryBlock.h" compile="0" resource="0"
-              file="src/containers/juce_MemoryBlock.h"/>
         <FILE id="zy1yAvLC1" name="juce_NamedValueSet.cpp" compile="1" resource="0"
               file="src/containers/juce_NamedValueSet.cpp"/>
         <FILE id="YIzV0n7ns" name="juce_NamedValueSet.h" compile="0" resource="0"
@@ -393,13 +375,8 @@
               file="src/containers/juce_PropertySet.cpp"/>
         <FILE id="O3bVIfg59" name="juce_PropertySet.h" compile="0" resource="0"
               file="src/containers/juce_PropertySet.h"/>
-        <FILE id="QXwSdGP77" name="juce_Range.h" compile="0" resource="0" file="src/containers/juce_Range.h"/>
         <FILE id="q1WQH39S3" name="juce_ReferenceCountedArray.h" compile="0"
               resource="0" file="src/containers/juce_ReferenceCountedArray.h"/>
-        <FILE id="zEp5U1KiQ" name="juce_ReferenceCountedObject.h" compile="0"
-              resource="0" file="src/containers/juce_ReferenceCountedObject.h"/>
-        <FILE id="Mt2QA9Qv3" name="juce_ScopedPointer.h" compile="0" resource="0"
-              file="src/containers/juce_ScopedPointer.h"/>
         <FILE id="CPW4LfoeP" name="juce_SortedSet.h" compile="0" resource="0"
               file="src/containers/juce_SortedSet.h"/>
         <FILE id="jo9VOycN5" name="juce_SparseSet.h" compile="0" resource="0"
@@ -415,14 +392,8 @@
               file="src/containers/juce_Variant.cpp"/>
         <FILE id="8q9BHXyE6" name="juce_Variant.h" compile="0" resource="0"
               file="src/containers/juce_Variant.h"/>
-        <FILE id="Nw7LSeh" name="juce_WeakReference.h" compile="0" resource="0"
-              file="src/containers/juce_WeakReference.h"/>
       </GROUP>
       <GROUP id="LTuqRhF2Y" name="core">
-        <FILE id="9zAJsfSFe" name="juce_Atomic.h" compile="0" resource="0"
-              file="src/core/juce_Atomic.h"/>
-        <FILE id="BVStueO0" name="juce_ByteOrder.h" compile="0" resource="0"
-              file="src/core/juce_ByteOrder.h"/>
         <FILE id="Hth1NsyDV" name="juce_FileLogger.cpp" compile="1" resource="0"
               file="src/core/juce_FileLogger.cpp"/>
         <FILE id="7nItXGiB" name="juce_FileLogger.h" compile="0" resource="0"
@@ -431,16 +402,10 @@
               file="src/core/juce_Initialisation.cpp"/>
         <FILE id="nsfdNZAs" name="juce_Initialisation.h" compile="0" resource="0"
               file="src/core/juce_Initialisation.h"/>
-        <FILE id="hRYAldz" name="juce_LeakedObjectDetector.h" compile="0" resource="0"
-              file="src/core/juce_LeakedObjectDetector.h"/>
         <FILE id="43AWfo8b2" name="juce_Logger.cpp" compile="1" resource="0"
               file="src/core/juce_Logger.cpp"/>
         <FILE id="KrXxapCit" name="juce_Logger.h" compile="0" resource="0"
               file="src/core/juce_Logger.h"/>
-        <FILE id="PtcTLlFez" name="juce_MathsFunctions.h" compile="0" resource="0"
-              file="src/core/juce_MathsFunctions.h"/>
-        <FILE id="S0q5apCvk" name="juce_Memory.h" compile="0" resource="0"
-              file="src/core/juce_Memory.h"/>
         <FILE id="el20KnKqi" name="juce_PerformanceCounter.cpp" compile="1"
               resource="0" file="src/core/juce_PerformanceCounter.cpp"/>
         <FILE id="ZDqYtDm8E" name="juce_PerformanceCounter.h" compile="0" resource="0"
@@ -449,10 +414,6 @@
               file="src/core/juce_PlatformDefs.h"/>
         <FILE id="o1vDnzWWu" name="juce_PlatformUtilities.h" compile="0" resource="0"
               file="src/core/juce_PlatformUtilities.h"/>
-        <FILE id="XVALcRmOR" name="juce_Random.cpp" compile="1" resource="0"
-              file="src/core/juce_Random.cpp"/>
-        <FILE id="i42D5OGHz" name="juce_Random.h" compile="0" resource="0"
-              file="src/core/juce_Random.h"/>
         <FILE id="n3tbSp" name="juce_RelativeTime.cpp" compile="1" resource="0"
               file="src/core/juce_RelativeTime.cpp"/>
         <FILE id="51S3JEvsR" name="juce_RelativeTime.h" compile="0" resource="0"
@@ -1251,6 +1212,42 @@
                 file="src/io/streams/juce_SubregionStream.h"/>
         </GROUP>
       </GROUP>
+      <GROUP id="1A2IQ32" name="maths">
+        <FILE id="1m7atLN" name="juce_BigInteger.cpp" compile="1" resource="0"
+              file="src/maths/juce_BigInteger.cpp"/>
+        <FILE id="psVWPIJ" name="juce_BigInteger.h" compile="0" resource="0"
+              file="src/maths/juce_BigInteger.h"/>
+        <FILE id="HTlnl6C" name="juce_Expression.cpp" compile="1" resource="0"
+              file="src/maths/juce_Expression.cpp"/>
+        <FILE id="3xPwpN" name="juce_Expression.h" compile="0" resource="0"
+              file="src/maths/juce_Expression.h"/>
+        <FILE id="rt09REF" name="juce_MathsFunctions.h" compile="0" resource="0"
+              file="src/maths/juce_MathsFunctions.h"/>
+        <FILE id="YOsrZ7v" name="juce_Random.cpp" compile="1" resource="0"
+              file="src/maths/juce_Random.cpp"/>
+        <FILE id="VLf8lcH" name="juce_Random.h" compile="0" resource="0" file="src/maths/juce_Random.h"/>
+        <FILE id="X1MGYQU" name="juce_Range.h" compile="0" resource="0" file="src/maths/juce_Range.h"/>
+      </GROUP>
+      <GROUP id="kTXuVhA" name="memory">
+        <FILE id="coZd5H5" name="juce_Atomic.h" compile="0" resource="0" file="src/memory/juce_Atomic.h"/>
+        <FILE id="DbDZ422" name="juce_ByteOrder.h" compile="0" resource="0"
+              file="src/memory/juce_ByteOrder.h"/>
+        <FILE id="fsu57zu" name="juce_HeapBlock.h" compile="0" resource="0"
+              file="src/memory/juce_HeapBlock.h"/>
+        <FILE id="n924l1" name="juce_LeakedObjectDetector.h" compile="0" resource="0"
+              file="src/memory/juce_LeakedObjectDetector.h"/>
+        <FILE id="lL6otkK" name="juce_Memory.h" compile="0" resource="0" file="src/memory/juce_Memory.h"/>
+        <FILE id="LgiWuqc" name="juce_MemoryBlock.cpp" compile="1" resource="0"
+              file="src/memory/juce_MemoryBlock.cpp"/>
+        <FILE id="IDj7DQ2" name="juce_MemoryBlock.h" compile="0" resource="0"
+              file="src/memory/juce_MemoryBlock.h"/>
+        <FILE id="0fuAAWP" name="juce_ReferenceCountedObject.h" compile="0"
+              resource="0" file="src/memory/juce_ReferenceCountedObject.h"/>
+        <FILE id="WElk5bz" name="juce_ScopedPointer.h" compile="0" resource="0"
+              file="src/memory/juce_ScopedPointer.h"/>
+        <FILE id="KAVuOQ" name="juce_WeakReference.h" compile="0" resource="0"
+              file="src/memory/juce_WeakReference.h"/>
+      </GROUP>
       <GROUP id="fRwnaei56" name="native">
         <FILE id="m3AUpRM7f" name="juce_linux_NativeCode.cpp" compile="1" resource="0"
               file="src/native/juce_linux_NativeCode.cpp"/>
@@ -1420,10 +1417,15 @@
               resource="0" file="src/text/juce_CharacterFunctions.cpp"/>
         <FILE id="McKZNzGvH" name="juce_CharacterFunctions.h" compile="0" resource="0"
               file="src/text/juce_CharacterFunctions.h"/>
+        <FILE id="iGtCiI8" name="juce_Identifier.cpp" compile="1" resource="0"
+              file="src/text/juce_Identifier.cpp"/>
+        <FILE id="CPlhWqs" name="juce_Identifier.h" compile="0" resource="0"
+              file="src/text/juce_Identifier.h"/>
         <FILE id="HCYu323Km" name="juce_LocalisedStrings.cpp" compile="1" resource="0"
               file="src/text/juce_LocalisedStrings.cpp"/>
         <FILE id="omEQRDHD" name="juce_LocalisedStrings.h" compile="0" resource="0"
               file="src/text/juce_LocalisedStrings.h"/>
+        <FILE id="LzGg5HD" name="juce_NewLine.h" compile="0" resource="0" file="src/text/juce_NewLine.h"/>
         <FILE id="k4WycuGq4" name="juce_String.cpp" compile="1" resource="0"
               file="src/text/juce_String.cpp"/>
         <FILE id="fUeX2geSR" name="juce_String.h" compile="0" resource="0"

amalgamation/juce_amalgamated_template.cpp

@@ -98,20 +98,20 @@
 #if JUCE_BUILD_CORE
  #include "../src/core/juce_FileLogger.cpp"
  #include "../src/core/juce_Logger.cpp"
- #include "../src/core/juce_Random.cpp"
+ #include "../src/maths/juce_Random.cpp"
  #include "../src/core/juce_RelativeTime.cpp"
  #include "../src/core/juce_SystemStats.cpp"
  #include "../src/core/juce_Time.cpp"
  #include "../src/core/juce_Initialisation.cpp"
  #include "../src/containers/juce_AbstractFifo.cpp"
- #include "../src/containers/juce_BigInteger.cpp"
- #include "../src/containers/juce_MemoryBlock.cpp"
+ #include "../src/maths/juce_BigInteger.cpp"
+ #include "../src/memory/juce_MemoryBlock.cpp"
  #include "../src/containers/juce_PropertySet.cpp"
- #include "../src/containers/juce_Identifier.cpp"
+ #include "../src/text/juce_Identifier.cpp"
  #include "../src/containers/juce_Variant.cpp"
  #include "../src/containers/juce_NamedValueSet.cpp"
  #include "../src/containers/juce_DynamicObject.cpp"
- #include "../src/containers/juce_Expression.cpp"
+ #include "../src/maths/juce_Expression.cpp"
  #include "../src/cryptography/juce_BlowFish.cpp"
  #include "../src/cryptography/juce_MD5.cpp"
  #include "../src/cryptography/juce_Primes.cpp"

extras/Jucer (experimental)/Source/Application/jucer_JuceUpdater.cpp

@@ -38,7 +38,7 @@ JuceUpdater::JuceUpdater()
     addAndMakeVisible (&filenameComp);
     addAndMakeVisible (&checkNowButton);
     addAndMakeVisible (&currentVersionLabel);
-    checkNowButton.addButtonListener (this);
+    checkNowButton.addListener (this);
     filenameComp.addListener (this);
 
     currentVersionLabel.setFont (Font (14.0f, Font::italic));
@@ -53,7 +53,7 @@ JuceUpdater::JuceUpdater()
 
 JuceUpdater::~JuceUpdater()
 {
-    checkNowButton.removeButtonListener (this);
+    checkNowButton.removeListener (this);
     filenameComp.removeListener (this);
 }
 
@@ -339,13 +339,13 @@ Component* JuceUpdater::refreshComponentForRow (int rowNumber, bool isRowSelecte
             : updater (updater_), version (0), applyButton ("Install this version...")
         {
             addAndMakeVisible (&applyButton);
-            applyButton.addButtonListener (this);
+            applyButton.addListener (this);
             setInterceptsMouseClicks (false, true);
         }
 
         ~UpdateListComponent()
         {
-            applyButton.removeButtonListener (this);
+            applyButton.removeListener (this);
         }
 
         void setVersion (VersionInfo* v)

extras/Jucer (experimental)/Source/Project/jucer_ProjectInformationComponent.cpp

@@ -110,16 +110,16 @@ ProjectInformationComponent::ProjectInformationComponent (Project& project_)
     addAndMakeVisible (&configTabBox);
     addAndMakeVisible (&editConfigsButton);
     editConfigsButton.setButtonText ("Add/Remove Configurations...");
-    editConfigsButton.addButtonListener (this);
+    editConfigsButton.addListener (this);
     addAndMakeVisible (&openProjectButton);
     openProjectButton.setButtonText ("Open Project in ");
-    openProjectButton.addButtonListener (this);
+    openProjectButton.addListener (this);
     addAndMakeVisible (&editExportersButton);
     editExportersButton.setButtonText ("Add/Remove Exporters...");
-    editExportersButton.addButtonListener (this);
+    editExportersButton.addListener (this);
     addAndMakeVisible (&saveAndOpenButton);
     saveAndOpenButton.setButtonText ("Save And Open in");
-    saveAndOpenButton.addButtonListener (this);
+    saveAndOpenButton.addListener (this);
 
     //[UserPreSize]
     rebuildConfigTabs();

extras/amalgamator/Source/Main.cpp

@@ -27,8 +27,6 @@
 
 
 //==============================================================================
-static const char* newLine = "\n";
-
 static bool matchesWildcard (const String& filename, const StringArray& wildcards)
 {
     for (int i = wildcards.size(); --i >= 0;)
@@ -281,6 +279,8 @@ static bool munge (const File& templateFile, const File& targetFile, const Strin
         return false;
     }
 
+    out->setNewLineString ("\n");
+
     if (! parseFile (targetFile.getParentDirectory(),
                      targetFile,
                      *out, templateFile,

extras/audio plugin host/Source/GraphEditorPanel.cpp

@@ -125,10 +125,10 @@ class PinComponent   : public Component,
 public:
     PinComponent (FilterGraph& graph_,
                   const uint32 filterID_, const int index_, const bool isInput_)
-        : graph (graph_),
-          filterID (filterID_),
+        : filterID (filterID_),
           index (index_),
-          isInput (isInput_)
+          isInput (isInput_),
+          graph (graph_)
     {
         const AudioProcessorGraph::Node::Ptr node (graph.getNodeForId (filterID_));
 
@@ -155,10 +155,6 @@ public:
         setSize (16, 16);
     }
 
-    ~PinComponent()
-    {
-    }
-
     void paint (Graphics& g)
     {
         const float w = (float) getWidth();
@@ -443,9 +439,9 @@ public:
 private:
     int pinSize;
     Point<int> originalPos;
+    Font font;
     int numIns, numOuts;
     DropShadowEffect shadow;
-    Font font;
 
     GraphEditorPanel* getGraphPanel() const throw()
     {
@@ -462,11 +458,11 @@ class ConnectorComponent   : public Component,
 {
 public:
     ConnectorComponent (FilterGraph& graph_)
-        : graph (graph_),
-          sourceFilterID (0),
+        : sourceFilterID (0),
           destFilterID (0),
           sourceFilterChannel (0),
           destFilterChannel (0),
+          graph (graph_),
           lastInputX (0),
           lastInputY (0),
           lastOutputX (0),

extras/audio plugins/wrapper/Standalone/juce_StandaloneFilterWindow.cpp

@@ -44,7 +44,7 @@ StandaloneFilterWindow::StandaloneFilterWindow (const String& title,
     setTitleBarButtonsRequired (DocumentWindow::minimiseButton | DocumentWindow::closeButton, false);
 
     Component::addAndMakeVisible (&optionsButton);
-    optionsButton.addButtonListener (this);
+    optionsButton.addListener (this);
     optionsButton.setTriggeredOnMouseDown (true);
 
     JUCE_TRY

extras/audio plugins/wrapper/juce_PluginHostType.h

@@ -58,7 +58,8 @@ public:
         SteinbergWavelab6,
         SteinbergWavelab7,
         SteinbergWavelabGeneric,
-        MuseReceptorGeneric
+        MuseReceptorGeneric,
+        MagixSamplitude
     };
 
     const HostType type;
@@ -114,6 +115,11 @@ public:
         return type == MuseReceptorGeneric;
     }
 
+    bool isSamplitude() const throw()
+    {
+        return type == MagixSamplitude;
+    }
+
     //==============================================================================
     static String getHostPath()
     {
@@ -127,7 +133,7 @@ private:
         const String hostPath (getHostPath());
         const String hostFilename (File (hostPath).getFileName());
 
-#if JUCE_MAC
+      #if JUCE_MAC
         if (hostPath.containsIgnoreCase     ("Live 6."))        return AbletonLive6;
         if (hostPath.containsIgnoreCase     ("Live 7."))        return AbletonLive7;
         if (hostPath.containsIgnoreCase     ("Live 8."))        return AbletonLive8;
@@ -140,7 +146,7 @@ private:
         if (hostPath.containsIgnoreCase     ("Wavelab 7"))      return SteinbergWavelab7;
         if (hostFilename.containsIgnoreCase ("Wavelab"))        return SteinbergWavelabGeneric;
 
-#elif JUCE_WINDOWS
+      #elif JUCE_WINDOWS
         if (hostFilename.containsIgnoreCase ("Live 6."))        return AbletonLive6;
         if (hostFilename.containsIgnoreCase ("Live 7."))        return AbletonLive7;
         if (hostFilename.containsIgnoreCase ("Live 8."))        return AbletonLive8;
@@ -161,15 +167,14 @@ private:
         if (hostPath.containsIgnoreCase     ("Wavelab 6"))      return SteinbergWavelab6;
         if (hostPath.containsIgnoreCase     ("Wavelab 7"))      return SteinbergWavelab7;
         if (hostFilename.containsIgnoreCase ("Wavelab"))        return SteinbergWavelabGeneric;
-        if (hostFilename.containsIgnoreCase ("reaper"))         return Reaper;
         if (hostFilename.containsIgnoreCase ("rm-host"))        return MuseReceptorGeneric;
+        if (hostFilename.startsWithIgnoreCase ("Sam"))          return MagixSamplitude;
 
-
-#elif JUCE_LINUX
+      #elif JUCE_LINUX
         jassertfalse   // not yet done!
-#else
+      #else
         #error
-#endif
+      #endif
         return UnknownHost;
     }
 

extras/browser plugins/How to build a browser plugin.txt

@@ -4,7 +4,7 @@
     =============================
     
 These classes let you easily turn a normal Juce component into a Mac/Windows NPAPI plugin 
-for use in Firefox, Safari, Opera, etc.
+for use in Firefox, Safari, Chrome, etc., and/or an ActiveX plugin for IE.
 
 To create your plugin, your code just needs to implement the createBrowserPlugin() function 
 to return a subclass of BrowserPluginComponent, and this acts as the plugin window.

extras/browser plugins/demo/build/mac/JuceBrowserPluginDemo.xcodeproj/project.pbxproj

@@ -270,6 +270,7 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = JuceBrowserPluginDemo;
@@ -283,6 +284,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
+				GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = JuceBrowserPluginDemo;

extras/browser plugins/demo/src/JuceBrowserPluginDemo.cpp

@@ -42,7 +42,7 @@ public:
 
         addAndMakeVisible (button = new TextButton ("Send a message to the webpage"));
         button->setBounds (320, 8, 180, 22);
-        button->addButtonListener (this);
+        button->addListener (this);
         button->setEnabled (false);
 
         ourJavascriptObject = new DemoBrowserObject (this);

extras/example projects/Source/Main.cpp

@@ -59,38 +59,21 @@ public:
 */
 class JUCEHelloWorldApplication : public JUCEApplication
 {
-    /* Important! NEVER embed objects directly inside your JUCEApplication class! Use
-       ONLY pointers to objects, which you should create during the initialise() method
-       (NOT in the constructor!) and delete in the shutdown() method (NOT in the
-       destructor!)
-
-       This is because the application object gets created before Juce has been properly
-       initialised, so any embedded objects would also get constructed too soon.
-   */
-    HelloWorldWindow* helloWorldWindow;
-
 public:
     //==============================================================================
     JUCEHelloWorldApplication()
         : helloWorldWindow (0)
     {
-        // NEVER do anything in here that could involve any Juce function being called
-        // - leave all your startup tasks until the initialise() method.
     }
 
     ~JUCEHelloWorldApplication()
     {
-        // Your shutdown() method should already have done all the things necessary to
-        // clean up this app object, so you should never need to put anything in
-        // the destructor.
-
-        // Making any Juce calls in here could be very dangerous...
     }
 
     //==============================================================================
     void initialise (const String& commandLine)
     {
-        // just create the main window...
+        // For this demo, we'll just create the main window...
         helloWorldWindow = new HelloWorldWindow();
 
         /*  ..and now return, which will fall into to the main event
@@ -104,20 +87,23 @@ public:
 
     void shutdown()
     {
-        // clear up..
+        // This method is where you should clear-up your app's resources..
 
-        if (helloWorldWindow != 0)
-            delete helloWorldWindow;
+        // The helloWorldWindow variable is a ScopedPointer, so setting it to a null
+        // pointer will delete the window.
+        helloWorldWindow = 0;
     }
 
     //==============================================================================
     const String getApplicationName()
     {
-        return T("Hello World for JUCE");
+        return "Hello World for JUCE";
     }
 
     const String getApplicationVersion()
     {
+        // The ProjectInfo::versionString value is automatically updated by the Jucer, and
+        // can be found in the JuceHeader.h file that it generates for our project.
         return ProjectInfo::versionString;
     }
 
@@ -129,6 +115,9 @@ public:
     void anotherInstanceStarted (const String& commandLine)
     {
     }
+
+private:
+    ScopedPointer<HelloWorldWindow> helloWorldWindow;
 };
 
 

extras/example projects/Source/MainComponent.cpp

@@ -44,7 +44,7 @@ MainComponent::MainComponent ()
 
     addAndMakeVisible (quitButton = new TextButton (String::empty));
     quitButton->setButtonText (T("Quit"));
-    quitButton->addButtonListener (this);
+    quitButton->addListener (this);
 
 
     //[UserPreSize]

extras/juce demo/Source/demos/AudioDemoLatencyPage.cpp

@@ -290,7 +290,7 @@ AudioDemoLatencyPage::AudioDemoLatencyPage (AudioDeviceManager& deviceManager_)
 
     addAndMakeVisible (startTestButton = new TextButton (String::empty));
     startTestButton->setButtonText ("Test Latency");
-    startTestButton->addButtonListener (this);
+    startTestButton->addListener (this);
 
     addAndMakeVisible (testResultsBox = new TextEditor (String::empty));
     testResultsBox->setMultiLine (true);

extras/juce demo/Source/demos/AudioDemoPlaybackPage.cpp

@@ -144,7 +144,7 @@ AudioDemoPlaybackPage::AudioDemoPlaybackPage (AudioDeviceManager& deviceManager_
 
     addAndMakeVisible (startStopButton = new TextButton (String::empty));
     startStopButton->setButtonText (T("Play/Stop"));
-    startStopButton->addButtonListener (this);
+    startStopButton->addListener (this);
     startStopButton->setColour (TextButton::buttonColourId, Colour (0xff79ed7f));
 
     addAndMakeVisible (fileTreeComp = new FileTreeComponent (directoryList));

extras/juce demo/Source/demos/AudioDemoRecordPage.cpp

@@ -155,7 +155,7 @@ AudioDemoRecordPage::AudioDemoRecordPage (AudioDeviceManager& deviceManager_)
 
     addAndMakeVisible (recordButton = new TextButton (String::empty));
     recordButton->setButtonText (T("Record"));
-    recordButton->addButtonListener (this);
+    recordButton->addListener (this);
     recordButton->setColour (TextButton::buttonColourId, Colour (0xffff5c5c));
     recordButton->setColour (TextButton::textColourOffId, Colours::black);
 

extras/juce demo/Source/demos/AudioDemoSynthPage.cpp

@@ -259,13 +259,13 @@ AudioDemoSynthPage::AudioDemoSynthPage (AudioDeviceManager& deviceManager_)
     addAndMakeVisible (sineButton = new ToggleButton (String::empty));
     sineButton->setButtonText (T("Use sine wave"));
     sineButton->setRadioGroupId (321);
-    sineButton->addButtonListener (this);
+    sineButton->addListener (this);
     sineButton->setToggleState (true, false);
 
     addAndMakeVisible (sampledButton = new ToggleButton (String::empty));
     sampledButton->setButtonText (T("Use sampled sound"));
     sampledButton->setRadioGroupId (321);
-    sampledButton->addButtonListener (this);
+    sampledButton->addListener (this);
 
     addAndMakeVisible (liveAudioDisplayComp = new LiveAudioInputDisplayComp());
 

extras/juce demo/Source/demos/CameraDemo.cpp

@@ -50,11 +50,11 @@ public:
         cameraSelectorComboBox.addListener (this);
 
         addAndMakeVisible (&snapshotButton);
-        snapshotButton.addButtonListener (this);
+        snapshotButton.addListener (this);
         snapshotButton.setEnabled (false);
 
         addAndMakeVisible (&recordMovieButton);
-        recordMovieButton.addButtonListener (this);
+        recordMovieButton.addListener (this);
         recordMovieButton.setEnabled (false);
 
         cameraSelectorComboBox.setSelectedId (2);

extras/juce demo/Source/demos/FontsAndTextDemo.cpp

@@ -58,10 +58,10 @@ public:
         textBox.setText ("The Quick Brown Fox Jumps Over The Lazy Dog\n\nAa Bb Cc Dd Ee Ff Gg Hh Ii Jj Kk Ll Mm Nn Oo Pp Qq Rr Ss Tt Uu Vv Ww Xx Yy Zz 0123456789");
 
         addAndMakeVisible (&boldButton);
-        boldButton.addButtonListener (this);
+        boldButton.addListener (this);
 
         addAndMakeVisible (&italicButton);
-        italicButton.addButtonListener (this);
+        italicButton.addListener (this);
 
         addAndMakeVisible (&sizeSlider);
         sizeSlider.setRange (3.0, 150.0, 0.1);

extras/juce demo/Source/demos/InterprocessCommsDemo.cpp

@@ -89,7 +89,7 @@ public:
         addChildComponent (&sendButton);
         sendButton.setBounds (240, 120, 200, 24);
         sendButton.changeWidthToFitText();
-        sendButton.addButtonListener (this);
+        sendButton.addListener (this);
 
         addChildComponent (&incomingMessages);
         incomingMessages.setReadOnly (true);

extras/juce demo/Source/demos/ThreadingDemo.cpp

@@ -232,7 +232,7 @@ public:
         controlButton.setTopLeftPosition (20, 20);
         controlButton.setTriggeredOnMouseDown (true);
         controlButton.setAlwaysOnTop (true);
-        controlButton.addButtonListener (this);
+        controlButton.addListener (this);
     }
 
     ~ThreadingDemo()

extras/juce demo/Source/demos/TreeViewDemo.cpp

@@ -141,7 +141,7 @@ public:
         thread.startThread (3);
 
         addAndMakeVisible (&typeButton);
-        typeButton.addButtonListener (this);
+        typeButton.addListener (this);
         typeButton.setAlwaysOnTop (true);
         typeButton.setTriggeredOnMouseDown (true);
 

extras/juce demo/Source/demos/WebBrowserDemo.cpp

@@ -83,11 +83,11 @@ public:
 
         // add some buttons..
         addAndMakeVisible (&goButton);
-        goButton.addButtonListener (this);
+        goButton.addListener (this);
         addAndMakeVisible (&backButton);
-        backButton.addButtonListener (this);
+        backButton.addListener (this);
         addAndMakeVisible (&forwardButton);
-        forwardButton.addButtonListener (this);
+        forwardButton.addListener (this);
 
         // send the browser to a start page..
         webView->goToURL ("http://www.google.com");

extras/juce demo/Source/demos/WidgetsDemo.cpp

@@ -526,7 +526,7 @@ public:
         addAndMakeVisible (db);
         db->setBounds (90, 30, 80, 80);
         db->setTooltip ("this is an image-only DrawableButton");
-        db->addButtonListener (buttonListener);
+        db->addListener (buttonListener);
 
         //==============================================================================
         // create an image-on-button-shape button from the same drawables..
@@ -546,7 +546,7 @@ public:
         addAndMakeVisible (db);
         db->setBounds (200, 70, 50, 50);
         db->setTooltip ("this is a DrawableButton on a standard button background");
-        db->addButtonListener (buttonListener);
+        db->addListener (buttonListener);
 
         //==============================================================================
         HyperlinkButton* hyperlink
@@ -580,7 +580,7 @@ public:
         addAndMakeVisible (animateButton);
         animateButton->changeWidthToFitText (24);
         animateButton->setTopLeftPosition (350, 70);
-        animateButton->addButtonListener (this);
+        animateButton->addListener (this);
     }
 
     ~ButtonsPage()
@@ -693,12 +693,12 @@ public:
         depthLabel.attachToComponent (&depthSlider, false);
 
         addAndMakeVisible (&orientationButton);
-        orientationButton.addButtonListener (this);
+        orientationButton.addListener (this);
         orientationButton.changeWidthToFitText (22);
         orientationButton.setTopLeftPosition (depthSlider.getX(), depthSlider.getBottom() + 20);
 
         addAndMakeVisible (&customiseButton);
-        customiseButton.addButtonListener (this);
+        customiseButton.addListener (this);
         customiseButton.changeWidthToFitText (22);
         customiseButton.setTopLeftPosition (orientationButton.getRight() + 20, orientationButton.getY());
     }
@@ -1103,7 +1103,7 @@ public:
         //==============================================================================
         addAndMakeVisible (&menuButton);
         menuButton.setBounds (10, 10, 200, 24);
-        menuButton.addButtonListener (this);
+        menuButton.addListener (this);
         menuButton.setTriggeredOnMouseDown (true); // because this button pops up a menu, this lets us
                                                     // hold down the button and drag straight onto the menu
 
@@ -1112,7 +1112,7 @@ public:
         enableButton.setBounds (230, 10, 180, 24);
         enableButton.setTooltip ("Enables/disables all the components");
         enableButton.setToggleState (true, false);
-        enableButton.addButtonListener (this);
+        enableButton.addListener (this);
 
         addAndMakeVisible (&transformSlider);
         transformSlider.setSliderStyle (Slider::LinearBar);

extras/the jucer/src/model/components/jucer_ButtonHandler.h

@@ -141,7 +141,7 @@ public:
                                  << b->getRadioGroupId() << ");\n";
 
         if (needsButtonListener (component))
-            code.constructorCode << memberVariableName << "->addButtonListener (this);\n";
+            code.constructorCode << memberVariableName << "->addListener (this);\n";
     }
 
     void fillInGeneratedCode (Component* component, GeneratedCode& code)

extras/the jucer/src/properties/jucer_PositionPropertyBase.h

@@ -60,7 +60,7 @@ public:
           allowRelativeOptions (allowRelativeOptions_)
     {
         addAndMakeVisible (button = new TextButton (T("mode")));
-        button->addButtonListener (this);
+        button->addListener (this);
         button->setTriggeredOnMouseDown (true);
         button->setConnectedEdges (TextButton::ConnectedOnLeft | TextButton::ConnectedOnRight);
 

extras/the jucer/src/ui/jucer_JucerDocumentHolder.cpp

@@ -305,7 +305,7 @@ public:
         addAndMakeVisible (editor = new CodeEditorComponent (codeDocument, &tokeniser));
 
         addAndMakeVisible (switchButton = new TextButton (String::empty));
-        switchButton->addButtonListener (this);
+        switchButton->addListener (this);
 
         setWantsKeyboardFocus (true);
     }

extras/the jucer/src/ui/jucer_ResourceEditorPanel.cpp

@@ -37,7 +37,7 @@ public:
     {
         setInterceptsMouseClicks (false, true);
         addAndMakeVisible (reloadButton = new TextButton (T("Reload")));
-        reloadButton->addButtonListener (this);
+        reloadButton->addListener (this);
     }
 
     ~ResourceListButton()
@@ -85,13 +85,13 @@ ResourceEditorPanel::ResourceEditorPanel (JucerDocument& document_)
     : document (document_)
 {
     addAndMakeVisible (addButton = new TextButton (T("Add new resource...")));
-    addButton->addButtonListener (this);
+    addButton->addListener (this);
 
     addAndMakeVisible (reloadAllButton = new TextButton (T("Reload all resources")));
-    reloadAllButton->addButtonListener (this);
+    reloadAllButton->addListener (this);
 
     addAndMakeVisible (delButton = new TextButton (T("Delete selected resources")));
-    delButton->addButtonListener (this);
+    delButton->addListener (this);
     delButton->setEnabled (false);
 
     addAndMakeVisible (listBox = new TableListBox (String::empty, this));

extras/the jucer/src/utility/jucer_ColourEditorComponent.h

@@ -116,7 +116,7 @@ private:
             if (canResetToDefault)
             {
                 addAndMakeVisible (defaultButton = new TextButton (T("Reset to Default")));
-                defaultButton->addButtonListener (this);
+                defaultButton->addListener (this);
             }
         }
 

juce_amalgamated.cpp

@@ -31119,7 +31119,7 @@ PluginListComponent::PluginListComponent (KnownPluginList& listToEdit,
 	addAndMakeVisible (&listBox);
 
 	addAndMakeVisible (&optionsButton);
-	optionsButton.addButtonListener (this);
+	optionsButton.addListener (this);
 	optionsButton.setTriggeredOnMouseDown (true);
 
 	setSize (400, 600);
@@ -31737,8 +31737,8 @@ private:
 AudioUnitPluginInstance::AudioUnitPluginInstance (const String& fileOrIdentifier)
 	: fileOrIdentifier (fileOrIdentifier),
 	  wantsMidiMessages (false), wasPlaying (false), prepared (false),
-	  audioUnit (0),
-	  currentBuffer (0)
+	  currentBuffer (0),
+	  audioUnit (0)
 {
 	using namespace AudioUnitFormatHelpers;
 
@@ -34128,10 +34128,10 @@ public:
 		  plugin (plugin_),
 		  isOpen (false),
 		  wasShowing (false),
-		  pluginRefusesToResize (false),
+		  recursiveResize (false),
 		  pluginWantsKeys (false),
-		  alreadyInside (false),
-		  recursiveResize (false)
+		  pluginRefusesToResize (false),
+		  alreadyInside (false)
 	{
 #if JUCE_WINDOWS
 		sizeCheckCount = 0;
@@ -43721,16 +43721,19 @@ void Button::handleCommandMessage (int commandId)
 	}
 }
 
-void Button::addButtonListener (ButtonListener* const newListener)
+void Button::addListener (ButtonListener* const newListener)
 {
 	buttonListeners.add (newListener);
 }
 
-void Button::removeButtonListener (ButtonListener* const listener)
+void Button::removeListener (ButtonListener* const listener)
 {
 	buttonListeners.remove (listener);
 }
 
+void Button::addButtonListener (ButtonListener* l)	  { addListener (l); }
+void Button::removeButtonListener (ButtonListener* l)   { removeListener (l); }
+
 void Button::sendClickMessage (const ModifierKeys& modifiers)
 {
 	Component::BailOutChecker checker (this);
@@ -49856,10 +49859,10 @@ void Slider::lookAndFeelChanged()
 	if (style == IncDecButtons)
 	{
 		addAndMakeVisible (incButton = lf.createSliderButton (true));
-		incButton->addButtonListener (this);
+		incButton->addListener (this);
 
 		addAndMakeVisible (decButton = lf.createSliderButton (false));
-		decButton->addButtonListener (this);
+		decButton->addListener (this);
 
 		if (incDecButtonMode != incDecButtonsNotDraggable)
 		{
@@ -55066,7 +55069,7 @@ Toolbar::Toolbar()
 	addChildComponent (missingItemsButton = getLookAndFeel().createToolbarMissingItemsButton (*this));
 
 	missingItemsButton->setAlwaysOnTop (true);
-	missingItemsButton->addButtonListener (this);
+	missingItemsButton->addListener (this);
 }
 
 Toolbar::~Toolbar()
@@ -55567,7 +55570,7 @@ private:
 			if ((optionFlags & Toolbar::showResetToDefaultsButton) != 0)
 			{
 				addAndMakeVisible (&defaultButton);
-				defaultButton.addButtonListener (this);
+				defaultButton.addListener (this);
 			}
 
 			addAndMakeVisible (&instructions);
@@ -58107,7 +58110,7 @@ FileBrowserComponent::FileBrowserComponent (int flags_,
 	fileLabel.attachToComponent (&filenameBox, true);
 
 	addAndMakeVisible (goUpButton = getLookAndFeel().createFileBrowserGoUpButton());
-	goUpButton->addButtonListener (this);
+	goUpButton->addListener (this);
 	goUpButton->setTooltip (TRANS ("go up to parent directory"));
 
 	if (previewComp != 0)
@@ -58681,9 +58684,9 @@ FileChooserDialogBox::FileChooserDialogBox (const String& name,
 	setResizable (true, true);
 	setResizeLimits (300, 300, 1200, 1000);
 
-	content->okButton.addButtonListener (this);
-	content->cancelButton.addButtonListener (this);
-	content->newFolderButton.addButtonListener (this);
+	content->okButton.addListener (this);
+	content->cancelButton.addListener (this);
+	content->newFolderButton.addListener (this);
 	content->chooserComponent.addListener (this);
 
 	selectionChanged();
@@ -59178,7 +59181,7 @@ void FilenameComponent::lookAndFeelChanged()
 	browseButton->setConnectedEdges (Button::ConnectedOnLeft);
 	resized();
 
-	browseButton->addButtonListener (this);
+	browseButton->addListener (this);
 }
 
 void FilenameComponent::setTooltip (const String& newTooltip)
@@ -59354,18 +59357,18 @@ FileSearchPathListComponent::FileSearchPathListComponent()
 	listBox.setOutlineThickness (1);
 
 	addAndMakeVisible (&addButton);
-	addButton.addButtonListener (this);
+	addButton.addListener (this);
 	addButton.setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight | Button::ConnectedOnBottom | Button::ConnectedOnTop);
 
 	addAndMakeVisible (&removeButton);
-	removeButton.addButtonListener (this);
+	removeButton.addListener (this);
 	removeButton.setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight | Button::ConnectedOnBottom | Button::ConnectedOnTop);
 
 	addAndMakeVisible (&changeButton);
-	changeButton.addButtonListener (this);
+	changeButton.addListener (this);
 
 	addAndMakeVisible (&upButton);
-	upButton.addButtonListener (this);
+	upButton.addListener (this);
 
 	{
 		Path arrowPath;
@@ -59378,7 +59381,7 @@ FileSearchPathListComponent::FileSearchPathListComponent()
 	}
 
 	addAndMakeVisible (&downButton);
-	downButton.addButtonListener (this);
+	downButton.addListener (this);
 
 	{
 		Path arrowPath;
@@ -60465,7 +60468,7 @@ KeyMappingEditorComponent::KeyMappingEditorComponent (KeyPressMappingSet& mappin
 	if (showResetToDefaultButton)
 	{
 		addAndMakeVisible (&resetButton);
-		resetButton.addButtonListener (treeItem);
+		resetButton.addListener (treeItem);
 	}
 
 	addAndMakeVisible (&tree);
@@ -63991,7 +63994,7 @@ void TabbedButtonBar::resized()
 		if (extraTabsButton == 0)
 		{
 			addAndMakeVisible (extraTabsButton = getLookAndFeel().createTabBarExtrasButton());
-			extraTabsButton->addButtonListener (behindFrontTab);
+			extraTabsButton->addListener (behindFrontTab);
 			extraTabsButton->setAlwaysOnTop (true);
 			extraTabsButton->setTriggeredOnMouseDown (true);
 		}
@@ -71839,7 +71842,7 @@ BooleanPropertyComponent::BooleanPropertyComponent (const String& name,
 {
 	addAndMakeVisible (&button);
 	button.setClickingTogglesState (false);
-	button.addButtonListener (this);
+	button.addListener (this);
 }
 
 BooleanPropertyComponent::BooleanPropertyComponent (const Value& valueToControl,
@@ -71905,7 +71908,7 @@ ButtonPropertyComponent::ButtonPropertyComponent (const String& name,
 {
 	addAndMakeVisible (&button);
 	button.setTriggeredOnMouseDown (triggerOnMouseDown);
-	button.addButtonListener (this);
+	button.addListener (this);
 }
 
 ButtonPropertyComponent::~ButtonPropertyComponent()
@@ -72812,7 +72815,7 @@ public:
 		if (hideAdvancedOptionsWithButton)
 		{
 			addAndMakeVisible (showAdvancedSettingsButton = new TextButton (TRANS("Show advanced settings...")));
-			showAdvancedSettingsButton->addButtonListener (this);
+			showAdvancedSettingsButton->addListener (this);
 		}
 
 		type->scanForDevices();
@@ -73003,7 +73006,7 @@ public:
 		{
 			addAndMakeVisible (showUIButton = new TextButton (TRANS ("show this device's control panel"),
 															  TRANS ("opens the device's own control panel")));
-			showUIButton->addButtonListener (this);
+			showUIButton->addListener (this);
 		}
 
 		resized();
@@ -73029,7 +73032,7 @@ public:
 				if (setup.maxNumOutputChannels > 0)
 				{
 					addAndMakeVisible (testButton = new TextButton (TRANS ("Test")));
-					testButton->addButtonListener (this);
+					testButton->addListener (this);
 				}
 			}
 
@@ -76253,7 +76256,7 @@ void PreferencesPanel::addSettingsPage (const String& title,
 
 	button->setImages (icon, overIcon, downIcon);
 	button->setRadioGroupId (1);
-	button->addButtonListener (this);
+	button->addListener (this);
 	button->setClickingTogglesState (true);
 	button->setWantsKeyboardFocus (false);
 	addAndMakeVisible (button);
@@ -76480,7 +76483,7 @@ void AlertWindow::addButton (const String& name,
 	b->setCommandToTrigger (0, returnValue, false);
 	b->addShortcut (shortcutKey1);
 	b->addShortcut (shortcutKey2);
-	b->addButtonListener (this);
+	b->addListener (this);
 	b->changeWidthToFitText (getLookAndFeel().getAlertWindowButtonHeight());
 
 	addAndMakeVisible (b, 0);
@@ -78148,7 +78151,7 @@ void DocumentWindow::lookAndFeelChanged()
 				if (buttonListener == 0)
 					buttonListener = new ButtonListenerProxy (*this);
 
-				titleBarButtons[i]->addButtonListener (buttonListener);
+				titleBarButtons[i]->addListener (buttonListener);
 				titleBarButtons[i]->setWantsKeyboardFocus (false);
 
 				// (call the Component method directly to avoid the assertion in ResizableWindow)
@@ -243549,9 +243552,8 @@ private:
 
 				case SC_MAXIMIZE:
 					if (! sendInputAttemptWhenModalMessage())
-						return 0;
+						setFullScreen (true);
 
-					setFullScreen (true);
 					return 0;
 
 				case SC_MINIMIZE:

src/application/juce_ApplicationProperties.h

@@ -29,7 +29,7 @@
 #include "../utilities/juce_PropertiesFile.h"
 #include "../utilities/juce_DeletedAtShutdown.h"
 #include "../core/juce_Singleton.h"
-#include "../containers/juce_ScopedPointer.h"
+#include "../memory/juce_ScopedPointer.h"
 
 
 //==============================================================================

src/audio/audio_file_formats/juce_AudioCDReader.h

@@ -30,7 +30,7 @@
 
 #include "juce_AudioFormatReader.h"
 #include "../../containers/juce_Array.h"
-#include "../../containers/juce_ScopedPointer.h"
+#include "../../memory/juce_ScopedPointer.h"
 #include "../../text/juce_StringArray.h"
 #if JUCE_MAC
 #include "../../io/files/juce_File.h"

src/audio/audio_file_formats/juce_AudioFormatManager.cpp

@@ -33,7 +33,7 @@ BEGIN_JUCE_NAMESPACE
 #include "juce_FlacAudioFormat.h"
 #include "juce_OggVorbisAudioFormat.h"
 #include "../../io/files/juce_FileInputStream.h"
-#include "../../containers/juce_ScopedPointer.h"
+#include "../../memory/juce_ScopedPointer.h"
 
 
 //==============================================================================

src/audio/audio_file_formats/juce_FlacAudioFormat.cpp

@@ -76,7 +76,7 @@ BEGIN_JUCE_NAMESPACE
 
 #include "juce_FlacAudioFormat.h"
 #include "../../text/juce_LocalisedStrings.h"
-#include "../../containers/juce_ScopedPointer.h"
+#include "../../memory/juce_ScopedPointer.h"
 
 
 //==============================================================================

src/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp

@@ -79,7 +79,7 @@ BEGIN_JUCE_NAMESPACE
 
 #include "juce_OggVorbisAudioFormat.h"
 #include "../../application/juce_Application.h"
-#include "../../core/juce_Random.h"
+#include "../../maths/juce_Random.h"
 #include "../../io/files/juce_FileInputStream.h"
 #include "../../text/juce_LocalisedStrings.h"
 

src/audio/audio_file_formats/juce_QuickTimeAudioFormat.cpp

@@ -65,7 +65,7 @@ BEGIN_JUCE_NAMESPACE
 #include "../../text/juce_LocalisedStrings.h"
 #include "../../threads/juce_Thread.h"
 #include "../../io/network/juce_URL.h"
-#include "../../containers/juce_ScopedPointer.h"
+#include "../../memory/juce_ScopedPointer.h"
 #include "../../core/juce_PlatformUtilities.h"
 
 bool juce_OpenQuickTimeMovieFromStream (InputStream* input, Movie& movie, Handle& dataHandle);

src/audio/audio_sources/juce_AudioTransportSource.cpp

@@ -29,7 +29,7 @@ BEGIN_JUCE_NAMESPACE
 
 #include "juce_AudioTransportSource.h"
 #include "../../threads/juce_ScopedLock.h"
-#include "../../containers/juce_ScopedPointer.h"
+#include "../../memory/juce_ScopedPointer.h"
 
 
 //==============================================================================

src/audio/audio_sources/juce_MixerAudioSource.h

@@ -29,7 +29,7 @@
 #include "juce_AudioSource.h"
 #include "../../threads/juce_CriticalSection.h"
 #include "../../containers/juce_Array.h"
-#include "../../containers/juce_BigInteger.h"
+#include "../../maths/juce_BigInteger.h"
 
 
 //==============================================================================

src/audio/devices/juce_AudioIODevice.h

@@ -27,7 +27,7 @@
 #define __JUCE_AUDIOIODEVICE_JUCEHEADER__
 
 #include "../../text/juce_StringArray.h"
-#include "../../containers/juce_BigInteger.h"
+#include "../../maths/juce_BigInteger.h"
 #include "../../containers/juce_OwnedArray.h"
 class AudioIODevice;
 

src/audio/dsp/juce_AudioDataConverters.cpp

@@ -535,7 +535,7 @@ void AudioDataConverters::deinterleaveSamples (const float* const source,
 #if JUCE_UNIT_TESTS
 
 #include "../../utilities/juce_UnitTest.h"
-#include "../../core/juce_Random.h"
+#include "../../maths/juce_Random.h"
 
 class AudioConversionTests  : public UnitTest
 {

src/audio/dsp/juce_AudioSampleBuffer.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_AUDIOSAMPLEBUFFER_JUCEHEADER__
 #define __JUCE_AUDIOSAMPLEBUFFER_JUCEHEADER__
 
-#include "../../containers/juce_HeapBlock.h"
+#include "../../memory/juce_HeapBlock.h"
 class AudioFormatReader;
 class AudioFormatWriter;
 

src/audio/midi/juce_MidiBuffer.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_MIDIBUFFER_JUCEHEADER__
 #define __JUCE_MIDIBUFFER_JUCEHEADER__
 
-#include "../../containers/juce_MemoryBlock.h"
+#include "../../memory/juce_MemoryBlock.h"
 #include "juce_MidiMessage.h"
 
 

src/audio/midi/juce_MidiMessage.cpp

@@ -28,7 +28,7 @@
 BEGIN_JUCE_NAMESPACE
 
 #include "juce_MidiMessage.h"
-#include "../../containers/juce_MemoryBlock.h"
+#include "../../memory/juce_MemoryBlock.h"
 
 
 //==============================================================================

src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm

@@ -410,8 +410,8 @@ private:
 AudioUnitPluginInstance::AudioUnitPluginInstance (const String& fileOrIdentifier)
     : fileOrIdentifier (fileOrIdentifier),
       wantsMidiMessages (false), wasPlaying (false), prepared (false),
-      audioUnit (0),
-      currentBuffer (0)
+      currentBuffer (0),
+      audioUnit (0)
 {
     using namespace AudioUnitFormatHelpers;
 

src/audio/plugins/formats/juce_VSTPluginFormat.cpp

@@ -61,7 +61,7 @@ BEGIN_JUCE_NAMESPACE
 #include "juce_VSTPluginFormat.h"
 #include "../../../threads/juce_Process.h"
 #include "../../../threads/juce_ScopedLock.h"
-#include "../../../core/juce_Random.h"
+#include "../../../maths/juce_Random.h"
 #include "../../../io/files/juce_DirectoryIterator.h"
 #include "../../../events/juce_Timer.h"
 #include "../../../events/juce_AsyncUpdater.h"
@@ -1152,10 +1152,10 @@ public:
           plugin (plugin_),
           isOpen (false),
           wasShowing (false),
-          pluginRefusesToResize (false),
+          recursiveResize (false),
           pluginWantsKeys (false),
-          alreadyInside (false),
-          recursiveResize (false)
+          pluginRefusesToResize (false),
+          alreadyInside (false)
     {
 #if JUCE_WINDOWS
         sizeCheckCount = 0;

src/audio/plugins/juce_PluginListComponent.cpp

@@ -50,7 +50,7 @@ PluginListComponent::PluginListComponent (KnownPluginList& listToEdit,
     addAndMakeVisible (&listBox);
 
     addAndMakeVisible (&optionsButton);
-    optionsButton.addButtonListener (this);
+    optionsButton.addListener (this);
     optionsButton.setTriggeredOnMouseDown (true);
 
     setSize (400, 600);

src/audio/processors/juce_AudioProcessor.h

@@ -30,7 +30,7 @@
 #include "../dsp/juce_AudioSampleBuffer.h"
 #include "../midi/juce_MidiBuffer.h"
 #include "../../text/juce_XmlElement.h"
-#include "../../containers/juce_BigInteger.h"
+#include "../../maths/juce_BigInteger.h"
 #include "juce_AudioProcessorListener.h"
 #include "juce_AudioPlayHead.h"
 

src/audio/synthesisers/juce_Sampler.h

@@ -26,8 +26,8 @@
 #ifndef __JUCE_SAMPLER_JUCEHEADER__
 #define __JUCE_SAMPLER_JUCEHEADER__
 
-#include "../../containers/juce_BigInteger.h"
-#include "../../containers/juce_ScopedPointer.h"
+#include "../../maths/juce_BigInteger.h"
+#include "../../memory/juce_ScopedPointer.h"
 #include "juce_Synthesiser.h"
 
 

src/audio/synthesisers/juce_Synthesiser.h

@@ -29,7 +29,7 @@
 #include "../dsp/juce_AudioSampleBuffer.h"
 #include "../midi/juce_MidiBuffer.h"
 #include "../../containers/juce_OwnedArray.h"
-#include "../../containers/juce_ReferenceCountedObject.h"
+#include "../../memory/juce_ReferenceCountedObject.h"
 #include "../../containers/juce_ReferenceCountedArray.h"
 #include "../../threads/juce_CriticalSection.h"
 

src/containers/juce_AbstractFifo.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_ABSTRACTFIFO_JUCEHEADER__
 #define __JUCE_ABSTRACTFIFO_JUCEHEADER__
 
-#include "../core/juce_Atomic.h"
+#include "../memory/juce_Atomic.h"
 
 
 //==============================================================================

src/containers/juce_ArrayAllocationBase.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
 #define __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
 
-#include "juce_HeapBlock.h"
+#include "../memory/juce_HeapBlock.h"
 
 
 //==============================================================================

src/containers/juce_DynamicObject.h

@@ -27,7 +27,7 @@
 #define __JUCE_DYNAMICOBJECT_JUCEHEADER__
 
 #include "juce_NamedValueSet.h"
-#include "juce_ReferenceCountedObject.h"
+#include "../memory/juce_ReferenceCountedObject.h"
 
 
 //==============================================================================

src/containers/juce_ReferenceCountedArray.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_REFERENCECOUNTEDARRAY_JUCEHEADER__
 #define __JUCE_REFERENCECOUNTEDARRAY_JUCEHEADER__
 
-#include "juce_ReferenceCountedObject.h"
+#include "../memory/juce_ReferenceCountedObject.h"
 #include "juce_ArrayAllocationBase.h"
 #include "juce_ElementComparator.h"
 #include "../threads/juce_CriticalSection.h"

src/containers/juce_SparseSet.h

@@ -27,7 +27,7 @@
 #define __JUCE_SPARSESET_JUCEHEADER__
 
 #include "juce_ArrayAllocationBase.h"
-#include "juce_Range.h"
+#include "../maths/juce_Range.h"
 #include "../threads/juce_CriticalSection.h"
 
 

src/containers/juce_Value.h

@@ -29,7 +29,7 @@
 #include "juce_Variant.h"
 #include "../events/juce_AsyncUpdater.h"
 #include "../events/juce_ListenerList.h"
-#include "juce_ReferenceCountedObject.h"
+#include "../memory/juce_ReferenceCountedObject.h"
 #include "juce_SortedSet.h"
 
 

src/containers/juce_Variant.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_VARIANT_JUCEHEADER__
 #define __JUCE_VARIANT_JUCEHEADER__
 
-#include "juce_Identifier.h"
+#include "../text/juce_Identifier.h"
 #include "../io/streams/juce_OutputStream.h"
 #include "../io/streams/juce_InputStream.h"
 

src/core/juce_FileLogger.cpp

@@ -31,7 +31,7 @@ BEGIN_JUCE_NAMESPACE
 #include "../io/files/juce_FileOutputStream.h"
 #include "../io/files/juce_FileInputStream.h"
 #include "../threads/juce_ScopedLock.h"
-#include "../containers/juce_ScopedPointer.h"
+#include "../memory/juce_ScopedPointer.h"
 #include "juce_SystemStats.h"
 
 

src/core/juce_FileLogger.h

@@ -28,7 +28,7 @@
 
 #include "juce_Logger.h"
 #include "../io/files/juce_File.h"
-#include "../containers/juce_ScopedPointer.h"
+#include "../memory/juce_ScopedPointer.h"
 
 
 //==============================================================================

src/core/juce_Initialisation.cpp

@@ -27,8 +27,8 @@
 
 BEGIN_JUCE_NAMESPACE
 
-#include "juce_Atomic.h"
-#include "juce_Random.h"
+#include "../memory/juce_Atomic.h"
+#include "../maths/juce_Random.h"
 #include "juce_PlatformUtilities.h"
 #include "juce_SystemStats.h"
 #include "../text/juce_LocalisedStrings.h"

src/core/juce_PerformanceCounter.cpp

@@ -29,6 +29,7 @@ BEGIN_JUCE_NAMESPACE
 
 #include "juce_PerformanceCounter.h"
 #include "juce_Time.h"
+#include "../text/juce_NewLine.h"
 
 
 //==============================================================================

src/core/juce_PlatformDefs.h

@@ -272,4 +272,15 @@
 
 #endif
 
+//==============================================================================
+// Cross-compiler deprecation macros..
+#if JUCE_MSVC && ! JUCE_NO_DEPRECATION_WARNINGS
+ #define JUCE_DEPRECATED(functionDef)     __declspec(deprecated) functionDef
+#elif JUCE_GCC  && ! JUCE_NO_DEPRECATION_WARNINGS
+ #define JUCE_DEPRECATED(functionDef)     functionDef __attribute__ ((deprecated))
+#else
+ #define JUCE_DEPRECATED(functionDef)     functionDef
+#endif
+
+
 #endif   // __JUCE_PLATFORMDEFS_JUCEHEADER__

src/core/juce_StandardHeader.h

@@ -33,7 +33,7 @@
 */
 #define JUCE_MAJOR_VERSION      1
 #define JUCE_MINOR_VERSION      52
-#define JUCE_BUILDNUMBER        108
+#define JUCE_BUILDNUMBER        109
 
 /** Current Juce version number.
 
@@ -171,11 +171,11 @@ extern JUCE_API bool JUCE_CALLTYPE juce_isRunningUnderDebugger();
   extern JUCE_API void juce_LogAssertion (const char* filename, int lineNum) throw();
 #endif
 
-#include "juce_Memory.h"
-#include "juce_MathsFunctions.h"
-#include "juce_ByteOrder.h"
+#include "../memory/juce_Memory.h"
+#include "../maths/juce_MathsFunctions.h"
+#include "../memory/juce_ByteOrder.h"
 #include "juce_Logger.h"
-#include "juce_LeakedObjectDetector.h"
+#include "../memory/juce_LeakedObjectDetector.h"
 
 
 END_JUCE_NAMESPACE

src/core/juce_Time.cpp

@@ -50,7 +50,7 @@ BEGIN_JUCE_NAMESPACE
 
 #include "juce_Time.h"
 #include "../threads/juce_Thread.h"
-#include "../containers/juce_MemoryBlock.h"
+#include "../memory/juce_MemoryBlock.h"
 #include "../text/juce_LocalisedStrings.h"
 
 //==============================================================================

src/core/juce_Uuid.cpp

@@ -28,10 +28,10 @@
 BEGIN_JUCE_NAMESPACE
 
 #include "juce_Uuid.h"
-#include "juce_Random.h"
+#include "../maths/juce_Random.h"
 #include "juce_Time.h"
 #include "../io/network/juce_MACAddress.h"
-#include "../containers/juce_MemoryBlock.h"
+#include "../memory/juce_MemoryBlock.h"
 
 
 //==============================================================================

src/cryptography/juce_BlowFish.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_BLOWFISH_JUCEHEADER__
 #define __JUCE_BLOWFISH_JUCEHEADER__
 
-#include "../containers/juce_HeapBlock.h"
+#include "../memory/juce_HeapBlock.h"
 
 
 //==============================================================================

src/cryptography/juce_MD5.cpp

@@ -29,7 +29,7 @@ BEGIN_JUCE_NAMESPACE
 
 #include "juce_MD5.h"
 #include "../io/files/juce_FileInputStream.h"
-#include "../containers/juce_ScopedPointer.h"
+#include "../memory/juce_ScopedPointer.h"
 
 
 //==============================================================================

src/cryptography/juce_MD5.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_MD5_JUCEHEADER__
 #define __JUCE_MD5_JUCEHEADER__
 
-#include "../containers/juce_MemoryBlock.h"
+#include "../memory/juce_MemoryBlock.h"
 #include "../io/streams/juce_InputStream.h"
 #include "../io/files/juce_File.h"
 

src/cryptography/juce_Primes.cpp

@@ -28,7 +28,7 @@
 BEGIN_JUCE_NAMESPACE
 
 #include "juce_Primes.h"
-#include "../core/juce_Random.h"
+#include "../maths/juce_Random.h"
 
 
 //==============================================================================

src/cryptography/juce_Primes.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_PRIMES_JUCEHEADER__
 #define __JUCE_PRIMES_JUCEHEADER__
 
-#include "../containers/juce_BigInteger.h"
+#include "../maths/juce_BigInteger.h"
 
 
 //==============================================================================

src/cryptography/juce_RSAKey.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_RSAKEY_JUCEHEADER__
 #define __JUCE_RSAKEY_JUCEHEADER__
 
-#include "../containers/juce_BigInteger.h"
+#include "../maths/juce_BigInteger.h"
 
 
 //==============================================================================

src/events/juce_AsyncUpdater.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_ASYNCUPDATER_JUCEHEADER__
 #define __JUCE_ASYNCUPDATER_JUCEHEADER__
 
-#include "../core/juce_Atomic.h"
+#include "../memory/juce_Atomic.h"
 #include "../events/juce_CallbackMessage.h"
 
 

src/events/juce_InterprocessConnection.cpp

@@ -29,7 +29,7 @@ BEGIN_JUCE_NAMESPACE
 
 #include "juce_InterprocessConnection.h"
 #include "../threads/juce_ScopedLock.h"
-#include "../containers/juce_ScopedPointer.h"
+#include "../memory/juce_ScopedPointer.h"
 
 
 //==============================================================================

src/events/juce_InterprocessConnection.h

@@ -30,7 +30,7 @@
 #include "../threads/juce_Thread.h"
 #include "../io/network/juce_Socket.h"
 #include "../io/files/juce_NamedPipe.h"
-#include "../containers/juce_ScopedPointer.h"
+#include "../memory/juce_ScopedPointer.h"
 class InterprocessConnectionServer;
 
 

src/events/juce_InterprocessConnectionServer.cpp

@@ -28,7 +28,7 @@
 BEGIN_JUCE_NAMESPACE
 
 #include "juce_InterprocessConnectionServer.h"
-#include "../containers/juce_ScopedPointer.h"
+#include "../memory/juce_ScopedPointer.h"
 
 
 //==============================================================================

src/events/juce_Message.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_MESSAGE_JUCEHEADER__
 #define __JUCE_MESSAGE_JUCEHEADER__
 
-#include "../containers/juce_ReferenceCountedObject.h"
+#include "../memory/juce_ReferenceCountedObject.h"
 class MessageListener;
 class MessageManager;
 

src/events/juce_MessageManager.h

@@ -28,7 +28,7 @@
 
 #include "../utilities/juce_DeletedAtShutdown.h"
 #include "../containers/juce_SortedSet.h"
-#include "../containers/juce_ScopedPointer.h"
+#include "../memory/juce_ScopedPointer.h"
 #include "../threads/juce_Thread.h"
 #include "../threads/juce_ThreadPool.h"
 #include "juce_ActionBroadcaster.h"

src/gui/components/buttons/juce_Button.cpp

@@ -344,16 +344,19 @@ void Button::handleCommandMessage (int commandId)
 }
 
 //==============================================================================
-void Button::addButtonListener (ButtonListener* const newListener)
+void Button::addListener (ButtonListener* const newListener)
 {
     buttonListeners.add (newListener);
 }
 
-void Button::removeButtonListener (ButtonListener* const listener)
+void Button::removeListener (ButtonListener* const listener)
 {
     buttonListeners.remove (listener);
 }
 
+void Button::addButtonListener (ButtonListener* l)      { addListener (l); }
+void Button::removeButtonListener (ButtonListener* l)   { removeListener (l); }
+
 void Button::sendClickMessage (const ModifierKeys& modifiers)
 {
     Component::BailOutChecker checker (this);

src/gui/components/buttons/juce_Button.h

@@ -176,7 +176,7 @@ public:
     /**
         Used to receive callbacks when a button is clicked.
 
-        @see Button::addButtonListener, Button::removeButtonListener
+        @see Button::addListener, Button::removeListener
     */
     class Listener
     {
@@ -192,18 +192,15 @@ public:
     };
 
     /** Registers a listener to receive events when this button's state changes.
-
         If the listener is already registered, this will not register it again.
-
-        @see removeButtonListener
+        @see removeListener
     */
-    void addButtonListener (Listener* newListener);
+    void addListener (Listener* newListener);
 
     /** Removes a previously-registered button listener
-
-        @see addButtonListener
+        @see addListener
     */
-    void removeButtonListener (Listener* listener);
+    void removeListener (Listener* listener);
 
     //==============================================================================
     /** Causes the button to act as if it's been clicked.
@@ -375,6 +372,11 @@ public:
     void setState (const ButtonState newState);
 
 
+    //==============================================================================
+    // These are deprecated - please use addListener() and removeListener() instead!
+    JUCE_DEPRECATED (void addButtonListener (Listener*));
+    JUCE_DEPRECATED (void removeButtonListener (Listener*));
+
 protected:
     //==============================================================================
     /** This method is called when the button has been clicked.
@@ -503,8 +505,10 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Button);
 };
 
-/** This typedef is just for compatibility with old code - newer code should use Button::Listener instead. */
-typedef Button::Listener ButtonListener;
+#ifndef DOXYGEN
+ /** This typedef is just for compatibility with old code and VC6 - newer code should use Button::Listener instead. */
+ typedef Button::Listener ButtonListener;
+#endif
 
 #if JUCE_VC6
  #undef Listener

src/gui/components/controls/juce_Slider.cpp

@@ -356,10 +356,10 @@ void Slider::lookAndFeelChanged()
     if (style == IncDecButtons)
     {
         addAndMakeVisible (incButton = lf.createSliderButton (true));
-        incButton->addButtonListener (this);
+        incButton->addListener (this);
 
         addAndMakeVisible (decButton = lf.createSliderButton (false));
-        decButton->addButtonListener (this);
+        decButton->addListener (this);
 
         if (incDecButtonMode != incDecButtonsNotDraggable)
         {

src/gui/components/controls/juce_TableListBox.cpp

@@ -28,8 +28,8 @@
 BEGIN_JUCE_NAMESPACE
 
 #include "juce_TableListBox.h"
-#include "../../../containers/juce_BigInteger.h"
-#include "../../../core/juce_Random.h"
+#include "../../../maths/juce_BigInteger.h"
+#include "../../../maths/juce_Random.h"
 #include "../mouse/juce_DragAndDropContainer.h"
 #include "../../graphics/imaging/juce_Image.h"
 #include "../../../text/juce_LocalisedStrings.h"

src/gui/components/controls/juce_TextEditor.h

@@ -27,7 +27,7 @@
 #define __JUCE_TEXTEDITOR_JUCEHEADER__
 
 #include "../juce_Component.h"
-#include "../../../containers/juce_Range.h"
+#include "../../../maths/juce_Range.h"
 #include "../../../events/juce_Timer.h"
 #include "../../../utilities/juce_UndoManager.h"
 #include "../layout/juce_Viewport.h"

src/gui/components/controls/juce_Toolbar.cpp

@@ -270,7 +270,7 @@ Toolbar::Toolbar()
     addChildComponent (missingItemsButton = getLookAndFeel().createToolbarMissingItemsButton (*this));
 
     missingItemsButton->setAlwaysOnTop (true);
-    missingItemsButton->addButtonListener (this);
+    missingItemsButton->addListener (this);
 }
 
 Toolbar::~Toolbar()
@@ -777,7 +777,7 @@ private:
             if ((optionFlags & Toolbar::showResetToDefaultsButton) != 0)
             {
                 addAndMakeVisible (&defaultButton);
-                defaultButton.addButtonListener (this);
+                defaultButton.addListener (this);
             }
 
             addAndMakeVisible (&instructions);

src/gui/components/controls/juce_TreeView.cpp

@@ -29,7 +29,7 @@ BEGIN_JUCE_NAMESPACE
 
 #include "juce_TreeView.h"
 #include "../lookandfeel/juce_LookAndFeel.h"
-#include "../../../containers/juce_BigInteger.h"
+#include "../../../maths/juce_BigInteger.h"
 #include "../mouse/juce_DragAndDropContainer.h"
 #include "../mouse/juce_MouseInputSource.h"
 #include "../../graphics/imaging/juce_Image.h"

src/gui/components/filebrowser/juce_FileBrowserComponent.cpp

@@ -127,7 +127,7 @@ FileBrowserComponent::FileBrowserComponent (int flags_,
     fileLabel.attachToComponent (&filenameBox, true);
 
     addAndMakeVisible (goUpButton = getLookAndFeel().createFileBrowserGoUpButton());
-    goUpButton->addButtonListener (this);
+    goUpButton->addListener (this);
     goUpButton->setTooltip (TRANS ("go up to parent directory"));
 
     if (previewComp != 0)

src/gui/components/filebrowser/juce_FileBrowserComponent.h

@@ -29,7 +29,7 @@
 #include "juce_DirectoryContentsDisplayComponent.h"
 #include "juce_FilePreviewComponent.h"
 #include "../../../io/files/juce_File.h"
-#include "../../../containers/juce_BigInteger.h"
+#include "../../../maths/juce_BigInteger.h"
 #include "../controls/juce_TextEditor.h"
 #include "../controls/juce_ComboBox.h"
 #include "../buttons/juce_DrawableButton.h"

src/gui/components/filebrowser/juce_FileChooserDialogBox.cpp

@@ -47,9 +47,9 @@ FileChooserDialogBox::FileChooserDialogBox (const String& name,
     setResizable (true, true);
     setResizeLimits (300, 300, 1200, 1000);
 
-    content->okButton.addButtonListener (this);
-    content->cancelButton.addButtonListener (this);
-    content->newFolderButton.addButtonListener (this);
+    content->okButton.addListener (this);
+    content->cancelButton.addListener (this);
+    content->newFolderButton.addListener (this);
     content->chooserComponent.addListener (this);
 
     selectionChanged();

src/gui/components/filebrowser/juce_FileSearchPathListComponent.cpp

@@ -49,18 +49,18 @@ FileSearchPathListComponent::FileSearchPathListComponent()
     listBox.setOutlineThickness (1);
 
     addAndMakeVisible (&addButton);
-    addButton.addButtonListener (this);
+    addButton.addListener (this);
     addButton.setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight | Button::ConnectedOnBottom | Button::ConnectedOnTop);
 
     addAndMakeVisible (&removeButton);
-    removeButton.addButtonListener (this);
+    removeButton.addListener (this);
     removeButton.setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight | Button::ConnectedOnBottom | Button::ConnectedOnTop);
 
     addAndMakeVisible (&changeButton);
-    changeButton.addButtonListener (this);
+    changeButton.addListener (this);
 
     addAndMakeVisible (&upButton);
-    upButton.addButtonListener (this);
+    upButton.addListener (this);
 
     {
         Path arrowPath;
@@ -73,7 +73,7 @@ FileSearchPathListComponent::FileSearchPathListComponent()
     }
 
     addAndMakeVisible (&downButton);
-    downButton.addButtonListener (this);
+    downButton.addListener (this);
 
     {
         Path arrowPath;

src/gui/components/filebrowser/juce_FilenameComponent.cpp

@@ -94,7 +94,7 @@ void FilenameComponent::lookAndFeelChanged()
     browseButton->setConnectedEdges (Button::ConnectedOnLeft);
     resized();
 
-    browseButton->addButtonListener (this);
+    browseButton->addListener (this);
 }
 
 void FilenameComponent::setTooltip (const String& newTooltip)

src/gui/components/juce_Component.h

@@ -40,7 +40,7 @@
 #include "../../text/juce_StringArray.h"
 #include "../../containers/juce_Array.h"
 #include "../../containers/juce_NamedValueSet.h"
-#include "../../containers/juce_WeakReference.h"
+#include "../../memory/juce_WeakReference.h"
 #include "juce_ModalComponentManager.h"
 
 class LookAndFeel;

src/gui/components/keyboard/juce_KeyMappingEditorComponent.cpp

@@ -403,7 +403,7 @@ KeyMappingEditorComponent::KeyMappingEditorComponent (KeyPressMappingSet& mappin
     if (showResetToDefaultButton)
     {
         addAndMakeVisible (&resetButton);
-        resetButton.addButtonListener (treeItem);
+        resetButton.addListener (treeItem);
     }
 
     addAndMakeVisible (&tree);

src/gui/components/keyboard/juce_TextInputTarget.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_TEXTINPUTTARGET_JUCEHEADER__
 #define __JUCE_TEXTINPUTTARGET_JUCEHEADER__
 
-#include "../../../containers/juce_Range.h"
+#include "../../../maths/juce_Range.h"
 
 
 //==============================================================================