diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:25 -0600 |
| commit | 1623fe64102c18ab098b79656b80f28cef840756 (patch) | |
| tree | 78f35fef11ea3dbbca1ba4c99937736a1a0894cf /lib/cppparser/lexer.cpp | |
| parent | b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 (diff) | |
| download | tdevelop-1623fe64102c18ab098b79656b80f28cef840756.tar.gz tdevelop-1623fe64102c18ab098b79656b80f28cef840756.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.
Diffstat (limited to 'lib/cppparser/lexer.cpp')
| -rw-r--r-- | lib/cppparser/lexer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp index 167c88c4..1ed9fca7 100644 --- a/lib/cppparser/lexer.cpp +++ b/lib/cppparser/lexer.cpp @@ -184,7 +184,7 @@ int Lexer::toInt( const Token& token ) int i = s[0] == 'L' ? 2 : 1; // wide char ? if( s[i] == '\\' ){ // escaped char - int c = s[i+1].unicode(); + int c = s[i+1].tqunicode(); switch( c ) { case '0': return 0; @@ -195,7 +195,7 @@ int Lexer::toInt( const Token& token ) return c; } } else { - return s[i].unicode(); + return s[i].tqunicode(); } } else { return 0; @@ -386,21 +386,21 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) TQString tokText = tok.text(); HashedString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText; if( str == ide ){ - //Problem p( i18n("unsafe use of macro '%1', macro is ignored").arg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning ); + //Problem p( i18n("unsafe use of macro '%1', macro is ignored").tqarg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning ); //m_driver->addProblem( m_driver->currentFileName(), p ); m_driver->removeMacro( ide ); // str = TQString(); } if( stringify ) { - textToInsert.append( TQString::fromLatin1("\"") + str.str() + TQString::fromLatin1("\" ") ); + textToInsert.append( TQString::tqfromLatin1("\"") + str.str() + TQString::tqfromLatin1("\" ") ); } else if( merge ){ textToInsert.truncate( textToInsert.length() - 1 ); - textToInsert.append( str.str() + TQString::fromLatin1(" ") ); + textToInsert.append( str.str() + TQString::tqfromLatin1(" ") ); } else if( tok == Token_ellipsis && d->hasBind("...") ){ textToInsert.append( ellipsisArg ); } else { - textToInsert.append( str.str() + TQString::fromLatin1(" ") ); + textToInsert.append( str.str() + TQString::tqfromLatin1(" ") ); } } |