summaryrefslogtreecommitdiffstats
path: root/libksieve
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
commit67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch)
tree5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /libksieve
parent2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff)
downloadtdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz
tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libksieve')
-rw-r--r--libksieve/impl/lexer.h6
-rw-r--r--libksieve/impl/parser.h8
-rw-r--r--libksieve/impl/utf8validator.h6
-rw-r--r--libksieve/ksieve/error.h8
-rw-r--r--libksieve/ksieve/lexer.h6
-rw-r--r--libksieve/ksieve/parser.h6
-rw-r--r--libksieve/ksieve/scriptbuilder.h6
-rw-r--r--libksieve/parser/lexer.cpp16
-rw-r--r--libksieve/parser/parser.cpp10
-rw-r--r--libksieve/parser/utf8validator.cpp6
-rw-r--r--libksieve/shared/error.cpp8
-rw-r--r--libksieve/tests/lexertest.cpp6
-rw-r--r--libksieve/tests/parsertest.cpp8
13 files changed, 50 insertions, 50 deletions
diff --git a/libksieve/impl/lexer.h b/libksieve/impl/lexer.h
index 5dbb3407..1620f29d 100644
--- a/libksieve/impl/lexer.h
+++ b/libksieve/impl/lexer.h
@@ -22,11 +22,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/libksieve/impl/parser.h b/libksieve/impl/parser.h
index d337f0f9..dd8b8228 100644
--- a/libksieve/impl/parser.h
+++ b/libksieve/impl/parser.h
@@ -22,11 +22,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -90,7 +90,7 @@ namespace KSieve {
bool obtainToken();
void consumeToken() {
mToken = Lexer::None;
- mTokenValue = TQString::null;
+ mTokenValue = TQString();
}
void makeError( Error::Type e, int line, int col ) {
mError = Error( e, line, col );
diff --git a/libksieve/impl/utf8validator.h b/libksieve/impl/utf8validator.h
index aa10bad2..e0f11222 100644
--- a/libksieve/impl/utf8validator.h
+++ b/libksieve/impl/utf8validator.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/libksieve/ksieve/error.h b/libksieve/ksieve/error.h
index de84b204..dc6b63bc 100644
--- a/libksieve/ksieve/error.h
+++ b/libksieve/ksieve/error.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -107,7 +107,7 @@ namespace KSieve {
static const char * typeToString( Type type );
Error( Type type=None,
- const TQString & s1=TQString::null, const TQString & s2=TQString::null,
+ const TQString & s1=TQString(), const TQString & s2=TQString(),
int line=-1, int col=-1 )
: mType( type ), mLine( line ), mCol( col ),
mStringOne( s1 ), mStringTwo( s2 ) {}
diff --git a/libksieve/ksieve/lexer.h b/libksieve/ksieve/lexer.h
index 8acb908d..d4dc7a97 100644
--- a/libksieve/ksieve/lexer.h
+++ b/libksieve/ksieve/lexer.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/libksieve/ksieve/parser.h b/libksieve/ksieve/parser.h
index eadd00ff..26e55a05 100644
--- a/libksieve/ksieve/parser.h
+++ b/libksieve/ksieve/parser.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/libksieve/ksieve/scriptbuilder.h b/libksieve/ksieve/scriptbuilder.h
index 71100d52..f365adfa 100644
--- a/libksieve/ksieve/scriptbuilder.h
+++ b/libksieve/ksieve/scriptbuilder.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp
index be0c493f..a38c6102 100644
--- a/libksieve/parser/lexer.cpp
+++ b/libksieve/parser/lexer.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -192,7 +192,7 @@ namespace KSieve {
Lexer::Token Lexer::Impl::nextToken( TQString & result ) {
assert( !atEnd() );
- result = TQString::null;
+ result = TQString();
//clearErrors();
const int oldLine = line();
@@ -499,8 +499,8 @@ namespace KSieve {
}
bool Lexer::Impl::parseNumber( TQString & result ) {
- // number := 1*DIGIT [QUANTIFIER]
- // QUANTIFIER := "K" / "M" / "G"
+ // number := 1*DIGIT [TQUANTIFIER]
+ // TQUANTIFIER := "K" / "M" / "G"
assert( isdigit( *mState.cursor ) );
@@ -592,7 +592,7 @@ namespace KSieve {
if ( line == "." )
break;
} else {
- lines.push_back( TQString::null );
+ lines.push_back( TQString() );
}
}
@@ -608,7 +608,7 @@ namespace KSieve {
}
bool Lexer::Impl::parseQuotedString( TQString & result ) {
- // quoted-string := DQUOTE *CHAR DQUOTE
+ // quoted-string := DTQUOTE *CHAR DTQUOTE
// check that caller plays by the rules:
assert( *(mState.cursor-1) == '"' );
diff --git a/libksieve/parser/parser.cpp b/libksieve/parser/parser.cpp
index 0a136e71..e823ac3f 100644
--- a/libksieve/parser/parser.cpp
+++ b/libksieve/parser/parser.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -332,7 +332,7 @@ namespace KSieve {
return true;
} else if ( isStringToken() ) {
if ( scriptBuilder() )
- scriptBuilder()->stringArgument( tokenValue(), token() == Lexer::MultiLineString, TQString::null );
+ scriptBuilder()->stringArgument( tokenValue(), token() == Lexer::MultiLineString, TQString() );
consumeToken();
return true;
} else if ( token() == Lexer::Special && tokenValue() == "[" ) {
@@ -590,7 +590,7 @@ namespace KSieve {
}
lastWasComma = false;
if ( scriptBuilder() )
- scriptBuilder()->stringListEntry( tokenValue(), token() == Lexer::MultiLineString, TQString::null );
+ scriptBuilder()->stringListEntry( tokenValue(), token() == Lexer::MultiLineString, TQString() );
consumeToken();
break;
diff --git a/libksieve/parser/utf8validator.cpp b/libksieve/parser/utf8validator.cpp
index ac94281e..b8600e7b 100644
--- a/libksieve/parser/utf8validator.cpp
+++ b/libksieve/parser/utf8validator.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/libksieve/shared/error.cpp b/libksieve/shared/error.cpp
index 527370b8..faf20bcc 100644
--- a/libksieve/shared/error.cpp
+++ b/libksieve/shared/error.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -103,7 +103,7 @@ namespace KSieve {
TQString err;
switch( type() ) {
case None:
- return TQString::null;
+ return TQString();
case Custom:
return mStringOne;
diff --git a/libksieve/tests/lexertest.cpp b/libksieve/tests/lexertest.cpp
index df5ac6e1..43d641fc 100644
--- a/libksieve/tests/lexertest.cpp
+++ b/libksieve/tests/lexertest.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/libksieve/tests/parsertest.cpp b/libksieve/tests/parsertest.cpp
index 9d0d8e14..ea718e4d 100644
--- a/libksieve/tests/parsertest.cpp
+++ b/libksieve/tests/parsertest.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -397,7 +397,7 @@ public:
write( multiLine ? "string type=\"multiline\"" : "string type=\"quoted\"", string );
}
void numberArgument( unsigned long number, char quantifier ) {
- const TQString txt = "number" + ( quantifier ? TQString(" quantifier=\"%1\"").arg( quantifier ) : TQString::null ) ;
+ const TQString txt = "number" + ( quantifier ? TQString(" quantifier=\"%1\"").arg( quantifier ) : TQString() ) ;
write( txt.latin1(), TQString::number( number ) );
}
void commandStart( const TQString & identifier ) {