Rename old tq methods that no longer need a unique name

1 files changed, 10 insertions, 10 deletions

diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index e6c641300..a7624d844 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -732,9 +732,9 @@ int KMKernel::sendCertificate( const TQString& to, const TQByteArray& certData )
   return 1;
 }
 
-KMMsgtqStatus KMKernel::strTotqStatus(const TQString &flags)
+KMMsgStatus KMKernel::strToStatus(const TQString &flags)
 {
-    KMMsgtqStatus status = 0;
+    KMMsgStatus status = 0;
     if (!flags.isEmpty()) {
         for (uint n = 0; n < flags.length() ; n++) {
             switch (flags[n]) {
@@ -946,8 +946,8 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
         }
 
         if ( !MsgStatusFlags.isEmpty() ) {
-          KMMsgtqStatus status = strTotqStatus(MsgStatusFlags);
-          if (status) msg->setqStatus(status);
+          KMMsgStatus status = strToStatus(MsgStatusFlags);
+          if (status) msg->seStatus(status);
         }
 
         int index;
@@ -1059,8 +1059,8 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
       int index;
 
       if( !MsgStatusFlags.isEmpty() ) {
-        KMMsgtqStatus status = strTotqStatus(MsgStatusFlags);
-        if (status) msg->setqStatus(status);
+        KMMsgStatus status = strToStatus(MsgStatusFlags);
+        if (status) msg->seStatus(status);
       }
 
       if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) {
@@ -1702,7 +1702,7 @@ void KMKernel::recreateCorruptIndexFiles()
     if ( !folder || folder->isDir() || folder->isOpened() )
       continue;
     KMFolderIndex * const index = dynamic_cast<KMFolderIndex*>( folder->storage() );
-    if ( index && index->indextqStatus() != KMFolderIndex::IndexOk ) {
+    if ( index && index->indexStatus() != KMFolderIndex::IndexOk ) {
       foldersWithBrokenIndex.append( index );
     }
   }
@@ -2330,13 +2330,13 @@ void KMKernel::selectFolder( TQString folderPath )
 KMMainWidget *KMKernel::getKMMainWidget()
 {
   //This could definitely use a speadup
-  TQWidgetList *l = kapp->tqtopLevelWidgets();
+  TQWidgetList *l = kapp->topLevelWidgets();
   TQWidgetListIt it( *l );
   TQWidget *wid;
 
   while ( ( wid = it.current() ) != 0 ) {
     ++it;
-    TQObjectList *l2 = wid->tqtopLevelWidget()->queryList( "KMMainWidget" );
+    TQObjectList *l2 = wid->topLevelWidget()->queryList( "KMMainWidget" );
     if (l2 && l2->first()) {
       KMMainWidget* kmmw = dynamic_cast<KMMainWidget *>( l2->first() );
       Q_ASSERT( kmmw );
@@ -2469,7 +2469,7 @@ Wallet *KMKernel::wallet() {
   if ( tqApp->activeWindow() )
     window = tqApp->activeWindow()->winId();
   else if ( getKMMainWidget() )
-    window = getKMMainWidget()->tqtopLevelWidget()->winId();
+    window = getKMMainWidget()->topLevelWidget()->winId();
 
   delete mWallet;
   mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window );