From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libksieve/impl/lexer.h | 24 ++++++++++++------------ libksieve/impl/parser.h | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'libksieve/impl') diff --git a/libksieve/impl/lexer.h b/libksieve/impl/lexer.h index 0eba0e585..5dbb34076 100644 --- a/libksieve/impl/lexer.h +++ b/libksieve/impl/lexer.h @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include namespace KSieve { @@ -79,7 +79,7 @@ namespace KSieve { mState = mStateStack.pop(); } - Lexer::Token nextToken( QString & tokenValue ); + Lexer::Token nextToken( TQString & tokenValue ); private: /** Cursor must be positioned on the \r or the \n. */ @@ -88,13 +88,13 @@ namespace KSieve { /** Cursor must be positioned after the opening hash (#). If parsing is successful, cursor is positioned behind the CRLF that ended the comment's line (or past the end). */ - bool parseHashComment( QString & result, bool reallySave=false ); + bool parseHashComment( TQString & result, bool reallySave=false ); /** Cursor must be positioned after the opening slash-asterisk */ - bool parseBracketComment( QString & result, bool reallySave=false ); + bool parseBracketComment( TQString & result, bool reallySave=false ); /** Cursor must be positioned on the opening '/'or '#' */ - bool parseComment( QString & result, bool reallySave=false ); + bool parseComment( TQString & result, bool reallySave=false ); /** Eats whitespace, but not comments */ bool eatWS(); @@ -103,19 +103,19 @@ namespace KSieve { bool eatCWS(); /** Cursor must be positioned on the first character */ - bool parseIdentifier( QString & result ); + bool parseIdentifier( TQString & result ); /** Cursor must be positioned after the initial ':' */ - bool parseTag( QString & result ); + bool parseTag( TQString & result ); /** Cursor must be positioned on the first digit */ - bool parseNumber( QString & result ); + bool parseNumber( TQString & result ); /** Cursor must be positioned after the "text:" token. */ - bool parseMultiLine( QString & result ); + bool parseMultiLine( TQString & result ); /** Cursor must be positioned after the initial " */ - bool parseQuotedString( QString & result ); + bool parseQuotedString( TQString & result ); struct State { State( const char * s=0 ) @@ -129,7 +129,7 @@ namespace KSieve { const char * const mEnd; const bool mIgnoreComments : 1; const bool mIgnoreLF : 1; - QValueStack mStateStack; + TQValueStack mStateStack; const char * beginOfLine() const { return mState.beginOfLine; } diff --git a/libksieve/impl/parser.h b/libksieve/impl/parser.h index 736678b43..d337f0f9d 100644 --- a/libksieve/impl/parser.h +++ b/libksieve/impl/parser.h @@ -82,7 +82,7 @@ namespace KSieve { Lexer::Token token() const { return mToken; } - QString tokenValue() const { return mTokenValue; } + TQString tokenValue() const { return mTokenValue; } bool atEnd() const { return !mToken && lexer.atEnd() ; @@ -90,7 +90,7 @@ namespace KSieve { bool obtainToken(); void consumeToken() { mToken = Lexer::None; - mTokenValue = QString::null; + mTokenValue = TQString::null; } void makeError( Error::Type e, int line, int col ) { mError = Error( e, line, col ); @@ -108,7 +108,7 @@ namespace KSieve { Error mError; Lexer::Token mToken; - QString mTokenValue; + TQString mTokenValue; Lexer::Impl lexer; ScriptBuilder * mBuilder; }; -- cgit v1.2.1