diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:23:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:23:31 -0600 |
| commit | 36b1e019b76f39cca8fc81f6d4df544f1c94c179 (patch) | |
| tree | 3ca2f4886d1a2810b952164dd1b0f3e92ef6bf3a /umbrello/umbrello/codeimport | |
| parent | f78838f2f736acc2b235d8b680f3379a07a6d372 (diff) | |
| download | tdesdk-36b1e019b76f39cca8fc81f6d4df544f1c94c179.tar.gz tdesdk-36b1e019b76f39cca8fc81f6d4df544f1c94c179.zip | |
Rename obsolete tq methods to standard names
Diffstat (limited to 'umbrello/umbrello/codeimport')
| -rw-r--r-- | umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp | 8 | ||||
| -rw-r--r-- | umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp | 6 | ||||
| -rw-r--r-- | umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp index 38561d53..eb3c4b6a 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp @@ -175,7 +175,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].tqunicode(); + int c = s[i+1].unicode(); switch( c ) { case '0': return 0; @@ -186,7 +186,7 @@ int Lexer::toInt( const Token& token ) return c; } } else { - return s[i].tqunicode(); + return s[i].unicode(); } } else { return 0; @@ -465,7 +465,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) tk.setStartPosition( startLine, startColumn ); tk.setEndPosition( m_currentLine, m_currentColumn ); } else { - tk = CREATE_TOKEN( ch.tqunicode(), currentPosition(), 1 ); + tk = CREATE_TOKEN( ch.unicode(), currentPosition(), 1 ); nextChar(); tk.setStartPosition( startLine, startColumn ); tk.setEndPosition( m_currentLine, m_currentColumn ); @@ -808,7 +808,7 @@ int Lexer::macroPrimary() { readWhiteSpaces( false ); int result = 0; - switch( currentChar().tqunicode() ) { + switch( currentChar().unicode() ) { case '(': nextChar(); result = macroExpression(); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp index a05a7ddf..2d009294 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp @@ -71,7 +71,7 @@ const HashEntry* Lookup::findEntry( const struct HashTable *table, const HashEntry* Lookup::findEntry( const struct HashTable *table, const TQString &s ) { - return findEntry( table, s.tqunicode(), s.length() ); + return findEntry( table, s.unicode(), s.length() ); } int Lookup::find(const struct HashTable *table, @@ -85,7 +85,7 @@ int Lookup::find(const struct HashTable *table, int Lookup::find(const struct HashTable *table, const TQString &s) { - return find(table, s.tqunicode(), s.length()); + return find(table, s.unicode(), s.length()); } unsigned int Lookup::hash(const TQChar *c, unsigned int len) @@ -100,7 +100,7 @@ unsigned int Lookup::hash(const TQChar *c, unsigned int len) unsigned int Lookup::hash(const TQString &key) { - return hash(key.tqunicode(), key.length()); + return hash(key.unicode(), key.length()); } unsigned int Lookup::hash(const char *s) diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp index 8b8cc8eb..3e6dde46 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp @@ -294,7 +294,7 @@ TQString URLUtil::envExpand ( const TQString& str ) if (pos < 0) pos = len; - char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() ); + char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() ); if (ret) { |