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

1 files changed, 11 insertions, 11 deletions

diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index fa32dea6..23517b53 100644
--- a/kmail/sievejob.cpp
+++ b/kmail/sievejob.cpp
@@ -34,8 +34,8 @@ namespace KMail {
 
   SieveJob::SieveJob( const KURL & url, const TQString & script,
 		      const TQValueStack<Command> & commands,
-		      TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+		      TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       mUrl( url ), mJob( 0 ), mDec( 0 ),
       mScript( script ), mFileExists( DontKnow ), mCommands( commands ),
       mShowProgressInfo(true)
@@ -47,8 +47,8 @@ namespace KMail {
   SieveJob::SieveJob( const KURL & url, const TQString & script,
 		      const TQValueStack<Command> & commands,
                       bool showProgressInfo,
-		      TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+		      TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       mUrl( url ), mJob( 0 ), mDec( 0 ),
       mScript( script ), mFileExists( DontKnow ), mCommands( commands ),
       mShowProgressInfo(showProgressInfo)
@@ -149,12 +149,12 @@ namespace KMail {
     // Convert mScript into UTF-8:
     data = mScript.utf8();
 
-    // "data" tqcontains a trailing NUL, remove:
+    // "data" contains a trailing NUL, remove:
     if ( data.size() > 0 && data[(int)data.size() - 1] == '\0' )
       data.resize( data.size() - 1 );
 
     // mark mScript sent:
-    mScript = TQString::null;
+    mScript = TQString();
   }
 
   void SieveJob::slotEntries( Job *, const UDSEntryList & l ) {
@@ -224,7 +224,7 @@ namespace KMail {
     if ( !mCommands.empty() ) {
       // Don't fail get'ting a non-existant script:
       if ( mCommands.top() == Get && mFileExists == No ) {
-	mScript = TQString::null;
+	mScript = TQString();
 	mCommands.pop();
       }
     }
@@ -261,18 +261,18 @@ namespace KMail {
     TQValueStack<Command> commands;
     commands.push( Get );
     commands.push( SearchActive );
-    return new SieveJob( src, TQString::null, commands, showProgressInfo );
+    return new SieveJob( src, TQString(), commands, showProgressInfo );
   }
 
   SieveJob * SieveJob::list( const KURL & src ) {
     TQValueStack<Command> commands;
     commands.push( List );
-    return new SieveJob( src, TQString::null, commands );
+    return new SieveJob( src, TQString(), commands );
   }
   SieveJob * SieveJob::del( const KURL & url ) {
     TQValueStack<Command> commands;
     commands.push( Delete );
-    return new SieveJob( url, TQString::null, commands );
+    return new SieveJob( url, TQString(), commands );
   }
 
   SieveJob * SieveJob::desactivate( const KURL & url ) {
@@ -284,7 +284,7 @@ namespace KMail {
   SieveJob * SieveJob::activate( const KURL & url ) {
     TQValueStack<Command> commands;
     commands.push( Activate );
-    return new SieveJob( url, TQString::null, commands );
+    return new SieveJob( url, TQString(), commands );
   }
 
 } // namespace KMail