1 files changed, 14 insertions, 14 deletions

diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 66ed33c30..87d29875d 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.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.
@@ -116,12 +116,12 @@ CalendarManager::CalendarManager()
   for ( CalendarResourceManager::ActiveIterator it = mgr->activeBegin(); it != mgr->activeEnd(); ++it ) {
     if ( (*it)->type() == "imap" || (*it)->type() == "kolab" ) {
       const TQStringList subResources = (*it)->subresources();
-      TQMap<TQString, int> prefixSet; // KDE4: QSet
+      TQMap<TQString, int> prefixSet; // KDE4: TQSet
       for ( TQStringList::ConstIterator subIt = subResources.begin(); subIt != subResources.end(); ++subIt ) {
         if ( !(*subIt).tqcontains( "/.INBOX.directory/" ) )
           // we don't care about shared folders
           continue;
-        prefixSet.insert( (*subIt).left( (*subIt).find( "/.INBOX.directory/" ) ), 0 );
+        prefixSet.insert( (*subIt).left( (*subIt).tqfind( "/.INBOX.directory/" ) ), 0 );
       }
       if ( prefixSet.count() > 1 )
         multipleKolabResources = true;
@@ -190,7 +190,7 @@ class Formatter : public KMail::Interface::BodyPartFormatter
     }
 };
 
-static TQString directoryForStatus( Attendee::PartStat status )
+static TQString directoryFortqStatus( Attendee::PartStat status )
 {
   TQString dir;
   switch ( status ) {
@@ -310,7 +310,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
                                 true, // RSVP, otherwise we would not be here
                                 status,
                                 myself ? myself->role() : heuristicalRole( incidence ),
-                                myself ? myself->uid() : TQString::null );
+                                myself ? myself->uid() : TQString() );
       if ( myself ) {
         newMyself->setDelegate( myself->delegate() );
         newMyself->setDelegator( myself->delegator() );
@@ -333,7 +333,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
     bool mail( Incidence* incidence, KMail::Callback& callback,
                Attendee::PartStat status,
                Scheduler::Method method = Scheduler::Reply,
-               const TQString &to = TQString::null, MailType type = Answer ) const
+               const TQString &to = TQString(), MailType type = Answer ) const
     {
       ICalFormat format;
       format.setTimeZone( KPimPrefs::timezone(), false );
@@ -367,7 +367,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       TQString recv = to;
       if ( recv.isEmpty() )
         recv = incidence->organizer().fullName();
-      TQString statusString = directoryForStatus( status );  //it happens to return the right strings
+      TQString statusString = directoryFortqStatus( status );  //it happens to return the right strings
       return callback.mailICal( recv, msg, subject, statusString, type != Forward );
     }
 
@@ -375,7 +375,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
     {
       TQString error;
       TQCString dcopService;
-      int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService );
+      int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/Organizer", TQString(), TQString(), &error, &dcopService );
       if ( result == 0 ) {
         // OK, so korganizer (or kontact) is running. Now ensure the object we want is available
         // [that's not the case when kontact was already running, but korganizer not loaded into it...]
@@ -567,7 +567,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       }
 
       // First, save it for KOrganizer to handle
-      TQString dir = directoryForStatus( status );
+      TQString dir = directoryFortqStatus( status );
       if ( dir.isEmpty() )
         return true; // unknown status
       if ( status != Attendee::Delegated ) // we do that below for delegated incidences
@@ -632,7 +632,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
                                     true, // RSVP, otherwise we would not be here
                                     status,
                                     heuristicalRole( incidence ),
-                                    TQString::null );
+                                    TQString() );
           incidence->clearAttendees();
           incidence->addAttendee( newMyself );
           ok = mail( incidence, callback, status, Scheduler::Reply );
@@ -649,7 +649,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       if ( status == Attendee::Delegated ) {
         incidence = icalToString( iCal );
         myself = findMyself( incidence, receiver );
-        myself->seStatus( status );
+        myself->setqStatus( status );
         myself->setDelegate( delegateString );
         TQString name, email;
         KPIM::getNameAndMail( delegateString, name, email );
@@ -932,7 +932,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
         }
       }
 
-      return TQString::null;
+      return TQString();
     }
 };