diff options
Diffstat (limited to 'libkpimidentities/identity.h')
| -rw-r--r-- | libkpimidentities/identity.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h index 2cc4ec4e..31deaca7 100644 --- a/libkpimidentities/identity.h +++ b/libkpimidentities/identity.h @@ -9,7 +9,7 @@ #include <kleo/enum.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqstring.h> #include <tqcstring.h> @@ -26,17 +26,17 @@ class TQDataStream; namespace KPIM { -KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Signature & sig ); -KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Signature & sig ); +TDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Signature & sig ); +TDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Signature & sig ); -KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Identity & ident ); -KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Identity & ident ); +TDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Identity & ident ); +TDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Identity & ident ); /** * @short abstraction of a signature (aka "footer"). * @author Marc Mutz <mutz@kde.org> */ -class KDE_EXPORT Signature { +class TDE_EXPORT Signature { friend class Identity; friend TQDataStream & KPIM::operator<<( TQDataStream & stream, const Signature & sig ); @@ -92,7 +92,7 @@ private: }; /** User identity information */ -class KDE_EXPORT Identity +class TDE_EXPORT Identity { // only the identity manager should be able to construct and // destruct us, but then we get into problems with using @@ -186,8 +186,8 @@ public: TQString organization() const { return mOrganization; } void setOrganization(const TQString&); - KDE_DEPRECATED TQCString pgpIdentity() const { return pgpEncryptionKey(); } - KDE_DEPRECATED void setPgpIdentity( const TQCString & key ) { + TDE_DEPRECATED TQCString pgpIdentity() const { return pgpEncryptionKey(); } + TDE_DEPRECATED void setPgpIdentity( const TQCString & key ) { setPGPEncryptionKey( key ); setPGPSigningKey( key ); } @@ -212,8 +212,8 @@ public: void setPreferredCryptoMessageFormat( Kleo::CryptoMessageFormat format ) { mPreferredCryptoMessageFormat = format; } /** email address (without the user name - only name\@host) */ - KDE_DEPRECATED TQString emailAddr() const { return primaryEmailAddress(); } - KDE_DEPRECATED void setEmailAddr( const TQString & email ) { setPrimaryEmailAddress( email ); } + TDE_DEPRECATED TQString emailAddr() const { return primaryEmailAddress(); } + TDE_DEPRECATED void setEmailAddr( const TQString & email ) { setPrimaryEmailAddress( email ); } /** primary email address (without the user name - only name\@host). The primary email address is used for all outgoing mail. */ |