diff options
Diffstat (limited to 'kmail/kmsearchpattern.h')
| -rw-r--r-- | kmail/kmsearchpattern.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h index a79b6122a..4c2cb75de 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; @@ -48,7 +48,7 @@ public: FuncIsInCategory, FuncIsNotInCategory, FuncHasAttachment, FuncHasNoAttachment}; KMSearchRule ( const TQCString & field=0, Function=FuncContains, - const TQString &contents=TQString::null ); + const TQString &contents=TQString() ); KMSearchRule ( const KMSearchRule &other ); const KMSearchRule & operator=( const KMSearchRule & other ); @@ -57,7 +57,7 @@ public: priate subclass depending on the @p field. */ static KMSearchRule* createInstance( const TQCString & field=0, Function function=FuncContains, - const TQString & contents=TQString::null ); + const TQString & contents=TQString() ); static KMSearchRule* createInstance( const TQCString & field, const char * function, @@ -160,7 +160,7 @@ class KMSearchRuleString : public KMSearchRule { public: KMSearchRuleString( const TQCString & field=0, Function function=FuncContains, - const TQString & contents=TQString::null ); + const TQString & contents=TQString() ); KMSearchRuleString( const KMSearchRuleString & other ); const KMSearchRuleString & operator=( const KMSearchRuleString & other ); @@ -195,7 +195,7 @@ class KMSearchRuleNumerical : public KMSearchRule { public: KMSearchRuleNumerical( const TQCString & field=0, Function function=FuncContains, - const TQString & contents=TQString::null ); + const TQString & contents=TQString() ); virtual bool isEmpty() const ; virtual bool matches( const KMMessage * msg ) const; @@ -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, - const TQString & contents=TQString::null ); - KMSearchRuleStatus( int status, Function function=FuncContains ); + KMSearchRuletqStatus( const TQCString & field=0, Function function=FuncContains, + const TQString & contents=TQString() ); + 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; }; // ------------------------------------------------------------------------ @@ -365,7 +365,7 @@ public: */ void readConfig( const KConfig * config ); /** Writes itself into @p config. The group has to be preset. Tries - to delete old-style keys by overwriting them with TQString::null. + to delete old-style keys by overwriting them with TQString(). Derived classes reimplementing writeConfig() should also call this method, or else the rules will not be stored. |