| @@ -171,7 +171,7 @@ void JucerDocument::setParentClasses (const String& classes) | |||||
| type = s = String(); | type = s = String(); | ||||
| } | } | ||||
| s = type + CodeHelpers::makeValidIdentifier (s.trim(), false, false, true); | |||||
| s = type + CodeHelpers::makeValidIdentifier (s.trim(), false, false, true, true); | |||||
| parentClassLines.set (i, s); | parentClassLines.set (i, s); | ||||
| } | } | ||||
| @@ -69,7 +69,7 @@ namespace CodeHelpers | |||||
| return lines.joinIntoString (newLine); | return lines.joinIntoString (newLine); | ||||
| } | } | ||||
| String makeValidIdentifier (String s, bool capitalise, bool removeColons, bool allowTemplates) | |||||
| String makeValidIdentifier (String s, bool capitalise, bool removeColons, bool allowTemplates, bool allowAsterisks) | |||||
| { | { | ||||
| if (s.isEmpty()) | if (s.isEmpty()) | ||||
| return "unknown"; | return "unknown"; | ||||
| @@ -93,6 +93,9 @@ namespace CodeHelpers | |||||
| if (! removeColons) | if (! removeColons) | ||||
| allowedChars += ":"; | allowedChars += ":"; | ||||
| if (allowAsterisks) | |||||
| allowedChars += "*"; | |||||
| StringArray words; | StringArray words; | ||||
| words.addTokens (s.retainCharacters (allowedChars), false); | words.addTokens (s.retainCharacters (allowedChars), false); | ||||
| words.trim(); | words.trim(); | ||||
| @@ -32,7 +32,8 @@ namespace CodeHelpers | |||||
| { | { | ||||
| String indent (const String& code, int numSpaces, bool indentFirstLine); | String indent (const String& code, int numSpaces, bool indentFirstLine); | ||||
| String unindent (const String& code, int numSpaces); | String unindent (const String& code, int numSpaces); | ||||
| String makeValidIdentifier (String s, bool capitalise, bool removeColons, bool allowTemplates); | |||||
| String makeValidIdentifier (String s, bool capitalise, bool removeColons, | |||||
| bool allowTemplates, bool allowAsterisks = false); | |||||
| String createIncludeStatement (const File& includedFile, const File& targetFile); | String createIncludeStatement (const File& includedFile, const File& targetFile); | ||||
| String createIncludeStatement (const String& includePath); | String createIncludeStatement (const String& includePath); | ||||
| String makeHeaderGuardName (const File& file); | String makeHeaderGuardName (const File& file); | ||||