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/ksieve/error.h | 12 ++++++------ libksieve/ksieve/lexer.h | 2 +- libksieve/ksieve/scriptbuilder.h | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'libksieve/ksieve') diff --git a/libksieve/ksieve/error.h b/libksieve/ksieve/error.h index 2dbed32c8..de84b2041 100644 --- a/libksieve/ksieve/error.h +++ b/libksieve/ksieve/error.h @@ -33,7 +33,7 @@ #ifndef __KSIEVE_ERROR_H__ #define __KSIEVE_ERROR_H__ -#include +#include #include @@ -107,14 +107,14 @@ namespace KSieve { static const char * typeToString( Type type ); Error( Type type=None, - const QString & s1=QString::null, const QString & s2=QString::null, + const TQString & s1=TQString::null, const TQString & s2=TQString::null, int line=-1, int col=-1 ) : mType( type ), mLine( line ), mCol( col ), mStringOne( s1 ), mStringTwo( s2 ) {} Error( Type type, int line, int col ) : mType( type ), mLine( line ), mCol( col ) {} - QString asString() const; + TQString asString() const; /** So you can write
if( error() )
with e.g. @ref Lexer */ operator bool() const { @@ -124,14 +124,14 @@ namespace KSieve { Type type() const { return mType; } int line() const { return mLine; } int column() const { return mCol; } - QString firstString() const { return mStringOne; } - QString secondString() const { return mStringTwo; } + TQString firstString() const { return mStringOne; } + TQString secondString() const { return mStringTwo; } protected: Type mType; int mLine; int mCol; - QString mStringOne, mStringTwo; + TQString mStringOne, mStringTwo; }; } // namespace KSieve diff --git a/libksieve/ksieve/lexer.h b/libksieve/ksieve/lexer.h index d5bb1fc3b..befcb0242 100644 --- a/libksieve/ksieve/lexer.h +++ b/libksieve/ksieve/lexer.h @@ -89,7 +89,7 @@ namespace KSieve { /** Parse the next token and return it's type. @p result will contain the value of the token. */ - Token nextToken( QString & result ); + Token nextToken( TQString & result ); void save(); void restore(); diff --git a/libksieve/ksieve/scriptbuilder.h b/libksieve/ksieve/scriptbuilder.h index 5e0a955bb..28fd60879 100644 --- a/libksieve/ksieve/scriptbuilder.h +++ b/libksieve/ksieve/scriptbuilder.h @@ -43,18 +43,18 @@ namespace KSieve { public: virtual ~ScriptBuilder() {} - virtual void taggedArgument( const QString & tag ) = 0; - virtual void stringArgument( const QString & string, bool multiLine, const QString & embeddedHashComment ) = 0; + virtual void taggedArgument( const TQString & tag ) = 0; + virtual void stringArgument( const TQString & string, bool multiLine, const TQString & embeddedHashComment ) = 0; virtual void numberArgument( unsigned long number, char quantifier ) = 0; virtual void stringListArgumentStart() = 0; - virtual void stringListEntry( const QString & string, bool multiLine, const QString & embeddedHashComment ) = 0; + virtual void stringListEntry( const TQString & string, bool multiLine, const TQString & embeddedHashComment ) = 0; virtual void stringListArgumentEnd() = 0; - virtual void commandStart( const QString & identifier ) = 0; + virtual void commandStart( const TQString & identifier ) = 0; virtual void commandEnd() = 0; - virtual void testStart( const QString & identifier ) = 0; + virtual void testStart( const TQString & identifier ) = 0; virtual void testEnd() = 0; virtual void testListStart() = 0; @@ -64,9 +64,9 @@ namespace KSieve { virtual void blockEnd() = 0; /** A hash comment always includes an implicit lineFeed() at it's end. */ - virtual void hashComment( const QString & comment ) = 0; + virtual void hashComment( const TQString & comment ) = 0; /** Bracket comments inclde explicit lineFeed()s in their content */ - virtual void bracketComment( const QString & comment ) = 0; + virtual void bracketComment( const TQString & comment ) = 0; virtual void lineFeed() = 0; -- cgit v1.2.1