diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 13:15:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 13:15:51 -0600 |
| commit | d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e (patch) | |
| tree | ecd8c94dc36cb35dd4810a2b05d1b78bb969e143 /kio/kssl/ksslcertificate.h | |
| parent | 703fb0c89c2eee56a1e613e67a446db9d4287929 (diff) | |
| download | tdelibs-d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e.tar.gz tdelibs-d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e.zip | |
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'kio/kssl/ksslcertificate.h')
| -rw-r--r-- | kio/kssl/ksslcertificate.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kio/kssl/ksslcertificate.h b/kio/kssl/ksslcertificate.h index a7906581a..0c5f87323 100644 --- a/kio/kssl/ksslcertificate.h +++ b/kio/kssl/ksslcertificate.h @@ -72,7 +72,7 @@ class X509; * @see KSSL * @short KDE X.509 Certificate */ -class KIO_EXPORT KSSLCertificate { +class TDEIO_EXPORT KSSLCertificate { friend class KSSL; friend class KSSLCertificateHome; friend class KSSLCertificateFactory; @@ -350,8 +350,8 @@ public: static TQString getMD5DigestFromKDEKey(const TQString& k); private: - KIO_EXPORT friend int operator!=(KSSLCertificate& x, KSSLCertificate& y); - KIO_EXPORT friend int operator==(KSSLCertificate& x, KSSLCertificate& y); + TDEIO_EXPORT friend int operator!=(KSSLCertificate& x, KSSLCertificate& y); + TDEIO_EXPORT friend int operator==(KSSLCertificate& x, KSSLCertificate& y); KSSLCertificatePrivate *d; int purposeToOpenSSL(KSSLPurpose p) const; @@ -365,11 +365,11 @@ protected: KSSLValidation processError(int ec); }; -KIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificate& r); -KIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificate& r); +TDEIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificate& r); +TDEIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificate& r); -KIO_EXPORT int operator==(KSSLCertificate& x, KSSLCertificate& y); -KIO_EXPORT inline int operator!=(KSSLCertificate& x, KSSLCertificate& y) +TDEIO_EXPORT int operator==(KSSLCertificate& x, KSSLCertificate& y); +TDEIO_EXPORT inline int operator!=(KSSLCertificate& x, KSSLCertificate& y) { return !(x == y); } #endif |