1 files changed, 36 insertions, 36 deletions

diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 1e9e5d13..7b5d2a3c 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -719,7 +719,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       disconnect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ),
-                  BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
+                  BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
       disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
       writeSortOrder();
       mFolder->close("kmheaders");
@@ -752,7 +752,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       connect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)),
-              BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
+              BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
       connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
           this, TQT_SLOT(setFolderInfoStatus()));
       connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
@@ -935,9 +935,9 @@ void KMHeaders::msgAdded(int id)
     }
 
     if (parent && mFolder->getMsgBase(parent->id())->isWatched())
-      mFolder->getMsgBase(id)->seStatus( KMMsgStatusWatched );
+      mFolder->getMsgBase(id)->setStatus( KMMsgStatusWatched );
     else if (parent && mFolder->getMsgBase(parent->id())->isIgnored())
-      mFolder->getMsgBase(id)->seStatus( KMMsgStatusIgnored );
+      mFolder->getMsgBase(id)->setStatus( KMMsgStatusIgnored );
     if (parent)
       hi = new HeaderItem( parent->item(), id );
     else
@@ -1115,7 +1115,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
     if ( mSubjThreading && removedItem->sortCacheItem()->subjectThreadingList() )
       removedItem->sortCacheItem()->subjectThreadingList()->removeRef( removedItem->sortCacheItem() );
 
-    // Reparent tqchildren of item.
+    // Reparent children of item.
     TQListViewItem *myParent = removedItem;
     TQListViewItem *myChild = myParent->firstChild();
     TQListViewItem *threadRoot = myParent;
@@ -1214,7 +1214,7 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId)
   HeaderItem *item = mItems[msgId];
   if (item) {
     item->irefresh();
-    item->tqrepaint();
+    item->repaint();
   }
 }
 
@@ -1399,11 +1399,11 @@ void KMHeaders::setFolderInfoStatus ()
   else
     str = unread ? i18n( "1 unread", "%n unread", unread ) : i18n( "0 unread" );
   const int count = mFolder->count();
-  str = count ? i18n( "1 message, %1.", "%n messages, %1.", count ).tqarg( str )
+  str = count ? i18n( "1 message, %1.", "%n messages, %1.", count ).arg( str )
               : i18n( "0 messages" ); // no need for "0 unread" to be added here
   if ( mFolder->isReadOnly() )
-    str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").tqarg( str );
-  BroadcastStatus::instance()->seStatusMsg(str);
+    str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").arg( str );
+  BroadcastStatus::instance()->setStatusMsg(str);
 }
 
 //-----------------------------------------------------------------------------
@@ -1451,8 +1451,8 @@ void KMHeaders::applyFiltersOnMsg()
       if ( msgCountToFilter - msgCount < 10 || !( msgCount % 20 ) || msgCount <= 10 ) {
         progressItem->updateProgress();
         TQString statusMsg = i18n("Filtering message %1 of %2");
-        statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter );
-        KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg );
+        statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
+        KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
         KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
       }
 
@@ -1523,7 +1523,7 @@ void KMHeaders::deleteMsg ()
            this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) );
   command->start();
 
-  BroadcastStatus::instance()->seStatusMsg("");
+  BroadcastStatus::instance()->setStatusMsg("");
   //  triggerUpdate();
 }
 
@@ -1620,11 +1620,11 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
   if ( command->result() == KMCommand::OK ) {
     // make sure the current item is shown
     makeHeaderVisible();
-    BroadcastStatus::instance()->seStatusMsg(
+    BroadcastStatus::instance()->setStatusMsg(
        deleted ? i18n("Messages deleted successfully.") : i18n("Messages moved successfully") );
   } else {
     /* The move failed or the user canceled it; reset the state of all
-     * messages involved and tqrepaint.
+     * messages involved and repaint.
      *
      * Note: This potentially resets too many items if there is more than one
      *       move going on. Oh well, I suppose no animals will be harmed.
@@ -1643,10 +1643,10 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
     }
     triggerUpdate();
     if ( command->result() == KMCommand::Failed )
-      BroadcastStatus::instance()->seStatusMsg(
+      BroadcastStatus::instance()->setStatusMsg(
            deleted ? i18n("Deleting messages failed.") : i18n("Moving messages failed.") );
     else
-      BroadcastStatus::instance()->seStatusMsg(
+      BroadcastStatus::instance()->setStatusMsg(
            deleted ? i18n("Deleting messages canceled.") : i18n("Moving messages canceled.") );
  }
  mOwner->updateMessageActions();
@@ -1714,7 +1714,7 @@ void KMHeaders::setSelected( TQListViewItem *item, bool selected )
     KListView::setSelected( item, selected );
 
   // If the item is the parent of a closed thread recursively select
-  // tqchildren .
+  // children .
   if ( isThreaded() && !item->isOpen() && item->firstChild() ) {
       TQListViewItem *nextRoot = item->itemBelow();
       TQListViewItemIterator it( item->firstChild() );
@@ -1828,7 +1828,7 @@ void KMHeaders::selectNextMessage()
         temp->firstChild();
         temp = temp->parent();
       }
-      lvi->tqrepaint();
+      lvi->repaint();
       /* test to see if we need to unselect messages on back track */
       (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true));
       setCurrentItem(below);
@@ -1866,7 +1866,7 @@ void KMHeaders::selectPrevMessage()
         temp->firstChild();
         temp = temp->parent();
       }
-      lvi->tqrepaint();
+      lvi->repaint();
       /* test to see if we need to unselect messages on back track */
       (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true));
       setCurrentItem(above);
@@ -1997,7 +1997,7 @@ int KMHeaders::findUnread(bool aDirNext, int aStartAt, bool onlyNew, bool accept
   // first unread item.
   //
   // Find the ancestor of the unread item closest to the
-  // root and recursively sort all of that ancestors tqchildren.
+  // root and recursively sort all of that ancestors children.
   if (item) {
     TQListViewItem *next = item;
     while (next->parent())
@@ -2135,10 +2135,10 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread)
     return;
   }
 
-  BroadcastStatus::instance()->seStatusMsg("");
+  BroadcastStatus::instance()->setStatusMsg("");
   if (markitread && idx >= 0) setMsgRead(idx);
   mItems[idx]->irefresh();
-  mItems[idx]->tqrepaint();
+  mItems[idx]->repaint();
   emit selected( msg );
   setFolderInfoStatus();
 }
@@ -2151,7 +2151,7 @@ void KMHeaders::highlightCurrentThread()
   for ( it.toFirst() ; it.current() ; ++it ) {
       TQListViewItem *lvi = *it;
       lvi->setSelected( true );
-      lvi->tqrepaint();
+      lvi->repaint();
   }
 }
 
@@ -2192,7 +2192,7 @@ void KMHeaders::updateMessageList( bool set_selection, bool forceJumpToUnread )
   noRepaint = false;
   KListView::setSorting( mSortCol, !mSortDescending );
   if (!mFolder) {
-    tqrepaint();
+    repaint();
     return;
   }
   readSortOrder( set_selection, forceJumpToUnread );
@@ -2290,7 +2290,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
      if ( rootDecoClicked ) {
         // Check if our item is the parent of a closed thread and if so, if the root
         // decoration of the item was clicked (i.e. the +/- sign) which would expand
-        // the thread. In that case, deselect all tqchildren, so opening the thread
+        // the thread. In that case, deselect all children, so opening the thread
         // doesn't cause a flicker.
         if ( !lvi->isOpen() && lvi->firstChild() ) {
            TQListViewItem *nextRoot = lvi->itemBelow();
@@ -2315,7 +2315,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
   }
 
   if ( rootDecoClicked ) {
-      // select the thread's tqchildren after closing if the parent is selected
+      // select the thread's children after closing if the parent is selected
      if ( lvi && !lvi->isOpen() && lvi->isSelected() )
         setSelected( lvi, true );
   }
@@ -2324,7 +2324,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
     if ( lvi != currentItem() )
       highlightMessage( lvi );
     /* Explicitely set selection state. This is necessary because we want to
-     * also select all tqchildren of closed threads when the parent is selected. */
+     * also select all children of closed threads when the parent is selected. */
 
     // unless ctrl mask, set selected if it isn't already
     if ( !( e->state() & ControlButton ) && !wasSelected )
@@ -2813,9 +2813,9 @@ bool KMHeaders::writeSortOrder()
     if (sortStream && ferror(sortStream)) {
         fclose(sortStream);
         unlink(TQFile::encodeName(sortFile));
-        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl;
+        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl;
         kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
-        kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").tqarg( sortFile ));
+        kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile ));
     }
     fclose(sortStream);
     ::rename(TQFile::encodeName(tempName), TQFile::encodeName(sortFile));
@@ -2853,9 +2853,9 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi)
     if (sortStream && ferror(sortStream)) {
         fclose(sortStream);
         unlink(TQFile::encodeName(sortFile));
-        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl;
+        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl;
         kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
-        kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").tqarg( sortFile ));
+        kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile ));
     }
     fclose(sortStream);
   } else {
@@ -3321,7 +3321,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
             qsort(unsorted, unsorted_count, sizeof(SortCacheItem *), //sort
                   compare_SortCacheItem);
 
-        /* The sorted list now contains all sorted tqchildren of this item, while
+        /* The sorted list now contains all sorted children of this item, while
          * the (aptly named) unsorted array contains all as of yet unsorted
          * ones. It has just been qsorted, so it is in itself sorted. These two
          * sorted lists are now merged into one. */
@@ -3353,11 +3353,11 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
 
             if(threaded && i->item()) {
                 // If the parent is watched or ignored, propagate that to it's
-                // tqchildren
+                // children
                 if (mFolder->getMsgBase(i->id())->isWatched())
-                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusWatched);
+                  mFolder->getMsgBase(new_kci->id())->setStatus(KMMsgStatusWatched);
                 if (mFolder->getMsgBase(i->id())->isIgnored())
-                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusIgnored);
+                  mFolder->getMsgBase(new_kci->id())->setStatus(KMMsgStatusIgnored);
                 khi = new HeaderItem(i->item(), new_kci->id(), new_kci->key());
             } else {
                 khi = new HeaderItem(this, new_kci->id(), new_kci->key());
@@ -3499,7 +3499,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
         if ( sortStream )
             fclose(sortStream);
         unlink(TQFile::encodeName(sortFile));
-        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl;
+        kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl;
         kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
 
         return true;