mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-22 01:34:21 +00:00
Code Activity

Many more String changes, so that finally the String class can store its internal data as either utf8, 16 or 32 - this is controlled by a flag JUCE_STRING_UTF_TYPE. It's currently set to utf-8 by default.

Browse source
This commit is contained in:
Julian Storer 2011-02-22 15:33:30 +00:00
parent f471f0a72d
commit 533e7ba795
46 changed files with 993 additions and 706 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/text/juce_StringArray.cpp
View file

@ -328,14 +328,14 @@ const String StringArray::joinIntoString (const String& separator, int start, in
if (start == last - 1)
return strings.getReference (start);
const int separatorLen = separator.length();
int charsNeeded = separatorLen * (last - start - 1);
const size_t separatorBytes = separator.getCharPointer().sizeInBytes() - sizeof (String::CharPointerType::CharType);
size_t bytesNeeded = separatorBytes * (last - start - 1);
for (int i = start; i < last; ++i)
charsNeeded += strings.getReference(i).length();
bytesNeeded += strings.getReference(i).getCharPointer().sizeInBytes() - sizeof (String::CharPointerType::CharType);
String result;
result.preallocateStorage (charsNeeded);
result.preallocateBytes (bytesNeeded);
String::CharPointerType dest (result.getCharPointer());
@ -346,7 +346,7 @@ const String StringArray::joinIntoString (const String& separator, int start, in
if (! s.isEmpty())
dest.writeAll (s.getCharPointer());
if (++start < last && separatorLen > 0)
if (++start < last && separatorBytes > 0)
dest.writeAll (separator.getCharPointer());
}