Browse Source

Minor StringArray fixes.

tags/2021-05-28
Julian Storer 16 years ago
parent
commit
2b06e4f6d9
5 changed files with 6 additions and 6 deletions
  1. +2
    -2
      juce_amalgamated.cpp
  2. +1
    -1
      juce_amalgamated.h
  3. +1
    -1
      src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm
  4. +1
    -1
      src/gui/graphics/geometry/juce_Rectangle.h
  5. +1
    -1
      src/text/juce_StringArray.cpp

+ 2
- 2
juce_amalgamated.cpp View File

@@ -12760,7 +12760,7 @@ const String StringArray::joinIntoString (const String& separator, int start, in

int StringArray::addTokens (const String& text, const bool preserveQuotedStrings)
{
return addTokens (text, T(" \n\r\t"), preserveQuotedStrings ? T("\"") : 0);
return addTokens (text, T(" \n\r\t"), preserveQuotedStrings ? T("\"") : T(""));
}

int StringArray::addTokens (const String& text, const String& breakCharacters, const String& quoteCharacters)
@@ -29976,7 +29976,7 @@ static bool getComponentDescFromIdentifier (const String& fileOrIdentifier, Comp
fileOrIdentifier.lastIndexOfChar (T('/'))) + 1));

StringArray tokens;
tokens.addTokens (s, T(","), 0);
tokens.addTokens (s, T(","), String::empty);
tokens.trim();
tokens.removeEmptyStrings();



+ 1
- 1
juce_amalgamated.h View File

@@ -10105,7 +10105,7 @@ public:
static const Rectangle fromString (const String& stringVersion)
{
StringArray toks;
toks.addTokens (stringVersion.trim(), T(",; \t\r\n"), 0);
toks.addTokens (stringVersion.trim(), T(",; \t\r\n"), String::empty);

return Rectangle (toks[0].trim().getIntValue(),
toks[1].trim().getIntValue(),


+ 1
- 1
src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm View File

@@ -165,7 +165,7 @@ static bool getComponentDescFromIdentifier (const String& fileOrIdentifier, Comp
fileOrIdentifier.lastIndexOfChar (T('/'))) + 1));
StringArray tokens;
tokens.addTokens (s, T(","), 0);
tokens.addTokens (s, T(","), String::empty);
tokens.trim();
tokens.removeEmptyStrings();


+ 1
- 1
src/gui/graphics/geometry/juce_Rectangle.h View File

@@ -513,7 +513,7 @@ public:
static const Rectangle fromString (const String& stringVersion)
{
StringArray toks;
toks.addTokens (stringVersion.trim(), T(",; \t\r\n"), 0);
toks.addTokens (stringVersion.trim(), T(",; \t\r\n"), String::empty);
return Rectangle (toks[0].trim().getIntValue(),
toks[1].trim().getIntValue(),


+ 1
- 1
src/text/juce_StringArray.cpp View File

@@ -329,7 +329,7 @@ const String StringArray::joinIntoString (const String& separator, int start, in
int StringArray::addTokens (const String& text, const bool preserveQuotedStrings)
{
return addTokens (text, T(" \n\r\t"), preserveQuotedStrings ? T("\"") : 0);
return addTokens (text, T(" \n\r\t"), preserveQuotedStrings ? T("\"") : T(""));
}
int StringArray::addTokens (const String& text, const String& breakCharacters, const String& quoteCharacters)


Loading…
Cancel
Save