mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-02-07 04:10:08 +00:00
Minor string literal tidy-ups.
This commit is contained in:
Julian Storer
parent
f316faaa04
commit
841a6665bd
148 changed files with 2219 additions and 2273 deletions
|
|
@ -46,14 +46,14 @@ namespace CppTokeniser
|
|||
static bool isIdentifierStart (const tchar c) throw()
|
||||
{
|
||||
return CharacterFunctions::isLetter (c)
|
||||
|| c == T('_') || c == T('@');
|
||||
|| c == '_' || c == '@';
|
||||
}
|
||||
|
||||
static bool isIdentifierBody (const tchar c) throw()
|
||||
{
|
||||
return CharacterFunctions::isLetter (c)
|
||||
|| CharacterFunctions::isDigit (c)
|
||||
|| c == T('_') || c == T('@');
|
||||
|| c == '_' || c == '@';
|
||||
}
|
||||
|
||||
static int parseIdentifier (CodeDocument::Iterator& source) throw()
|
||||
|
|
@ -314,7 +314,7 @@ static void skipComment (CodeDocument::Iterator& source) throw()
|
|||
{
|
||||
const juce_wchar c = source.nextChar();
|
||||
|
||||
if (c == 0 || (c == T('/') && lastWasStar))
|
||||
if (c == 0 || (c == '/' && lastWasStar))
|
||||
break;
|
||||
|
||||
lastWasStar = (c == '*');
|
||||
|
|
@ -337,20 +337,20 @@ int CPlusPlusCodeTokeniser::readNextToken (CodeDocument::Iterator& source)
|
|||
source.skip();
|
||||
break;
|
||||
|
||||
case T('0'):
|
||||
case T('1'):
|
||||
case T('2'):
|
||||
case T('3'):
|
||||
case T('4'):
|
||||
case T('5'):
|
||||
case T('6'):
|
||||
case T('7'):
|
||||
case T('8'):
|
||||
case T('9'):
|
||||
case '0':
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
case '4':
|
||||
case '5':
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9':
|
||||
result = CppTokeniser::parseNumber (source);
|
||||
break;
|
||||
|
||||
case T('.'):
|
||||
case '.':
|
||||
result = CppTokeniser::parseNumber (source);
|
||||
|
||||
if (result == tokenType_error)
|
||||
|
|
@ -358,41 +358,41 @@ int CPlusPlusCodeTokeniser::readNextToken (CodeDocument::Iterator& source)
|
|||
|
||||
break;
|
||||
|
||||
case T(','):
|
||||
case T(';'):
|
||||
case T(':'):
|
||||
case ',':
|
||||
case ';':
|
||||
case ':':
|
||||
source.skip();
|
||||
result = tokenType_punctuation;
|
||||
break;
|
||||
|
||||
case T('('):
|
||||
case T(')'):
|
||||
case T('{'):
|
||||
case T('}'):
|
||||
case T('['):
|
||||
case T(']'):
|
||||
case '(':
|
||||
case ')':
|
||||
case '{':
|
||||
case '}':
|
||||
case '[':
|
||||
case ']':
|
||||
source.skip();
|
||||
result = tokenType_bracket;
|
||||
break;
|
||||
|
||||
case T('"'):
|
||||
case T('\''):
|
||||
case '"':
|
||||
case '\'':
|
||||
CppTokeniser::skipQuotedString (source);
|
||||
result = tokenType_stringLiteral;
|
||||
break;
|
||||
|
||||
case T('+'):
|
||||
case '+':
|
||||
result = tokenType_operator;
|
||||
source.skip();
|
||||
|
||||
if (source.peekNextChar() == T('+'))
|
||||
if (source.peekNextChar() == '+')
|
||||
source.skip();
|
||||
else if (source.peekNextChar() == T('='))
|
||||
else if (source.peekNextChar() == '=')
|
||||
source.skip();
|
||||
|
||||
break;
|
||||
|
||||
case T('-'):
|
||||
case '-':
|
||||
source.skip();
|
||||
result = CppTokeniser::parseNumber (source);
|
||||
|
||||
|
|
@ -400,39 +400,39 @@ int CPlusPlusCodeTokeniser::readNextToken (CodeDocument::Iterator& source)
|
|||
{
|
||||
result = tokenType_operator;
|
||||
|
||||
if (source.peekNextChar() == T('-'))
|
||||
if (source.peekNextChar() == '-')
|
||||
source.skip();
|
||||
else if (source.peekNextChar() == T('='))
|
||||
else if (source.peekNextChar() == '=')
|
||||
source.skip();
|
||||
}
|
||||
break;
|
||||
|
||||
case T('*'):
|
||||
case T('%'):
|
||||
case T('='):
|
||||
case T('!'):
|
||||
case '*':
|
||||
case '%':
|
||||
case '=':
|
||||
case '!':
|
||||
result = tokenType_operator;
|
||||
source.skip();
|
||||
|
||||
if (source.peekNextChar() == T('='))
|
||||
if (source.peekNextChar() == '=')
|
||||
source.skip();
|
||||
|
||||
break;
|
||||
|
||||
case T('/'):
|
||||
case '/':
|
||||
result = tokenType_operator;
|
||||
source.skip();
|
||||
|
||||
if (source.peekNextChar() == T('='))
|
||||
if (source.peekNextChar() == '=')
|
||||
{
|
||||
source.skip();
|
||||
}
|
||||
else if (source.peekNextChar() == T('/'))
|
||||
else if (source.peekNextChar() == '/')
|
||||
{
|
||||
result = tokenType_comment;
|
||||
source.skipToEndOfLine();
|
||||
}
|
||||
else if (source.peekNextChar() == T('*'))
|
||||
else if (source.peekNextChar() == '*')
|
||||
{
|
||||
source.skip();
|
||||
result = tokenType_comment;
|
||||
|
|
@ -441,103 +441,103 @@ int CPlusPlusCodeTokeniser::readNextToken (CodeDocument::Iterator& source)
|
|||
|
||||
break;
|
||||
|
||||
case T('?'):
|
||||
case T('~'):
|
||||
case '?':
|
||||
case '~':
|
||||
source.skip();
|
||||
result = tokenType_operator;
|
||||
break;
|
||||
|
||||
case T('<'):
|
||||
case '<':
|
||||
source.skip();
|
||||
result = tokenType_operator;
|
||||
|
||||
if (source.peekNextChar() == T('='))
|
||||
if (source.peekNextChar() == '=')
|
||||
{
|
||||
source.skip();
|
||||
}
|
||||
else if (source.peekNextChar() == T('<'))
|
||||
else if (source.peekNextChar() == '<')
|
||||
{
|
||||
source.skip();
|
||||
|
||||
if (source.peekNextChar() == T('='))
|
||||
if (source.peekNextChar() == '=')
|
||||
source.skip();
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case T('>'):
|
||||
case '>':
|
||||
source.skip();
|
||||
result = tokenType_operator;
|
||||
|
||||
if (source.peekNextChar() == T('='))
|
||||
if (source.peekNextChar() == '=')
|
||||
{
|
||||
source.skip();
|
||||
}
|
||||
else if (source.peekNextChar() == T('<'))
|
||||
else if (source.peekNextChar() == '<')
|
||||
{
|
||||
source.skip();
|
||||
|
||||
if (source.peekNextChar() == T('='))
|
||||
if (source.peekNextChar() == '=')
|
||||
source.skip();
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case T('|'):
|
||||
case '|':
|
||||
source.skip();
|
||||
result = tokenType_operator;
|
||||
|
||||
if (source.peekNextChar() == T('='))
|
||||
if (source.peekNextChar() == '=')
|
||||
{
|
||||
source.skip();
|
||||
}
|
||||
else if (source.peekNextChar() == T('|'))
|
||||
else if (source.peekNextChar() == '|')
|
||||
{
|
||||
source.skip();
|
||||
|
||||
if (source.peekNextChar() == T('='))
|
||||
if (source.peekNextChar() == '=')
|
||||
source.skip();
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case T('&'):
|
||||
case '&':
|
||||
source.skip();
|
||||
result = tokenType_operator;
|
||||
|
||||
if (source.peekNextChar() == T('='))
|
||||
if (source.peekNextChar() == '=')
|
||||
{
|
||||
source.skip();
|
||||
}
|
||||
else if (source.peekNextChar() == T('&'))
|
||||
else if (source.peekNextChar() == '&')
|
||||
{
|
||||
source.skip();
|
||||
|
||||
if (source.peekNextChar() == T('='))
|
||||
if (source.peekNextChar() == '=')
|
||||
source.skip();
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case T('^'):
|
||||
case '^':
|
||||
source.skip();
|
||||
result = tokenType_operator;
|
||||
|
||||
if (source.peekNextChar() == T('='))
|
||||
if (source.peekNextChar() == '=')
|
||||
{
|
||||
source.skip();
|
||||
}
|
||||
else if (source.peekNextChar() == T('^'))
|
||||
else if (source.peekNextChar() == '^')
|
||||
{
|
||||
source.skip();
|
||||
|
||||
if (source.peekNextChar() == T('='))
|
||||
if (source.peekNextChar() == '=')
|
||||
source.skip();
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case T('#'):
|
||||
case '#':
|
||||
result = tokenType_preprocessor;
|
||||
source.skipToEndOfLine();
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -61,12 +61,12 @@ public:
|
|||
|
||||
while (t[pos] != 0)
|
||||
{
|
||||
if (t[pos] == T('\r'))
|
||||
if (t[pos] == '\r')
|
||||
{
|
||||
++numNewLineChars;
|
||||
++pos;
|
||||
|
||||
if (t[pos] == T('\n'))
|
||||
if (t[pos] == '\n')
|
||||
{
|
||||
++numNewLineChars;
|
||||
++pos;
|
||||
|
|
@ -75,7 +75,7 @@ public:
|
|||
break;
|
||||
}
|
||||
|
||||
if (t[pos] == T('\n'))
|
||||
if (t[pos] == '\n')
|
||||
{
|
||||
++numNewLineChars;
|
||||
++pos;
|
||||
|
|
@ -567,7 +567,7 @@ bool CodeDocument::writeToStream (OutputStream& stream)
|
|||
|
||||
void CodeDocument::setNewLineCharacters (const String& newLine) throw()
|
||||
{
|
||||
jassert (newLine == T("\r\n") || newLine == T("\n") || newLine == T("\r"));
|
||||
jassert (newLine == "\r\n" || newLine == "\n" || newLine == "\r");
|
||||
newLineChars = newLine;
|
||||
}
|
||||
|
||||
|
|
@ -617,8 +617,8 @@ const CodeDocument::Position CodeDocument::findWordBreakAfter (const Position& p
|
|||
|
||||
while (i < maxDistance
|
||||
&& CharacterFunctions::isWhitespace (p.getCharacter())
|
||||
&& (i == 0 || (p.getCharacter() != T('\n')
|
||||
&& p.getCharacter() != T('\r'))))
|
||||
&& (i == 0 || (p.getCharacter() != '\n'
|
||||
&& p.getCharacter() != '\r')))
|
||||
{
|
||||
++i;
|
||||
p.moveBy (1);
|
||||
|
|
@ -636,8 +636,8 @@ const CodeDocument::Position CodeDocument::findWordBreakAfter (const Position& p
|
|||
|
||||
while (i < maxDistance
|
||||
&& CharacterFunctions::isWhitespace (p.getCharacter())
|
||||
&& (i == 0 || (p.getCharacter() != T('\n')
|
||||
&& p.getCharacter() != T('\r'))))
|
||||
&& (i == 0 || (p.getCharacter() != '\n'
|
||||
&& p.getCharacter() != '\r')))
|
||||
{
|
||||
++i;
|
||||
p.moveBy (1);
|
||||
|
|
@ -658,7 +658,7 @@ const CodeDocument::Position CodeDocument::findWordBreakBefore (const Position&
|
|||
{
|
||||
const tchar c = p.movedBy (-1).getCharacter();
|
||||
|
||||
if (c == T('\r') || c == T('\n'))
|
||||
if (c == '\r' || c == '\n')
|
||||
{
|
||||
stoppedAtLineStart = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ private:
|
|||
|
||||
for (;;)
|
||||
{
|
||||
int tabPos = t.text.indexOfChar (T('\t'));
|
||||
int tabPos = t.text.indexOfChar ('\t');
|
||||
if (tabPos < 0)
|
||||
break;
|
||||
|
||||
|
|
@ -264,7 +264,7 @@ private:
|
|||
int col = 0;
|
||||
for (int i = 0; i < index; ++i)
|
||||
{
|
||||
if (line[i] != T('\t'))
|
||||
if (line[i] != '\t')
|
||||
++col;
|
||||
else
|
||||
col += spacesPerTab - (col % spacesPerTab);
|
||||
|
|
@ -636,7 +636,7 @@ void CodeEditorComponent::insertTabAtCaret()
|
|||
}
|
||||
else
|
||||
{
|
||||
insertTextAtCaret (T("\t"));
|
||||
insertTextAtCaret ("\t");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -952,28 +952,28 @@ bool CodeEditorComponent::keyPressed (const KeyPress& key)
|
|||
{
|
||||
deleteForward (moveInWholeWordSteps);
|
||||
}
|
||||
else if (key == KeyPress (T('c'), ModifierKeys::commandModifier, 0))
|
||||
else if (key == KeyPress ('c', ModifierKeys::commandModifier, 0))
|
||||
{
|
||||
copy();
|
||||
}
|
||||
else if (key == KeyPress (T('x'), ModifierKeys::commandModifier, 0))
|
||||
else if (key == KeyPress ('x', ModifierKeys::commandModifier, 0))
|
||||
{
|
||||
copyThenCut();
|
||||
}
|
||||
else if (key == KeyPress (T('v'), ModifierKeys::commandModifier, 0))
|
||||
else if (key == KeyPress ('v', ModifierKeys::commandModifier, 0))
|
||||
{
|
||||
paste();
|
||||
}
|
||||
else if (key == KeyPress (T('z'), ModifierKeys::commandModifier, 0))
|
||||
else if (key == KeyPress ('z', ModifierKeys::commandModifier, 0))
|
||||
{
|
||||
undo();
|
||||
}
|
||||
else if (key == KeyPress (T('y'), ModifierKeys::commandModifier, 0)
|
||||
|| key == KeyPress (T('z'), ModifierKeys::commandModifier | ModifierKeys::shiftModifier, 0))
|
||||
else if (key == KeyPress ('y', ModifierKeys::commandModifier, 0)
|
||||
|| key == KeyPress ('z', ModifierKeys::commandModifier | ModifierKeys::shiftModifier, 0))
|
||||
{
|
||||
redo();
|
||||
}
|
||||
else if (key == KeyPress (T('a'), ModifierKeys::commandModifier, 0))
|
||||
else if (key == KeyPress ('a', ModifierKeys::commandModifier, 0))
|
||||
{
|
||||
selectAll();
|
||||
}
|
||||
|
|
@ -1098,7 +1098,7 @@ int CodeEditorComponent::indexToColumn (int lineNum, int index) const throw()
|
|||
int col = 0;
|
||||
for (int i = 0; i < index; ++i)
|
||||
{
|
||||
if (line[i] != T('\t'))
|
||||
if (line[i] != '\t')
|
||||
++col;
|
||||
else
|
||||
col += getTabSize() - (col % getTabSize());
|
||||
|
|
@ -1115,7 +1115,7 @@ int CodeEditorComponent::columnToIndex (int lineNum, int column) const throw()
|
|||
int i, col = 0;
|
||||
for (i = 0; i < lineLength; ++i)
|
||||
{
|
||||
if (line[i] != T('\t'))
|
||||
if (line[i] != '\t')
|
||||
++col;
|
||||
else
|
||||
col += getTabSize() - (col % getTabSize());
|
||||
|
|
@ -1131,7 +1131,7 @@ int CodeEditorComponent::columnToIndex (int lineNum, int column) const throw()
|
|||
void CodeEditorComponent::setFont (const Font& newFont)
|
||||
{
|
||||
font = newFont;
|
||||
charWidth = font.getStringWidthFloat (T("0"));
|
||||
charWidth = font.getStringWidthFloat ("0");
|
||||
lineHeight = roundToInt (font.getHeight());
|
||||
resized();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue