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

1 files changed, 7 insertions, 7 deletions

diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index 010a9d003..6d634d8f8 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -16,11 +16,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.
@@ -31,7 +31,7 @@
 #include "globalsettings.h"
 #include "folderstorage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
 #include "kmcommands.h"
 
 #include <kdebug.h>
@@ -117,7 +117,7 @@ void ExpireJob::slotDoWork()
 {
   // No need to worry about mSrcFolder==0 here. The FolderStorage deletes the jobs on destruction.
   FolderStorage* storage = mSrcFolder->storage();
-  int stopIndex = mImmediate ? 0 : QMAX( 0, mCurrentIndex - EXPIREJOB_NRMESSAGES );
+  int stopIndex = mImmediate ? 0 : TQMAX( 0, mCurrentIndex - EXPIREJOB_NRMESSAGES );
 #ifdef DEBUG_SCHEDULER
   kdDebug(5006) << "ExpireJob: checking messages " << mCurrentIndex << " to " << stopIndex << endl;
 #endif
@@ -190,7 +190,7 @@ void ExpireJob::done()
     }
   }
   if ( !str.isEmpty() )
-    BroadcasStatus::instance()->seStatusMsg( str );
+    BroadcastqStatus::instance()->seStatusMsg( str );
 
   KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
   group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used
@@ -244,7 +244,7 @@ void ExpireJob::slotMessagesMoved( KMCommand *command )
     }
   default: ;
   }
-  BroadcasStatus::instance()->seStatusMsg( msg );
+  BroadcastqStatus::instance()->seStatusMsg( msg );
 
   deleteLater();
 }