From d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 13:15:51 -0600 Subject: Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4 --- kio/kssl/ksslcertdlg.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kio/kssl/ksslcertdlg.h') diff --git a/kio/kssl/ksslcertdlg.h b/kio/kssl/ksslcertdlg.h index 314ae677d..8d6f3d777 100644 --- a/kio/kssl/ksslcertdlg.h +++ b/kio/kssl/ksslcertdlg.h @@ -40,7 +40,7 @@ class TQPushButton; * @see KSSL * @short KDE X.509 Certificate Dialog */ -class KIO_EXPORT KSSLCertDlg : public KDialog { +class TDEIO_EXPORT KSSLCertDlg : public KDialog { Q_OBJECT public: /** @@ -119,7 +119,7 @@ private: }; -class KIO_EXPORT KSSLCertDlgRet { +class TDEIO_EXPORT KSSLCertDlgRet { public: bool ok; TQString choice; @@ -131,8 +131,8 @@ protected: KSSLCertDlgRetPrivate *d; }; -KIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertDlgRet& r); -KIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r); +TDEIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertDlgRet& r); +TDEIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r); #endif -- cgit v1.2.1