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

7 files changed, 19 insertions, 19 deletions

diff --git a/kioslaves/mbox/mboxfile.cc b/kioslaves/mbox/mboxfile.cc
index 271b71019..3c6c6cc7a 100644
--- a/kioslaves/mbox/mboxfile.cc
+++ b/kioslaves/mbox/mboxfile.cc
@@ -20,9 +20,9 @@
 
 #include <assert.h>
 
-MBoxFile::MBoxFile( const UrlInfo* info, MBoxProtocol* parent )
+MBoxFile::MBoxFile( const UrlInfo* info, MBoxProtocol* tqparent )
 	: m_info( info ),
-	m_mbox( parent )
+	m_mbox( tqparent )
 {
 	assert( m_info );
 }
diff --git a/kioslaves/mbox/mboxfile.h b/kioslaves/mbox/mboxfile.h
index b8a98973e..a628e3817 100644
--- a/kioslaves/mbox/mboxfile.h
+++ b/kioslaves/mbox/mboxfile.h
@@ -32,9 +32,9 @@ public:
 	/**
 	 * Constructor
 	 * @param info The urlinfo which must be used
-	 * @param parent The MBoxProtocol parent instance, used to throw errors.
+	 * @param tqparent The MBoxProtocol tqparent instance, used to throw errors.
 	 */
-	MBoxFile( const UrlInfo* info, MBoxProtocol* parent );
+	MBoxFile( const UrlInfo* info, MBoxProtocol* tqparent );
 
 	/**
 	 * Empty destructor
@@ -61,7 +61,7 @@ protected:
 	const UrlInfo* const m_info;
 
 	/**
-	 * A instance of the parent protocol, meant to throw errors if neccesairy.
+	 * A instance of the tqparent protocol, meant to throw errors if neccesairy.
 	 */
 	MBoxProtocol* const m_mbox;
 };
diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc
index 7cf67e32f..32f52d5b3 100644
--- a/kioslaves/mbox/readmbox.cc
+++ b/kioslaves/mbox/readmbox.cc
@@ -37,12 +37,12 @@
 
 #include <utime.h>
 
-ReadMBox::ReadMBox( const UrlInfo* info, MBoxProtocol* parent, bool onlynew, bool savetime )
-	: MBoxFile( info, parent ),
+ReadMBox::ReadMBox( const UrlInfo* info, MBoxProtocol* tqparent, bool onlynew, bool savetime )
+	: MBoxFile( info, tqparent ),
 	m_file( 0 ),
 	m_stream( 0 ),
-	m_current_line( new TQString( TQString::null ) ),
-	m_current_id( new TQString( TQString::null ) ),
+	m_current_line( new TQString( TQString() ) ),
+	m_current_id( new TQString( TQString() ) ),
 	m_atend( true ),
 	m_prev_time( 0 ),
 	m_only_new( onlynew ),
@@ -88,7 +88,7 @@ bool ReadMBox::nextLine()
 	m_atend = m_current_line->isNull();
 	if( m_atend ) // Cursor was at EOF
 	{
-		*m_current_id = TQString::null;
+		*m_current_id = TQString();
 		m_prev_status = m_status;
 		return true;
 	}
@@ -103,7 +103,7 @@ bool ReadMBox::nextLine()
 		return true;
 	} else if( m_only_new )
 	{
-		if( m_header && m_current_line->left( 7 ) == "Status:" &&
+		if( m_header && m_current_line->left( 7 ) == "tqStatus:" &&
 		    ! m_current_line->tqcontains( "U" ) && ! m_current_line->tqcontains( "N" ) )
 		{
 			m_status = false;
@@ -145,7 +145,7 @@ void ReadMBox::rewind()
 	if( !m_stream )
 		return; //Rewinding not possible
 	
-	m_stream->device()->reset();
+	m_stream->tqdevice()->reset();
 	m_atend = m_stream->atEnd();
 }
 
diff --git a/kioslaves/mbox/readmbox.h b/kioslaves/mbox/readmbox.h
index 0f7c4d836..ea63068ca 100644
--- a/kioslaves/mbox/readmbox.h
+++ b/kioslaves/mbox/readmbox.h
@@ -40,11 +40,11 @@ public:
 	 * Constructor
 	 *
 	 * @param info The information of the file to read
-	 * @param parent The instance of the parent MBoxProtocol.
+	 * @param tqparent The instance of the tqparent MBoxProtocol.
 	 * @param onlynew Only read new messages from the MBox file.
 	 * @param savetime If true, the atime of the mbox-file is preserved (note that this touch the ctime).
 	 */
-	ReadMBox( const UrlInfo* info, MBoxProtocol* parent, bool onlynew = false, bool savetime = false );
+	ReadMBox( const UrlInfo* info, MBoxProtocol* tqparent, bool onlynew = false, bool savetime = false );
 
 	/**
 	 * Destructor
@@ -53,14 +53,14 @@ public:
 
 	/**
 	 * This functions return the current line
-	 * @return The line last read, or TQString::null if there wasn't such last line
+	 * @return The line last read, or TQString() if there wasn't such last line
 	 */
 	TQString currentLine() const;
 
 	/**
 	 * This function returns the current id. The id is the first line of an email,
 	 * and is used in filenaming. The id normally starts with "From ".
-	 * @return The current ID, or TQString::null if no id was found yet.
+	 * @return The current ID, or TQString() if no id was found yet.
 	 */
 	TQString currentID() const;
 
diff --git a/kioslaves/mbox/stat.cc b/kioslaves/mbox/stat.cc
index c34f0bceb..00285b149 100644
--- a/kioslaves/mbox/stat.cc
+++ b/kioslaves/mbox/stat.cc
@@ -107,7 +107,7 @@ void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, long lng )
 {
 	KIO::UDSAtom atom;
 	atom.m_uds = uds;
-	atom.m_str = TQString::null;
+	atom.m_str = TQString();
 	atom.m_long = lng;
 
 	entry.append( atom );
diff --git a/kioslaves/mbox/urlinfo.cc b/kioslaves/mbox/urlinfo.cc
index 2153afb13..d59c77ac8 100644
--- a/kioslaves/mbox/urlinfo.cc
+++ b/kioslaves/mbox/urlinfo.cc
@@ -101,7 +101,7 @@ bool UrlInfo::isDirectory( const KURL& url )
 
 	//Setting paramaters
 	*m_filename = filename;
-	*m_id = TQString::null;
+	*m_id = TQString();
 	m_type = directory;
 	kdDebug() << "urlInfo::isDirectory( " << url << " )" << endl;
 	return true;
diff --git a/kioslaves/mbox/urlinfo.h b/kioslaves/mbox/urlinfo.h
index b15f64fb1..96882d1db 100644
--- a/kioslaves/mbox/urlinfo.h
+++ b/kioslaves/mbox/urlinfo.h
@@ -64,7 +64,7 @@ public:
 	TQString id() const;
 
 	/**
-	 * @return the while url as QString
+	 * @return the while url as TQString
 	 */
 	TQString url() const;
 private: