From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:50 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 kmail/headerlistquicksearch.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'kmail/headerlistquicksearch.cpp')

diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index 5fe00e02..4d5669a1 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -51,7 +51,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
                                               KListView *listView,
                                               KActionCollection *actionCollection,
                                               const char *name )
-  : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mStatus(0),  statusList()
+  : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mtqStatus(0),  statusList()
 {
   KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
                                            TQApplication::reverseLayout()
@@ -72,16 +72,16 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
   mStatusCombo->setSizeLimit( 12 );
   mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") );
 
-  inserStatus( StatusUnread );
-  inserStatus( StatusNew );
-  inserStatus( StatusImportant );
-  inserStatus( StatusReplied );
-  inserStatus( StatusForwarded );
-  inserStatus( StatusToDo );
-  inserStatus( StatusHasAttachment );
-  inserStatus( StatusInvitation );
-  inserStatus( StatusWatched );
-  inserStatus( StatusIgnored );
+  insertqStatus( StatusUnread );
+  insertqStatus( StatusNew );
+  insertqStatus( StatusImportant );
+  insertqStatus( StatusReplied );
+  insertqStatus( StatusForwarded );
+  insertqStatus( StatusToDo );
+  insertqStatus( StatusHasAttachment );
+  insertqStatus( StatusInvitation );
+  insertqStatus( StatusWatched );
+  insertqStatus( StatusIgnored );
   mStatusCombo->setCurrentItem( 0 );
   mStatusCombo->installEventFilter( this );
   connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ),
@@ -145,10 +145,10 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event )
 bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQString &s) const
 {
   mCurrentSearchTerm = s; // bit of a hack, but works
-  if ( mStatus != 0 ) {
+  if ( mtqStatus != 0 ) {
     KMHeaders *headers = static_cast<KMHeaders*>( item->listView() );
     const KMMsgBase *msg = headers->getMsgBaseForItem( item );
-    if ( !msg || ! ( msg->status() & mStatus ) )
+    if ( !msg || ! ( msg->status() & mtqStatus ) )
       return false;
   }
 
@@ -176,13 +176,13 @@ void HeaderListQuickSearch::reset()
 void HeaderListQuickSearch::sloStatusChanged( int index )
 {
   if ( index == 0 )
-    mStatus = 0;
+    mtqStatus = 0;
   else
-    mStatus = KMSearchRuleStatus::statusFromEnglishName( statusList[index - 1] );
+    mtqStatus = KMSearchRuletqStatus::statusFromEnglishName( statusList[index - 1] );
   updateSearch();
 }
 
-void HeaderListQuickSearch::inserStatus(KMail::StatusValueTypes which)
+void HeaderListQuickSearch::insertqStatus(KMail::StatusValueTypes which)
 {
   mStatusCombo->insertItem( SmallIcon( KMail::StatusValues[which].icon ),
     i18n( KMail::StatusValues[ which ].text ) );
@@ -196,9 +196,9 @@ TQString HeaderListQuickSearch::currentSearchTerm() const
 }
 
 
-int HeaderListQuickSearch::currenStatus() const
+int HeaderListQuickSearch::currentqStatus() const
 {
-    return mStatus;
+    return mtqStatus;
 }
 
 } // namespace KMail
-- 
cgit v1.2.3