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

21 files changed, 197 insertions, 197 deletions

diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index 26a91e679..e3032d118 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -57,7 +57,7 @@ Contact::Contact( const KABC::Addressee* addr )
 }
 
 // loading (xml->addressee)
-Contact::Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
+Contact::Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
   : mHasGeo( false )
 {
   load( xml );
@@ -487,7 +487,7 @@ void Contact::saveCustomAttributes( TQDomElement& element ) const
       writeString( element, (*it).name, (*it).value );
     } else {
       // skip writing the freebusyurl as it is a hack we need to remove eventually
-      if ( (*it).name == TQString::fromLatin1( "FreeBusyURL" ) ) {
+      if ( (*it).name == TQString::tqfromLatin1( "FreeBusyURL" ) ) {
         continue;
       }
 
@@ -1110,7 +1110,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
   //    (includes e.g. crypto settings, and extra im addresses)
   TQStringList knownCustoms;
   for ( const char** p = s_knownCustomFields; *p; ++p )
-    knownCustoms << TQString::fromLatin1( *p );
+    knownCustoms << TQString::tqfromLatin1( *p );
   TQStringList customs = addressee->customs();
   for( TQStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) {
     // KABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves
@@ -1124,7 +1124,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
     if ( pos == -1 ) continue;
     TQString value = name.mid( pos + 1 );
     name = name.left( pos );
-    if ( !knownCustoms.contains( name ) ) {
+    if ( !knownCustoms.tqcontains( name ) ) {
       //kdDebug() << k_funcinfo << "app=" << app << " name=" << name << " value=" << value << endl;
       Custom c;
       if ( app != "KADDRESSBOOK" ) // that's the default
@@ -1162,8 +1162,8 @@ void Contact::saveTo( KABC::Addressee* addressee )
     for ( ; mit != mDistrListMembers.end(); ++mit ) {
       TQString displayName = (*mit).displayName;
       // fixup the display name DistributionList::assumes neither ',' nor ';' is present
-      displayName.replace( ',', ' ' );
-      displayName.replace( ';', ' ' );
+      displayName.tqreplace( ',', ' ' );
+      displayName.tqreplace( ';', ' ' );
       distrList.insertEntry( displayName, (*mit).email );
     }
     addressee->insertCustom( "KADDRESSBOOK", "DistributionList", distrList.custom( "KADDRESSBOOK", "DistributionList" ) );
@@ -1253,13 +1253,13 @@ void Contact::saveTo( KABC::Addressee* addressee )
   }
 
   for( TQValueList<Custom>::ConstIterator it = mCustomList.begin(); it != mCustomList.end(); ++it ) {
-    TQString app = (*it).app.isEmpty() ? TQString::fromLatin1( "KADDRESSBOOK" ) : (*it).app;
+    TQString app = (*it).app.isEmpty() ? TQString::tqfromLatin1( "KADDRESSBOOK" ) : (*it).app;
     addressee->insertCustom( app, (*it).name, (*it).value );
   }
   //kdDebug(5006) << addressee->customs() << endl;
 }
 
-TQImage Contact::loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
+TQImage Contact::loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
 {
   TQImage img;
   KURL url;
@@ -1285,7 +1285,7 @@ TQImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
   return img;
 }
 
-TQByteArray Kolab::Contact::loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
+TQByteArray Kolab::Contact::loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
 {
   TQByteArray data;
   KURL url;
diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h
index a9465642f..66a7c418a 100644
--- a/kresources/kolab/kabc/contact.h
+++ b/kresources/kolab/kabc/contact.h
@@ -69,7 +69,7 @@ public:
   };
 
   explicit Contact( const KABC::Addressee* address );
-  Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+  Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
   ~Contact();
 
   void saveTo( KABC::Addressee* address );
@@ -221,10 +221,10 @@ private:
   void loadDistrListMember( const TQDomElement& element );
   void saveDistrListMembers( TQDomElement& element ) const;
 
-  TQImage loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+  TQImage loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
   TQImage loadPictureFromAddressee( const KABC::Picture& picture );
 
-  TQByteArray loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+  TQByteArray loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
   TQByteArray loadSoundFromAddressee( const KABC::Sound& sound );
 
   TQString productID() const;
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index ae8e225fb..e9c481bfb 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -151,7 +151,7 @@ void KABC::ResourceKolab::releaseSaveTicket( Ticket* ticket )
 
 TQString KABC::ResourceKolab::loadContact( const TQString& contactData,
                                           const TQString& subResource,
-                                          Q_UINT32 sernum,
+                                          TQ_UINT32 sernum,
                                           KMailICalIface::StorageFormat format )
 {
   KABC::Addressee addr;
@@ -215,7 +215,7 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
     for ( int indexFormat = 0; indexFormat < 3; ++indexFormat ) {
       const char* mimetype = s_formats[indexFormat].mimetype;
       KMailICalIface::StorageFormat format = s_formats[indexFormat].format;
-      TQMap<Q_UINT32, TQString> lst;
+      TQMap<TQ_UINT32, TQString> lst;
       if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
         kdError() << "Communication problem in KABC::ResourceKolab::loadSubResource()\n";
         if ( progressId )
@@ -223,7 +223,7 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
         return false;
       }
 
-      for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+      for( TQMap<TQ_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
         loadContact( it.data(), subResource, it.key(), format );
       }
 
@@ -334,7 +334,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
   TQString subResource;
-  Q_UINT32 sernum;
+  TQ_UINT32 sernum;
   if ( mUidMap.find( uid ) != mUidMap.end() ) {
     subResource = mUidMap[ uid ].resource();
     if ( !subresourceWritable( subResource ) ) {
@@ -416,7 +416,7 @@ void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   //kdDebug(5650) << k_funcinfo << uid << endl;
   bool ok = false;
-  if ( mUidMap.contains( uid ) ) {
+  if ( mUidMap.tqcontains( uid ) ) {
     mUidsPendingUpdate.append( uid );
   } else {
     mUidsPendingAdding.append( uid );
@@ -453,7 +453,7 @@ void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
  */
 bool KABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
                                                  const TQString& subResource,
-                                                 Q_UINT32 sernum,
+                                                 TQ_UINT32 sernum,
                                                  int format,
                                                  const TQString& contactXML )
 {
@@ -468,8 +468,8 @@ bool KABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Emit "addressbook changed" if this comes from kmail and not from the GUI
-  if ( !mUidsPendingAdding.contains( uid )
-       && !mUidsPendingUpdate.contains( uid ) ) {
+  if ( !mUidsPendingAdding.tqcontains( uid )
+       && !mUidsPendingUpdate.tqcontains( uid ) ) {
     addressBook()->emitAddressBookChanged();
   } else {
     mUidsPendingAdding.remove( uid );
@@ -490,11 +490,11 @@ void KABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.contains( uid ) ) {
+  if ( mUidsPendingDeletion.tqcontains( uid ) ) {
     mUidsPendingDeletion.remove( uid );
-  } else if ( mUidsPendingUpdate.contains( uid ) ) {
+  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // replace it, so let's just sit tight.
+    // tqreplace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     mAddrMap.remove( uid );
@@ -523,7 +523,7 @@ void KABC::ResourceKolab::fromKMailAddSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( mSubResources.contains( subResource ) )
+  if ( mSubResources.tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -540,7 +540,7 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( !mSubResources.contains( subResource ) )
+  if ( !mSubResources.tqcontains( subResource ) )
     // Not registered
     return;
 
@@ -575,13 +575,13 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
 
 
 
-void KABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                                     const TQString& /* type */,
                                                     const TQString& folder )
 {
   // FIXME
   KMailICalIface::StorageFormat format = KMailICalIface::StorageXML;
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
     loadContact( it.data(), folder, it.key(), format );
   }
   if ( !addressBook() ){
@@ -597,7 +597,7 @@ TQStringList KABC::ResourceKolab::subresources() const
 
 bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].active();
   }
 
@@ -609,7 +609,7 @@ bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
 
 bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].writable();
   }
   return false; //better a safe default
@@ -617,7 +617,7 @@ bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) con
 
 int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].completionWeight();
   }
 
@@ -628,7 +628,7 @@ int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresourc
 
 TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].label();
   }
 
@@ -638,7 +638,7 @@ TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) co
 
 void KABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     mSubResources[ subresource ].setCompletionWeight( completionWeight );
   } else {
     kdDebug(5650) << "setSubresourceCompletionWeight: subresource " << subresource << " not found" << endl;
@@ -657,7 +657,7 @@ TQMap<TQString, TQString> KABC::ResourceKolab::uidToResourceMap() const
 
 void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, bool active )
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     mSubResources[ subresource ].setActive( active );
     load();
   } else {
diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h
index 9158375a1..2288bf258 100644
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.h
@@ -112,12 +112,12 @@ public:
   void fromKMailDelSubresource( const TQString& type, const TQString& id );
 
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& contact );
+                              TQ_UINT32 sernum, int format, const TQString& contact );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& contact );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -158,7 +158,7 @@ protected:
                               const TQString& label, bool writable );
   bool loadSubResource( const TQString& subResource );
   TQString loadContact( const TQString& contactData, const TQString& subResource,
-                       Q_UINT32 sernum, const KMailICalIface::StorageFormat format );
+                       TQ_UINT32 sernum, const KMailICalIface::StorageFormat format );
 
   TQString configFile() const {
     return Kolab::ResourceKolabBase::configFile( "kabc" );
diff --git a/kresources/kolab/kcal/event.cpp b/kresources/kolab/kcal/event.cpp
index e1d58a13c..f8309053e 100644
--- a/kresources/kolab/kcal/event.cpp
+++ b/kresources/kolab/kcal/event.cpp
@@ -40,7 +40,7 @@ using namespace Kolab;
 
 
 KCal::Event* Event::xmlToEvent( const TQString& xml, const TQString& tz, KCal::ResourceKolab* res,
-                                const TQString& subResource, Q_UINT32 sernum )
+                                const TQString& subResource, TQ_UINT32 sernum )
 {
   Event event( res, subResource, sernum, tz );
   event.load( xml );
@@ -55,7 +55,7 @@ TQString Event::eventToXML( KCal::Event* kcalEvent, const TQString& tz  )
   return event.saveXML();
 }
 
-Event::Event( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+Event::Event( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
               const TQString& tz, KCal::Event* event )
   : Incidence( res, subResource, sernum, tz ),
   mShowTimeAs( KCal::Event::Opaque ), mHasEndDate( false )
diff --git a/kresources/kolab/kcal/event.h b/kresources/kolab/kcal/event.h
index c45018adc..d9f1069a9 100644
--- a/kresources/kolab/kcal/event.h
+++ b/kresources/kolab/kcal/event.h
@@ -54,13 +54,13 @@ public:
   /// Use this to parse an xml string to a event entry
   /// The caller is responsible for deleting the returned event
   static KCal::Event* xmlToEvent( const TQString& xml, const TQString& tz, KCal::ResourceKolab* res = 0,
-                                  const TQString& subResource = TQString::null, Q_UINT32 sernum = 0 );
+                                  const TQString& subResource = TQString::null, TQ_UINT32 sernum = 0 );
 
   /// Use this to get an xml string describing this event entry
   static TQString eventToXML( KCal::Event*, const TQString& tz );
 
   /// Create a event object and
-  explicit Event( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+  explicit Event( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
                   const TQString& tz, KCal::Event* event = 0 );
   virtual ~Event();
 
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index de076eb98..060b9b93f 100644
--- a/kresources/kolab/kcal/incidence.cpp
+++ b/kresources/kolab/kcal/incidence.cpp
@@ -49,7 +49,7 @@
 using namespace Kolab;
 
 
-Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
                       const TQString& tz )
   : KolabBase( tz ), mFloatingStatus( Unset ), mHasAlarm( false ),
     mResource( res ),
@@ -175,7 +175,7 @@ bool Incidence::loadAttendeeAttribute( TQDomElement& element,
       TQString tagName = e.tagName();
 
       if ( tagName == "display-name" ) {
-        // Quote the text in case it contains commas or other quotable chars.
+        // Quote the text in case it tqcontains commas or other quotable chars.
         TQString tusername = KPIM::quoteNameIfNecessary( e.text() );
 
         TQString tname, temail;
@@ -559,7 +559,7 @@ bool Incidence::saveAttributes( TQDomElement& element ) const
   saveAttachments( element );
   if ( mHasAlarm ) {
     // Alarms should be minutes before. Libkcal uses event time + alarm time
-    int alarmTime = qRound( -alarm() );
+    int alarmTime = tqRound( -alarm() );
     writeString( element, "alarm", TQString::number( alarmTime ) );
   }
   saveAlarms( element );
@@ -900,7 +900,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
 
   if ( mHasAlarm && mAlarms.isEmpty() ) {
     KCal::Alarm* alarm = incidence->newAlarm();
-    alarm->setStartOffset( qRound( mAlarm * 60.0 ) );
+    alarm->setStartOffset( tqRound( mAlarm * 60.0 ) );
     alarm->setEnabled( true );
     alarm->setType( KCal::Alarm::Display );
   } else if ( !mAlarms.isEmpty() ) {
diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h
index 582d34c38..b3de2f914 100644
--- a/kresources/kolab/kcal/incidence.h
+++ b/kresources/kolab/kcal/incidence.h
@@ -77,7 +77,7 @@ public:
     TQString delegator;
   };
 
-  explicit Incidence( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+  explicit Incidence( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
                       const TQString& tz );
   virtual ~Incidence();
 
@@ -167,7 +167,7 @@ protected:
 
   KCal::ResourceKolab *mResource;
   TQString mSubResource;
-  Q_UINT32 mSernum;
+  TQ_UINT32 mSernum;
 };
 
 }
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 1f5f486ff..5bbae761b 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -70,7 +70,7 @@ static const char* incidenceInlineMimeType = "text/calendar";
 
 ResourceKolab::ResourceKolab( const KConfig *config )
   : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ),
-    mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
+    mCalendar( TQString::tqfromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
         "mResourceChangedTimer" ), mBatchAddingInProgress( false )
 {
   if ( !config ) {
@@ -170,7 +170,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." )
                            : !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." )
                            : i18n( "Loading events..." );
-  const bool useProgress = qApp && qApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
+  const bool useProgress = tqApp && tqApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
   if ( useProgress )
     (void)::Observer::self(); // ensure kio_uiserver is running
   UIServer_stub uiserver( "kio_uiserver", "UIServer" );
@@ -183,7 +183,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   }
 
   for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) {
-    TQMap<Q_UINT32, TQString> lst;
+    TQMap<TQ_UINT32, TQString> lst;
     if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
       kdError(5650) << "Communication problem in ResourceKolab::load()\n";
       if ( progressId )
@@ -193,7 +193,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
 
     { // for RAII scoping below
       TemporarySilencer t( this );
-      for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+      for( TQMap<TQ_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
         addIncidence( mimetype, it.data(), subResource, it.key() );
       }
     }
@@ -310,7 +310,7 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase )
   const TQString uid = incidencebase->uid();
   //kdDebug() << k_funcinfo << uid << endl;
 
-  if ( mUidsPendingUpdate.contains( uid ) || mUidsPendingAdding.contains( uid ) ) {
+  if ( mUidsPendingUpdate.tqcontains( uid ) || mUidsPendingAdding.tqcontains( uid ) ) {
     /* We are currently processing this event ( removing and readding or
      * adding it ). If so, ignore this update. Keep the last of these around
      * and process once we hear back from KMail on this event. */
@@ -336,7 +336,7 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase )
     if ( i ) {
       bool ignoreThisUpdate = false;
 
-      if ( !mLastKnownRevisions.contains( uid ) ) {
+      if ( !mLastKnownRevisions.tqcontains( uid ) ) {
         mLastKnownRevisions[uid] = i->revision();
       }
 
@@ -354,8 +354,8 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase )
   } // end optimization
 
   TQString subResource;
-  Q_UINT32 sernum = 0;
-  if ( mUidMap.contains( uid ) ) {
+  TQ_UINT32 sernum = 0;
+  if ( mUidMap.tqcontains( uid ) ) {
     subResource = mUidMap[ uid ].resource();
     sernum = mUidMap[ uid ].serialNumber();
     mUidsPendingUpdate.append( uid );
@@ -370,7 +370,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase )
   }
 
   incidencebase->setSyncStatusSilent( KCal::Event::SYNCMOD );
-  incidencebase->setLastModified( TQDateTime::currentDateTime() );
+  incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() );
 
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
@@ -378,7 +378,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase )
   incidenceUpdatedSilent( incidencebase );
 }
 
-void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subresource, Q_UINT32 sernum )
+void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subresource, TQ_UINT32 sernum )
 {
   if ( !inc ) {
     return;
@@ -441,7 +441,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre
    mSilent = silent;
 }
 void ResourceKolab::addIncidence( const char* mimetype, const TQString& data,
-                                  const TQString& subResource, Q_UINT32 sernum )
+                                  const TQString& subResource, TQ_UINT32 sernum )
 {
   // This uses pointer comparison, so it only works if we use the static
   // objects defined in the top of the file
@@ -459,7 +459,7 @@ void ResourceKolab::addIncidence( const char* mimetype, const TQString& data,
 
 
 bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const TQString& subresource,
-                                     Q_UINT32 sernum )
+                                     TQ_UINT32 sernum )
 {
   const TQString& type = incidencebase->type();
   const char* mimetype = 0;
@@ -543,7 +543,7 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const T
   // behold, sernum is an in-parameter
   const bool rc = kmailUpdate( subresource, sernum, data, mimetype, subject, customHeaders, attURLs, attMimeTypes, attNames, deletedAtts );
   // update the serial number
-  if ( mUidMap.contains( incidencebase->uid() ) ) {
+  if ( mUidMap.tqcontains( incidencebase->uid() ) ) {
     mUidMap[ incidencebase->uid() ].setSerialNumber( sernum );
   }
 
@@ -556,7 +556,7 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const T
 }
 
 bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _subresource,
-                                  Q_UINT32 sernum )
+                                  TQ_UINT32 sernum )
 {
   Q_ASSERT( incidence );
   if ( !incidence ) {
@@ -629,7 +629,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
 
       // Lets not warn the user 100 times that there's no writable resource
       // and not ask 100 times which resource to use
-      if ( !mBatchAddingInProgress || !mLastUsedResources.contains( type ) ) {
+      if ( !mBatchAddingInProgress || !mLastUsedResources.tqcontains( type ) ) {
         subResource = findWritableResource( type, *map, text );
         mLastUsedResources[type] = subResource;
       } else {
@@ -676,7 +676,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
     }
   } else { /* KMail told us */
-    const bool ourOwnUpdate = mUidsPendingUpdate.contains(  uid );
+    const bool ourOwnUpdate = mUidsPendingUpdate.tqcontains(  uid );
     kdDebug( 5650 ) << "addIncidence: ourOwnUpdate " << ourOwnUpdate << endl;
     /* Check if we updated this one, which means kmail deleted and added it.
      * We know the new state, so lets just not do much at all. The old incidence
@@ -692,7 +692,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
        * unless the folder is read-only, in which case the user should not be
        * offered a means of putting mails in a folder she'll later be unable to
        * upload. Skip the incidence, in this case. */
-      if ( mUidMap.contains( uid ) ) {
+      if ( mUidMap.tqcontains( uid ) ) {
         if ( mUidMap[ uid ].resource() == subResource ) {
           if ( (*map)[ subResource ].writable() ) {
             kdDebug( 5650 ) << "lets resolve the conflict " << endl;
@@ -716,7 +716,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
       /* Add to the cache if the add didn't come from KOrganizer, in which case
        * we've already added it, and listen to updates from KOrganizer for it. */
-      if ( !mUidsPendingAdding.contains( uid ) ) {
+      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
         mCalendar.addIncidence( incidence );
         incidence->registerObserver( this );
       }
@@ -733,7 +733,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
     } else {
       /* If the uid was added by KMail, KOrganizer needs to be told, so
        * schedule emitting of the resourceChanged signal. */
-      if ( !mUidsPendingAdding.contains( uid ) ) {
+      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
         if ( !ourOwnUpdate ) mResourceChangedTimer.changeInterval( 100 );
       } else {
         mUidsPendingAdding.remove( uid );
@@ -752,7 +752,7 @@ bool ResourceKolab::addEvent( KCal::Event *event )
 
 bool ResourceKolab::addEvent( KCal::Event *event, const TQString &subResource )
 {
-  if ( mUidMap.contains( event->uid() ) ) {
+  if ( mUidMap.tqcontains( event->uid() ) ) {
     return true; //noop
   } else {
     return addIncidence( event, subResource, 0 );
@@ -760,7 +760,7 @@ bool ResourceKolab::addEvent( KCal::Event *event, const TQString &subResource )
 }
 
 void ResourceKolab::addEvent( const TQString& xml, const TQString& subresource,
-                              Q_UINT32 sernum )
+                              TQ_UINT32 sernum )
 {
   KCal::Event* event = Kolab::Event::xmlToEvent( xml, mCalendar.timeZoneId(), this, subresource, sernum );
   Q_ASSERT( event );
@@ -776,7 +776,7 @@ bool ResourceKolab::deleteIncidence( KCal::Incidence* incidence )
   }
 
   const TQString uid = incidence->uid();
-  if( !mUidMap.contains( uid ) ) return false; // Odd
+  if( !mUidMap.tqcontains( uid ) ) return false; // Odd
   /* The user told us to delete, tell KMail */
   if ( !mSilent ) {
     kmailDeleteIncidence( mUidMap[ uid ].resource(),
@@ -832,7 +832,7 @@ bool ResourceKolab::addTodo( KCal::Todo *todo )
 
 bool ResourceKolab::addTodo( KCal::Todo *todo, const TQString &subResource )
 {
-  if ( mUidMap.contains( todo->uid() ) ) {
+  if ( mUidMap.tqcontains( todo->uid() ) ) {
     return true; //noop
   } else {
     return addIncidence( todo, subResource, 0 );
@@ -840,7 +840,7 @@ bool ResourceKolab::addTodo( KCal::Todo *todo, const TQString &subResource )
 }
 
 void ResourceKolab::addTodo( const TQString& xml, const TQString& subresource,
-                             Q_UINT32 sernum )
+                             TQ_UINT32 sernum )
 {
   KCal::Todo* todo = Kolab::Task::xmlToTask( xml, mCalendar.timeZoneId(), this, subresource, sernum );
   Q_ASSERT( todo );
@@ -876,14 +876,14 @@ bool ResourceKolab::addJournal( KCal::Journal *journal )
 
 bool ResourceKolab::addJournal( KCal::Journal *journal, const TQString &subResource )
 {
-  if ( mUidMap.contains( journal->uid() ) )
+  if ( mUidMap.tqcontains( journal->uid() ) )
     return true; //noop
   else
     return addIncidence( journal, subResource, 0 );
 }
 
 void ResourceKolab::addJournal( const TQString& xml, const TQString& subresource,
-                                Q_UINT32 sernum )
+                                TQ_UINT32 sernum )
 {
   KCal::Journal* journal =
     Kolab::Journal::xmlToJournal( xml, mCalendar.timeZoneId() );
@@ -921,12 +921,12 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms
     KCal::Alarm *a = (*it);
     ++it;
     const TQString &uid = a->parent()->uid();
-     if ( mUidMap.contains( uid ) ) {
+     if ( mUidMap.tqcontains( uid ) ) {
        const TQString &sr = mUidMap[ uid ].resource();
        Kolab::SubResource *subResource = 0;
-       if ( mEventSubResources.contains( sr ) )
+       if ( mEventSubResources.tqcontains( sr ) )
           subResource = &( mEventSubResources[ sr ] );
-       else if ( mTodoSubResources.contains( sr ) )
+       else if ( mTodoSubResources.tqcontains( sr ) )
           subResource = &( mTodoSubResources[ sr ] );
        assert( subResource );
        if ( subResource->alarmRelevant() )
@@ -960,7 +960,7 @@ void ResourceKolab::setTimeZoneId( const TQString& tzid )
 
 bool ResourceKolab::fromKMailAddIncidence( const TQString& type,
                                            const TQString& subResource,
-                                           Q_UINT32 sernum,
+                                           TQ_UINT32 sernum,
                                            int format,
                                            const TQString& data )
 {
@@ -1011,14 +1011,14 @@ void ResourceKolab::fromKMailDelIncidence( const TQString& type,
   // Can't be in both, by contract
   if ( mUidsPendingDeletion.find( uid ) != mUidsPendingDeletion.end() ) {
     mUidsPendingDeletion.remove( mUidsPendingDeletion.find( uid ) );
-  } else if ( mUidsPendingUpdate.contains( uid ) ) {
+  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // replace it, so let's just sit tight.
+    // tqreplace it, so let's just sit tight.
   } else {
     TQString uidToUse;
 
     QPair<TQString, TQString> p( uid, subResource );
-    if ( mOriginalUID2fakeUID.contains( p ) ) {
+    if ( mOriginalUID2fakeUID.tqcontains( p ) ) {
       // Incidence with the same uid in a different folder...
       // use the UID that addIncidence(...) generated
       uidToUse = mOriginalUID2fakeUID[p];
@@ -1073,7 +1073,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( map->contains( subResource ) )
+  if ( map->tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -1093,7 +1093,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
   ResourceMap* map = subResourceMap( type );
   if ( !map ) // not ours
     return;
-  if ( map->contains( subResource ) )
+  if ( map->tqcontains( subResource ) )
     map->erase( subResource );
   else
     // Not registered
@@ -1122,21 +1122,21 @@ TQStringList ResourceKolab::subresources() const
 const QString
 ResourceKolab::labelForSubresource( const TQString& subresource ) const
 {
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].label();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].label();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].label();
   return subresource;
 }
 
-void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                               const TQString& type,
                                               const TQString& folder )
 {
   TemporarySilencer t( this );
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it )
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it )
     addIncidence( type.latin1(), it.data(), folder, it.key() );
 }
 
@@ -1146,11 +1146,11 @@ bool ResourceKolab::subresourceActive( const TQString& subresource ) const
   // before it opens the resource :-( Make sure we are open
   const_cast<ResourceKolab*>( this )->doOpen();
 
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].active();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].active();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].active();
 
   // Safe default bet:
@@ -1163,15 +1163,15 @@ void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v )
 {
   ResourceMap *map = 0;
   const char* mimeType = 0;
-  if ( mEventSubResources.contains( subresource ) ) {
+  if ( mEventSubResources.tqcontains( subresource ) ) {
      map = &mEventSubResources;
      mimeType = eventAttachmentMimeType;
   }
-  if ( mTodoSubResources.contains( subresource ) ) {
+  if ( mTodoSubResources.tqcontains( subresource ) ) {
      map = &mTodoSubResources;
      mimeType = todoAttachmentMimeType;
   }
-  if ( mJournalSubResources.contains( subresource ) ) {
+  if ( mJournalSubResources.tqcontains( subresource ) ) {
      map = &mJournalSubResources;
      mimeType = journalAttachmentMimeType;
   }
@@ -1194,11 +1194,11 @@ bool ResourceKolab::subresourceWritable( const TQString& subresource ) const
   // before it opens the resource :-( Make sure we are open
   const_cast<ResourceKolab*>( this )->doOpen();
 
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].writable();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].writable();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].writable();
 
   return false; //better a safe default
@@ -1236,11 +1236,11 @@ bool ResourceKolab::addSubresource( const TQString& resource, const TQString& pa
    kdDebug(5650) << "KCal Kolab resource - adding subresource: " << resource << endl;
    TQString contentsType = kmailCalendarContentsType;
    if ( !parent.isEmpty() ) {
-     if ( mEventSubResources.contains( parent ) )
+     if ( mEventSubResources.tqcontains( parent ) )
        contentsType = kmailCalendarContentsType;
-     else if ( mTodoSubResources.contains( parent ) )
+     else if ( mTodoSubResources.tqcontains( parent ) )
        contentsType = kmailTodoContentsType;
-     else if ( mJournalSubResources.contains( parent ) )
+     else if ( mJournalSubResources.tqcontains( parent ) )
        contentsType = kmailJournalContentsType;
    } else {
      TQStringList contentTypeChoices;
@@ -1269,10 +1269,10 @@ bool ResourceKolab::removeSubresource( const TQString& resource )
 TQString ResourceKolab::subresourceIdentifier( Incidence *incidence )
 {
   TQString uid = incidence->uid();
-  if ( mUidMap.contains( uid ) )
+  if ( mUidMap.tqcontains( uid ) )
     return mUidMap[ uid ].resource();
   else
-    if ( mNewIncidencesMap.contains( uid ) )
+    if ( mNewIncidencesMap.tqcontains( uid ) )
       return mNewIncidencesMap[ uid ];
     else
       return TQString();
@@ -1311,11 +1311,11 @@ bool ResourceKolab::unloadSubResource( const TQString& subResource )
 
 TQString ResourceKolab::subresourceType( const TQString &resource )
 {
-  if ( mEventSubResources.contains( resource ) )
+  if ( mEventSubResources.tqcontains( resource ) )
     return "event";
-  if ( mTodoSubResources.contains( resource ) )
+  if ( mTodoSubResources.tqcontains( resource ) )
     return "todo";
-  if ( mJournalSubResources.contains( resource ) )
+  if ( mJournalSubResources.tqcontains( resource ) )
     return "journal";
   return TQString();
 }
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index dda5ba32a..fd4c3b57e 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -106,7 +106,7 @@ public:
 
   /// The ResourceKolabBase methods called by KMail
   bool fromKMailAddIncidence( const TQString& type, const TQString& subResource,
-                              Q_UINT32 sernum, int format, const TQString& data );
+                              TQ_UINT32 sernum, int format, const TQString& data );
   void fromKMailDelIncidence( const TQString& type, const TQString& subResource,
                               const TQString& uid );
   void fromKMailRefresh( const TQString& type, const TQString& subResource );
@@ -117,7 +117,7 @@ public:
                                 bool alarmRelevant );
   void fromKMailDelSubresource( const TQString& type, const TQString& subResource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -165,23 +165,23 @@ protected:
 
 private:
   void removeIncidences( const TQCString& incidenceType );
-  void resolveConflict( KCal::Incidence*, const TQString& subresource, Q_UINT32 sernum );
+  void resolveConflict( KCal::Incidence*, const TQString& subresource, TQ_UINT32 sernum );
   void addIncidence( const char* mimetype, const TQString& xml,
-                     const TQString& subResource, Q_UINT32 sernum );
+                     const TQString& subResource, TQ_UINT32 sernum );
 
 
   /**
      Caller guarantees i is not null.
    */
   bool addIncidence( KCal::Incidence *i, const TQString& subresource,
-                     Q_UINT32 sernum );
+                     TQ_UINT32 sernum );
 
   void addEvent( const TQString& xml, const TQString& subresource,
-                 Q_UINT32 sernum );
+                 TQ_UINT32 sernum );
   void addTodo( const TQString& xml, const TQString& subresource,
-                Q_UINT32 sernum );
+                TQ_UINT32 sernum );
   void addJournal( const TQString& xml, const TQString& subresource,
-                   Q_UINT32 sernum );
+                   TQ_UINT32 sernum );
 
 
   bool loadAllEvents();
@@ -209,7 +209,7 @@ private:
   Kolab::ResourceMap* subResourceMap( const TQString& contentsType );
 
   bool sendKMailUpdate( KCal::IncidenceBase* incidence, const TQString& _subresource,
-                        Q_UINT32 sernum );
+                        TQ_UINT32 sernum );
 
 
   KCal::CalendarLocal mCalendar;
@@ -223,11 +223,11 @@ private:
   ICalFormat mFormat;
 
   /**
-    This map contains the association between a new added incidence
+    This map tqcontains the association between a new added incidence
     and the subresource it belongs to.
     That's needed to return the correct mapping in subresourceIdentifier().
 
-    We can't trust on mUidMap here, because it contains only non-pending uids.
+    We can't trust on mUidMap here, because it tqcontains only non-pending uids.
    */
   TQMap<TQString, TQString> mNewIncidencesMap;
   int mProgressDialogIncidenceLimit;
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 36876b7d5..33cc50eef 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -75,7 +75,7 @@ static int kolabPrioritytoKCal( const int kolabPriority )
 }
 
 KCal::Todo* Task::xmlToTask( const TQString& xml, const TQString& tz, KCal::ResourceKolab *res,
-                             const TQString& subResource, Q_UINT32 sernum )
+                             const TQString& subResource, TQ_UINT32 sernum )
 {
   Task task( res, subResource, sernum, tz );
   task.load( xml );
@@ -90,7 +90,7 @@ TQString Task::taskToXML( KCal::Todo* todo, const TQString& tz )
   return task.saveXML();
 }
 
-Task::Task( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+Task::Task( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
             const TQString& tz, KCal::Todo* task )
   : Incidence( res, subResource, sernum, tz ),
     mPriority( 5 ), mPercentCompleted( 0 ),
@@ -126,7 +126,7 @@ int Task::percentCompleted() const
   return mPercentCompleted;
 }
 
-void Task::setStatus( KCal::Incidence::Status status )
+void Task::seStatus( KCal::Incidence::Status status )
 {
   mStatus = status;
 }
@@ -234,17 +234,17 @@ bool Task::loadAttribute( TQDomElement& element )
     setPercentCompleted( percent );
   } else if ( tagName == "status" ) {
     if ( element.text() == "in-progress" )
-      setStatus( KCal::Incidence::StatusInProcess );
+      seStatus( KCal::Incidence::StatusInProcess );
     else if ( element.text() == "completed" )
-      setStatus( KCal::Incidence::StatusCompleted );
+      seStatus( KCal::Incidence::StatusCompleted );
     else if ( element.text() == "waiting-on-someone-else" )
-      setStatus( KCal::Incidence::StatusNeedsAction );
+      seStatus( KCal::Incidence::StatusNeedsAction );
     else if ( element.text() == "deferred" )
       // Guessing a status here
-      setStatus( KCal::Incidence::StatusCanceled );
+      seStatus( KCal::Incidence::StatusCanceled );
     else
       // Default
-      setStatus( KCal::Incidence::StatusNone );
+      seStatus( KCal::Incidence::StatusNone );
   } else if ( tagName == "due-date" ) {
     setDueDate( element.text() );
   } else if ( tagName == "parent" ) {
@@ -374,7 +374,7 @@ void Task::setFields( const KCal::Todo* task )
 
   setPriority( task->priority() );
   setPercentCompleted( task->percentComplete() );
-  setStatus( task->status() );
+  seStatus( task->status() );
   setHasStartDate( task->hasStartDate() );
 
   if ( task->hasDueDate() ) {
@@ -447,7 +447,7 @@ void Task::saveTo( KCal::Todo* task )
 
   task->setPriority( priority() );
   task->setPercentComplete( percentCompleted() );
-  task->setStatus( status() );
+  task->seStatus( status() );
   task->setHasStartDate( hasStartDate() );
   task->setHasDueDate( hasDueDate() );
   if ( hasDueDate() )
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index f7e7c6d51..6fe318e2c 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -58,12 +58,12 @@ public:
   /// Use this to parse an xml string to a task entry
   /// The caller is responsible for deleting the returned task
   static KCal::Todo* xmlToTask( const TQString& xml, const TQString& tz, KCal::ResourceKolab *res = 0,
-                                const TQString& subResource = TQString::null, Q_UINT32 sernum = 0 );
+                                const TQString& subResource = TQString::null, TQ_UINT32 sernum = 0 );
 
   /// Use this to get an xml string describing this task entry
   static TQString taskToXML( KCal::Todo*, const TQString& tz );
 
-  explicit Task( KCal::ResourceKolab *res, const TQString& subResource, Q_UINT32 sernum,
+  explicit Task( KCal::ResourceKolab *res, const TQString& subResource, TQ_UINT32 sernum,
                  const TQString& tz, KCal::Todo* todo = 0 );
   virtual ~Task();
 
@@ -77,7 +77,7 @@ public:
   virtual void setPercentCompleted( int percent );
   virtual int percentCompleted() const;
 
-  virtual void setStatus( KCal::Incidence::Status status );
+  virtual void seStatus( KCal::Incidence::Status status );
   virtual KCal::Incidence::Status status() const;
 
   virtual void setParent( const TQString& parentUid );
diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp
index d917d0ac2..38f670871 100644
--- a/kresources/kolab/knotes/resourcekolab.cpp
+++ b/kresources/kolab/knotes/resourcekolab.cpp
@@ -52,7 +52,7 @@ static const char* inlineMimeType = "text/calendar";
 
 ResourceKolab::ResourceKolab( const KConfig *config )
   : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ),
-    mCalendar( TQString::fromLatin1("UTC") )
+    mCalendar( TQString::tqfromLatin1("UTC") )
 {
   if ( !config ) {
     setResourceName( i18n( "Kolab Server" ) );
@@ -105,7 +105,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
     return false;
   }
 
-  TQMap<Q_UINT32, TQString> lst;
+  TQMap<TQ_UINT32, TQString> lst;
   if( !kmailIncidences( lst, mimetype, subResource, 0, count ) ) {
     kdError(5500) << "Communication problem in "
                   << "ResourceKolab::getIncidenceList()\n";
@@ -117,7 +117,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   // Populate with the new entries
   const bool silent = mSilent;
   mSilent = true;
-  TQMap<Q_UINT32, TQString>::ConstIterator it;
+  TQMap<TQ_UINT32, TQString>::ConstIterator it;
   for ( it = lst.constBegin(); it != lst.constEnd(); ++it ) {
     KCal::Journal* journal = addNote( it.data(), subResource, it.key(), mimetype );
     if ( !journal )
@@ -164,7 +164,7 @@ bool ResourceKolab::addNote( KCal::Journal* journal )
 }
 
 KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& subresource,
-                             Q_UINT32 sernum, const TQString &mimetype )
+                             TQ_UINT32 sernum, const TQString &mimetype )
 {
   KCal::Journal *journal = 0;
 
@@ -178,12 +178,12 @@ KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& sub
   Q_ASSERT( journal );
 
   bool addedOk = journal &&
-                 !mUidMap.contains( journal->uid() ) &&
+                 !mUidMap.tqcontains( journal->uid() ) &&
                  addNote( journal, subresource, sernum );
 
   // for debugging
-  if ( journal && mUidMap.contains( journal->uid() ) ) {
-    kdDebug(5500) << "mUidMap already contains " << journal->uid() << endl;
+  if ( journal && mUidMap.tqcontains( journal->uid() ) ) {
+    kdDebug(5500) << "mUidMap already tqcontains " << journal->uid() << endl;
   }
 
   if ( !addedOk ) {
@@ -194,7 +194,7 @@ KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& sub
   return journal;
 }
 
-bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource, Q_UINT32 sernum )
+bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource, TQ_UINT32 sernum )
 {
   kdDebug(5500) << "ResourceKolab::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )\n";
 
@@ -232,7 +232,7 @@ bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource
 bool ResourceKolab::deleteNote( KCal::Journal* journal )
 {
   const TQString uid = journal->uid();
-  if ( !mUidMap.contains( uid ) )
+  if ( !mUidMap.tqcontains( uid ) )
     // Odd
     return false;
 
@@ -270,8 +270,8 @@ KCal::Alarm::List ResourceKolab::alarms( const TQDateTime& from, const TQDateTim
 void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* i )
 {
   TQString subResource;
-  Q_UINT32 sernum;
-  if ( mUidMap.contains( i->uid() ) ) {
+  TQ_UINT32 sernum;
+  if ( mUidMap.tqcontains( i->uid() ) ) {
     subResource = mUidMap[ i->uid() ].resource();
     sernum = mUidMap[ i->uid() ].serialNumber();
   } else { // can this happen?
@@ -293,7 +293,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* i )
  */
 bool ResourceKolab::fromKMailAddIncidence( const TQString& type,
                                            const TQString& subResource,
-                                           Q_UINT32 sernum,
+                                           TQ_UINT32 sernum,
                                            int format,
                                            const TQString& note )
 {
@@ -352,7 +352,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( mSubResources.contains( subResource ) )
+  if ( mSubResources.tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -372,7 +372,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( !mSubResources.contains( subResource ) )
+  if ( !mSubResources.tqcontains( subResource ) )
     // Not registered
     return;
 
@@ -408,7 +408,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
   emit signalSubresourceRemoved( this, type, subResource );
 }
 
-void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                               const TQString& type,
                                               const TQString& folder )
 {
@@ -422,7 +422,7 @@ void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& m
     mimetype = attachmentMimeType;
   else
     mimetype = inlineMimeType;
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it ) {
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it ) {
     KCal::Journal* journal = addNote( it.data(), folder, it.key(), mimetype );
     if ( !journal )
       kdDebug(5500) << "loading note " << it.key() << " failed" << endl;
@@ -440,7 +440,7 @@ TQStringList ResourceKolab::subresources() const
 
 bool ResourceKolab::subresourceActive( const TQString& res ) const
 {
-  if ( mSubResources.contains( res ) ) {
+  if ( mSubResources.tqcontains( res ) ) {
     return mSubResources[ res ].active();
   }
 
@@ -452,7 +452,7 @@ bool ResourceKolab::subresourceActive( const TQString& res ) const
 
 bool ResourceKolab::subresourceWritable( const TQString& res ) const
 {
-  if ( mSubResources.contains( res ) ) {
+  if ( mSubResources.tqcontains( res ) ) {
     return mSubResources[ res ].writable();
   }
 
diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h
index 6ff994ccf..cfeeb0eb6 100644
--- a/kresources/kolab/knotes/resourcekolab.h
+++ b/kresources/kolab/knotes/resourcekolab.h
@@ -81,7 +81,7 @@ public:
 
   /// The ResourceKolabBase methods called by KMail
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& note );
+                              TQ_UINT32 sernum, int format, const TQString& note );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& uid );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
@@ -92,7 +92,7 @@ public:
                                 bool alarmRelevant );
   void fromKMailDelSubresource( const TQString& type, const TQString& resource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -111,9 +111,9 @@ signals:
 
 private:
   bool addNote( KCal::Journal* journal, const TQString& resource,
-                Q_UINT32 sernum );
+                TQ_UINT32 sernum );
   KCal::Journal* addNote( const TQString& data, const TQString& subresource,
-                          Q_UINT32 sernum, const TQString &mimetype );
+                          TQ_UINT32 sernum, const TQString &mimetype );
 
   bool loadSubResource( const TQString& resource, const TQString& mimetype );
 
diff --git a/kresources/kolab/shared/kmailconnection.cpp b/kresources/kolab/shared/kmailconnection.cpp
index 66674abfa..5b2921b94 100644
--- a/kresources/kolab/shared/kmailconnection.cpp
+++ b/kresources/kolab/shared/kmailconnection.cpp
@@ -85,7 +85,7 @@ bool KMailConnection::connectToKMail()
         if ( services[i].find( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
           continue; 
         const QCStringList objs = kapp->dcopClient()->remoteObjects( services[i] );
-        if ( objs.contains( dcopObjectId ) ) {
+        if ( objs.tqcontains( dcopObjectId ) ) {
           dcopService = services[i];
           break;
         }
@@ -111,8 +111,8 @@ bool KMailConnection::connectToKMail()
                                                    dcopService, dcopObjectId );
 
     // Attach to the KMail signals
-    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,Q_UINT32,int,TQString)",
-                              "fromKMailAddIncidence(TQString,TQString,Q_UINT32,int,TQString)" ) )
+    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,TQ_UINT32,int,TQString)",
+                              "fromKMailAddIncidence(TQString,TQString,TQ_UINT32,int,TQString)" ) )
       kdError(5650) << "DCOP connection to incidenceAdded failed" << endl;
     if ( !connectKMailSignal( "incidenceDeleted(TQString,TQString,TQString)",
                               "fromKMailDelIncidence(TQString,TQString,TQString)" ) )
@@ -126,8 +126,8 @@ bool KMailConnection::connectToKMail()
     if ( !connectKMailSignal( "subresourceDeleted(TQString,TQString)",
                               "fromKMailDelSubresource(TQString,TQString)" ) )
       kdError(5650) << "DCOP connection to subresourceDeleted failed" << endl;
-    if ( !connectKMailSignal( "asyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)",
-                              "fromKMailAsyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)" ) )
+    if ( !connectKMailSignal( "asyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)",
+                              "fromKMailAsyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)" ) )
       kdError(5650) << "DCOP connection to asyncLoadResult failed" << endl;
   }
 
@@ -136,7 +136,7 @@ bool KMailConnection::connectToKMail()
 
 bool KMailConnection::fromKMailAddIncidence( const TQString& type,
                                              const TQString& folder,
-                                             Q_UINT32 sernum,
+                                             TQ_UINT32 sernum,
                                              int format,
                                              const TQString& data )
 {
@@ -184,7 +184,7 @@ void KMailConnection::fromKMailDelSubresource( const TQString& type,
   mResource->fromKMailDelSubresource( type, resource );
 }
 
-void KMailConnection::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KMailConnection::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                                 const TQString& type,
                                                 const TQString& folder )
 {
@@ -219,7 +219,7 @@ bool KMailConnection::kmailIncidencesCount( int& count,
   return mKMailIcalIfaceStub->ok();
 }
 
-bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool KMailConnection::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
                                        const TQString& mimetype,
                                        const TQString& resource,
                                        int startIndex,
@@ -235,7 +235,7 @@ bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
 
 bool KMailConnection::kmailGetAttachment( KURL& url,
                                           const TQString& resource,
-                                          Q_UINT32 sernum,
+                                          TQ_UINT32 sernum,
                                           const TQString& filename )
 {
   if ( !connectToKMail() )
@@ -247,7 +247,7 @@ bool KMailConnection::kmailGetAttachment( KURL& url,
 
 bool KMailConnection::kmailAttachmentMimetype( TQString & mimeType,
                                                const TQString & resource,
-                                               Q_UINT32 sernum,
+                                               TQ_UINT32 sernum,
                                                const TQString & filename )
 {
   if ( !connectToKMail() )
@@ -257,7 +257,7 @@ bool KMailConnection::kmailAttachmentMimetype( TQString & mimeType,
 }
 
 bool KMailConnection::kmailListAttachments(TQStringList &list,
-                                            const TQString & resource, Q_UINT32 sernum)
+                                            const TQString & resource, TQ_UINT32 sernum)
 {
   if ( !connectToKMail() )
     return false;
@@ -267,7 +267,7 @@ bool KMailConnection::kmailListAttachments(TQStringList &list,
 }
 
 bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
-                                            Q_UINT32 sernum )
+                                            TQ_UINT32 sernum )
 {
   return connectToKMail()
     && mKMailIcalIfaceStub->deleteIncidenceKolab( resource, sernum )
@@ -275,7 +275,7 @@ bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
 }
 
 bool KMailConnection::kmailUpdate( const TQString& resource,
-                                   Q_UINT32& sernum,
+                                   TQ_UINT32& sernum,
                                    const TQString& subject,
                                    const TQString& plainTextBody,
                                    const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/kolab/shared/kmailconnection.h b/kresources/kolab/shared/kmailconnection.h
index 16b80bfb0..3cf5b826f 100644
--- a/kresources/kolab/shared/kmailconnection.h
+++ b/kresources/kolab/shared/kmailconnection.h
@@ -55,7 +55,7 @@ class KMailConnection : public TQObject, public DCOPObject {
   // These are the methods called by KMail when the resource changes
 k_dcop:
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& xml );
+                              TQ_UINT32 sernum, int format, const TQString& xml );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& xml );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
@@ -63,7 +63,7 @@ k_dcop:
                                 const TQString& label, bool writable,
                                 bool alarmRelevant );
   void fromKMailDelSubresource( const TQString& type, const TQString& resource );
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map, const TQString& type,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map, const TQString& type,
                                  const TQString& folder );
 
 public:
@@ -81,20 +81,20 @@ public:
   bool kmailIncidencesCount( int& count,
                              const TQString& mimetype,
                              const TQString& resource );
-  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+  bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
                         const TQString& resource,
                         int startIndex,
                         int nbMessages );
 
-  bool kmailGetAttachment( KURL& url, const TQString& resource, Q_UINT32 sernum,
+  bool kmailGetAttachment( KURL& url, const TQString& resource, TQ_UINT32 sernum,
                            const TQString& filename );
   bool kmailAttachmentMimetype( TQString &mimeType, const TQString &resource,
-                                Q_UINT32 sernum, const TQString &filename );
+                                TQ_UINT32 sernum, const TQString &filename );
   bool kmailListAttachments( TQStringList &list, const TQString &resource,
-                             Q_UINT32 sernum );
-  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+                             TQ_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
   bool kmailUpdate( const TQString& resource,
-                    Q_UINT32& sernum,
+                    TQ_UINT32& sernum,
                     const TQString& subject,
                     const TQString& plainTextBody,
                     const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp
index b7f502576..978481072 100644
--- a/kresources/kolab/shared/kolabbase.cpp
+++ b/kresources/kolab/shared/kolabbase.cpp
@@ -44,8 +44,8 @@ using namespace Kolab;
 
 
 KolabBase::KolabBase( const TQString& tz )
-  : mCreationDate( TQDateTime::currentDateTime() ),
-    mLastModified( TQDateTime::currentDateTime() ),
+  : mCreationDate( TQDateTime::tqcurrentDateTime() ),
+    mLastModified( TQDateTime::tqcurrentDateTime() ),
     mSensitivity( Public ), mTimeZoneId( tz ),
     mHasPilotSyncId( false ),  mHasPilotSyncStatus( false )
 {
@@ -94,7 +94,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee )
   kdDebug(5006) << "Creation time string: " << creationString << endl;
   TQDateTime creationDate;
   if ( creationString.isEmpty() ) {
-    creationDate = TQDateTime::currentDateTime();
+    creationDate = TQDateTime::tqcurrentDateTime();
     kdDebug(5006) << "Creation date set to current time\n";
   }
   else {
@@ -103,7 +103,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee )
   }
   TQDateTime modified = addressee->revision();
   if ( !modified.isValid() )
-    modified = TQDateTime::currentDateTime();
+    modified = TQDateTime::tqcurrentDateTime();
   setLastModified( modified );
   if ( modified < creationDate ) {
     // It's not possible that the modification date is earlier than creation
@@ -259,7 +259,7 @@ bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email )
       const TQString tagName = e.tagName();
 
       if ( tagName == "display-name" ) {
-        // Quote the text in case it contains commas or other quotable chars.
+        // Quote the text in case it tqcontains commas or other quotable chars.
         TQString tusername = KPIM::quoteNameIfNecessary( e.text() );
 
         TQString tname, temail;
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index 2db2117db..26ef00db6 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -83,7 +83,7 @@ bool ResourceKolabBase::kmailIncidencesCount( int &count,
   return mConnection->kmailIncidencesCount( count, mimetype, resource );
 }
 
-bool ResourceKolabBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool ResourceKolabBase::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
                                          const TQString& mimetype,
                                          const TQString& resource,
                                          int startIndex,
@@ -93,27 +93,27 @@ bool ResourceKolabBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
 }
 
 bool ResourceKolabBase::kmailGetAttachment( KURL& url, const TQString& resource,
-                                            Q_UINT32 sernum,
+                                            TQ_UINT32 sernum,
                                             const TQString& filename ) const
 {
   return mConnection->kmailGetAttachment( url, resource, sernum, filename );
 }
 
 bool ResourceKolabBase::kmailAttachmentMimetype( TQString & mimeType, TQString & resource,
-                                                 Q_UINT32 sernum, const TQString & filename ) const
+                                                 TQ_UINT32 sernum, const TQString & filename ) const
 {
   return mConnection->kmailAttachmentMimetype( mimeType, resource, sernum, filename );
 }
 
 bool ResourceKolabBase::kmailListAttachments( TQStringList &list,
                                               const TQString & resource,
-                                              Q_UINT32 sernum ) const
+                                              TQ_UINT32 sernum ) const
 {
   return mConnection->kmailListAttachments( list, resource, sernum );
 }
 
 bool ResourceKolabBase::kmailDeleteIncidence( const TQString& resource,
-                                              Q_UINT32 sernum )
+                                              TQ_UINT32 sernum )
 {
   return mSilent || mConnection->kmailDeleteIncidence( resource, sernum );
 }
@@ -126,7 +126,7 @@ static TQString plainTextBody()
     " Groupware format.\nFor a list of such email clients please"
     " visit\n%1" );
   const char * url = "http://www.kolab.org/kolab2-clients.html";
-  TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).arg( url );
+  TQString firstPartTextUntranslated = TQString::tqfromLatin1( firstPartTextToTranslate ).arg( url );
   TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url );
   if ( firstPartText != firstPartTextUntranslated ) {
     firstPartText.append("\n\n-----------------------------------------------------\n\n");
@@ -136,7 +136,7 @@ static TQString plainTextBody()
 }
 
 bool ResourceKolabBase::kmailUpdate( const TQString& resource,
-                                     Q_UINT32& sernum,
+                                     TQ_UINT32& sernum,
                                      const TQString& xml,
                                      const TQString& mimetype,
                                      const TQString& subject,
diff --git a/kresources/kolab/shared/resourcekolabbase.h b/kresources/kolab/shared/resourcekolabbase.h
index 1bd8b9515..565be2675 100644
--- a/kresources/kolab/shared/resourcekolabbase.h
+++ b/kresources/kolab/shared/resourcekolabbase.h
@@ -81,7 +81,7 @@ public:
   // These are the methods called by KMail when the resource changes
   virtual bool fromKMailAddIncidence( const TQString& type,
                                       const TQString& resource,
-                                      Q_UINT32 sernum,
+                                      TQ_UINT32 sernum,
                                       int format,
                                       const TQString& data ) = 0;
   virtual void fromKMailDelIncidence( const TQString& type,
@@ -97,7 +97,7 @@ public:
   virtual void fromKMailDelSubresource( const TQString& type,
                                         const TQString& resource ) = 0;
 
-  virtual void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  virtual void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                          const TQString& type,
                                          const TQString& folder ) = 0;
 protected:
@@ -119,7 +119,7 @@ protected:
 
   /// Get the mimetype attachments from a chunk of messages from this folder.
   /// Returns a TQMap with serialNumber/attachment pairs.
-  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+  bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
                         const TQString& resource,
                         int startIndex,
                         int nbMessages ) const;
@@ -131,20 +131,20 @@ public: // for Contact
   /// be called by the resource after obtaining the incidence.
   /// The resource must delete the temp file.
   bool kmailGetAttachment( KURL& url, const TQString& resource,
-                           Q_UINT32 sernum,
+                           TQ_UINT32 sernum,
                            const TQString& filename ) const;
 
   /** Get the mimetype of the specified attachment. */
   bool kmailAttachmentMimetype( TQString &mimeType, TQString &resource,
-                                Q_UINT32 sernum, const TQString &filename ) const;
+                                TQ_UINT32 sernum, const TQString &filename ) const;
 
   /// List all attachments of a mail.
   bool kmailListAttachments( TQStringList &list, const TQString &resource,
-                             Q_UINT32 sernum ) const;
+                             TQ_UINT32 sernum ) const;
 
 protected:
   /// Delete an incidence.
-  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
 
   KMailICalIface::StorageFormat kmailStorageFormat( const TQString& folder ) const;
 
@@ -152,7 +152,7 @@ protected:
 
   /// Update an incidence. The list of attachments are URLs.
   /// The parameter sernum is updated with the right KMail serial number
-  bool kmailUpdate( const TQString& resource, Q_UINT32& sernum,
+  bool kmailUpdate( const TQString& resource, TQ_UINT32& sernum,
                     const TQString& xml,
                     const TQString& mimetype,
                     const TQString& subject,
diff --git a/kresources/kolab/shared/subresource.cpp b/kresources/kolab/shared/subresource.cpp
index de4048fc7..a7ffb8f90 100644
--- a/kresources/kolab/shared/subresource.cpp
+++ b/kresources/kolab/shared/subresource.cpp
@@ -103,7 +103,7 @@ int SubResource::completionWeight() const
   return mCompletionWeight;
 }
 
-StorageReference::StorageReference( const TQString& resource, Q_UINT32 sernum )
+StorageReference::StorageReference( const TQString& resource, TQ_UINT32 sernum )
   : mResource( resource ), mSerialNumber( sernum )
 {
 }
@@ -122,12 +122,12 @@ TQString StorageReference::resource() const
   return mResource;
 }
 
-void StorageReference::setSerialNumber( Q_UINT32 serialNumber )
+void StorageReference::setSerialNumber( TQ_UINT32 serialNumber )
 {
   mSerialNumber = serialNumber;
 }
 
-Q_UINT32 StorageReference::serialNumber() const
+TQ_UINT32 StorageReference::serialNumber() const
 {
   return mSerialNumber;
 }
diff --git a/kresources/kolab/shared/subresource.h b/kresources/kolab/shared/subresource.h
index 87f98e6dd..de7a92e93 100644
--- a/kresources/kolab/shared/subresource.h
+++ b/kresources/kolab/shared/subresource.h
@@ -96,18 +96,18 @@ public:
   // Just for QMap
   StorageReference() {}
 
-  StorageReference( const TQString& resource, Q_UINT32 sernum );
+  StorageReference( const TQString& resource, TQ_UINT32 sernum );
   virtual ~StorageReference();
 
   virtual void setResource( const TQString& resource );
   virtual TQString resource() const;
 
-  virtual void setSerialNumber( Q_UINT32 serialNumber );
-  virtual Q_UINT32 serialNumber() const;
+  virtual void setSerialNumber( TQ_UINT32 serialNumber );
+  virtual TQ_UINT32 serialNumber() const;
 
 private:
   TQString mResource;
-  Q_UINT32 mSerialNumber;
+  TQ_UINT32 mSerialNumber;
 };
 
 typedef TQMap<TQString, StorageReference> UidMap;