diff options
Diffstat (limited to 'libkmime')
-rw-r--r-- | libkmime/boolflags.h | 4 | ||||
-rw-r--r-- | libkmime/kmime_charfreq.h | 6 | ||||
-rw-r--r-- | libkmime/kmime_codec_base64.cpp | 2 | ||||
-rw-r--r-- | libkmime/kmime_codec_base64.h | 2 | ||||
-rw-r--r-- | libkmime/kmime_codec_identity.cpp | 2 | ||||
-rw-r--r-- | libkmime/kmime_codec_identity.h | 2 | ||||
-rw-r--r-- | libkmime/kmime_codec_qp.cpp | 2 | ||||
-rw-r--r-- | libkmime/kmime_codec_qp.h | 2 | ||||
-rw-r--r-- | libkmime/kmime_codec_uuencode.cpp | 2 | ||||
-rw-r--r-- | libkmime/kmime_codec_uuencode.h | 2 | ||||
-rw-r--r-- | libkmime/kmime_codecs.cpp | 2 | ||||
-rw-r--r-- | libkmime/kmime_codecs.h | 6 | ||||
-rw-r--r-- | libkmime/kmime_content.h | 2 | ||||
-rw-r--r-- | libkmime/kmime_header_parsing.cpp | 10 | ||||
-rw-r--r-- | libkmime/kmime_header_parsing.h | 60 | ||||
-rw-r--r-- | libkmime/kmime_headers.h | 50 | ||||
-rw-r--r-- | libkmime/kmime_headers_obs.h | 30 | ||||
-rw-r--r-- | libkmime/kmime_mdn.cpp | 2 | ||||
-rw-r--r-- | libkmime/kmime_mdn.h | 8 | ||||
-rw-r--r-- | libkmime/kmime_message.h | 2 | ||||
-rw-r--r-- | libkmime/kmime_newsarticle.h | 4 | ||||
-rw-r--r-- | libkmime/kmime_util.h | 36 | ||||
-rw-r--r-- | libkmime/kqcstringsplitter.h | 4 |
23 files changed, 121 insertions, 121 deletions
diff --git a/libkmime/boolflags.h b/libkmime/boolflags.h index ccd4e852..821c8188 100644 --- a/libkmime/boolflags.h +++ b/libkmime/boolflags.h @@ -17,7 +17,7 @@ #ifndef __KMIME_BOOLFLAGS_H__ #define __KMIME_BOOLFLAGS_H__ -#include <tdepimmacros.h> +#include <kdemacros.h> /** This class stores boolean values in single bytes. It provides a similar functionality as TQBitArray @@ -25,7 +25,7 @@ We use it to store the flags of an article @internal */ -class KDE_EXPORT BoolFlags { +class TDE_EXPORT BoolFlags { public: BoolFlags() { clear(); } diff --git a/libkmime/kmime_charfreq.h b/libkmime/kmime_charfreq.h index 014cae6e..fcd7aeab 100644 --- a/libkmime/kmime_charfreq.h +++ b/libkmime/kmime_charfreq.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_charfreq.h KMime, the KDE internet mail/usenet news message library. @@ -16,12 +16,12 @@ #define __KMIME_CHARFREQ_H__ #include <tqcstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #undef None namespace KMime { -class KDE_EXPORT CharFreq { +class TDE_EXPORT CharFreq { public: CharFreq( const TQByteArray & buf ); CharFreq( const char * buf, size_t len ); diff --git a/libkmime/kmime_codec_base64.cpp b/libkmime/kmime_codec_base64.cpp index e1c4d499..4b4020cb 100644 --- a/libkmime/kmime_codec_base64.cpp +++ b/libkmime/kmime_codec_base64.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_base64.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_base64.h b/libkmime/kmime_codec_base64.h index 6d80d9b9..6d9b867f 100644 --- a/libkmime/kmime_codec_base64.h +++ b/libkmime/kmime_codec_base64.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_base64.h This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_identity.cpp b/libkmime/kmime_codec_identity.cpp index 27fe8f42..39792a21 100644 --- a/libkmime/kmime_codec_identity.cpp +++ b/libkmime/kmime_codec_identity.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_identity.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_identity.h b/libkmime/kmime_codec_identity.h index a18cfd1f..4ded0f8b 100644 --- a/libkmime/kmime_codec_identity.h +++ b/libkmime/kmime_codec_identity.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_identity.h This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_qp.cpp b/libkmime/kmime_codec_qp.cpp index 149b01f2..b625346f 100644 --- a/libkmime/kmime_codec_qp.cpp +++ b/libkmime/kmime_codec_qp.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_qp.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_qp.h b/libkmime/kmime_codec_qp.h index a80226f5..28bb79f7 100644 --- a/libkmime/kmime_codec_qp.h +++ b/libkmime/kmime_codec_qp.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_qp.h This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_uuencode.cpp b/libkmime/kmime_codec_uuencode.cpp index fe5acf4f..ada9416d 100644 --- a/libkmime/kmime_codec_uuencode.cpp +++ b/libkmime/kmime_codec_uuencode.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_uuencode.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_uuencode.h b/libkmime/kmime_codec_uuencode.h index 80288b41..0477c93c 100644 --- a/libkmime/kmime_codec_uuencode.h +++ b/libkmime/kmime_codec_uuencode.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_uuencode.h This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codecs.cpp b/libkmime/kmime_codecs.cpp index bf33159e..361b224c 100644 --- a/libkmime/kmime_codecs.cpp +++ b/libkmime/kmime_codecs.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codecs.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codecs.h b/libkmime/kmime_codecs.h index 1bd8c9ec..1bd1bddc 100644 --- a/libkmime/kmime_codecs.h +++ b/libkmime/kmime_codecs.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codecs.h This file is part of KMime, the KDE internet mail/usenet news message library. @@ -40,7 +40,7 @@ #include <tqcstring.h> // TQByteArray #include <kdebug.h> // for kdFatal() -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KMime { @@ -54,7 +54,7 @@ class Decoder; @short Codecs for common mail transfer encodings. @author Marc Mutz <mutz@kde.org> */ -class KDE_EXPORT Codec { +class TDE_EXPORT Codec { protected: static TQAsciiDict<Codec>* all; diff --git a/libkmime/kmime_content.h b/libkmime/kmime_content.h index 1d2aac2d..784179c6 100644 --- a/libkmime/kmime_content.h +++ b/libkmime/kmime_content.h @@ -56,7 +56,7 @@ class Base { structure, that represents the structure of the message */ -class KDE_EXPORT Content : public Base { +class TDE_EXPORT Content : public Base { public: typedef TQPtrList<KMime::Content> List; diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp index 5c9423b7..aa3d29b7 100644 --- a/libkmime/kmime_header_parsing.cpp +++ b/libkmime/kmime_header_parsing.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_header_parsing.cpp This file is part of KMime, the KDE internet mail/usenet news message library. @@ -1104,7 +1104,7 @@ bool parseParameter( const char* & scursor, const char * const send, "Chopping away \"*\"." << endl; maybeAttribute.truncate( maybeAttribute.length() - 1 ); } - result = tqMakePair( maybeAttribute.lower(), TQStringOrTQPair() ); + result = qMakePair( maybeAttribute.lower(), TQStringOrTQPair() ); return true; } @@ -1128,19 +1128,19 @@ bool parseParameter( const char* & scursor, const char * const send, if ( !parseGenericQuotedString( scursor, send, maybeValue.qstring, isCRLF ) ) { scursor = oldscursor; - result = tqMakePair( maybeAttribute.lower(), TQStringOrTQPair() ); + result = qMakePair( maybeAttribute.lower(), TQStringOrTQPair() ); return false; // this case needs further processing by upper layers!! } } else { // value is a token: if ( !parseToken( scursor, send, maybeValue.qpair, false /* no 8bit */ ) ) { scursor = oldscursor; - result = tqMakePair( maybeAttribute.lower(), TQStringOrTQPair() ); + result = qMakePair( maybeAttribute.lower(), TQStringOrTQPair() ); return false; // this case needs further processing by upper layers!! } } - result = tqMakePair( maybeAttribute.lower(), maybeValue ); + result = qMakePair( maybeAttribute.lower(), maybeValue ); return true; } diff --git a/libkmime/kmime_header_parsing.h b/libkmime/kmime_header_parsing.h index d567e5fe..cf398e61 100644 --- a/libkmime/kmime_header_parsing.h +++ b/libkmime/kmime_header_parsing.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_header_parsing.h This file is part of KMime, the KDE internet mail/usenet news message library. @@ -38,7 +38,7 @@ #include <time.h> -#include <tdepimmacros.h> +#include <kdemacros.h> template <typename K, typename V> class TQMap; class TQStringList; @@ -48,32 +48,32 @@ namespace KMime { namespace Types { // for when we can't make up our mind what to use... - struct KDE_EXPORT TQStringOrTQPair { + struct TDE_EXPORT TQStringOrTQPair { TQStringOrTQPair() : qstring(), qpair(0,0) {} TQString qstring; TQPair<const char*,int> qpair; }; - struct KDE_EXPORT AddrSpec { + struct TDE_EXPORT AddrSpec { TQString asString() const; TQString localPart; TQString domain; }; typedef TQValueList<AddrSpec> AddrSpecList; - struct KDE_EXPORT Mailbox { + struct TDE_EXPORT Mailbox { TQString displayName; AddrSpec addrSpec; }; typedef TQValueList<Mailbox> MailboxList; - struct KDE_EXPORT Address { + struct TDE_EXPORT Address { TQString displayName; MailboxList mailboxList; }; typedef TQValueList<Address> AddressList; - struct KDE_EXPORT DateTime { + struct TDE_EXPORT DateTime { time_t time; // secs since 1.1.1970, 0:00 UTC/GMT long int secsEastOfGMT; // timezone bool timeZoneKnown; // do we know the timezone? (e.g. on -0000) @@ -98,7 +98,7 @@ namespace HeaderParsing { @return the decoded string the encoded word represented. */ bool parseEncodedWord( const char* & scursor, const char * const send, - TQString & result, TQCString & language ) KDE_EXPORT; + TQString & result, TQCString & language ) TDE_EXPORT; // // The parsing squad: // @@ -106,34 +106,34 @@ namespace HeaderParsing { /** You may or may not have already started parsing into the atom. This function will go on where you left off. */ bool parseAtom( const char* & scursor, const char * const send, - TQString & result, bool allow8Bit=false ) KDE_EXPORT; + TQString & result, bool allow8Bit=false ) TDE_EXPORT; bool parseAtom( const char* & scursor, const char * const send, - TQPair<const char*,int> & result, bool allow8Bit=false ) KDE_EXPORT; + TQPair<const char*,int> & result, bool allow8Bit=false ) TDE_EXPORT; /** You may or may not have already started parsing into the token. This function will go on where you left off. */ bool parseToken( const char* & scursor, const char * const send, - TQString & result, bool allow8Bit=false ) KDE_EXPORT; + TQString & result, bool allow8Bit=false ) TDE_EXPORT; bool parseToken( const char* & scursor, const char * const send, - TQPair<const char*,int> & result, bool allow8Bit=false ) KDE_EXPORT; + TQPair<const char*,int> & result, bool allow8Bit=false ) TDE_EXPORT; /** @p scursor must be positioned after the opening openChar. */ bool parseGenericQuotedString( const char* & scursor, const char* const send, TQString & result, bool isCRLF, const char openChar='"', - const char closeChar='"' ) KDE_EXPORT; + const char closeChar='"' ) TDE_EXPORT; /** @p scursor must be positioned right after the opening '(' */ bool parseComment( const char* & scursor, const char * const send, - TQString & result, bool isCRLF=false, bool reallySave=true ) KDE_EXPORT; + TQString & result, bool isCRLF=false, bool reallySave=true ) TDE_EXPORT; /** You may or may not have already started parsing into the phrase, but only if it starts with atext. If you setup this function to parse a phrase starting with an encoded-word or quoted-string, @p scursor has to point to the char introducing the encoded-word or quoted-string, resp. */ bool parsePhrase( const char* & scursor, const char * const send, - TQString & result, bool isCRLF=false ) KDE_EXPORT; + TQString & result, bool isCRLF=false ) TDE_EXPORT; /** You may or may not have already started parsing into the initial atom, but not up to it's end. */ bool parseDotAtom( const char* & scursor, const char * const send, - TQString & result, bool isCRLF=false ) KDE_EXPORT; + TQString & result, bool isCRLF=false ) TDE_EXPORT; /** Eats comment-folding-white-space, skips whitespace, folding and comments (even nested ones) and stops at the next non-CFWS @@ -144,42 +144,42 @@ namespace HeaderParsing { scursor is being positioned on the opening '(' of the outmost comment. */ - void eatCFWS( const char* & scursor, const char * const send, bool isCRLF ) KDE_EXPORT; + void eatCFWS( const char* & scursor, const char * const send, bool isCRLF ) TDE_EXPORT; bool parseDomain( const char* & scursor, const char * const send, - TQString & result, bool isCRLF=false ) KDE_EXPORT; + TQString & result, bool isCRLF=false ) TDE_EXPORT; bool parseObsRoute( const char* & scursor, const char * const send, TQStringList & result, - bool isCRLF=false, bool save=false ) KDE_EXPORT; + bool isCRLF=false, bool save=false ) TDE_EXPORT; bool parseAddrSpec( const char* & scursor, const char * const send, - Types::AddrSpec & result, bool isCRLF=false ) KDE_EXPORT; + Types::AddrSpec & result, bool isCRLF=false ) TDE_EXPORT; bool parseAngleAddr( const char* & scursor, const char * const send, - Types::AddrSpec & result, bool isCRLF=false ) KDE_EXPORT; + Types::AddrSpec & result, bool isCRLF=false ) TDE_EXPORT; bool parseMailbox( const char* & scursor, const char * const send, - Types::Mailbox & result, bool isCRLF=false ) KDE_EXPORT; + Types::Mailbox & result, bool isCRLF=false ) TDE_EXPORT; bool parseGroup( const char* & scursor, const char * const send, - Types::Address & result, bool isCRLF=false ) KDE_EXPORT; + Types::Address & result, bool isCRLF=false ) TDE_EXPORT; bool parseAddress( const char* & scursor, const char * const send, - Types::Address & result, bool isCRLF=false ) KDE_EXPORT; + Types::Address & result, bool isCRLF=false ) TDE_EXPORT; bool parseAddressList( const char* & scursor, const char * const send, - Types::AddressList & result, bool isCRLF=false ) KDE_EXPORT; + Types::AddressList & result, bool isCRLF=false ) TDE_EXPORT; bool parseParameter( const char* & scursor, const char * const send, TQPair<TQString,Types::TQStringOrTQPair> & result, - bool isCRLF=false ) KDE_EXPORT; + bool isCRLF=false ) TDE_EXPORT; bool parseParameterList( const char* & scursor, const char * const send, - TQMap<TQString,TQString> & result, bool isCRLF=false ) KDE_EXPORT; + TQMap<TQString,TQString> & result, bool isCRLF=false ) TDE_EXPORT; bool parseRawParameterList( const char* & scursor, const char * const send, TQMap<TQString,Types::TQStringOrTQPair> & result, - bool isCRLF=false ) KDE_EXPORT; + bool isCRLF=false ) TDE_EXPORT; bool parseTime( const char* & scursor, const char * const send, int & hour, int & min, int & sec, long int & secsEastOfGMT, - bool & timeZoneKnown, bool isCRLF=false ) KDE_EXPORT; + bool & timeZoneKnown, bool isCRLF=false ) TDE_EXPORT; bool parseDateTime( const char* & scursor, const char * const send, - Types::DateTime & result, bool isCRLF=false ) KDE_EXPORT; + Types::DateTime & result, bool isCRLF=false ) TDE_EXPORT; #if 0 bool tryToMakeAnySenseOfDateString( const char* & scursor, diff --git a/libkmime/kmime_headers.h b/libkmime/kmime_headers.h index 4c2b7313..0b17cbb1 100644 --- a/libkmime/kmime_headers.h +++ b/libkmime/kmime_headers.h @@ -1,4 +1,4 @@ -/* -*- c++ -* +/* kmime_headers.h KMime, the KDE internet mail/usenet news message library. @@ -35,7 +35,7 @@ #include <time.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KMime { @@ -108,7 +108,7 @@ mk_parsing_subclass_with_name( subclass, subclass, baseclass ) /** Baseclass of all header-classes. It represents a header-field as described in RFC-822. */ -class KDE_EXPORT Base { +class TDE_EXPORT Base { public: typedef TQPtrList<Base> List; @@ -213,7 +213,7 @@ namespace Generics { // known issues: // - uses old decodeRFC2047String function, instead of our own... -class KDE_EXPORT GUnstructured : public Base { +class TDE_EXPORT GUnstructured : public Base { public: GUnstructured() : Base() {} @@ -266,7 +266,7 @@ private: @author Marc Mutz <mutz@kde.org> */ -class KDE_EXPORT GStructured : public Base { +class TDE_EXPORT GStructured : public Base { public: GStructured() : Base() {} GStructured( Content * p ) : Base( p ) {} @@ -300,7 +300,7 @@ protected: }; -class KDE_EXPORT GAddress : public GStructured { +class TDE_EXPORT GAddress : public GStructured { public: GAddress() : GStructured() {} GAddress( Content * p ) : GStructured( p ) {} @@ -316,7 +316,7 @@ protected: /** Base class for headers that deal with (possibly multiple) addresses, but don't allow groups: */ -class KDE_EXPORT MailboxList : public GAddress { +class TDE_EXPORT MailboxList : public GAddress { public: MailboxList() : GAddress() {} MailboxList( Content * p ) : GAddress( p ) {} @@ -340,7 +340,7 @@ mk_parsing_subclass(SingleMailbox,MailboxList); /** Base class for headers that deal with (possibly multiple) addresses, allowing groups. */ -class KDE_EXPORT AddressList : public GAddress { +class TDE_EXPORT AddressList : public GAddress { public: AddressList() : GAddress() {} AddressList( Content * p ) : GAddress( p ) {} @@ -358,7 +358,7 @@ protected: }; /** Base class for headers which deal with a list of msg-id's */ -class KDE_EXPORT GIdent : public GAddress { +class TDE_EXPORT GIdent : public GAddress { public: GIdent() : GAddress() {} GIdent( Content * p ) : GAddress( p ) {} @@ -379,7 +379,7 @@ protected: mk_parsing_subclass(GSingleIdent,GIdent); /** Base class for headers which deal with a single atom. */ -class KDE_EXPORT GToken : public GStructured { +class TDE_EXPORT GToken : public GStructured { public: GToken() : GStructured() {} GToken( Content * p ) : GStructured( p ) {} @@ -396,7 +396,7 @@ protected: }; -class KDE_EXPORT GPhraseList : public GStructured { +class TDE_EXPORT GPhraseList : public GStructured { public: GPhraseList() : GStructured() {} GPhraseList( Content * p ) : GStructured( p ) {} @@ -412,7 +412,7 @@ protected: TQStringList mPhraseList; }; -class KDE_EXPORT GDotAtom : public GStructured { +class TDE_EXPORT GDotAtom : public GStructured { public: GDotAtom() : GStructured() {} GDotAtom( Content * p ) : GStructured( p ) {} @@ -428,7 +428,7 @@ protected: TQString mDotAtom; }; -class KDE_EXPORT GParametrized : public GStructured { +class TDE_EXPORT GParametrized : public GStructured { public: GParametrized() : GStructured() {} GParametrized( Content * p ) : GStructured( p ) {} @@ -444,7 +444,7 @@ protected: private: }; -class KDE_EXPORT GContentType : public GParametrized { +class TDE_EXPORT GContentType : public GParametrized { public: GContentType() : GParametrized() {} GContentType( Content * p ) : GParametrized( p ) {} @@ -462,7 +462,7 @@ protected: }; -class KDE_EXPORT GCISTokenWithParameterList : public GParametrized { +class TDE_EXPORT GCISTokenWithParameterList : public GParametrized { public: GCISTokenWithParameterList() : GParametrized() {} GCISTokenWithParameterList( Content * p ) : GParametrized( p ) {} @@ -489,7 +489,7 @@ protected: /** Represents the Return-Path header field. */ -class KDE_EXPORT ReturnPath : public Generics::GAddress { +class TDE_EXPORT ReturnPath : public Generics::GAddress { public: ReturnPath() : Generics::GAddress() {} ReturnPath( Content * p ) : Generics::GAddress( p ) {} @@ -565,7 +565,7 @@ mk_trivial_subclass_with_name(ContentDisposition,Content-Disposition, Adds a type over GUnstructured. @see GUnstructured */ -class KDE_EXPORT Generic : public Generics::GUnstructured { +class TDE_EXPORT Generic : public Generics::GUnstructured { public: Generic() : Generics::GUnstructured(), t_ype(0) {} @@ -591,7 +591,7 @@ class KDE_EXPORT Generic : public Generics::GUnstructured { /** Represents a "Subject" header */ -class KDE_EXPORT Subject : public Generics::GUnstructured { +class TDE_EXPORT Subject : public Generics::GUnstructured { public: Subject() : Generics::GUnstructured() {} @@ -610,7 +610,7 @@ class KDE_EXPORT Subject : public Generics::GUnstructured { }; /** Represents a "Organization" header */ -class KDE_EXPORT Organization : public Generics::GUnstructured { +class TDE_EXPORT Organization : public Generics::GUnstructured { public: Organization() : Generics::GUnstructured() {} @@ -634,7 +634,7 @@ class KDE_EXPORT Organization : public Generics::GUnstructured { /** Represents a "Control" header */ -class KDE_EXPORT Control : public Base { +class TDE_EXPORT Control : public Base { public: Control() : Base() {} @@ -659,7 +659,7 @@ class KDE_EXPORT Control : public Base { }; /** Represents a "Date" header */ -class KDE_EXPORT Date : public Base { +class TDE_EXPORT Date : public Base { public: Date() : Base(), t_ime(0) {} @@ -690,7 +690,7 @@ class KDE_EXPORT Date : public Base { /** Represents a "Newsgroups" header */ -class KDE_EXPORT Newsgroups : public Base { +class TDE_EXPORT Newsgroups : public Base { public: Newsgroups() : Base() {} @@ -718,7 +718,7 @@ class KDE_EXPORT Newsgroups : public Base { /** Represents a "Followup-To" header */ -class KDE_EXPORT FollowUpTo : public Newsgroups { +class TDE_EXPORT FollowUpTo : public Newsgroups { public: FollowUpTo() : Newsgroups() {} @@ -733,7 +733,7 @@ class KDE_EXPORT FollowUpTo : public Newsgroups { /** Represents a "Lines" header */ -class KDE_EXPORT Lines : public Base { +class TDE_EXPORT Lines : public Base { public: Lines() : Base(),l_ines(-1) {} @@ -762,7 +762,7 @@ class KDE_EXPORT Lines : public Base { /** Represents a "User-Agent" header */ -class KDE_EXPORT UserAgent : public Base { +class TDE_EXPORT UserAgent : public Base { public: UserAgent() : Base() {} diff --git a/libkmime/kmime_headers_obs.h b/libkmime/kmime_headers_obs.h index a167e1f8..2278af90 100644 --- a/libkmime/kmime_headers_obs.h +++ b/libkmime/kmime_headers_obs.h @@ -20,10 +20,10 @@ #error You cannot use this file with the new header classes! #endif -#include <tdepimmacros.h> +#include <kdemacros.h> /** Represents a "Message-Id" header */ -class KDE_EXPORT MessageID : public Base { +class TDE_EXPORT MessageID : public Base { public: MessageID() : Base() {} @@ -48,7 +48,7 @@ class KDE_EXPORT MessageID : public Base { }; /** Represents a "Supersedes" header */ -class KDE_EXPORT Supersedes : public MessageID { +class TDE_EXPORT Supersedes : public MessageID { public: Supersedes() : MessageID() {} @@ -63,7 +63,7 @@ class KDE_EXPORT Supersedes : public MessageID { /** This class encapsulates an address-field, containing an email-address and a real name */ -class KDE_EXPORT AddressField : public Base { +class TDE_EXPORT AddressField : public Base { public: AddressField() : Base() {} @@ -98,7 +98,7 @@ class KDE_EXPORT AddressField : public Base { typedef TQPtrList<AddressField> ObsAddressList; /** Represent a "From" header */ -class KDE_EXPORT From : public AddressField { +class TDE_EXPORT From : public AddressField { public: From() : AddressField() {} @@ -112,7 +112,7 @@ class KDE_EXPORT From : public AddressField { /** Represents a "Reply-To" header */ -class KDE_EXPORT ReplyTo : public AddressField { +class TDE_EXPORT ReplyTo : public AddressField { public: ReplyTo() : AddressField() {} @@ -128,7 +128,7 @@ class KDE_EXPORT ReplyTo : public AddressField { /** Represents a "Mail-Copies-To" header http://www.newsreaders.com/misc/mail-copies-to.html */ -class KDE_EXPORT MailCopiesTo : public AddressField { +class TDE_EXPORT MailCopiesTo : public AddressField { public: MailCopiesTo() : AddressField() {} @@ -146,7 +146,7 @@ class KDE_EXPORT MailCopiesTo : public AddressField { }; /** Represents a "To" header */ -class KDE_EXPORT To : public Base { +class TDE_EXPORT To : public Base { public: To() : Base(),a_ddrList(0) {} @@ -176,7 +176,7 @@ class KDE_EXPORT To : public Base { /** Represents a "CC" header */ -class KDE_EXPORT CC : public To { +class TDE_EXPORT CC : public To { public: CC() : To() {} @@ -191,7 +191,7 @@ class KDE_EXPORT CC : public To { /** Represents a "BCC" header */ -class KDE_EXPORT BCC : public To { +class TDE_EXPORT BCC : public To { public: BCC() : To() {} @@ -205,7 +205,7 @@ class KDE_EXPORT BCC : public To { }; /** Represents a "References" header */ -class KDE_EXPORT References : public Base { +class TDE_EXPORT References : public Base { public: References() : Base(),p_os(-1) {} @@ -235,7 +235,7 @@ class KDE_EXPORT References : public Base { }; /** Represents a "Content-Type" header */ -class KDE_EXPORT ContentType : public Base { +class TDE_EXPORT ContentType : public Base { public: ContentType() : Base(),m_imeType("invalid/invalid"),c_ategory(CCsingle) {} @@ -294,7 +294,7 @@ class KDE_EXPORT ContentType : public Base { /** Represents a "Content-Transfer-Encoding" header */ -class KDE_EXPORT CTEncoding : public Base { +class TDE_EXPORT CTEncoding : public Base { public: CTEncoding() : Base(),c_te(CE7Bit),d_ecoded(true) {} @@ -324,7 +324,7 @@ class KDE_EXPORT CTEncoding : public Base { /** Represents a "Content-Disposition" header */ -class KDE_EXPORT CDisposition : public Base { +class TDE_EXPORT CDisposition : public Base { public: CDisposition() : Base(),d_isp(CDinline) {} @@ -355,7 +355,7 @@ class KDE_EXPORT CDisposition : public Base { /** Represents a "Content-Description" header */ -class KDE_EXPORT CDescription : public Generics::GUnstructured { +class TDE_EXPORT CDescription : public Generics::GUnstructured { public: CDescription() : Generics::GUnstructured() {} diff --git a/libkmime/kmime_mdn.cpp b/libkmime/kmime_mdn.cpp index 4040d893..60142120 100644 --- a/libkmime/kmime_mdn.cpp +++ b/libkmime/kmime_mdn.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_mdn.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_mdn.h b/libkmime/kmime_mdn.h index 30fa238a..53959550 100644 --- a/libkmime/kmime_mdn.h +++ b/libkmime/kmime_mdn.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_mdn.h This file is part of KMime, the KDE internet mail/usenet news message library. @@ -35,7 +35,7 @@ #include <tqvaluelist.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQCString; @@ -178,7 +178,7 @@ namespace KMime { /** Main function. Generates the content of the message/disposition-notification body part. */ - KDE_EXPORT extern TQCString dispositionNotificationBodyContent( const TQString & finalRecipient, + TDE_EXPORT extern TQCString dispositionNotificationBodyContent( const TQString & finalRecipient, const TQCString & originalRecipient, const TQCString & originalMsgID, DispositionType disposition, @@ -188,7 +188,7 @@ namespace KMime { =TQValueList<DispositionModifier>(), const TQString & special=TQString() ); - KDE_EXPORT extern TQString descriptionFor( DispositionType d, + TDE_EXPORT extern TQString descriptionFor( DispositionType d, const TQValueList<DispositionModifier> & m =TQValueList<DispositionModifier>() ); diff --git a/libkmime/kmime_message.h b/libkmime/kmime_message.h index 8f6a0a39..0cfa2015 100644 --- a/libkmime/kmime_message.h +++ b/libkmime/kmime_message.h @@ -22,7 +22,7 @@ namespace KMime { -class KDE_EXPORT Message : public Content { +class TDE_EXPORT Message : public Content { public: typedef TQPtrList<Message> List; diff --git a/libkmime/kmime_newsarticle.h b/libkmime/kmime_newsarticle.h index bbca34d8..a7b9d35d 100644 --- a/libkmime/kmime_newsarticle.h +++ b/libkmime/kmime_newsarticle.h @@ -18,11 +18,11 @@ #include "kmime_message.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KMime { -class KDE_EXPORT NewsArticle : public Message { +class TDE_EXPORT NewsArticle : public Message { public: diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h index 4619446a..ff332c31 100644 --- a/libkmime/kmime_util.h +++ b/libkmime/kmime_util.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_util.h KMime, the KDE internet mail/usenet news message library. @@ -21,7 +21,7 @@ #include "tqcstring.h" #include "tqvaluelist.h" #include "time.h" -#include <tdepimmacros.h> +#include <kdemacros.h> typedef TQValueList<TQCString> QCStringList; @@ -29,14 +29,14 @@ namespace KMime { /** Consult the charset cache. Only used for reducing mem usage by keeping strings in a common repository.*/ - extern const char* cachedCharset(const TQCString &name) KDE_EXPORT; + extern const char* cachedCharset(const TQCString &name) TDE_EXPORT; /** Consult the language cache. Only used for reducing mem usage by keeping strings in a common repository.*/ - extern const char* cachedLanguage(const TQCString &name) KDE_EXPORT; + extern const char* cachedLanguage(const TQCString &name) TDE_EXPORT; /** checks whether @p s contains any non-us-ascii characters */ - extern bool isUsAscii(const TQString &s) KDE_EXPORT; + extern bool isUsAscii(const TQString &s) TDE_EXPORT; inline bool isOfSet(const uchar map[16], unsigned char ch) { Q_ASSERT( ch < 128 ); @@ -75,14 +75,14 @@ namespace KMime { @return the decoded string. */ extern TQString decodeRFC2047String(const TQCString &src, const char **usedCS, - const TQCString &defaultCS, bool forceCS) KDE_EXPORT; + const TQCString &defaultCS, bool forceCS) TDE_EXPORT; /** Decode string @p src according to RFC2047 (ie. the =?charset?[qb]?encoded?= construct). @param src source string. @return the decoded string. */ - extern TQString decodeRFC2047String(const TQCString &src) KDE_EXPORT; + extern TQString decodeRFC2047String(const TQCString &src) TDE_EXPORT; /** Encode string @p src according to RFC2047 using charset @p charset. @@ -95,7 +95,7 @@ namespace KMime { @return the encoded string. */ extern TQCString encodeRFC2047String(const TQString &src, const char *charset, - bool addressHeader=false, bool allow8bitHeaders=false) KDE_EXPORT; + bool addressHeader=false, bool allow8bitHeaders=false) TDE_EXPORT; /** Uses current time, pid and random numbers to construct a string that aims to be unique on a per-host basis (ie. for the local @@ -103,7 +103,7 @@ namespace KMime { @return the unique string. @see multiPartBoundary */ - extern TQCString uniqueString() KDE_EXPORT; + extern TQCString uniqueString() TDE_EXPORT; /** Constructs a random string (sans leading/trailing "--") that can be used as a multipart delimiter (ie. as @p boundary parameter @@ -111,7 +111,7 @@ namespace KMime { @return the randomized string. @see uniqueString */ - extern TQCString multiPartBoundary() KDE_EXPORT; + extern TQCString multiPartBoundary() TDE_EXPORT; /** Tries to extract the header with name @p name from the string @p src, unfolding it if necessary. @@ -120,7 +120,7 @@ namespace KMime { @return the first instance of the header @p name in @p src or a null TQCString if no such header was found. */ - extern TQCString extractHeader(const TQCString &src, const char *name) KDE_EXPORT; + extern TQCString extractHeader(const TQCString &src, const char *name) TDE_EXPORT; /** Converts all occurrences of "\r\n" (CRLF) in @p s to "\n" (LF). This function is expensive and should be used only if the mail @@ -130,7 +130,7 @@ namespace KMime { @return the string with CRLF's substitued for LF's @see CRLFtoLF(const char*) LFtoCRLF */ - extern TQCString CRLFtoLF(const TQCString &s) KDE_EXPORT; + extern TQCString CRLFtoLF(const TQCString &s) TDE_EXPORT; /** Converts all occurrences of "\r\n" (CRLF) in @p s to "\n" (LF). This function is expensive and should be used only if the mail @@ -140,7 +140,7 @@ namespace KMime { @return the string with CRLF's substitued for LF's @see CRLFtoLF(const TQCString&) LFtoCRLF */ - extern TQCString CRLFtoLF(const char *s) KDE_EXPORT; + extern TQCString CRLFtoLF(const char *s) TDE_EXPORT; /** Converts all occurrences of "\n" (LF) in @p s to "\r\n" (CRLF). This function is expensive and should be used only if the mail @@ -152,27 +152,27 @@ namespace KMime { @return the string with CRLF's substitued for LF's @see CRLFtoLF(const TQCString&) LFtoCRLF */ - extern TQCString LFtoCRLF(const TQCString &s) KDE_EXPORT; + extern TQCString LFtoCRLF(const TQCString &s) TDE_EXPORT; /** Removes quote (DQUOTE) characters and decodes "quoted-pairs" (ie. backslash-escaped characters) @param str the string to work on. @see addQuotes */ - KDE_EXPORT extern void removeQuots(TQCString &str); + TDE_EXPORT extern void removeQuots(TQCString &str); /** Removes quote (DQUOTE) characters and decodes "quoted-pairs" (ie. backslash-escaped characters) @param str the string to work on. @see addQuotes */ - KDE_EXPORT extern void removeQuots(TQString &str); + TDE_EXPORT extern void removeQuots(TQString &str); /** Converts the given string into a quoted-string if the string contains any special characters (ie. one of ()<>@,.;:[]=\"). @param str us-ascii string to work on. @param forceQuotes if @p true, always add quote characters. */ - KDE_EXPORT extern void addQuotes(TQCString &str, bool forceQuotes); + TDE_EXPORT extern void addQuotes(TQCString &str, bool forceQuotes); /** @@ -191,7 +191,7 @@ namespace KMime { * * */ - class KDE_EXPORT DateFormatter { + class TDE_EXPORT DateFormatter { public: enum FormatType { CTime, //< ctime "Sun Mar 31 02:08:35 2002" diff --git a/libkmime/kqcstringsplitter.h b/libkmime/kqcstringsplitter.h index 117f0510..964fd09d 100644 --- a/libkmime/kqcstringsplitter.h +++ b/libkmime/kqcstringsplitter.h @@ -19,9 +19,9 @@ #include <tqcstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> -class KDE_EXPORT KTQCStringSplitter { +class TDE_EXPORT KTQCStringSplitter { public: KTQCStringSplitter(); |