Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

9 files changed, 112 insertions, 112 deletions

diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp
index 35cd65848..06e2685d6 100644
--- a/ktnef/gui/attachpropertydialog.cpp
+++ b/ktnef/gui/attachpropertydialog.cpp
@@ -53,7 +53,7 @@ void AttachPropertyDialog::setAttachment(KTNEFAttach *attach)
 	s.append(" bytes");
 	size_->setText(s);
 	KMimeType::Ptr	mimetype = KMimeType::mimeType(attach->mimeTag());
-	TQPixmap pix = loadRenderingPixmap( attach, colorGroup().background() );
+	TQPixmap pix = loadRenderingPixmap( attach, tqcolorGroup().background() );
 	if ( !pix.isNull() )
 		icon_->setPixmap( pix );
 	else
@@ -162,7 +162,7 @@ TQPixmap loadRenderingPixmap( KTNEFPropertySet *pSet, const TQColor& bgColor )
 		rendBuffer.open( IO_ReadOnly );
 		TQDataStream rendStream( &rendBuffer );
 		rendStream.setByteOrder( TQDataStream::LittleEndian );
-		Q_UINT16 type, w, h;
+		TQ_UINT16 type, w, h;
 		rendStream >> type >> w >> w; // read type and skip 4 bytes
 		rendStream >> w >> h;
 		rendBuffer.close();
diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui
index 0d68c3ac4..a06db962b 100644
--- a/ktnef/gui/attachpropertydialogbase.ui
+++ b/ktnef/gui/attachpropertydialogbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AttachPropertyDialogBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -169,7 +169,7 @@
             <property name="name">
                 <cstring>icon_</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>16</width>
                     <height>16</height>
@@ -211,7 +211,7 @@
         </widget>
         <widget class="QLayoutWidget" row="8" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -227,7 +227,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>150</width>
                             <height>20</height>
@@ -274,7 +274,7 @@
 <slots>
     <slot access="protected">saveClicked()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp
index 4c158a21d..ea44edbe1 100644
--- a/ktnef/gui/ktnefmain.cpp
+++ b/ktnef/gui/ktnefmain.cpp
@@ -358,7 +358,7 @@ void KTNEFMain::viewDragRequested( const TQValueList<KTNEFAttach*>& list )
 
 void KTNEFMain::slotEditToolbars()
 {
-	saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
+	saveMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
 	KEditToolbar	dlg(actionCollection());
 	connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
 	dlg.exec();
@@ -367,7 +367,7 @@ void KTNEFMain::slotEditToolbars()
 void KTNEFMain::slotNewToolbarConfig()
 {
 	createGUI();
-	applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
+	applyMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
 }
 
 void KTNEFMain::slotShowMessageProperties()
diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp
index a77098350..79d5f073b 100644
--- a/ktnef/gui/ktnefview.cpp
+++ b/ktnef/gui/ktnefview.cpp
@@ -49,7 +49,7 @@ Attachment::Attachment(TQListView *parent, KTNEFAttach *attach)
 	if (!attach_->fileName().isEmpty()) setText(0, attach_->fileName());
 	KMimeType::Ptr	mimeType = KMimeType::mimeType( attach_->mimeTag() );
 	setText(1, mimeType->comment());
-	TQPixmap pix = loadRenderingPixmap( attach, parent->colorGroup().base() );
+	TQPixmap pix = loadRenderingPixmap( attach, parent->tqcolorGroup().base() );
 	if ( !pix.isNull() )
 		setPixmap( 0, pix );
 	else
diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp
index 41b908d1c..f8e19411e 100644
--- a/ktnef/gui/qwmf.cpp
+++ b/ktnef/gui/qwmf.cpp
@@ -762,7 +762,7 @@ void QWinMetaFile::extTextOut( long num, short* parm )
         mPainter.translate( -parm[ 1 ], -parm[ 0 ] );
     }
 
-    // alignment
+    // tqalignment
     if ( mTextAlign & 0x06 )
         x -= ( width / 2 );
     if ( mTextAlign & 0x08 )
diff --git a/ktnef/gui/qwmf.h b/ktnef/gui/qwmf.h
index 2a39b7b9e..5717b3938 100644
--- a/ktnef/gui/qwmf.h
+++ b/ktnef/gui/qwmf.h
@@ -136,7 +136,7 @@ public: // should be protected but cannot
     /****************** Text *******************/
     /* set text color */
     void setTextColor( long num, short* parms );
-    /* set text alignment */
+    /* set text tqalignment */
     void setTextAlign( long num, short* parms );
     /* draw text */
     void textOut( long num, short* parms );
diff --git a/ktnef/gui/wmfstruct.h b/ktnef/gui/wmfstruct.h
index ca4f1f7db..33a4a67c2 100644
--- a/ktnef/gui/wmfstruct.h
+++ b/ktnef/gui/wmfstruct.h
@@ -6,7 +6,7 @@
 
 typedef short WORD;
 typedef int DWORD;
-typedef Q_INT32 LONG;
+typedef TQ_INT32 LONG;
 typedef void* _HANDLE;
 
 typedef struct _RECT
@@ -53,7 +53,7 @@ struct WmfEnhMetaHeader
     WORD    nHandles;           // Number of handles in the handle table
     // Handle index zero is reserved.
     WORD    sReserved;          // Reserved.  Must be zero.
-    DWORD   nDescription;       // Number of chars in the unicode description string
+    DWORD   nDescription;       // Number of chars in the tqunicode description string
     // This is 0 if there is no description string
     DWORD   offDescription;     // Offset to the metafile description record.
     // This is 0 if there is no description string
diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp
index e97ec8128..a73a1d547 100644
--- a/ktnef/lib/ktnefparser.cpp
+++ b/ktnef/lib/ktnefparser.cpp
@@ -40,11 +40,11 @@
 
 
 typedef struct {
-	Q_UINT16 type;
-	Q_UINT16 tag;
+	TQ_UINT16 type;
+	TQ_UINT16 tag;
 	TQVariant value;
 	struct {
-		Q_UINT32 type;
+		TQ_UINT32 type;
 		TQVariant value;
 	} name;
 } MAPI_value;
@@ -52,12 +52,12 @@ typedef struct {
 void clearMAPIName( MAPI_value& mapi );
 void clearMAPIValue(MAPI_value& mapi, bool clearName = true);
 TQString readMAPIString( TQDataStream& stream, bool isUnicode = false, bool align = true, int len = -1 );
-Q_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi);
+TQ_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi);
 TQDateTime readTNEFDate( TQDataStream& stream );
 TQString readTNEFAddress( TQDataStream& stream );
-TQByteArray readTNEFData( TQDataStream& stream, Q_UINT32 len );
-TQVariant readTNEFAttribute( TQDataStream& stream, Q_UINT16 type, Q_UINT32 len );
-TQDateTime formatTime( Q_UINT32 lowB, Q_UINT32 highB );
+TQByteArray readTNEFData( TQDataStream& stream, TQ_UINT32 len );
+TQVariant readTNEFAttribute( TQDataStream& stream, TQ_UINT16 type, TQ_UINT32 len );
+TQDateTime formatTime( TQ_UINT32 lowB, TQ_UINT32 highB );
 TQString formatRecipient( const TQMap<int,KTNEFProperty*>& props );
 
 //------------------------------------------------------------------------------------
@@ -112,8 +112,8 @@ void KTNEFParser::deleteDevice()
 
 bool KTNEFParser::decodeMessage()
 {
-	Q_UINT32	i1, i2, off;
-	Q_UINT16	u, tag, type;
+	TQ_UINT32	i1, i2, off;
+	TQ_UINT16	u, tag, type;
 	TQVariant value;
 
 	// read (type+name)
@@ -187,8 +187,8 @@ bool KTNEFParser::decodeMessage()
 			break;
 		case attMSGSTATUS:
 			{
-				Q_UINT8 c;
-				Q_UINT32 flag = 0;
+				TQ_UINT8 c;
+				TQ_UINT32 flag = 0;
 				d->stream_ >> c;
 				if ( c & fmsRead ) flag |= MSGFLAG_READ;
 				if ( !( c & fmsModified ) ) flag |= MSGFLAG_UNMODIFIED;
@@ -202,7 +202,7 @@ bool KTNEFParser::decodeMessage()
 			break;
 		case attRECIPTABLE:
 			{
-				Q_UINT32 rows;
+				TQ_UINT32 rows;
 				TQValueList<TQVariant> recipTable;
 				d->stream_ >> rows;
 				for ( uint i=0; i<rows; i++ )
@@ -254,8 +254,8 @@ bool KTNEFParser::decodeMessage()
 
 bool KTNEFParser::decodeAttachment()
 {
-	Q_UINT32	i;
-	Q_UINT16	tag, type, u;
+	TQ_UINT32	i;
+	TQ_UINT16	tag, type, u;
 	TQVariant value;
 	TQString str;
 
@@ -328,9 +328,9 @@ void KTNEFParser::setDefaultExtractDir(const TQString& dirname)
 
 bool KTNEFParser::parseDevice()
 {
-	Q_UINT16	u;
-	Q_UINT32	i;
-	Q_UINT8		c;
+	TQ_UINT16	u;
+	TQ_UINT32	i;
+	TQ_UINT8		c;
 
 	d->message_->clearAttachments();
 	if (d->current_)
@@ -405,7 +405,7 @@ bool KTNEFParser::extractAttachmentTo(KTNEFAttach *att, const TQString& dirname)
 	if ( !outfile )
 		return false;
 
-	Q_UINT32	len = att->size(), sz(16384);
+	TQ_UINT32	len = att->size(), sz(16384);
 	int		n(0);
 	char		*buf = new char[sz];
 	bool		ok(true);
@@ -465,7 +465,7 @@ void KTNEFParser::checkCurrent( int key )
 		d->current_ = new KTNEFAttach();
 	else
 	{
-		if ( d->current_->attributes().contains( key ) )
+		if ( d->current_->attributes().tqcontains( key ) )
 		{
 			if (d->current_->offset() >= 0 )
 			{
@@ -478,7 +478,7 @@ void KTNEFParser::checkCurrent( int key )
 					// and/or content (using at most 32 bytes)
 					KMimeType::Ptr mimetype;
 					if ( !d->current_->fileName().isEmpty() )
-						mimetype = KMimeType::findByPath( d->current_->fileName(), 0, true );
+						mimetype = KMimeType::tqfindByPath( d->current_->fileName(), 0, true );
                                         if (!mimetype) return; // FIXME
 					if ( mimetype->name() == "application/octet-stream" && d->current_->size() > 0 )
 					{
@@ -486,7 +486,7 @@ void KTNEFParser::checkCurrent( int key )
 						TQByteArray buffer( QMIN( 32, d->current_->size() ) );
 						d->device_->at( d->current_->offset() );
 						d->device_->readBlock( buffer.data(), buffer.size() );
-						mimetype = KMimeType::findByContent( buffer );
+						mimetype = KMimeType::tqfindByContent( buffer );
 						d->device_->at( oldOffset );
 					}
 					d->current_->setMimeTag( mimetype->name() );
@@ -521,7 +521,7 @@ void clearMAPIValue(MAPI_value& mapi, bool clearName)
 		clearMAPIName( mapi );
 }
 
-TQDateTime formatTime( Q_UINT32 lowB, Q_UINT32 highB )
+TQDateTime formatTime( TQ_UINT32 lowB, TQ_UINT32 highB )
 {
 	TQDateTime dt;
 #if ( SIZEOF_UINT64_T == 8 )
@@ -580,27 +580,27 @@ TQString formatRecipient( const TQMap<int,KTNEFProperty*>& props )
 TQDateTime readTNEFDate( TQDataStream& stream )
 {
 	// 14-bytes long
-	Q_UINT16 y, m, d, hh, mm, ss, dm;
+	TQ_UINT16 y, m, d, hh, mm, ss, dm;
 	stream >> y >> m >> d >> hh >> mm >> ss >> dm;
 	return TQDateTime( TQDate( y, m, d ), TQTime( hh, mm, ss ) );
 }
 
 TQString readTNEFAddress( TQDataStream& stream )
 {
-	Q_UINT16 totalLen, strLen, addrLen;
+	TQ_UINT16 totalLen, strLen, addrLen;
 	TQString s;
 	stream >> totalLen >> totalLen >> strLen >> addrLen;
 	s.append( readMAPIString( stream, false, false, strLen ) );
 	s.append( " <" );
 	s.append( readMAPIString( stream, false, false, addrLen ) );
 	s.append( ">" );
-	Q_UINT8 c;
+	TQ_UINT8 c;
 	for ( int i=8+strLen+addrLen; i<totalLen; i++ )
 		stream >> c;
 	return s;
 }
 
-TQByteArray readTNEFData( TQDataStream& stream, Q_UINT32 len )
+TQByteArray readTNEFData( TQDataStream& stream, TQ_UINT32 len )
 {
 	TQByteArray array( len );
 	if ( len > 0 )
@@ -608,7 +608,7 @@ TQByteArray readTNEFData( TQDataStream& stream, Q_UINT32 len )
 	return array;
 }
 
-TQVariant readTNEFAttribute( TQDataStream& stream, Q_UINT16 type, Q_UINT32 len )
+TQVariant readTNEFAttribute( TQDataStream& stream, TQ_UINT16 type, TQ_UINT32 len )
 {
 	switch ( type )
 	{
@@ -624,18 +624,18 @@ TQVariant readTNEFAttribute( TQDataStream& stream, Q_UINT16 type, Q_UINT32 len )
 
 TQString readMAPIString( TQDataStream& stream, bool isUnicode, bool align, int len_ )
 {
-	Q_UINT32 len;
+	TQ_UINT32 len;
 	char *buf = 0;
 	if ( len_ == -1 )
 		stream >> len;
 	else
 		len = len_;
-	Q_UINT32 fullLen = len;
+	TQ_UINT32 fullLen = len;
 	if ( align )
 		ALIGN( fullLen, 4 );
 	buf = new char[ len ];
 	stream.readRawBytes( buf, len );
-	Q_UINT8 c;
+	TQ_UINT8 c;
 	for ( uint i=len; i<fullLen; i++ )
 		stream >> c;
 	TQString res;
@@ -647,9 +647,9 @@ TQString readMAPIString( TQDataStream& stream, bool isUnicode, bool align, int l
 	return res;
 }
 
-Q_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi)
+TQ_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi)
 {
-	Q_UINT32	d;
+	TQ_UINT32	d;
 
 	clearMAPIValue(mapi);
 	stream >> d;
@@ -696,7 +696,7 @@ Q_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi)
 			break;
 		   case MAPI_TYPE_TIME:
 			{
-				Q_UINT32 lowB, highB;
+				TQ_UINT32 lowB, highB;
 				stream >> lowB >> highB;
 				value = formatTime( lowB, highB );
 			}
@@ -726,7 +726,7 @@ Q_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi)
 			for (uint i=0;i<d;i++)
 			{
 				value.clear();
-				Q_UINT32 len;
+				TQ_UINT32 len;
 				stream >> len;
 				value = TQByteArray( len );
 				if (len > 0)
@@ -734,7 +734,7 @@ Q_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi)
 					int fullLen = len;
 					ALIGN(fullLen, 4);
 					stream.readRawBytes(value.asByteArray().data(), len);
-					Q_UINT8 c;
+					TQ_UINT8 c;
 					for ( int i=len; i<fullLen; i++ )
 						stream >> c;
 				}
@@ -754,7 +754,7 @@ Q_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi)
 
 bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAttach *attach )
 {
-	Q_UINT32	n;
+	TQ_UINT32	n;
 	MAPI_value	mapi;
 	KTNEFProperty *p;
 	TQMap<int,KTNEFProperty*>::ConstIterator it;
@@ -792,7 +792,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt
 					int len = data.size();
 					ALIGN( len, 4 );
 					d->device_->at( d->device_->at()-len );
-					Q_UINT32 interface_ID;
+					TQ_UINT32 interface_ID;
 					d->stream_ >> interface_ID;
 					if ( interface_ID == MAPI_IID_IMessage )
 					{
diff --git a/ktnef/lib/ktnefwriter.cpp b/ktnef/lib/ktnefwriter.cpp
index 48734bebd..3da4dc1e0 100644
--- a/ktnef/lib/ktnefwriter.cpp
+++ b/ktnef/lib/ktnefwriter.cpp
@@ -34,10 +34,10 @@
 
 class KTNEFWriter::PrivateData {
 public:
-  PrivateData() { mFirstAttachNum = TQDateTime::currentDateTime().toTime_t(); }
+  PrivateData() { mFirstAttachNum = TQDateTime::tqcurrentDateTime().toTime_t(); }
 
   KTNEFPropertySet properties;
-  Q_UINT16 mFirstAttachNum;
+  TQ_UINT16 mFirstAttachNum;
 };
 
 
@@ -50,8 +50,8 @@ KTNEFWriter::KTNEFWriter() {
   addProperty( attTNEFVERSION, atpDWORD, v );
 
   // Now set the code page to something reasonable. TODO: Use the right one
-  TQVariant v1( (Q_UINT32)0x4e4 );
-  TQVariant v2( (Q_UINT32)0x0 );
+  TQVariant v1( (TQ_UINT32)0x4e4 );
+  TQVariant v2( (TQ_UINT32)0x0 );
   TQValueList<TQVariant> list;
   list << v1;
   list << v2;
@@ -69,25 +69,25 @@ void KTNEFWriter::addProperty( int tag, int type, const TQVariant& value ) {
 }
 
 
-void addToChecksum( Q_UINT32 i, Q_UINT16 &checksum ) {
+void addToChecksum( TQ_UINT32 i, TQ_UINT16 &checksum ) {
   checksum += i & 0xff;
   checksum += (i >> 8) & 0xff;
   checksum += (i >> 16) & 0xff;
   checksum += (i >> 24) & 0xff;
 }
 
-void addToChecksum( TQCString &cs, Q_UINT16 &checksum ) {
+void addToChecksum( TQCString &cs, TQ_UINT16 &checksum ) {
   int len = cs.length();
   for (int i=0; i<len; i++)
-    checksum += (Q_UINT8)cs[i];
+    checksum += (TQ_UINT8)cs[i];
 }
 
 void writeCString( TQDataStream &stream, TQCString &str ) {
   stream.writeRawBytes( str.data(), str.length() );
-  stream << (Q_UINT8)0;
+  stream << (TQ_UINT8)0;
 }
 
-Q_UINT32 mergeTagAndType( Q_UINT32 tag, Q_UINT32 type ) {
+TQ_UINT32 mergeTagAndType( TQ_UINT32 tag, TQ_UINT32 type ) {
   return ( ( type & 0xffff ) << 16 ) | ( tag & 0xffff );
 }
 
@@ -107,8 +107,8 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
 
   KTNEFProperty *property = *it;
 
-  Q_UINT32 i;
-  Q_UINT16 checksum = 0;
+  TQ_UINT32 i;
+  TQ_UINT16 checksum = 0;
   TQValueList<TQVariant> list;
   TQString s;
   TQCString cs, cs2;
@@ -117,60 +117,60 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
   TQTime time;
   switch( tag ) {
   case attMSGSTATUS:
-    // Q_UINT8
+    // TQ_UINT8
     i = property->value().toUInt() & 0xff;
     checksum = i;
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)1;
-    stream << (Q_UINT8)i;
+    stream << (TQ_UINT32)1;
+    stream << (TQ_UINT8)i;
 
     bytes += 10;
     break;
 
   case attMSGPRIORITY:
   case attREQUESTRES:
-    // Q_UINT16
+    // TQ_UINT16
     i = property->value().toUInt() & 0xffff;
     addToChecksum( i, checksum );
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)2;
-    stream << (Q_UINT16)i;
+    stream << (TQ_UINT32)2;
+    stream << (TQ_UINT16)i;
 
     bytes += 11;
     break;
 
   case attTNEFVERSION:
-    // Q_UINT32
+    // TQ_UINT32
     i = property->value().toUInt();
     addToChecksum( i, checksum );
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)4;
-    stream << (Q_UINT32)i;
+    stream << (TQ_UINT32)4;
+    stream << (TQ_UINT32)i;
 
     bytes += 13;
     break;
 
   case attOEMCODEPAGE:
-    // 2 Q_UINT32
+    // 2 TQ_UINT32
     list = property->value().toList();
     assert( list.count() == 2 );
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)8;
+    stream << (TQ_UINT32)8;
 
     i = list[0].toInt();
     addToChecksum( i, checksum );
-    stream << (Q_UINT32)i;
+    stream << (TQ_UINT32)i;
     i = list[1].toInt();
     addToChecksum( i, checksum );
-    stream << (Q_UINT32)i;
+    stream << (TQ_UINT32)i;
 
     bytes += 17;
     break;
@@ -183,9 +183,9 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
     cs = property->value().toString().local8Bit();
     addToChecksum( cs, checksum );
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)cs.length()+1;
+    stream << (TQ_UINT32)cs.length()+1;
     writeCString( stream, cs );
 
     bytes += 9 + cs.length()+1;
@@ -200,18 +200,18 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
     cs2 = (TQString("smtp:") + list[1].toString()).local8Bit(); // Email address
     i = 18 + cs.length() + cs2.length(); // 2 * sizof(TRP) + strings + 2x'\0'
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)i;
+    stream << (TQ_UINT32)i;
 
     // The stream has to be aligned to 4 bytes for the strings
     // TODO: Or does it? Looks like Outlook doesn't do this
     // bytes += 17;
     // Write the first TRP structure
-    stream << (Q_UINT16)4;                 // trpidOneOff
-    stream << (Q_UINT16)i;                 // totalsize
-    stream << (Q_UINT16)(cs.length()+1);   // sizeof name
-    stream << (Q_UINT16)(cs2.length()+1);  // sizeof address
+    stream << (TQ_UINT16)4;                 // trpidOneOff
+    stream << (TQ_UINT16)i;                 // totalsize
+    stream << (TQ_UINT16)(cs.length()+1);   // sizeof name
+    stream << (TQ_UINT16)(cs2.length()+1);  // sizeof address
 
     // if ( bytes % 4 != 0 )
       // Align the buffer
@@ -221,7 +221,7 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
     writeCString( stream, cs2 );
 
     // Write the empty padding TRP structure (just zeroes)
-    stream << (Q_UINT32)0 << (Q_UINT32)0;
+    stream << (TQ_UINT32)0 << (TQ_UINT32)0;
 
     addToChecksum( 4, checksum );
     addToChecksum( i, checksum );
@@ -241,37 +241,37 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
     time = dt.time();
     date = dt.date();
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)14;
+    stream << (TQ_UINT32)14;
 
-    i = (Q_UINT16)date.year();
+    i = (TQ_UINT16)date.year();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
-    i = (Q_UINT16)date.month();
+    stream << (TQ_UINT16)i;
+    i = (TQ_UINT16)date.month();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
-    i = (Q_UINT16)date.day();
+    stream << (TQ_UINT16)i;
+    i = (TQ_UINT16)date.day();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
-    i = (Q_UINT16)time.hour();
+    stream << (TQ_UINT16)i;
+    i = (TQ_UINT16)time.hour();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
-    i = (Q_UINT16)time.minute();
+    stream << (TQ_UINT16)i;
+    i = (TQ_UINT16)time.minute();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
-    i = (Q_UINT16)time.second();
+    stream << (TQ_UINT16)i;
+    i = (TQ_UINT16)time.second();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
-    i = (Q_UINT16)date.dayOfWeek();
+    stream << (TQ_UINT16)i;
+    i = (TQ_UINT16)date.dayOfWeek();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
+    stream << (TQ_UINT16)i;
     break;
 /*
   case attMSGSTATUS:
     {
-      Q_UINT8 c;
-      Q_UINT32 flag = 0;
+      TQ_UINT8 c;
+      TQ_UINT32 flag = 0;
       if ( c & fmsRead ) flag |= MSGFLAG_READ;
       if ( !( c & fmsModified ) ) flag |= MSGFLAG_UNMODIFIED;
       if ( c & fmsSubmitted ) flag |= MSGFLAG_SUBMIT;
@@ -280,10 +280,10 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
       d->stream_ >> c;
 
       i = property->value().toUInt();
-      stream << (Q_UINT8)LVL_MESSAGE;
-      stream << (Q_UINT32)type;
-      stream << (Q_UINT32)2;
-      stream << (Q_UINT8)i;
+      stream << (TQ_UINT8)LVL_MESSAGE;
+      stream << (TQ_UINT32)type;
+      stream << (TQ_UINT32)2;
+      stream << (TQ_UINT8)i;
       addToChecksum( i, checksum );
       // from reader: d->message_->addProperty( 0x0E07, MAPI_TYPE_ULONG, flag );
     }
@@ -296,7 +296,7 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
     return false;
   }
 
-  stream << (Q_UINT16)checksum;
+  stream << (TQ_UINT16)checksum;
   return true;
 }
 
@@ -485,7 +485,7 @@ void KTNEFWriter::setSummary( const TQString &s ) {
 // TNEF encoding: Normal =  3, high = 2, low = 1
 // MAPI encoding: Normal = -1, high = 0, low = 1
 void KTNEFWriter::setPriority( Priority p ) {
-  TQVariant v( (Q_UINT32)p );
+  TQVariant v( (TQ_UINT32)p );
   addProperty( attMSGPRIORITY, atpSHORT, v );
 }