Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


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

32 files changed, 235 insertions, 231 deletions

diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index e3032d118..474eafa3d 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -293,12 +293,12 @@ TQDate Contact::anniversary() const
   return mAnniversary;
 }
 
-void Contact::setChildren( const TQString& children )
+void Contact::setChildren( const TQString& tqchildren )
 {
-  mChildren = children;
+  mChildren = tqchildren;
 }
 
-TQString Contact::children() const
+TQString Contact::tqchildren() const
 {
   return mChildren;
 }
@@ -619,7 +619,7 @@ bool Contact::loadAttribute( TQDomElement& element )
     }
     break;
   case 'c':
-    if ( tagName == "children" ) {
+    if ( tagName == "tqchildren" ) {
       setChildren( element.text() );
       return true;
     }
@@ -798,7 +798,7 @@ bool Contact::saveAttributes( TQDomElement& element ) const
       writeString( element, "x-logo", mLogoAttachmentName );
     if ( !sound().isNull() )
       writeString( element, "x-sound", mSoundAttachmentName );
-    writeString( element, "children", children() );
+    writeString( element, "tqchildren", tqchildren() );
     writeString( element, "gender", gender() );
     writeString( element, "language", language() );
     savePhoneAttributes( element );
@@ -1115,12 +1115,12 @@ void Contact::setFields( const KABC::Addressee* addressee )
   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
     // The format is "app-name:value".
-    int pos = (*it).find( '-' );
+    int pos = (*it).tqfind( '-' );
     if ( pos == -1 ) continue;
     TQString app = (*it).left( pos );
     if ( app == "KOLAB" ) continue;
     TQString name = (*it).mid( pos + 1 );
-    pos = name.find( ':' );
+    pos = name.tqfind( ':' );
     if ( pos == -1 ) continue;
     TQString value = name.mid( pos + 1 );
     name = name.left( pos );
@@ -1146,7 +1146,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
   // mailer, timezone, productId, sortString, agent, rfc2426 name()
 
   // Things KAddressBook can't handle, so they are saved as unhandled tags:
-  // initials, children, gender, language
+  // initials, tqchildren, gender, language
 }
 
 // The loading is: xml -> Contact -> addressee, this is the second part
diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h
index 66a7c418a..60c399335 100644
--- a/kresources/kolab/kabc/contact.h
+++ b/kresources/kolab/kabc/contact.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -154,8 +154,8 @@ public:
   TQString soundAttachmentName() const { return mSoundAttachmentName; }
   TQByteArray sound() const { return mSound; }
 
-  void setChildren( const TQString& children );
-  TQString children() const;
+  void setChildren( const TQString& tqchildren );
+  TQString tqchildren() const;
 
   void setGender( const TQString& gender );
   TQString gender() const;
diff --git a/kresources/kolab/kabc/kolab.desktop b/kresources/kolab/kabc/kolab.desktop
index 8339f9c22..c0c9c80d7 100644
--- a/kresources/kolab/kabc/kolab.desktop
+++ b/kresources/kolab/kabc/kolab.desktop
@@ -35,7 +35,7 @@ Name[pl]=Książka adresowa na serwerze IMAP za pośrednictwem KMail
 Name[pt]=Livro de Endereços em Servidor IMAP via KMail
 Name[pt_BR]=Livro de Endereços em servidor IMAP via KMail
 Name[ru]=Адресная книга на сервере IMAP через KMail
-Name[sk]=Adresár na IMAP-serveri pomocou KMail
+Name[sk]=Adresár na IMAP-serveri potqmocou KMail
 Name[sl]=Adresar na strežniku IMAP preko KMaila
 Name[sr]=Адресар на IMAP серверу преко KMail-а
 Name[sr@Latn]=Adresar na IMAP serveru preko KMail-a
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index e9c481bfb..0acabb09b 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -79,7 +79,7 @@ static const char* s_inlineMimeType = "text/x-vcard";
 KABC::ResourceKolab::ResourceKolab( const KConfig *config )
   : KPIM::ResourceABC( config ),
     Kolab::ResourceKolabBase( "ResourceKolab-KABC" ),
-    mCachedSubresource( TQString::null ), mCachedSubresourceNotFound( false ), mLocked( false )
+    mCachedSubresource( TQString() ), mCachedSubresourceNotFound( false ), mLocked( false )
 {
   setType( "imap" );
   if ( !config ) {
@@ -144,7 +144,7 @@ KABC::Ticket * KABC::ResourceKolab::requestSaveTicket()
 void KABC::ResourceKolab::releaseSaveTicket( Ticket* ticket )
 {
   mLocked = false;
-  mCachedSubresource = TQString::null;
+  mCachedSubresource = TQString();
   mCachedSubresourceNotFound = false;
   delete ticket;
 }
@@ -185,7 +185,7 @@ static const struct { const char* mimetype; KMailICalIface::StorageFormat format
 bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
 {
   int count = 0;
-  if ( !kmailIncidencesCount( count, TQString::null, subResource ) ) {
+  if ( !kmailIncidencesCount( count, TQString(), subResource ) ) {
     kdError() << "Communication problem in KABC::ResourceKolab::loadSubResource()\n";
     return false;
   }
@@ -335,7 +335,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   TQString subResource;
   TQ_UINT32 sernum;
-  if ( mUidMap.find( uid ) != mUidMap.end() ) {
+  if ( mUidMap.tqfind( uid ) != mUidMap.end() ) {
     subResource = mUidMap[ uid ].resource();
     if ( !subresourceWritable( subResource ) ) {
       kdWarning() << "Wow! Something tried to update a non-writable addressee! Fix this caller: " << kdBacktrace() << endl;
@@ -398,7 +398,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
     kdDebug(5650) << "kmailUpdate returned, now sernum=" << sernum << " for uid=" << uid << endl;
     mUidMap[ uid ] = StorageReference( subResource, sernum );
     // This is ugly, but it's faster than doing
-    // mAddrMap.find(addr.uid()), which would give the same :-(
+    // mAddrMap.tqfind(addr.uid()), which would give the same :-(
     // Reason for this: The Changed attribute of Addressee should
     // be mutable
     const_cast<Addressee&>(addr).setChanged( false );
@@ -431,7 +431,7 @@ void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
 void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
-  if ( mUidMap.find( uid ) == mUidMap.end() ) return;
+  if ( mUidMap.tqfind( uid ) == mUidMap.end() ) return;
   //kdDebug(5650) << k_funcinfo << uid << endl;
   const TQString resource = mUidMap[ uid ].resource();
   if ( !subresourceWritable( resource ) ) {
@@ -494,7 +494,7 @@ void KABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
     mUidsPendingDeletion.remove( uid );
   } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // tqreplace it, so let's just sit tight.
+    // replace 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 );
@@ -633,7 +633,7 @@ TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) co
   }
 
   kdDebug(5650) << "subresourceLabel( " << subresource << " ): not found!\n";
-  return TQString::null;
+  return TQString();
 }
 
 void KABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
@@ -668,9 +668,9 @@ void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, boo
 
 
 /*virtual*/
-bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& parent )
+bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& tqparent )
 {
-  return kmailAddSubresource( label, parent, s_kmailContentsType );
+  return kmailAddSubresource( label, tqparent, s_kmailContentsType );
 }
 
 /*virtual*/
diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h
index 2288bf258..a3c8a9c36 100644
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -53,6 +53,7 @@ class KDE_EXPORT ResourceKolab : public KPIM::ResourceABC,
                      public Kolab::ResourceKolabBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/kresources/kolab/kabc/resourcekolab_plugin.cpp b/kresources/kolab/kabc/resourcekolab_plugin.cpp
index c4f1b3333..db69b8969 100644
--- a/kresources/kolab/kabc/resourcekolab_plugin.cpp
+++ b/kresources/kolab/kabc/resourcekolab_plugin.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/kcal/event.cpp b/kresources/kolab/kcal/event.cpp
index f8309053e..fedeca0c2 100644
--- a/kresources/kolab/kcal/event.cpp
+++ b/kresources/kolab/kcal/event.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -51,7 +51,7 @@ KCal::Event* Event::xmlToEvent( const TQString& xml, const TQString& tz, KCal::R
 
 TQString Event::eventToXML( KCal::Event* kcalEvent, const TQString& tz  )
 {
-  Event event( 0, TQString::null, 0, tz, kcalEvent );
+  Event event( 0, TQString(), 0, tz, kcalEvent );
   return event.saveXML();
 }
 
@@ -82,18 +82,18 @@ void Event::setEndDate( const TQDateTime& date )
 {
   mEndDate = date;
   mHasEndDate = true;
-  if ( mFloatingStatus == AllDay )
+  if ( mFloatingtqStatus == AllDay )
     kdDebug() << "ERROR: Time on end date but no time on the event\n";
-  mFloatingStatus = HasTime;
+  mFloatingtqStatus = HasTime;
 }
 
 void Event::setEndDate( const TQDate& date )
 {
   mEndDate = date;
   mHasEndDate = true;
-  if ( mFloatingStatus == HasTime )
+  if ( mFloatingtqStatus == HasTime )
     kdDebug() << "ERROR: No time on end date but time on the event\n";
-  mFloatingStatus = AllDay;
+  mFloatingtqStatus = AllDay;
 }
 
 void Event::setEndDate( const TQString& endDate )
@@ -142,7 +142,7 @@ bool Event::saveAttributes( TQDomElement& element ) const
   else
     writeString( element, "show-time-as", "busy" );
   if ( mHasEndDate ) {
-    if ( mFloatingStatus == HasTime )
+    if ( mFloatingtqStatus == HasTime )
       writeString( element, "end-date", dateTimeToString( endDate() ) );
     else
       writeString( element, "end-date", dateToString( endDate().date() ) );
@@ -195,10 +195,10 @@ void Event::setFields( const KCal::Event* event )
   if ( event->hasEndDate() || event->hasDuration() ) {
     if ( event->doesFloat() ) {
       // This is a floating event. Don't timezone move this one
-      mFloatingStatus = AllDay;
+      mFloatingtqStatus = AllDay;
       setEndDate( event->dtEnd().date() );
     } else {
-      mFloatingStatus = HasTime;
+      mFloatingtqStatus = HasTime;
       setEndDate( localToUTC( event->dtEnd() ) );
     }
   } else {
@@ -213,7 +213,7 @@ void Event::saveTo( KCal::Event* event )
 
   event->setHasEndDate( mHasEndDate );
   if ( mHasEndDate ) {
-    if ( mFloatingStatus == AllDay )
+    if ( mFloatingtqStatus == AllDay )
       // This is a floating event. Don't timezone move this one
       event->setDtEnd( endDate() );
     else
diff --git a/kresources/kolab/kcal/event.h b/kresources/kolab/kcal/event.h
index d9f1069a9..57aa3358f 100644
--- a/kresources/kolab/kcal/event.h
+++ b/kresources/kolab/kcal/event.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -54,7 +54,7 @@ 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, TQ_UINT32 sernum = 0 );
+                                  const TQString& subResource = TQString(), TQ_UINT32 sernum = 0 );
 
   /// Use this to get an xml string describing this event entry
   static TQString eventToXML( KCal::Event*, const TQString& tz );
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index 060b9b93f..0d99780a4 100644
--- a/kresources/kolab/kcal/incidence.cpp
+++ b/kresources/kolab/kcal/incidence.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -51,7 +51,7 @@ using namespace Kolab;
 
 Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
                       const TQString& tz )
-  : KolabBase( tz ), mFloatingStatus( Unset ), mHasAlarm( false ),
+  : KolabBase( tz ), mFloatingtqStatus( Unset ), mHasAlarm( false ),
     mResource( res ),
     mSubResource( subResource ),
     mSernum( sernum )
@@ -95,17 +95,17 @@ KolabBase::Email Incidence::organizer() const
 void Incidence::setStartDate( const TQDateTime& startDate )
 {
   mStartDate = startDate;
-  if ( mFloatingStatus == AllDay )
+  if ( mFloatingtqStatus == AllDay )
     kdDebug() << "ERROR: Time on start date but no time on the event\n";
-  mFloatingStatus = HasTime;
+  mFloatingtqStatus = HasTime;
 }
 
 void Incidence::setStartDate( const TQDate& startDate )
 {
   mStartDate = startDate;
-  if ( mFloatingStatus == HasTime )
+  if ( mFloatingtqStatus == HasTime )
     kdDebug() << "ERROR: No time on start date but time on the event\n";
-  mFloatingStatus = AllDay;
+  mFloatingtqStatus = AllDay;
 }
 
 void Incidence::setStartDate( const TQString& startDate )
@@ -175,7 +175,7 @@ bool Incidence::loadAttendeeAttribute( TQDomElement& element,
       TQString tagName = e.tagName();
 
       if ( tagName == "display-name" ) {
-        // Quote the text in case it tqcontains commas or other quotable chars.
+        // Quote the text in case it contains commas or other quotable chars.
         TQString tusername = KPIM::quoteNameIfNecessary( e.text() );
 
         TQString tname, temail;
@@ -546,7 +546,7 @@ bool Incidence::saveAttributes( TQDomElement& element ) const
   // Save the base class elements
   KolabBase::saveAttributes( element );
 
-  if ( mFloatingStatus == HasTime )
+  if ( mFloatingtqStatus == HasTime )
     writeString( element, "start-date", dateTimeToString( startDate() ) );
   else
     writeString( element, "start-date", dateToString( startDate().date() ) );
@@ -595,7 +595,7 @@ void Incidence::loadCustomAttributes( TQDomElement& element )
   mCustomList.append( custom );
 }
 
-static KCal::Attendee::PartStat attendeeStringToStatus( const TQString& s )
+static KCal::Attendee::PartStat attendeeStringTotqStatus( const TQString& s )
 {
   if ( s == "none" )
     return KCal::Attendee::NeedsAction;
@@ -771,10 +771,10 @@ void Incidence::setFields( const KCal::Incidence* incidence )
 
   if ( incidence->doesFloat() ) {
     // This is a floating event. Don't timezone move this one
-    mFloatingStatus = AllDay;
+    mFloatingtqStatus = AllDay;
     setStartDate( incidence->dtStart().date() );
   } else {
-    mFloatingStatus = HasTime;
+    mFloatingtqStatus = HasTime;
     setStartDate( localToUTC( incidence->dtStart() ) );
   }
 
@@ -844,7 +844,7 @@ void Incidence::setFields( const KCal::Incidence* incidence )
   // Handle the scheduling ID
   if ( incidence->schedulingID() == incidence->uid() ) {
     // There is no scheduling ID
-    setInternalUID( TQString::null );
+    setInternalUID( TQString() );
   } else {
     // We've internally been using a different uid, so save that as the
     // temporary (internal) uid and restore the original uid, the one that
@@ -856,7 +856,7 @@ void Incidence::setFields( const KCal::Incidence* incidence )
   if ( incidence->pilotId() != 0 )
     setPilotSyncId( incidence->pilotId() );
 
-  setPilotSyncStatus( incidence->syncStatus() );
+  setPilotSynctqStatus( incidence->synctqStatus() );
 
   // Unhandled tags and other custom properties (see libkcal/customproperties.h)
   const TQMap<TQCString, TQString> map = incidence->customProperties();
@@ -886,7 +886,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
 {
   KolabBase::saveTo( incidence );
 
-  if ( mFloatingStatus == AllDay ) {
+  if ( mFloatingtqStatus == AllDay ) {
     // This is a floating event. Don't timezone move this one
     incidence->setDtStart( startDate() );
     incidence->setFloats( true );
@@ -920,7 +920,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
   incidence->clearAttendees();
   TQValueList<Attendee>::ConstIterator it;
   for ( it = mAttendees.begin(); it != mAttendees.end(); ++it ) {
-    KCal::Attendee::PartStat status = attendeeStringToStatus( (*it).status );
+    KCal::Attendee::PartStat status = attendeeStringTotqStatus( (*it).status );
     KCal::Attendee::Role role = attendeeStringToRole( (*it).role );
     KCal::Attendee* attendee = new KCal::Attendee( (*it).displayName,
                                                    (*it).smtpAddress,
@@ -994,8 +994,8 @@ void Incidence::saveTo( KCal::Incidence* incidence )
   }
   if ( hasPilotSyncId() )
     incidence->setPilotId( pilotSyncId() );
-  if ( hasPilotSyncStatus() )
-    incidence->setSyncStatus( pilotSyncStatus() );
+  if ( hasPilotSynctqStatus() )
+    incidence->setSynctqStatus( pilotSynctqStatus() );
 
   for( TQValueList<Custom>::ConstIterator it = mCustomList.constBegin(); it != mCustomList.constEnd(); ++it ) {
     incidence->setNonKDECustomProperty( (*it).key, (*it).value );
diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h
index b3de2f914..e5df23820 100644
--- a/kresources/kolab/kcal/incidence.h
+++ b/kresources/kolab/kcal/incidence.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -123,7 +123,7 @@ public:
   virtual bool saveAttributes( TQDomElement& ) const;
 
 protected:
-  enum FloatingStatus { Unset, AllDay, HasTime };
+  enum FloatingtqStatus { Unset, AllDay, HasTime };
 
   // Read all known fields from this ical incidence
   void setFields( const KCal::Incidence* );
@@ -150,7 +150,7 @@ protected:
   TQString mLocation;
   Email mOrganizer;
   TQDateTime mStartDate;
-  FloatingStatus mFloatingStatus;
+  FloatingtqStatus mFloatingtqStatus;
   float mAlarm;
   bool mHasAlarm;
   Recurrence mRecurrence;
diff --git a/kresources/kolab/kcal/journal.cpp b/kresources/kolab/kcal/journal.cpp
index 462cfe3ca..4957927a3 100644
--- a/kresources/kolab/kcal/journal.cpp
+++ b/kresources/kolab/kcal/journal.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/kcal/journal.h b/kresources/kolab/kcal/journal.h
index 57d614cc1..cd583c6ca 100644
--- a/kresources/kolab/kcal/journal.h
+++ b/kresources/kolab/kcal/journal.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/kcal/kolab.desktop b/kresources/kolab/kcal/kolab.desktop
index c0a7daa56..21b412ed2 100644
--- a/kresources/kolab/kcal/kolab.desktop
+++ b/kresources/kolab/kcal/kolab.desktop
@@ -35,7 +35,7 @@ Name[pl]=Kalendarz na serwerze IMAP za pośrednictwem KMail
 Name[pt]=Calendário em Servidor IMAP via KMail
 Name[pt_BR]=Calendário em Servidor IMAP via KMail
 Name[ru]=Календарь на сервере IMAP через KMail
-Name[sk]=Kalendár na IMAP serveri pomocou KMail
+Name[sk]=Kalendár na IMAP serveri potqmocou KMail
 Name[sl]=Koledar na strežniku IMAP preko KMaila
 Name[sr]=Календар на IMAP серверу преко KMail-а
 Name[sr@Latn]=Kalendar na IMAP serveru preko KMail-a
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 5bbae761b..59f6a3558 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -22,11 +22,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -285,7 +285,7 @@ void ResourceKolab::removeIncidences( const TQCString& incidenceType )
     // better call event(uid), todo(uid) etc. directly.
 
     // A  faster but hackish way would probably be to check the type of the resource,
-    // like mEventSubResources.find( it.data().resource() ) != mEventSubResources.end() ?
+    // like mEventSubResources.tqfind( it.data().resource() ) != mEventSubResources.end() ?
     const TQString& uid = it.key();
     if ( incidenceType == "Event" && mCalendar.event( uid ) )
       mUidMap.remove( it );
@@ -726,7 +726,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
     }
     /* Check if there are updates for this uid pending and if so process them. */
-    if ( KCal::IncidenceBase *update = mPendingUpdates.find( uid ) ) {
+    if ( KCal::IncidenceBase *update = mPendingUpdates.tqfind( uid ) ) {
       mSilent = false; // we do want to tell KMail
       mPendingUpdates.remove( uid );
       incidenceUpdated( update );
@@ -920,7 +920,7 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms
   while ( it != alarms.end() ) {
     KCal::Alarm *a = (*it);
     ++it;
-    const TQString &uid = a->parent()->uid();
+    const TQString &uid = a->tqparent()->uid();
      if ( mUidMap.tqcontains( uid ) ) {
        const TQString &sr = mUidMap[ uid ].resource();
        Kolab::SubResource *subResource = 0;
@@ -1009,15 +1009,15 @@ void ResourceKolab::fromKMailDelIncidence( const TQString& type,
   if ( !subresourceActive( subResource ) ) return;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.find( uid ) != mUidsPendingDeletion.end() ) {
-    mUidsPendingDeletion.remove( mUidsPendingDeletion.find( uid ) );
+  if ( mUidsPendingDeletion.tqfind( uid ) != mUidsPendingDeletion.end() ) {
+    mUidsPendingDeletion.remove( mUidsPendingDeletion.tqfind( uid ) );
   } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // tqreplace it, so let's just sit tight.
+    // replace it, so let's just sit tight.
   } else {
     TQString uidToUse;
 
-    QPair<TQString, TQString> p( uid, subResource );
+    TQPair<TQString, TQString> p( uid, subResource );
     if ( mOriginalUID2fakeUID.tqcontains( p ) ) {
       // Incidence with the same uid in a different folder...
       // use the UID that addIncidence(...) generated
@@ -1119,7 +1119,7 @@ TQStringList ResourceKolab::subresources() const
          + mJournalSubResources.keys() );
 }
 
-const QString
+const TQString
 ResourceKolab::labelForSubresource( const TQString& subresource ) const
 {
   if ( mEventSubResources.tqcontains( subresource ) )
@@ -1231,22 +1231,22 @@ Kolab::ResourceMap* ResourceKolab::subResourceMap( const TQString& contentsType
 
 
 /*virtual*/
-bool ResourceKolab::addSubresource( const TQString& resource, const TQString& parent )
+bool ResourceKolab::addSubresource( const TQString& resource, const TQString& tqparent )
 {
    kdDebug(5650) << "KCal Kolab resource - adding subresource: " << resource << endl;
    TQString contentsType = kmailCalendarContentsType;
-   if ( !parent.isEmpty() ) {
-     if ( mEventSubResources.tqcontains( parent ) )
+   if ( !tqparent.isEmpty() ) {
+     if ( mEventSubResources.tqcontains( tqparent ) )
        contentsType = kmailCalendarContentsType;
-     else if ( mTodoSubResources.tqcontains( parent ) )
+     else if ( mTodoSubResources.tqcontains( tqparent ) )
        contentsType = kmailTodoContentsType;
-     else if ( mJournalSubResources.tqcontains( parent ) )
+     else if ( mJournalSubResources.tqcontains( tqparent ) )
        contentsType = kmailJournalContentsType;
    } else {
      TQStringList contentTypeChoices;
      contentTypeChoices << i18n("Calendar") << i18n("Tasks") << i18n("Journals");
      const TQString caption = i18n("Which kind of subresource should this be?");
-     const TQString choice = KInputDialog::getItem( caption, TQString::null, contentTypeChoices );
+     const TQString choice = KInputDialog::getItem( caption, TQString(), contentTypeChoices );
      if ( choice == contentTypeChoices[0] )
        contentsType = kmailCalendarContentsType;
      else if ( choice == contentTypeChoices[1] )
@@ -1255,7 +1255,7 @@ bool ResourceKolab::addSubresource( const TQString& resource, const TQString& pa
        contentsType = kmailJournalContentsType;
    }
 
-   return kmailAddSubresource( resource, parent, contentsType );
+   return kmailAddSubresource( resource, tqparent, contentsType );
 }
 
 /*virtual*/
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index fd4c3b57e..1535403a6 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -22,11 +22,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -52,6 +52,7 @@ class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar,
                       public Kolab::ResourceKolabBase
 {
   Q_OBJECT
+  TQ_OBJECT
     friend struct TemporarySilencer;
 
 public:
@@ -139,7 +140,7 @@ public:
 
   virtual TQString subresourceIdentifier( Incidence *incidence );
 
-  virtual bool addSubresource( const TQString& resource, const TQString& parent );
+  virtual bool addSubresource( const TQString& resource, const TQString& tqparent );
   virtual bool removeSubresource( const TQString& resource );
 
   virtual TQString subresourceType( const TQString &resource );
@@ -223,11 +224,11 @@ private:
   ICalFormat mFormat;
 
   /**
-    This map tqcontains the association between a new added incidence
+    This map contains 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 tqcontains only non-pending uids.
+    We can't trust on mUidMap here, because it contains only non-pending uids.
    */
   TQMap<TQString, TQString> mNewIncidencesMap;
   int mProgressDialogIncidenceLimit;
@@ -245,7 +246,7 @@ private:
    *
    * The key is originalUID,subResource and the value is the fake UID.
    */
-  TQMap< QPair<TQString, TQString>, TQString > mOriginalUID2fakeUID;
+  TQMap< TQPair<TQString, TQString>, TQString > mOriginalUID2fakeUID;
 
   bool mBatchAddingInProgress;
   TQMap<Kolab::ResourceType,TQString> mLastUsedResources;
diff --git a/kresources/kolab/kcal/resourcekolab_plugin.cpp b/kresources/kolab/kcal/resourcekolab_plugin.cpp
index 14d09465a..151fa9f3d 100644
--- a/kresources/kolab/kcal/resourcekolab_plugin.cpp
+++ b/kresources/kolab/kcal/resourcekolab_plugin.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 33cc50eef..872e9b4a4 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -86,7 +86,7 @@ KCal::Todo* Task::xmlToTask( const TQString& xml, const TQString& tz, KCal::Reso
 
 TQString Task::taskToXML( KCal::Todo* todo, const TQString& tz )
 {
-  Task task( 0, TQString::null, 0, tz, todo );
+  Task task( 0, TQString(), 0, tz, todo );
   return task.saveXML();
 }
 
@@ -94,7 +94,7 @@ Task::Task( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 ser
             const TQString& tz, KCal::Todo* task )
   : Incidence( res, subResource, sernum, tz ),
     mPriority( 5 ), mPercentCompleted( 0 ),
-    mStatus( KCal::Incidence::StatusNone ),
+    mtqStatus( KCal::Incidence::StatusNone ),
     mHasStartDate( false ), mHasDueDate( false ),
     mHasCompletedDate( false )
 {
@@ -126,22 +126,22 @@ int Task::percentCompleted() const
   return mPercentCompleted;
 }
 
-void Task::seStatus( KCal::Incidence::Status status )
+void Task::setqStatus( KCal::Incidence::tqStatus status )
 {
-  mStatus = status;
+  mtqStatus = status;
 }
 
-KCal::Incidence::Status Task::status() const
+KCal::Incidence::tqStatus Task::status() const
 {
-  return mStatus;
+  return mtqStatus;
 }
 
-void Task::setParent( const TQString& parentUid )
+void Task::setParent( const TQString& tqparentUid )
 {
-  mParent = parentUid;
+  mParent = tqparentUid;
 }
 
-TQString Task::parent() const
+TQString Task::tqparent() const
 {
   return mParent;
 }
@@ -150,14 +150,14 @@ void Task::setDueDate( const TQDateTime& date )
 {
   mDueDate = date;
   mHasDueDate = true;
-  mFloatingStatus = HasTime;
+  mFloatingtqStatus = HasTime;
 }
 
 void Task::setDueDate( const TQDate &date )
 {
   mDueDate = date;
   mHasDueDate = true;
-  mFloatingStatus = AllDay;
+  mFloatingtqStatus = AllDay;
 }
 
 
@@ -234,20 +234,20 @@ bool Task::loadAttribute( TQDomElement& element )
     setPercentCompleted( percent );
   } else if ( tagName == "status" ) {
     if ( element.text() == "in-progress" )
-      seStatus( KCal::Incidence::StatusInProcess );
+      setqStatus( KCal::Incidence::StatusInProcess );
     else if ( element.text() == "completed" )
-      seStatus( KCal::Incidence::StatusCompleted );
+      setqStatus( KCal::Incidence::StatusCompleted );
     else if ( element.text() == "waiting-on-someone-else" )
-      seStatus( KCal::Incidence::StatusNeedsAction );
+      setqStatus( KCal::Incidence::StatusNeedsAction );
     else if ( element.text() == "deferred" )
       // Guessing a status here
-      seStatus( KCal::Incidence::StatusCanceled );
+      setqStatus( KCal::Incidence::StatusCanceled );
     else
       // Default
-      seStatus( KCal::Incidence::StatusNone );
+      setqStatus( KCal::Incidence::StatusNone );
   } else if ( tagName == "due-date" ) {
     setDueDate( element.text() );
-  } else if ( tagName == "parent" ) {
+  } else if ( tagName == "tqparent" ) {
     setParent( element.text() );
   } else if ( tagName == "x-completed-date" ) {
     setCompletedDate( stringToDateTime( element.text() ) );
@@ -300,15 +300,15 @@ bool Task::saveAttributes( TQDomElement& element ) const
   }
 
   if ( hasDueDate() ) {
-    if ( mFloatingStatus == HasTime ) {
+    if ( mFloatingtqStatus == HasTime ) {
       writeString( element, "due-date", dateTimeToString( dueDate() ) );
     } else {
       writeString( element, "due-date", dateToString( dueDate().date() ) );
     }
   }
 
-  if ( !parent().isNull() ) {
-    writeString( element, "parent", parent() );
+  if ( !tqparent().isNull() ) {
+    writeString( element, "tqparent", tqparent() );
   }
 
   if ( hasCompletedDate() && percentCompleted() == 100 ) {
@@ -374,17 +374,17 @@ void Task::setFields( const KCal::Todo* task )
 
   setPriority( task->priority() );
   setPercentCompleted( task->percentComplete() );
-  seStatus( task->status() );
+  setqStatus( task->status() );
   setHasStartDate( task->hasStartDate() );
 
   if ( task->hasDueDate() ) {
     setDueDate( localToUTC( task->dtDue() ) );
     if ( task->doesFloat() ) {
       // This is a floating task. Don't timezone move this one
-      mFloatingStatus = AllDay;
+      mFloatingtqStatus = AllDay;
       setDueDate( task->dtDue().date() );
     } else {
-      mFloatingStatus = HasTime;
+      mFloatingtqStatus = HasTime;
       setDueDate( localToUTC( task->dtDue() ) );
     }
   } else {
@@ -396,7 +396,7 @@ void Task::setFields( const KCal::Todo* task )
   } else if ( !task->relatedToUid().isEmpty() ) {
     setParent( task->relatedToUid( ) );
   } else {
-    setParent( TQString::null );
+    setParent( TQString() );
   }
 
   if ( task->hasCompletedDate() && task->percentComplete() == 100 ) {
@@ -447,14 +447,14 @@ void Task::saveTo( KCal::Todo* task )
 
   task->setPriority( priority() );
   task->setPercentComplete( percentCompleted() );
-  task->seStatus( status() );
+  task->setqStatus( status() );
   task->setHasStartDate( hasStartDate() );
   task->setHasDueDate( hasDueDate() );
   if ( hasDueDate() )
     task->setDtDue( utcToLocal( dueDate() ) );
 
-  if ( !parent().isNull() )
-    task->setRelatedToUid( parent() );
+  if ( !tqparent().isNull() )
+    task->setRelatedToUid( tqparent() );
 
   if ( hasCompletedDate() && task->percentComplete() == 100 )
     task->setCompleted( utcToLocal( mCompletedDate ) );
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index 6fe318e2c..624605a29 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -58,7 +58,7 @@ 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, TQ_UINT32 sernum = 0 );
+                                const TQString& subResource = TQString(), TQ_UINT32 sernum = 0 );
 
   /// Use this to get an xml string describing this task entry
   static TQString taskToXML( KCal::Todo*, const TQString& tz );
@@ -77,11 +77,11 @@ public:
   virtual void setPercentCompleted( int percent );
   virtual int percentCompleted() const;
 
-  virtual void seStatus( KCal::Incidence::Status status );
-  virtual KCal::Incidence::Status status() const;
+  virtual void setqStatus( KCal::Incidence::tqStatus status );
+  virtual KCal::Incidence::tqStatus status() const;
 
-  virtual void setParent( const TQString& parentUid );
-  virtual TQString parent() const;
+  virtual void setParent( const TQString& tqparentUid );
+  virtual TQString tqparent() const;
 
   virtual void setHasStartDate( bool );
   virtual bool hasStartDate() const;
@@ -126,7 +126,7 @@ protected:
   int mKCalPriorityFromDom;
 
   int mPercentCompleted;
-  KCal::Incidence::Status mStatus;
+  KCal::Incidence::tqStatus mtqStatus;
   TQString mParent;
 
   bool mHasStartDate;
diff --git a/kresources/kolab/knotes/kolabresource.desktop b/kresources/kolab/knotes/kolabresource.desktop
index 317032d17..5a53529dc 100644
--- a/kresources/kolab/knotes/kolabresource.desktop
+++ b/kresources/kolab/knotes/kolabresource.desktop
@@ -35,7 +35,7 @@ Name[pl]=Serwer IMAP za pośrednictwem KMail
 Name[pt]=Servidor IMAP via KMail
 Name[pt_BR]=Servidor IMAP via KMail
 Name[ru]=Доступ к серверу IMAP через KMail
-Name[sk]=IMAP-server pomocou KMail
+Name[sk]=IMAP-server potqmocou KMail
 Name[sl]=Strežnik IMAP preko KMaila
 Name[sr]=IMAP сервер преко KMail-а
 Name[sr@Latn]=IMAP server preko KMail-a
diff --git a/kresources/kolab/knotes/note.cpp b/kresources/kolab/knotes/note.cpp
index 168dae562..e456e43be 100644
--- a/kresources/kolab/knotes/note.cpp
+++ b/kresources/kolab/knotes/note.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/knotes/note.h b/kresources/kolab/knotes/note.h
index 11f4749e1..d61a2009e 100644
--- a/kresources/kolab/knotes/note.h
+++ b/kresources/kolab/knotes/note.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp
index 38f670871..cf386218a 100644
--- a/kresources/kolab/knotes/resourcekolab.cpp
+++ b/kresources/kolab/knotes/resourcekolab.cpp
@@ -22,11 +22,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -160,7 +160,7 @@ bool ResourceKolab::save()
 
 bool ResourceKolab::addNote( KCal::Journal* journal )
 {
-  return addNote( journal, TQString::null, 0 );
+  return addNote( journal, TQString(), 0 );
 }
 
 KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& subresource,
diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h
index cfeeb0eb6..3b61d6ec9 100644
--- a/kresources/kolab/knotes/resourcekolab.h
+++ b/kresources/kolab/knotes/resourcekolab.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -54,6 +54,7 @@ class KDE_EXPORT ResourceKolab : public ResourceNotes,
                       public ResourceKolabBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   ResourceKolab( const KConfig* );
diff --git a/kresources/kolab/knotes/resourcekolab_plugin.cpp b/kresources/kolab/knotes/resourcekolab_plugin.cpp
index 772184982..fa187d2b9 100644
--- a/kresources/kolab/knotes/resourcekolab_plugin.cpp
+++ b/kresources/kolab/knotes/resourcekolab_plugin.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/shared/kmailconnection.cpp b/kresources/kolab/shared/kmailconnection.cpp
index 5b2921b94..d9ffd98d5 100644
--- a/kresources/kolab/shared/kmailconnection.cpp
+++ b/kresources/kolab/shared/kmailconnection.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -82,7 +82,7 @@ bool KMailConnection::connectToKMail()
       // someone, probably ourselves, already offers the interface, if not stop here
       const QCStringList services = kapp->dcopClient()->registeredApplications();
       for ( uint i = 0; i < services.count(); ++i ) {
-        if ( services[i].find( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
+        if ( services[i].tqfind( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
           continue; 
         const QCStringList objs = kapp->dcopClient()->remoteObjects( services[i] );
         if ( objs.tqcontains( dcopObjectId ) ) {
@@ -97,8 +97,8 @@ bool KMailConnection::connectToKMail()
     } else {
       TQString error;
       int result = KDCOPServiceStarter::self()->
-        findServiceFor( "DCOP/ResourceBackend/IMAP", TQString::null,
-                        TQString::null, &error, &dcopService );
+        findServiceFor( "DCOP/ResourceBackend/IMAP", TQString(),
+                        TQString(), &error, &dcopService );
       if ( result != 0 ) {
         kdError(5650) << "Couldn't connect to the IMAP resource backend\n";
         // TODO: You might want to show "error" (if not empty) here,
@@ -295,11 +295,11 @@ bool KMailConnection::kmailUpdate( const TQString& resource,
 }
 
 bool KMailConnection::kmailAddSubresource( const TQString& resource,
-                                           const TQString& parent,
+                                           const TQString& tqparent,
                                            const TQString& contentsType )
 {
   return connectToKMail()
-      && mKMailIcalIfaceStub->addSubresource( resource, parent, contentsType )
+      && mKMailIcalIfaceStub->addSubresource( resource, tqparent, contentsType )
       && mKMailIcalIfaceStub->ok();
 }
 
diff --git a/kresources/kolab/shared/kmailconnection.h b/kresources/kolab/shared/kmailconnection.h
index 3cf5b826f..b7befb4de 100644
--- a/kresources/kolab/shared/kmailconnection.h
+++ b/kresources/kolab/shared/kmailconnection.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -50,6 +50,7 @@ class ResourceKolabBase;
 */
 class KMailConnection : public TQObject, public DCOPObject {
   Q_OBJECT
+//  TQ_OBJECT
   K_DCOP
 
   // These are the methods called by KMail when the resource changes
@@ -107,7 +108,7 @@ public:
 
   bool kmailTriggerSync( const TQString& contentsType );
   bool kmailAddSubresource( const TQString& resource,
-                            const TQString& parent,
+                            const TQString& tqparent,
                             const TQString& contentsType );
   bool kmailRemoveSubresource( const TQString& resource );
 
diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp
index 978481072..cb04d12be 100644
--- a/kresources/kolab/shared/kolabbase.cpp
+++ b/kresources/kolab/shared/kolabbase.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,7 +47,7 @@ KolabBase::KolabBase( const TQString& tz )
   : mCreationDate( TQDateTime::tqcurrentDateTime() ),
     mLastModified( TQDateTime::tqcurrentDateTime() ),
     mSensitivity( Public ), mTimeZoneId( tz ),
-    mHasPilotSyncId( false ),  mHasPilotSyncStatus( false )
+    mHasPilotSyncId( false ),  mHasPilotSynctqStatus( false )
 {
 }
 
@@ -58,7 +58,7 @@ KolabBase::~KolabBase()
 void KolabBase::setFields( const KCal::Incidence* incidence )
 {
   // So far unhandled KCal::IncidenceBase fields:
-  // mPilotID, mSyncStatus, mFloats
+  // mPilotID, mSynctqStatus, mFloats
 
   setUid( incidence->uid() );
   setBody( incidence->description() );
@@ -233,20 +233,20 @@ unsigned long KolabBase::pilotSyncId() const
   return mPilotSyncId;
 }
 
-void KolabBase::setPilotSyncStatus( int status )
+void KolabBase::setPilotSynctqStatus( int status )
 {
-  mHasPilotSyncStatus = true;
-  mPilotSyncStatus = status;
+  mHasPilotSynctqStatus = true;
+  mPilotSynctqStatus = status;
 }
 
-bool KolabBase::hasPilotSyncStatus() const
+bool KolabBase::hasPilotSynctqStatus() const
 {
-  return mHasPilotSyncStatus;
+  return mHasPilotSynctqStatus;
 }
 
-int KolabBase::pilotSyncStatus() const
+int KolabBase::pilotSynctqStatus() const
 {
-  return mPilotSyncStatus;
+  return mPilotSynctqStatus;
 }
 
 bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email )
@@ -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 tqcontains commas or other quotable chars.
+        // Quote the text in case it contains commas or other quotable chars.
         TQString tusername = KPIM::quoteNameIfNecessary( e.text() );
 
         TQString tname, temail;
@@ -335,7 +335,7 @@ bool KolabBase::loadAttribute( TQDomElement& element )
       return true;
     }
     if ( tagName == "pilot-sync-status" ) {
-      setPilotSyncStatus( element.text().toInt() );
+      setPilotSynctqStatus( element.text().toInt() );
       return true;
     }
     break;
@@ -357,8 +357,8 @@ bool KolabBase::saveAttributes( TQDomElement& element ) const
   writeString( element, "sensitivity", sensitivityToString( sensitivity() ) );
   if ( hasPilotSyncId() )
     writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) );
-  if ( hasPilotSyncStatus() )
-    writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) );
+  if ( hasPilotSynctqStatus() )
+    writeString( element, "pilot-sync-status", TQString::number( pilotSynctqStatus() ) );
   return true;
 }
 
@@ -409,12 +409,12 @@ TQDomDocument KolabBase::domTree()
 
 TQString KolabBase::dateTimeToString( const TQDateTime& time )
 {
-  return time.toString( Qt::ISODate ) + 'Z';
+  return time.toString( TQt::ISODate ) + 'Z';
 }
 
 TQString KolabBase::dateToString( const TQDate& date )
 {
-  return date.toString( Qt::ISODate );
+  return date.toString( TQt::ISODate );
 }
 
 TQDateTime KolabBase::stringToDateTime( const TQString& _date )
@@ -426,12 +426,12 @@ TQDateTime KolabBase::stringToDateTime( const TQString& _date )
   //In TQt3, TQt::ISODate cannot handle a trailing Z for UTC, so remove if found.
   else if ( date.endsWith( "Z" ) )
     date.truncate( date.length() - 1 );
-  return TQDateTime::fromString( date, Qt::ISODate );
+  return TQDateTime::fromString( date, TQt::ISODate );
 }
 
 TQDate KolabBase::stringToDate( const TQString& date )
 {
-  return TQDate::fromString( date, Qt::ISODate );
+  return TQDate::fromString( date, TQt::ISODate );
 }
 
 TQString KolabBase::sensitivityToString( Sensitivity s )
diff --git a/kresources/kolab/shared/kolabbase.h b/kresources/kolab/shared/kolabbase.h
index ba6a1c85a..d4621c722 100644
--- a/kresources/kolab/shared/kolabbase.h
+++ b/kresources/kolab/shared/kolabbase.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -54,8 +54,8 @@ class KolabBase {
 public:
   struct Email {
   public:
-    Email( const TQString& name = TQString::null,
-           const TQString& email = TQString::null )
+    Email( const TQString& name = TQString(),
+           const TQString& email = TQString() )
       : displayName( name ), smtpAddress( email )
     {
     }
@@ -66,7 +66,7 @@ public:
 
   enum Sensitivity { Public = 0, Private = 1, Confidential = 2 };
 
-  explicit KolabBase( const TQString& timezone = TQString::null );
+  explicit KolabBase( const TQString& timezone = TQString() );
   virtual ~KolabBase();
 
   // Return a string identifying this type
@@ -94,9 +94,9 @@ public:
   virtual bool hasPilotSyncId() const;
   virtual unsigned long pilotSyncId() const;
 
-  virtual void setPilotSyncStatus( int status );
-  virtual bool hasPilotSyncStatus() const;
-  virtual int pilotSyncStatus() const;
+  virtual void setPilotSynctqStatus( int status );
+  virtual bool hasPilotSynctqStatus() const;
+  virtual int pilotSynctqStatus() const;
 
   // String - Date conversion methods
   static TQString dateTimeToString( const TQDateTime& time );
@@ -116,7 +116,7 @@ public:
   bool load( const TQString& xml );
   bool load( TQFile& xml );
 
-  // Load this QDomDocument
+  // Load this TQDomDocument
   virtual bool loadXML( const TQDomDocument& xml ) = 0;
 
   // Serialize this object to an XML string
@@ -167,9 +167,9 @@ protected:
   TQString mTimeZoneId;
 
   // KPilot synchronization stuff
-  bool mHasPilotSyncId,  mHasPilotSyncStatus;
+  bool mHasPilotSyncId,  mHasPilotSynctqStatus;
   unsigned long mPilotSyncId;
-  int mPilotSyncStatus;
+  int mPilotSynctqStatus;
 };
 
 }
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index 26ef00db6..cf81f4518 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -199,10 +199,10 @@ bool ResourceKolabBase::connectToKMail() const
 }
 
 bool ResourceKolabBase::kmailAddSubresource( const TQString& resource,
-                                             const TQString& parent,
+                                             const TQString& tqparent,
                                              const TQString& contentsType )
 {
-  return mConnection->kmailAddSubresource( resource, parent, contentsType );
+  return mConnection->kmailAddSubresource( resource, tqparent, contentsType );
 }
 
 bool ResourceKolabBase::kmailRemoveSubresource( const TQString& resource )
@@ -257,7 +257,7 @@ TQString ResourceKolabBase::findWritableResource( const ResourceType &type,
 
     KMessageBox::error( 0, errorText );
     mErrorCode = NoWritableFound;
-    return TQString::null;
+    return TQString();
   }
   if ( possible.count() == 1 )
     // Just one found
@@ -274,7 +274,7 @@ TQString ResourceKolabBase::findWritableResource( const ResourceType &type,
   if ( chosenLabel.isEmpty() ) {
     // cancelled
     mErrorCode = UserCancel;
-    return TQString::null;
+    return TQString();
   }
   return possible[chosenLabel];
 }
diff --git a/kresources/kolab/shared/resourcekolabbase.h b/kresources/kolab/shared/resourcekolabbase.h
index 565be2675..d16f2a576 100644
--- a/kresources/kolab/shared/resourcekolabbase.h
+++ b/kresources/kolab/shared/resourcekolabbase.h
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -162,7 +162,7 @@ protected:
                     const TQStringList& attachmentNames = TQStringList(),
                     const TQStringList& deletedAttachments = TQStringList() );
 
-  bool kmailAddSubresource( const TQString& resource, const TQString& parent,
+  bool kmailAddSubresource( const TQString& resource, const TQString& tqparent,
                             const TQString& contentsType );
   bool kmailRemoveSubresource( const TQString& resource );
 
@@ -172,7 +172,7 @@ protected:
   /// If only one of these is writable, return that. Otherwise return null.
   TQString findWritableResource( const ResourceType &type,
                                 const ResourceMap& resources,
-                                const TQString& text = TQString::null );
+                                const TQString& text = TQString() );
 
   enum ErrorCode {
     NoError,
diff --git a/kresources/kolab/shared/subresource.cpp b/kresources/kolab/shared/subresource.cpp
index a7ffb8f90..7520d275a 100644
--- a/kresources/kolab/shared/subresource.cpp
+++ b/kresources/kolab/shared/subresource.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/kolab/shared/subresource.h b/kresources/kolab/shared/subresource.h
index de7a92e93..79104a747 100644
--- a/kresources/kolab/shared/subresource.h
+++ b/kresources/kolab/shared/subresource.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -45,7 +45,7 @@ namespace Kolab {
  */
 class SubResource {
 public:
-  // This is just for QMap
+  // This is just for TQMap
   SubResource() {}
 
   SubResource( bool active, bool writable, const TQString& label,
@@ -93,7 +93,7 @@ typedef TQMap<TQString, SubResource> ResourceMap;
  */
 class StorageReference {
 public:
-  // Just for QMap
+  // Just for TQMap
   StorageReference() {}
 
   StorageReference( const TQString& resource, TQ_UINT32 sernum );