Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 9 insertions, 9 deletions

diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index b60e9cdc8..87533a250 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -10,7 +10,7 @@
 #include <tqptrlist.h>
 #include <tqstring.h>
 #include <tqcstring.h>
-#include "kmmsgbase.h" // for KMMsgStatus
+#include "kmmsgbase.h" // for KMMsgtqStatus
 
 class KMMessage;
 class KConfig;
@@ -208,13 +208,13 @@ public:
 
 namespace KMail {
 // The below are used in several places and here so they are accessible.
-  struct MessageStatus {
+  struct MessagetqStatus {
     const char * const text;
     const char * const icon;
   };
 
   // If you change the ordering here; also do it in the enum below
-  static const MessageStatus StatusValues[] = {
+  static const MessagetqStatus StatusValues[] = {
     { I18N_NOOP( "Important" ),        "kmmsgflag"   },
     { I18N_NOOP( "New" ),              "kmmsgnew"   },
     { I18N_NOOP( "Unread" ),           "kmmsgunseen"   },
@@ -255,7 +255,7 @@ namespace KMail {
   };
 
   static const int StatusValueCount =
-    sizeof( StatusValues ) / sizeof( MessageStatus );
+    sizeof( StatusValues ) / sizeof( MessagetqStatus );
   // we want to show all status entries in the quick search bar, but only the
   // ones up to attachment in the search/filter dialog, because there the
   // attachment case is handled separately.
@@ -267,12 +267,12 @@ namespace KMail {
     @short This class represents a search pattern rule operating on message
     status.
 */
-class KMSearchRuleStatus : public KMSearchRule
+class KMSearchRuletqStatus : public KMSearchRule
 {
 public:
-   KMSearchRuleStatus( const TQCString & field=0, Function function=FuncContains,
+   KMSearchRuletqStatus( const TQCString & field=0, Function function=FuncContains,
 		       const TQString & contents=TQString() );
-   KMSearchRuleStatus( int status, Function function=FuncContains );
+   KMSearchRuletqStatus( int status, Function function=FuncContains );
 
   virtual bool isEmpty() const ;
   virtual bool matches( const KMMessage * msg ) const;
@@ -280,9 +280,9 @@ public:
   virtual bool matches( const DwString &, KMMessage &,
                         const DwBoyerMoore *,
 			int ) const;
-  static KMMsgStatus statusFromEnglishName(const TQString&);
+  static KMMsgtqStatus statusFromEnglishName(const TQString&);
   private:
-  KMMsgStatus mStatus;
+  KMMsgtqStatus mtqStatus;
 };
 
 // ------------------------------------------------------------------------