Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4

22 files changed, 34 insertions, 34 deletions

diff --git a/kio/kssl/kopenssl.h b/kio/kssl/kopenssl.h
index 24130807a..59cf7b560 100644
--- a/kio/kssl/kopenssl.h
+++ b/kio/kssl/kopenssl.h
@@ -63,7 +63,7 @@ class KOpenSSLProxyPrivate;
  * @short KDE OpenSSL Wrapper
  * @internal
  */
-class KIO_EXPORT KOpenSSLProxy {
+class TDEIO_EXPORT KOpenSSLProxy {
 friend class KStaticDeleter<KOpenSSLProxy>;
 public:
 
diff --git a/kio/kssl/ksmimecrypto.h b/kio/kssl/ksmimecrypto.h
index 95d17a8a8..5f8e1da73 100644
--- a/kio/kssl/ksmimecrypto.h
+++ b/kio/kssl/ksmimecrypto.h
@@ -30,7 +30,7 @@
 class KOpenSSLProxy;
 class KSMIMECryptoPrivate;
 
-class KIO_EXPORT KSMIMECrypto {
+class TDEIO_EXPORT KSMIMECrypto {
  public:
     KSMIMECrypto();
     ~KSMIMECrypto();
diff --git a/kio/kssl/kssl.h b/kio/kssl/kssl.h
index ffb217980..e10b10eaf 100644
--- a/kio/kssl/kssl.h
+++ b/kio/kssl/kssl.h
@@ -39,7 +39,7 @@ class KSSLSession;
  * @see KExtendedSocket, TCPSlaveBase
  * @short KDE SSL Class
  */
-class KIO_EXPORT KSSL {
+class TDEIO_EXPORT KSSL {
 public:
 	/**
 	 *  Construct a KSSL object
diff --git a/kio/kssl/ksslcertchain.h b/kio/kssl/ksslcertchain.h
index c7e9f3c8f..eb6c27d44 100644
--- a/kio/kssl/ksslcertchain.h
+++ b/kio/kssl/ksslcertchain.h
@@ -42,7 +42,7 @@ class TQStringList;
  * @see KSSL, KSSLCertificate, KSSLPeerInfo
  * @short KDE X.509 Certificate Chain
  */
-class KIO_EXPORT KSSLCertChain {
+class TDEIO_EXPORT KSSLCertChain {
 friend class KSSL;
 friend class KSSLPeerInfo;
 
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
 
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
diff --git a/kio/kssl/ksslcertificatecache.h b/kio/kssl/ksslcertificatecache.h
index 486997265..924cb0f54 100644
--- a/kio/kssl/ksslcertificatecache.h
+++ b/kio/kssl/ksslcertificatecache.h
@@ -28,7 +28,7 @@ class KSSLCertificate;
 
 #include <tdelibs_export.h>
 
-class KIO_EXPORT KSSLCertificateCache {
+class TDEIO_EXPORT KSSLCertificateCache {
 public:
 
 enum KSSLCertificatePolicy { Unknown, Reject, Accept, Prompt, Ambiguous };
@@ -101,7 +101,7 @@ private:
 };
 
 
-KIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificateCache::KSSLCertificatePolicy& p);
-KIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p);
+TDEIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificateCache::KSSLCertificatePolicy& p);
+TDEIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p);
 
 #endif
diff --git a/kio/kssl/ksslcertificatefactory.h b/kio/kssl/ksslcertificatefactory.h
index c259e60e8..503c591a7 100644
--- a/kio/kssl/ksslcertificatefactory.h
+++ b/kio/kssl/ksslcertificatefactory.h
@@ -29,7 +29,7 @@ class KSSLCertificate;
 
 typedef enum {KEYTYPE_UNKNOWN, KEYTYPE_RSA, KEYTYPE_DSA} KSSLKeyType;
 
-class KIO_EXPORT KSSLCertificateFactory {
+class TDEIO_EXPORT KSSLCertificateFactory {
  
 public:
 
diff --git a/kio/kssl/ksslcertificatehome.h b/kio/kssl/ksslcertificatehome.h
index 549d7c168..f8a18a423 100644
--- a/kio/kssl/ksslcertificatehome.h
+++ b/kio/kssl/ksslcertificatehome.h
@@ -28,7 +28,7 @@ class KSSLPKCS12;
 
 #include <tdelibs_export.h>
 
-class KIO_EXPORT KSSLCertificateHome {
+class TDEIO_EXPORT KSSLCertificateHome {
  
 public:
 
diff --git a/kio/kssl/ksslconnectioninfo.h b/kio/kssl/ksslconnectioninfo.h
index e9bbad831..09fd5cdae 100644
--- a/kio/kssl/ksslconnectioninfo.h
+++ b/kio/kssl/ksslconnectioninfo.h
@@ -37,7 +37,7 @@ class KSSL;
  * @see KSSL
  * @short KDE SSL Connection Information
  */
-class KIO_EXPORT KSSLConnectionInfo {
+class TDEIO_EXPORT KSSLConnectionInfo {
 friend class KSSL;
 public:
 	/**
diff --git a/kio/kssl/ksslcsessioncache.h b/kio/kssl/ksslcsessioncache.h
index 4cfc77aaf..9badfe279 100644
--- a/kio/kssl/ksslcsessioncache.h
+++ b/kio/kssl/ksslcsessioncache.h
@@ -26,7 +26,7 @@
 class KURL;
 class TQString;
 
-class KIO_EXPORT KSSLCSessionCache {
+class TDEIO_EXPORT KSSLCSessionCache {
  public:
 
     /**
diff --git a/kio/kssl/ksslinfodlg.h b/kio/kssl/ksslinfodlg.h
index 4bd00a9e5..c73afbba1 100644
--- a/kio/kssl/ksslinfodlg.h
+++ b/kio/kssl/ksslinfodlg.h
@@ -47,7 +47,7 @@ class KSSLCertChain;
  * @see KSSL
  * @short KDE SSL Information Dialog
  */
-class KIO_EXPORT KSSLInfoDlg : public KDialog {
+class TDEIO_EXPORT KSSLInfoDlg : public KDialog {
 	Q_OBJECT
 public:
 	/**
@@ -146,7 +146,7 @@ private slots:
  * @see KSSLInfoDlg
  * @short KDE SSL Certificate Box
  */
-class KIO_EXPORT KSSLCertBox : public TQScrollView {
+class TDEIO_EXPORT KSSLCertBox : public TQScrollView {
 public:
 	/**
 	 *  Construct a certificate box
diff --git a/kio/kssl/ksslkeygen.h b/kio/kssl/ksslkeygen.h
index cd1d8e7ab..5bb99a593 100644
--- a/kio/kssl/ksslkeygen.h
+++ b/kio/kssl/ksslkeygen.h
@@ -41,7 +41,7 @@ class KGWizardPage2;
  * @see KSSL, KSSLCertificate, KSSLPKCS12
  * @short KDE Key Generation Dialog
  */
-class KIO_EXPORT KSSLKeyGen : public KWizard {
+class TDEIO_EXPORT KSSLKeyGen : public KWizard {
 	Q_OBJECT
 public:
 	/**
diff --git a/kio/kssl/ksslpeerinfo.h b/kio/kssl/ksslpeerinfo.h
index bdcf91231..a5cd017c9 100644
--- a/kio/kssl/ksslpeerinfo.h
+++ b/kio/kssl/ksslpeerinfo.h
@@ -39,7 +39,7 @@ class KInetSocketAddress;
  * @see KSSL
  * @short KDE SSL Peer Data
  */
-class KIO_EXPORT KSSLPeerInfo {
+class TDEIO_EXPORT KSSLPeerInfo {
 friend class KSSL;
 public:
 	/**
diff --git a/kio/kssl/ksslpemcallback.h b/kio/kssl/ksslpemcallback.h
index 0a8978b6e..265edd099 100644
--- a/kio/kssl/ksslpemcallback.h
+++ b/kio/kssl/ksslpemcallback.h
@@ -23,7 +23,7 @@
 
 #include <tdelibs_export.h>
 
-int KIO_EXPORT KSSLPemCallback(char *buf, int size, int rwflag, void *userdata);
+int TDEIO_EXPORT KSSLPemCallback(char *buf, int size, int rwflag, void *userdata);
 
 #endif
 
diff --git a/kio/kssl/ksslpkcs12.h b/kio/kssl/ksslpkcs12.h
index bfbd78d3e..c9dff0d82 100644
--- a/kio/kssl/ksslpkcs12.h
+++ b/kio/kssl/ksslpkcs12.h
@@ -58,7 +58,7 @@ class KOpenSSLProxy;
  * @see KSSL, KSSLCertificate
  * @short KDE PKCS#12 Certificate
  */
-class KIO_EXPORT KSSLPKCS12 {
+class TDEIO_EXPORT KSSLPKCS12 {
 friend class KSSL;
 
 public:
diff --git a/kio/kssl/ksslpkcs7.h b/kio/kssl/ksslpkcs7.h
index 07c221464..c94b7bc7a 100644
--- a/kio/kssl/ksslpkcs7.h
+++ b/kio/kssl/ksslpkcs7.h
@@ -57,7 +57,7 @@ class KOpenSSLProxy;
  * @see KSSL
  * @short KDE PKCS#7 Certificate
  */
-class KIO_EXPORT KSSLPKCS7 {
+class TDEIO_EXPORT KSSLPKCS7 {
 friend class KSSL;
 
 public:
diff --git a/kio/kssl/ksslsession.h b/kio/kssl/ksslsession.h
index d8689833f..394a4b91a 100644
--- a/kio/kssl/ksslsession.h
+++ b/kio/kssl/ksslsession.h
@@ -39,7 +39,7 @@ class KSSLSessionPrivate;
  * @see KSSL
  * @short KDE SSL Session Information
  */
-class KIO_EXPORT KSSLSession {
+class TDEIO_EXPORT KSSLSession {
 friend class KSSL;
 public:
 	/**
diff --git a/kio/kssl/ksslsettings.h b/kio/kssl/ksslsettings.h
index 1b56a7a3a..18dd31249 100644
--- a/kio/kssl/ksslsettings.h
+++ b/kio/kssl/ksslsettings.h
@@ -36,7 +36,7 @@ class KSSLSettingsPrivate;
  * @see KSSL
  * @short KDE SSL Settings
  */
-class KIO_EXPORT KSSLSettings {
+class TDEIO_EXPORT KSSLSettings {
 public:
 	/**
 	 *  Construct a KSSL Settings object
diff --git a/kio/kssl/ksslsigners.h b/kio/kssl/ksslsigners.h
index 21744f1de..3149e852a 100644
--- a/kio/kssl/ksslsigners.h
+++ b/kio/kssl/ksslsigners.h
@@ -40,7 +40,7 @@ class DCOPClient;
  * @see KSSL, KSSLCertificate
  * @short KDE SSL Signer Database
  */
-class KIO_EXPORT KSSLSigners {
+class TDEIO_EXPORT KSSLSigners {
 public:
 	/**
 	 *  Construct a KSSLSigner object.
diff --git a/kio/kssl/ksslx509map.h b/kio/kssl/ksslx509map.h
index 93c46aeec..f76413100 100644
--- a/kio/kssl/ksslx509map.h
+++ b/kio/kssl/ksslx509map.h
@@ -36,7 +36,7 @@
  * @see KSSL, KSSLCertificate
  * @short X.509 Map Parser
  */
-class KIO_EXPORT KSSLX509Map {
+class TDEIO_EXPORT KSSLX509Map {
 public:
 	/**
 	 *  Construct an X.509 Map
diff --git a/kio/kssl/ksslx509v3.h b/kio/kssl/ksslx509v3.h
index 45c7d706e..c521f3e25 100644
--- a/kio/kssl/ksslx509v3.h
+++ b/kio/kssl/ksslx509v3.h
@@ -35,7 +35,7 @@
  * @see KExtendedSocket, TCPSlaveBase
  * @short KDE SSL Class
  */
-class KIO_EXPORT KSSLX509V3 {
+class TDEIO_EXPORT KSSLX509V3 {
 friend class KSSLCertificate;
 friend class KSSLCertificatePrivate;
 public: