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

Added Value support to the Button's toggle state and TextEditor content. Refactored the atomic operation functions to live inside a class called Atomic, and the byte order functions into a class called ByteOrder.

Browse source
This commit is contained in:
Julian Storer 2010-01-10 22:00:59 +00:00
parent 3ddbc82f9f
commit 18ffeba9da
64 changed files with 3721 additions and 3609 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/text/juce_String.cpp
View file

@ -58,7 +58,7 @@ void juce_initialiseStrings()
//==============================================================================
void String::deleteInternal() throw()
{
if (atomicDecrementAndReturn (text->refCount) == 0)
if (Atomic::decrementAndReturn (text->refCount) == 0)
juce_free (text);
}
@ -105,7 +105,7 @@ void String::appendInternal (const tchar* const newText,
InternalRefCountedStringHolder* const old = text;
text = newTextHolder;
if (atomicDecrementAndReturn (old->refCount) == 0)
if (Atomic::decrementAndReturn (old->refCount) == 0)
juce_free (old);
}
else
@ -145,7 +145,7 @@ void String::dupeInternalIfMultiplyReferenced() throw()
text = newTextHolder;
if (atomicDecrementAndReturn (old->refCount) == 0)
if (Atomic::decrementAndReturn (old->refCount) == 0)
juce_free (old);
}
}
@ -163,7 +163,7 @@ String::String() throw()
String::String (const String& other) throw()
: text (other.text)
{
atomicIncrement (text->refCount);
Atomic::increment (text->refCount);
}
String::String (const int numChars,
@ -461,7 +461,7 @@ String::~String() throw()
{
emptyString.refCount = safeEmptyStringRefCount;
if (atomicDecrementAndReturn (text->refCount) == 0)
if (Atomic::decrementAndReturn (text->refCount) == 0)
juce_free (text);
}
@ -625,9 +625,9 @@ const String& String::operator= (const String& other) throw()
{
if (this != &other)
{
atomicIncrement (other.text->refCount);
Atomic::increment (other.text->refCount);
if (atomicDecrementAndReturn (text->refCount) == 0)
if (Atomic::decrementAndReturn (text->refCount) == 0)
juce_free (text);
text = other.text;
@ -2087,12 +2087,12 @@ const String String::createStringFromData (const void* const data_,
if (bigEndian)
{
for (int i = 0; i < numChars; ++i)
dst[i] = (tchar) swapIfLittleEndian (src[i]);
dst[i] = (tchar) ByteOrder::swapIfLittleEndian (src[i]);
}
else
{
for (int i = 0; i < numChars; ++i)
dst[i] = (tchar) swapIfBigEndian (src[i]);
dst[i] = (tchar) ByteOrder::swapIfBigEndian (src[i]);
}
dst [numChars] = 0;
@ -2276,5 +2276,28 @@ const String String::fromUTF8 (const uint8* const buffer, int bufferSizeBytes) t
return result;
}
//==============================================================================
String::Concatenator::Concatenator (String& stringToAppendTo)
: result (stringToAppendTo),
nextIndex (stringToAppendTo.length())
{
}
String::Concatenator::~Concatenator()
{
}
void String::Concatenator::append (const String& s)
{
const int len = s.length();
if (len > 0)
{
result.preallocateStorage (nextIndex + len);
s.copyToBuffer (const_cast <tchar*> ((const tchar*) result) + nextIndex, len);
nextIndex += len;
}
}
END_JUCE_NAMESPACE