diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
| commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
| tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /lib/cppparser/lexer.h | |
| parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
| download | tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip | |
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'lib/cppparser/lexer.h')
| -rw-r--r-- | lib/cppparser/lexer.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h index a94e5c5e..cbaed1be 100644 --- a/lib/cppparser/lexer.h +++ b/lib/cppparser/lexer.h @@ -30,7 +30,7 @@ #include <hashedstring.h> #include <ext/hash_map> -#define CHARTYPE QChar +#define CHARTYPE TQChar enum Type { Token_eof = 0, @@ -60,7 +60,7 @@ enum Type { Token_k_dcop, Token_k_dcop_signals, - Token_Q_OBJECT, + Token_TQ_OBJECT, Token_signals, Token_slots, Token_emit, @@ -217,7 +217,7 @@ public: void setPreprocessorEnabled( bool enabled ); void resetSkipWords(); - void addSkipWord( const TQString& word, SkipType skipType=SkipWord, const TQString& str = TQString::null ); + void addSkipWord( const TQString& word, SkipType skipType=SkipWord, const TQString& str = TQString() ); TQString source() const; void setSource( const TQString& source ); @@ -243,11 +243,11 @@ public: int currentColumn() const { return m_currentColumn; } inline const CHARTYPE* offset( int offset ) const { - return m_source.unicode() + offset; + return m_source.tqunicode() + offset; } inline int getOffset( const TQChar* p ) const { - return int(p - (m_source.unicode())); + return int(p - (m_source.tqunicode())); } private: @@ -322,7 +322,7 @@ private: bool m_recordComments; bool m_recordWhiteSpaces; bool m_startLine; - __gnu_cxx::hash_map< HashedString, QPair<SkipType, TQString> > m_words; + __gnu_cxx::hash_map< HashedString, TQPair<SkipType, TQString> > m_words; int m_skippedLines; @@ -513,12 +513,12 @@ inline const Token& Lexer::nextToken() inline const Token& Lexer::tokenAt( int n ) const { - return *m_tokens[ QMIN(n, m_size-1) ]; + return *m_tokens[ TQMIN(n, m_size-1) ]; } inline const Token& Lexer::lookAhead( int n ) const { - return *m_tokens[ QMIN(m_index + n, m_size-1) ]; + return *m_tokens[ TQMIN(m_index + n, m_size-1) ]; } inline int Lexer::tokenPosition( const Token& token ) const |