From 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:50:21 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kmail/kmsearchpattern.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'kmail/kmsearchpattern.h') diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h index 87533a25..b60e9cdc 100644 --- a/kmail/kmsearchpattern.h +++ b/kmail/kmsearchpattern.h @@ -10,7 +10,7 @@ #include #include #include -#include "kmmsgbase.h" // for KMMsgtqStatus +#include "kmmsgbase.h" // for KMMsgStatus 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 MessagetqStatus { + struct MessageStatus { const char * const text; const char * const icon; }; // If you change the ordering here; also do it in the enum below - static const MessagetqStatus StatusValues[] = { + static const MessageStatus 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( MessagetqStatus ); + sizeof( StatusValues ) / sizeof( MessageStatus ); // 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 KMSearchRuletqStatus : public KMSearchRule +class KMSearchRuleStatus : public KMSearchRule { public: - KMSearchRuletqStatus( const TQCString & field=0, Function function=FuncContains, + KMSearchRuleStatus( const TQCString & field=0, Function function=FuncContains, const TQString & contents=TQString() ); - KMSearchRuletqStatus( int status, Function function=FuncContains ); + KMSearchRuleStatus( 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 KMMsgtqStatus statusFromEnglishName(const TQString&); + static KMMsgStatus statusFromEnglishName(const TQString&); private: - KMMsgtqStatus mtqStatus; + KMMsgStatus mStatus; }; // ------------------------------------------------------------------------ -- cgit v1.2.3