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

196 files changed, 579 insertions, 579 deletions

diff --git a/arts/kde/artskde.idl b/arts/kde/artskde.idl
index f31b49ed4..f1de50924 100644
--- a/arts/kde/artskde.idl
+++ b/arts/kde/artskde.idl
@@ -12,7 +12,7 @@ interface KFloatWatchProxy {
 /* 
  * used for deliviering MCOP data to the playobjects
  */
-interface KIOInputStream : InputStream {
+interface TDEIOInputStream : InputStream {
 	boolean openURL(string url);
 	
 	attribute long bufferPackets;
diff --git a/arts/kde/kaudioconverter.cc b/arts/kde/kaudioconverter.cc
index adda3033a..c5a526db6 100644
--- a/arts/kde/kaudioconverter.cc
+++ b/arts/kde/kaudioconverter.cc
@@ -81,12 +81,12 @@ void KAudioConverter::requestPlayObject(const KURL &url)
 {	
 	string queryInterface = "Arts::PlayObject";
 	
-	Arts::KIOInputStream inputStream;
+	Arts::TDEIOInputStream inputStream;
 	
 	if(!url.isLocalFile())
 	{
-		Arts::KIOInputStream_impl *inputStreamImpl = new Arts::KIOInputStream_impl();
-		inputStream = Arts::KIOInputStream::_from_base(inputStreamImpl);
+		Arts::TDEIOInputStream_impl *inputStreamImpl = new Arts::TDEIOInputStream_impl();
+		inputStream = Arts::TDEIOInputStream::_from_base(inputStreamImpl);
 
 		TQObject::connect(inputStreamImpl, TQT_SIGNAL(mimeTypeFound(const TQString &)), TQT_SLOT(slotMimeType(const TQString &)));
 
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index ab215a585..4ff509980 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -41,9 +41,9 @@
 
 using namespace Arts;
 
-const unsigned int KIOInputStream_impl::PACKET_COUNT = 10;
+const unsigned int TDEIOInputStream_impl::PACKET_COUNT = 10;
 
-KIOInputStream_impl::KIOInputStream_impl() : m_packetSize(2048)
+TDEIOInputStream_impl::TDEIOInputStream_impl() : m_packetSize(2048)
 {
 	m_job = 0;
 	m_finished = false;
@@ -55,13 +55,13 @@ KIOInputStream_impl::KIOInputStream_impl() : m_packetSize(2048)
 	m_size = 0;
 }
 
-KIOInputStream_impl::~KIOInputStream_impl()
+TDEIOInputStream_impl::~TDEIOInputStream_impl()
 {
 	if(m_job != 0)
 	    m_job->kill();
 }
 
-void KIOInputStream_impl::streamStart()
+void TDEIOInputStream_impl::streamStart()
 {
 	// prevent kill/reconnect
 	if (m_streamStarted) {
@@ -92,7 +92,7 @@ void KIOInputStream_impl::streamStart()
 	m_streamStarted = true;
 }
 
-void KIOInputStream_impl::streamEnd()
+void TDEIOInputStream_impl::streamEnd()
 {
 	kdDebug( 400 ) << "streamEnd()\n";
 
@@ -117,14 +117,14 @@ void KIOInputStream_impl::streamEnd()
 	m_streamStarted = false;
 }
 
-bool KIOInputStream_impl::openURL(const std::string& url)
+bool TDEIOInputStream_impl::openURL(const std::string& url)
 {
 	m_url = KURL(url.c_str());
 	m_size = 0;
 	return true;
 }
 
-void KIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data)
+void TDEIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data)
 {
 	if(m_finished)
 	    m_finished = false;
@@ -136,7 +136,7 @@ void KIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data)
 	processQueue();
 }
 
-void KIOInputStream_impl::slotResult(TDEIO::Job *job)
+void TDEIOInputStream_impl::slotResult(TDEIO::Job *job)
 {
 	// jobs delete themselves after emitting their result
 	m_finished = true;
@@ -151,38 +151,38 @@ void KIOInputStream_impl::slotResult(TDEIO::Job *job)
 	}
 }
 
-void KIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype)
+void TDEIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype)
 {
 	kdDebug( 400 ) << "got mimetype: " << mimetype << endl;
 	emit mimeTypeFound(mimetype);
 }
 
-void KIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size)
+void TDEIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size)
 {
 	m_size = size;
 }
 
-bool KIOInputStream_impl::eof()
+bool TDEIOInputStream_impl::eof()
 {
 	return (m_finished && m_data.size() == 0);
 }
 
-bool KIOInputStream_impl::seekOk()
+bool TDEIOInputStream_impl::seekOk()
 {
 	return false;
 }
 
-long KIOInputStream_impl::size()
+long TDEIOInputStream_impl::size()
 {
 	return m_size ? m_size : m_data.size();
 }
 
-long KIOInputStream_impl::seek(long)
+long TDEIOInputStream_impl::seek(long)
 {
 	return -1;
 }
 
-void KIOInputStream_impl::processQueue()
+void TDEIOInputStream_impl::processQueue()
 {
 	if(m_job != 0)
 	{
@@ -210,7 +210,7 @@ void KIOInputStream_impl::processQueue()
 	}
 }
 
-void KIOInputStream_impl::request_outdata(DataPacket<mcopbyte> *packet)
+void TDEIOInputStream_impl::request_outdata(DataPacket<mcopbyte> *packet)
 {
 	processQueue();
 	packet->size = std::min(m_packetSize, (unsigned int)m_data.size());
@@ -233,4 +233,4 @@ void KIOInputStream_impl::request_outdata(DataPacket<mcopbyte> *packet)
 	packet->send();
 }
 
-REGISTER_IMPLEMENTATION(KIOInputStream_impl);
+REGISTER_IMPLEMENTATION(TDEIOInputStream_impl);
diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h
index 06052e04b..d0a872881 100644
--- a/arts/kde/kioinputstream_impl.h
+++ b/arts/kde/kioinputstream_impl.h
@@ -31,14 +31,14 @@
 
 namespace Arts {
 
-class KIOInputStream_impl : public TQObject, virtual public KIOInputStream_skel, 
+class TDEIOInputStream_impl : public TQObject, virtual public TDEIOInputStream_skel, 
 					    virtual public InputStream_skel,
 					    virtual public StdSynthModule
 {
 Q_OBJECT
 public:
-	KIOInputStream_impl();
-	~KIOInputStream_impl();
+	TDEIOInputStream_impl();
+	~TDEIOInputStream_impl();
 	
 	void streamStart();	
 	void streamEnd();
diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc
index 826a3b165..f838c4f77 100644
--- a/arts/kde/kiotest.cc
+++ b/arts/kde/kiotest.cc
@@ -27,7 +27,7 @@ int main(int argc, char **argv)
 	TDEApplication app;
 	QIOManager qiomanager;
 	Dispatcher dispatcher(&qiomanager);
-	KIOInputStream stream;
+	TDEIOInputStream stream;
 	StdoutWriter writer;
 
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc
index e367ea924..ffb71d8b1 100644
--- a/arts/kde/kiotestslow.cc
+++ b/arts/kde/kiotestslow.cc
@@ -96,7 +96,7 @@ int main(int argc, char **argv)
 	QIOManager qiomanager;
 	Dispatcher dispatcher(&qiomanager);
 #ifndef USE_FILEINPUTSTREAM
-	KIOInputStream stream;
+	TDEIOInputStream stream;
 #else
 	FileInputStream stream;
 #endif
diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h
index 4aafe0b58..f5bd849be 100644
--- a/arts/kde/kplayobject.h
+++ b/arts/kde/kplayobject.h
@@ -126,7 +126,7 @@ class PlayObjectFactory;
   * This class acts as a general interface to the KDE multimedia framework.
   * You basically point the Playobject to an URL and say "play", and it will
   * automatically decode and play and / or display the file or stream.
-  * For non-local media, it will make extensive use of KIOInputStream to
+  * For non-local media, it will make extensive use of TDEIOInputStream to
   * directly play the content from the remote location without having to
   * download it to a temporary local file first.
   *
diff --git a/arts/kde/kplayobjectcreator.cc b/arts/kde/kplayobjectcreator.cc
index b1969718e..2e8187e67 100644
--- a/arts/kde/kplayobjectcreator.cc
+++ b/arts/kde/kplayobjectcreator.cc
@@ -53,8 +53,8 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj
 		m_createBUS = createBUS;
 
 		// This is the RightWay(tm) according to stw
-		Arts::KIOInputStream_impl* instream_impl = new Arts::KIOInputStream_impl();
-		m_instream = Arts::KIOInputStream::_from_base(instream_impl);
+		Arts::TDEIOInputStream_impl* instream_impl = new Arts::TDEIOInputStream_impl();
+		m_instream = Arts::TDEIOInputStream::_from_base(instream_impl);
 
 		// signal will be called once the ioslave knows the mime-type of the stream
 		connect(instream_impl, TQT_SIGNAL(mimeTypeFound(const TQString &)),
diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h
index d52e18a1e..74e571c8e 100644
--- a/arts/kde/kplayobjectcreator.h
+++ b/arts/kde/kplayobjectcreator.h
@@ -46,7 +46,7 @@ private slots:
 
 private:
 	Arts::SoundServerV2 m_server;
-	Arts::KIOInputStream m_instream;
+	Arts::TDEIOInputStream m_instream;
 	Arts::PlayObject playObject;
 	bool m_createBUS;
 };
diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc
index c09692946..db4110792 100644
--- a/arts/kde/kplayobjectfactory.cc
+++ b/arts/kde/kplayobjectfactory.cc
@@ -75,7 +75,7 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const TQStri
 	{
 		if(mimetype == "application/octet-stream" && m_allowStreaming)
 		{
-			Arts::KIOInputStream instream;
+			Arts::TDEIOInputStream instream;
 			instream.openURL(url.url().latin1());
 
 			m_stream = true;
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
index 7ecd14554..85b9b12b0 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
@@ -45,7 +45,7 @@
 
 using namespace KABC;
 
-ResourceLDAPKIOConfig::ResourceLDAPKIOConfig( TQWidget* parent,  const char* name )
+ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent,  const char* name )
   : KRES::ConfigWidget( parent, name )
 {
   TQBoxLayout *mainLayout = new TQVBoxLayout( this );
@@ -62,12 +62,12 @@ ResourceLDAPKIOConfig::ResourceLDAPKIOConfig( TQWidget* parent,  const char* nam
   connect( mCacheButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCache() ) );
 }
 
-void ResourceLDAPKIOConfig::loadSettings( KRES::Resource *res )
+void ResourceLDAPTDEIOConfig::loadSettings( KRES::Resource *res )
 {
   ResourceLDAPKIO *resource = dynamic_cast<ResourceLDAPKIO*>( res );
   
   if ( !resource ) {
-    kdDebug(5700) << "ResourceLDAPKIOConfig::loadSettings(): cast failed" << endl;
+    kdDebug(5700) << "ResourceLDAPTDEIOConfig::loadSettings(): cast failed" << endl;
     return;
   }
 
@@ -98,12 +98,12 @@ void ResourceLDAPKIOConfig::loadSettings( KRES::Resource *res )
   mAutoCache = resource->autoCache();
 }
 
-void ResourceLDAPKIOConfig::saveSettings( KRES::Resource *res )
+void ResourceLDAPTDEIOConfig::saveSettings( KRES::Resource *res )
 {
   ResourceLDAPKIO *resource = dynamic_cast<ResourceLDAPKIO*>( res );
   
   if ( !resource ) {
-    kdDebug(5700) << "ResourceLDAPKIOConfig::saveSettings(): cast failed" << endl;
+    kdDebug(5700) << "ResourceLDAPTDEIOConfig::saveSettings(): cast failed" << endl;
     return;
   }
 
@@ -131,7 +131,7 @@ void ResourceLDAPKIOConfig::saveSettings( KRES::Resource *res )
 
 }
 
-void ResourceLDAPKIOConfig::editAttributes()
+void ResourceLDAPTDEIOConfig::editAttributes()
 {
   AttributesDialog dlg( mAttributes, mRDNPrefix, this );
   if ( dlg.exec() ) {
@@ -140,7 +140,7 @@ void ResourceLDAPKIOConfig::editAttributes()
   }
 }
 
-void ResourceLDAPKIOConfig::editCache()
+void ResourceLDAPTDEIOConfig::editCache()
 {
   LDAPUrl src;
   TQStringList attr;
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.h b/kabc/plugins/ldapkio/resourceldapkioconfig.h
index f8e0003ec..e14c7c428 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.h
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.h
@@ -42,12 +42,12 @@ class KLineEdit;
 
 namespace KABC {
 
-class KABC_EXPORT ResourceLDAPKIOConfig : public KRES::ConfigWidget
+class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
 
   public:
-    ResourceLDAPKIOConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceLDAPTDEIOConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp
index 975837bf8..7edb90e22 100644
--- a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp
@@ -31,6 +31,6 @@ extern "C"
   KDE_EXPORT void *init_kabc_ldapkio()
   {
     TDEGlobal::locale()->insertCatalogue("kabc_ldapkio");
-    return new KRES::PluginFactory<ResourceLDAPKIO, ResourceLDAPKIOConfig>();
+    return new KRES::PluginFactory<ResourceLDAPKIO, ResourceLDAPTDEIOConfig>();
   }
 }
diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index a82a80a0e..9d8b0ac4f 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -87,7 +87,7 @@
 
 class JSStackFrame;
 
-typedef TQMap< int, KJavaKIOJob* > KIOJobMap;
+typedef TQMap< int, KJavaTDEIOJob* > TDEIOJobMap;
 typedef TQMap< int, JSStackFrame* > JSStack;
 
 class JSStackFrame {
@@ -121,7 +121,7 @@ private:
    TQMap< int, TQGuardedPtr<KJavaAppletContext> > contexts;
    TQString appletLabel;
    JSStack jsstack;
-   KIOJobMap kiojobs;
+   TDEIOJobMap kiojobs;
    bool javaProcessFailed;
    bool useKIO;
    KSSL * kssl;
@@ -448,7 +448,7 @@ void KJavaAppletServer::sendURLData( int loaderID, int code, const TQByteArray&
 
 void KJavaAppletServer::removeDataJob( int loaderID )
 {
-    const KIOJobMap::iterator it = d->kiojobs.find( loaderID );
+    const TDEIOJobMap::iterator it = d->kiojobs.find( loaderID );
     if (it != d->kiojobs.end()) {
         it.data()->deleteLater();
         d->kiojobs.erase( it );
@@ -502,7 +502,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
     if (cmd_code == KJAS_PUT_DATA) {
         // rest of the data is for kio put
         if (ok) {
-            KIOJobMap::iterator it = d->kiojobs.find( ID_num );
+            TDEIOJobMap::iterator it = d->kiojobs.find( ID_num );
             if (ok && it != d->kiojobs.end()) {
                 TQByteArray qba;
                 qba.setRawData(qb.data() + index, qb.size() - index - 1);
@@ -565,7 +565,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
         case KJAS_DATA_COMMAND:
             if (ok && !args.empty()) {
                 const int cmd = args.first().toInt( &ok );
-                KIOJobMap::iterator it = d->kiojobs.find( ID_num );
+                TDEIOJobMap::iterator it = d->kiojobs.find( ID_num );
                 if (ok && it != d->kiojobs.end())
                     it.data()->jobCommand( cmd );
                 kdDebug(6100) << "KIO Data command: " << ID_num << " " << args.first() << endl;
diff --git a/khtml/java/kjavadownloader.cpp b/khtml/java/kjavadownloader.cpp
index a12b585b7..a0a8abdd2 100644
--- a/khtml/java/kjavadownloader.cpp
+++ b/khtml/java/kjavadownloader.cpp
@@ -41,9 +41,9 @@ static const int KJAS_STOP = 0;
 static const int KJAS_HOLD = 1;
 static const int KJAS_RESUME = 2;
 
-KJavaKIOJob::~KJavaKIOJob() {}
+KJavaTDEIOJob::~KJavaTDEIOJob() {}
 
-void KJavaKIOJob::data( const TQByteArray& )
+void KJavaTDEIOJob::data( const TQByteArray& )
 {
     kdError(6100) << "Job id mixup" << endl;
 }
diff --git a/khtml/java/kjavadownloader.h b/khtml/java/kjavadownloader.h
index ab6553398..22690824c 100644
--- a/khtml/java/kjavadownloader.h
+++ b/khtml/java/kjavadownloader.h
@@ -40,16 +40,16 @@ namespace TDEIO {
 class KJavaDownloaderPrivate;
 class KJavaUploaderPrivate;
 
-class KJavaKIOJob : public TQObject
+class KJavaTDEIOJob : public TQObject
 {
 Q_OBJECT
 public:
-    virtual ~KJavaKIOJob();
+    virtual ~KJavaTDEIOJob();
     virtual void jobCommand( int cmd ) = 0;
     virtual void data( const TQByteArray& qb );
 };
 
-class KJavaDownloader : public KJavaKIOJob
+class KJavaDownloader : public KJavaTDEIOJob
 {
 Q_OBJECT
 
@@ -69,7 +69,7 @@ private:
 
 };
 
-class KJavaUploader : public KJavaKIOJob
+class KJavaUploader : public KJavaTDEIOJob
 {
 Q_OBJECT
 
diff --git a/kio/bookmarks/kbookmark.h b/kio/bookmarks/kbookmark.h
index 84f177522..4e5dc9149 100644
--- a/kio/bookmarks/kbookmark.h
+++ b/kio/bookmarks/kbookmark.h
@@ -28,7 +28,7 @@
 class KBookmarkManager;
 class KBookmarkGroup;
 
-class KIO_EXPORT KBookmark
+class TDEIO_EXPORT KBookmark
 {
     friend class KBookmarkGroup;
 public:
@@ -196,7 +196,7 @@ private:
 /**
  * A group of bookmarks
  */
-class KIO_EXPORT KBookmarkGroup : public KBookmark
+class TDEIO_EXPORT KBookmarkGroup : public KBookmark
 {
 public:
     /**
@@ -315,7 +315,7 @@ private:
 /**
  * @since 3.2
  */
-class KIO_EXPORT KBookmarkGroupTraverser {
+class TDEIO_EXPORT KBookmarkGroupTraverser {
 protected:
     virtual ~KBookmarkGroupTraverser() { ; }
     void traverse(const KBookmarkGroup &);
diff --git a/kio/bookmarks/kbookmarkbar.h b/kio/bookmarks/kbookmarkbar.h
index 310c1933d..1f100d183 100644
--- a/kio/bookmarks/kbookmarkbar.h
+++ b/kio/bookmarks/kbookmarkbar.h
@@ -39,7 +39,7 @@ class TQPopupMenu;
  * identical to using KBookmarkMenu so follow the directions
  * there.
  */
-class KIO_EXPORT KBookmarkBar : public TQObject
+class TDEIO_EXPORT KBookmarkBar : public TQObject
 {
     Q_OBJECT
     
diff --git a/kio/bookmarks/kbookmarkdombuilder.h b/kio/bookmarks/kbookmarkdombuilder.h
index f1f712531..44fe7b170 100644
--- a/kio/bookmarks/kbookmarkdombuilder.h
+++ b/kio/bookmarks/kbookmarkdombuilder.h
@@ -27,7 +27,7 @@
 /**
  * @since 3.2
  */
-class KIO_EXPORT KBookmarkDomBuilder : public TQObject {
+class TDEIO_EXPORT KBookmarkDomBuilder : public TQObject {
    Q_OBJECT
 public:
    KBookmarkDomBuilder(const KBookmarkGroup &group, KBookmarkManager *);
diff --git a/kio/bookmarks/kbookmarkdrag.h b/kio/bookmarks/kbookmarkdrag.h
index c213f2d93..016bd6849 100644
--- a/kio/bookmarks/kbookmarkdrag.h
+++ b/kio/bookmarks/kbookmarkdrag.h
@@ -25,7 +25,7 @@
 #include <kbookmark.h>
 
 // Clipboard/dnd data : URLs + XML for bookmarks
-class KIO_EXPORT KBookmarkDrag : public TQUriDrag
+class TDEIO_EXPORT KBookmarkDrag : public TQUriDrag
 {
 public:
     static KBookmarkDrag * newDrag( const TQValueList<KBookmark> & bookmarks,
diff --git a/kio/bookmarks/kbookmarkexporter.h b/kio/bookmarks/kbookmarkexporter.h
index 0943d6cbe..68e8f475a 100644
--- a/kio/bookmarks/kbookmarkexporter.h
+++ b/kio/bookmarks/kbookmarkexporter.h
@@ -29,7 +29,7 @@
 /**
  * @since 3.2
  */
-class KIO_EXPORT KBookmarkExporterBase
+class TDEIO_EXPORT KBookmarkExporterBase
 {
 public:
     KBookmarkExporterBase(KBookmarkManager* mgr, const TQString & fileName)
diff --git a/kio/bookmarks/kbookmarkimporter.h b/kio/bookmarks/kbookmarkimporter.h
index 8fb684c7e..cc87b2004 100644
--- a/kio/bookmarks/kbookmarkimporter.h
+++ b/kio/bookmarks/kbookmarkimporter.h
@@ -34,7 +34,7 @@
  * and KActionMenu uses it to create actions directly.
  * @since 3.2
  */
-class KIO_EXPORT KBookmarkImporterBase : public TQObject
+class TDEIO_EXPORT KBookmarkImporterBase : public TQObject
 {
     Q_OBJECT
 public:
@@ -84,7 +84,7 @@ private:
 /**
  * A class for importing XBEL files
  */
-class KIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser
+class TDEIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser
 {
     Q_OBJECT
 public:
diff --git a/kio/bookmarks/kbookmarkimporter_crash.h b/kio/bookmarks/kbookmarkimporter_crash.h
index a5ae08d96..f4fc9af32 100644
--- a/kio/bookmarks/kbookmarkimporter_crash.h
+++ b/kio/bookmarks/kbookmarkimporter_crash.h
@@ -34,7 +34,7 @@
  * A class for importing all crash sessions as bookmarks
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject
+class TDEIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject
 {
     Q_OBJECT
 public:
@@ -57,7 +57,7 @@ protected:
  * A class for importing all crash sessions as bookmarks
  * @since 3.2
  */
-class KIO_EXPORT KCrashBookmarkImporterImpl : public KBookmarkImporterBase
+class TDEIO_EXPORT KCrashBookmarkImporterImpl : public KBookmarkImporterBase
 {
 public:
     KCrashBookmarkImporterImpl() : m_shouldDelete(false) { }
diff --git a/kio/bookmarks/kbookmarkimporter_ie.h b/kio/bookmarks/kbookmarkimporter_ie.h
index eddf20f41..b1b7c651c 100644
--- a/kio/bookmarks/kbookmarkimporter_ie.h
+++ b/kio/bookmarks/kbookmarkimporter_ie.h
@@ -33,7 +33,7 @@
  * A class for importing IE bookmarks
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject
+class TDEIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject
 {
     Q_OBJECT
 public:
@@ -62,7 +62,7 @@ protected:
  * A class for importing IE bookmarks
  * @since 3.2
  */
-class KIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase
+class TDEIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase
 {
 public:
     KIEBookmarkImporterImpl() { }
@@ -75,7 +75,7 @@ private:
 /*
  * @since 3.2
  */
-class KIO_EXPORT KIEBookmarkExporterImpl : public KBookmarkExporterBase
+class TDEIO_EXPORT KIEBookmarkExporterImpl : public KBookmarkExporterBase
 {
 public:
     KIEBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & path)
diff --git a/kio/bookmarks/kbookmarkimporter_kde1.h b/kio/bookmarks/kbookmarkimporter_kde1.h
index 7e6ad2395..5af4f04e9 100644
--- a/kio/bookmarks/kbookmarkimporter_kde1.h
+++ b/kio/bookmarks/kbookmarkimporter_kde1.h
@@ -31,7 +31,7 @@
  * Separated from KBookmarkManager to save memory (we throw this one
  * out once the import is done)
  */
-class KIO_EXPORT KBookmarkImporter
+class TDEIO_EXPORT KBookmarkImporter
 {
 public:
     KBookmarkImporter( TQDomDocument * doc ) : m_pDoc(doc) {}
diff --git a/kio/bookmarks/kbookmarkimporter_ns.h b/kio/bookmarks/kbookmarkimporter_ns.h
index fdf79a3b9..10844fc63 100644
--- a/kio/bookmarks/kbookmarkimporter_ns.h
+++ b/kio/bookmarks/kbookmarkimporter_ns.h
@@ -34,7 +34,7 @@
  * A class for importing NS bookmarks
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject
+class TDEIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject
 {
     Q_OBJECT
 public:
@@ -64,7 +64,7 @@ protected:
  * utf8 defaults to off
  * @since 3.2
  */
-class KIO_EXPORT KNSBookmarkImporterImpl : public KBookmarkImporterBase
+class TDEIO_EXPORT KNSBookmarkImporterImpl : public KBookmarkImporterBase
 {
 public:
     KNSBookmarkImporterImpl() : m_utf8(false) { }
@@ -81,7 +81,7 @@ private:
  * utf8 defaults to on
  * @since 3.2
  */
-class KIO_EXPORT KMozillaBookmarkImporterImpl : public KNSBookmarkImporterImpl
+class TDEIO_EXPORT KMozillaBookmarkImporterImpl : public KNSBookmarkImporterImpl
 {
 public:
     KMozillaBookmarkImporterImpl() { setUtf8(true); }
@@ -94,7 +94,7 @@ private:
  * Warning, it overwrites the existing bookmarks.html file !
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KNSBookmarkExporter
+class TDEIO_EXPORT_DEPRECATED KNSBookmarkExporter
 {
 public:
     KNSBookmarkExporter(KBookmarkManager* mgr, const TQString & fileName)
@@ -113,7 +113,7 @@ protected:
 /**
  * @since 3.2
  */
-class KIO_EXPORT KNSBookmarkExporterImpl : public KBookmarkExporterBase
+class TDEIO_EXPORT KNSBookmarkExporterImpl : public KBookmarkExporterBase
 {
 public:
     KNSBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & fileName)
diff --git a/kio/bookmarks/kbookmarkimporter_opera.h b/kio/bookmarks/kbookmarkimporter_opera.h
index 0f9a3ba00..f6f1028b1 100644
--- a/kio/bookmarks/kbookmarkimporter_opera.h
+++ b/kio/bookmarks/kbookmarkimporter_opera.h
@@ -32,7 +32,7 @@
  * A class for importing Opera bookmarks
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject
+class TDEIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject
 {
     Q_OBJECT
 public:
@@ -58,7 +58,7 @@ protected:
  * A class for importing Opera bookmarks
  * @since 3.2
  */
-class KIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase
+class TDEIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase
 {
 public:
     KOperaBookmarkImporterImpl() { }
@@ -71,7 +71,7 @@ private:
 /**
  * @since 3.2
  */
-class KIO_EXPORT KOperaBookmarkExporterImpl : public KBookmarkExporterBase
+class TDEIO_EXPORT KOperaBookmarkExporterImpl : public KBookmarkExporterBase
 {
 public:
     KOperaBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & filename)
diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h
index d076eefc7..4a129704a 100644
--- a/kio/bookmarks/kbookmarkmanager.h
+++ b/kio/bookmarks/kbookmarkmanager.h
@@ -50,7 +50,7 @@
  * </xbel>
  * \endcode
  */
-class KIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject
+class TDEIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject
 {
     Q_OBJECT
     K_DCOP
@@ -314,7 +314,7 @@ private:
  * If you wish to use your own editor or allow the user to add
  * bookmarks, you must overload this class.
  */
-class KIO_EXPORT KBookmarkOwner
+class TDEIO_EXPORT KBookmarkOwner
 {
 public:
   /**
@@ -350,7 +350,7 @@ protected:
 /**
  * @since 3.2
  */
-class KIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner
+class TDEIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner
 {
     Q_OBJECT
 public:
diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h
index b54398a02..35e6191e3 100644
--- a/kio/bookmarks/kbookmarkmenu.h
+++ b/kio/bookmarks/kbookmarkmenu.h
@@ -76,7 +76,7 @@ namespace TDEIO { class Job; }
  * 1a) Reimplement your own KBookmarkOwner
  * 1b) Reimplement and instantiate your own KBookmarkManager
  */
-class KIO_EXPORT KBookmarkMenu : public TQObject
+class TDEIO_EXPORT KBookmarkMenu : public TQObject
 {
   Q_OBJECT
   friend class KBookmarkMenuNSImporter;
@@ -238,7 +238,7 @@ protected:
 /**
  * A class connected to KNSBookmarkImporter, to fill KActionMenus.
  */
-class KIO_EXPORT KBookmarkMenuNSImporter : public TQObject
+class TDEIO_EXPORT KBookmarkMenuNSImporter : public TQObject
 {
   Q_OBJECT
 public:
diff --git a/kio/bookmarks/kbookmarknotifier.h b/kio/bookmarks/kbookmarknotifier.h
index 3982f984f..f99e570bc 100644
--- a/kio/bookmarks/kbookmarknotifier.h
+++ b/kio/bookmarks/kbookmarknotifier.h
@@ -28,7 +28,7 @@
  * DCOP interface for a bookmark notifier (an object which emits signals
  * upon changes to the bookmarks)
  */
-class KIO_EXPORT KBookmarkNotifier : virtual public DCOPObject
+class TDEIO_EXPORT KBookmarkNotifier : virtual public DCOPObject
 {
   K_DCOP
 
diff --git a/kio/kfile/kcombiview.h b/kio/kfile/kcombiview.h
index 2747c51ad..5d56b8257 100644
--- a/kio/kfile/kcombiview.h
+++ b/kio/kfile/kcombiview.h
@@ -51,7 +51,7 @@ class TQIconViewItem;
  * @see KFileDetailView
  * @see KDirOperator
  */
-class KIO_EXPORT KCombiView : public TQSplitter,
+class TDEIO_EXPORT KCombiView : public TQSplitter,
 		   public KFileView
 {
     Q_OBJECT
diff --git a/kio/kfile/kcustommenueditor.h b/kio/kfile/kcustommenueditor.h
index 9112780b0..108e9c477 100644
--- a/kio/kfile/kcustommenueditor.h
+++ b/kio/kfile/kcustommenueditor.h
@@ -30,7 +30,7 @@ class TDEConfigBase;
   * @author Waldo Bastian (bastian@kde.org)
   * @since 3.1
   */
-class KIO_EXPORT KCustomMenuEditor : public KDialogBase
+class TDEIO_EXPORT KCustomMenuEditor : public KDialogBase
 {
     Q_OBJECT
 public:
diff --git a/kio/kfile/kdiroperator.h b/kio/kfile/kdiroperator.h
index 73798b92c..3dbd42759 100644
--- a/kio/kfile/kdiroperator.h
+++ b/kio/kfile/kdiroperator.h
@@ -94,7 +94,7 @@ namespace TDEIO {
  * @short A widget for displaying files and browsing directories.
  * @author Stephan Kulow <coolo@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KDirOperator : public TQWidget
+class TDEIO_EXPORT KDirOperator : public TQWidget
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kdirselectdialog.h b/kio/kfile/kdirselectdialog.h
index 106fe77fc..746064c68 100644
--- a/kio/kfile/kdirselectdialog.h
+++ b/kio/kfile/kdirselectdialog.h
@@ -36,7 +36,7 @@ class KToggleAction;
  * @author Michael Jarrett <michaelj@corel.com>
  * @see KFileDialog
  */
-class KIO_EXPORT KDirSelectDialog : public KDialogBase
+class TDEIO_EXPORT KDirSelectDialog : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kdirsize.h b/kio/kfile/kdirsize.h
index 41fe87eb6..b0f2c8fc2 100644
--- a/kio/kfile/kdirsize.h
+++ b/kio/kfile/kdirsize.h
@@ -27,7 +27,7 @@
  * Computes a directory size (similar to "du", but doesn't give the same results
  * since we simply sum up the dir and file sizes, whereas du speaks disk blocks)
  */
-class KIO_EXPORT KDirSize : public TDEIO::Job
+class TDEIO_EXPORT KDirSize : public TDEIO::Job
 {
   Q_OBJECT
 protected:
diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h
index 7b9fc6238..5ffa47d9a 100644
--- a/kio/kfile/kdiskfreesp.h
+++ b/kio/kfile/kdiskfreesp.h
@@ -37,7 +37,7 @@ class TDEProcess;
  * This class parses the output of "df" to find the disk usage
  * information for a given partition (mount point).
  */
-class KIO_EXPORT KDiskFreeSp : public TQObject
+class TDEIO_EXPORT KDiskFreeSp : public TQObject
 {  Q_OBJECT
 public:
    KDiskFreeSp( TQObject *parent=0, const char *name=0 );
diff --git a/kio/kfile/kencodingfiledialog.h b/kio/kfile/kencodingfiledialog.h
index 15b44f9c3..95daca6ce 100644
--- a/kio/kfile/kencodingfiledialog.h
+++ b/kio/kfile/kencodingfiledialog.h
@@ -36,7 +36,7 @@ struct KEncodingFileDialogPrivate;
  * can easily add children that will be incorporated into the layout.
  */
 
-class KIO_EXPORT KEncodingFileDialog : public KFileDialog
+class TDEIO_EXPORT KEncodingFileDialog : public KFileDialog
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kfile.h b/kio/kfile/kfile.h
index 8e6541cb3..7209a1d25 100644
--- a/kio/kfile/kfile.h
+++ b/kio/kfile/kfile.h
@@ -28,7 +28,7 @@
  * construct a KFile object itself.
  */
 
-class KIO_EXPORT KFile
+class TDEIO_EXPORT KFile
 {
 public:
     /**
diff --git a/kio/kfile/kfilebookmarkhandler.h b/kio/kfile/kfilebookmarkhandler.h
index 7db71548b..9b615c87e 100644
--- a/kio/kfile/kfilebookmarkhandler.h
+++ b/kio/kfile/kfilebookmarkhandler.h
@@ -26,7 +26,7 @@ class TQTextStream;
 class KPopupMenu;
 
 
-class KIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner
+class TDEIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h
index 9c41cfb91..37e71720f 100644
--- a/kio/kfile/kfiledetailview.h
+++ b/kio/kfile/kfiledetailview.h
@@ -34,7 +34,7 @@ class TQKeyEvent;
  * An item for the listiew, that has a reference to its corresponding
  * KFileItem.
  */
-class KIO_EXPORT KFileListViewItem : public KListViewItem
+class TDEIO_EXPORT KFileListViewItem : public KListViewItem
 {
 public:
     KFileListViewItem( TQListView *parent, const TQString &text,
@@ -106,7 +106,7 @@ private:
  * @see KCombiView
  * @see KFileIconView
  */
-class KIO_EXPORT KFileDetailView : public KListView, public KFileView
+class TDEIO_EXPORT KFileDetailView : public KListView, public KFileView
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kfiledialog.h b/kio/kfile/kfiledialog.h
index 51d817b2f..2f986d351 100644
--- a/kio/kfile/kfiledialog.h
+++ b/kio/kfile/kfiledialog.h
@@ -74,7 +74,7 @@ struct KFileDialogPrivate;
  *
  * @author Richard J. Moore <rich@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KFileDialog : public KDialogBase
+class TDEIO_EXPORT KFileDialog : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kfilefiltercombo.h b/kio/kfile/kfilefiltercombo.h
index d1f9cbf62..589376d0c 100644
--- a/kio/kfile/kfilefiltercombo.h
+++ b/kio/kfile/kfilefiltercombo.h
@@ -28,7 +28,7 @@
 
 class KFileFilterComboPrivate;
 
-class KIO_EXPORT KFileFilterCombo : public KComboBox
+class TDEIO_EXPORT KFileFilterCombo : public KComboBox
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kfileiconview.h b/kio/kfile/kfileiconview.h
index 209e4828a..98afc0a6e 100644
--- a/kio/kfile/kfileiconview.h
+++ b/kio/kfile/kfileiconview.h
@@ -37,7 +37,7 @@ class TQLabel;
  * An item for the iconview, that has a reference to its corresponding
  * KFileItem.
  */
-class KIO_EXPORT KFileIconViewItem : public KIconViewItem
+class TDEIO_EXPORT KFileIconViewItem : public KIconViewItem
 {
 public:
     KFileIconViewItem( TQIconView *parent, const TQString &text,
@@ -80,7 +80,7 @@ namespace TDEIO {
  * @see KCombiView
  * @see KFileDetailView
  */
-class KIO_EXPORT KFileIconView : public KIconView, public KFileView
+class TDEIO_EXPORT KFileIconView : public KIconView, public KFileView
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kfilemetainfowidget.h b/kio/kfile/kfilemetainfowidget.h
index 96614950b..a42846bea 100644
--- a/kio/kfile/kfilemetainfowidget.h
+++ b/kio/kfile/kfilemetainfowidget.h
@@ -27,7 +27,7 @@
 /*!
  * A widget to display file meta infos (like id3 for mp3)
  */
-class KIO_EXPORT KFileMetaInfoWidget: public TQWidget
+class TDEIO_EXPORT KFileMetaInfoWidget: public TQWidget
 {
     Q_OBJECT
 public:
diff --git a/kio/kfile/kfilemetapreview.h b/kio/kfile/kfilemetapreview.h
index 19b7901a1..f26cd29b5 100644
--- a/kio/kfile/kfilemetapreview.h
+++ b/kio/kfile/kfilemetapreview.h
@@ -15,7 +15,7 @@
 #include <kpreviewwidgetbase.h>
 #include <kurl.h>
 
-class KIO_EXPORT KFileMetaPreview : public KPreviewWidgetBase
+class TDEIO_EXPORT KFileMetaPreview : public KPreviewWidgetBase
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kfilepreview.h b/kio/kfile/kfilepreview.h
index 79dda2984..af6fe13d2 100644
--- a/kio/kfile/kfilepreview.h
+++ b/kio/kfile/kfilepreview.h
@@ -36,7 +36,7 @@
 /*!
  * This KFileView is an empbedded preview for some file types.
  */
-class KIO_EXPORT KFilePreview : public TQSplitter, public KFileView
+class TDEIO_EXPORT KFilePreview : public TQSplitter, public KFileView
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kfilesharedlg.h b/kio/kfile/kfilesharedlg.h
index 54876f12a..e7998ad66 100644
--- a/kio/kfile/kfilesharedlg.h
+++ b/kio/kfile/kfilesharedlg.h
@@ -30,7 +30,7 @@ class TQPushButton;
  * @author David Faure <david@mandrakesoft.com>
  * @since 3.1
  */
-class KIO_EXPORT KFileSharePropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KFileSharePropsPlugin : public KPropsDlgPlugin
 {
     Q_OBJECT
 public:
diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h
index f7a27131b..d1c2a689e 100644
--- a/kio/kfile/kfilespeedbar.h
+++ b/kio/kfile/kfilespeedbar.h
@@ -23,7 +23,7 @@
 
 class TDEConfig;
 
-class KIO_EXPORT KFileSpeedBar : public KURLBar
+class TDEIO_EXPORT KFileSpeedBar : public KURLBar
 {
     Q_OBJECT
 public:
diff --git a/kio/kfile/kfiletreebranch.h b/kio/kfile/kfiletreebranch.h
index 30f5cf47c..31e6dcfc0 100644
--- a/kio/kfile/kfiletreebranch.h
+++ b/kio/kfile/kfiletreebranch.h
@@ -45,7 +45,7 @@ class KFileTreeView;
  *
  */
 
-class KIO_EXPORT KFileTreeBranch : public KDirLister
+class TDEIO_EXPORT KFileTreeBranch : public KDirLister
 {
    Q_OBJECT
 public:
diff --git a/kio/kfile/kfiletreeview.h b/kio/kfile/kfiletreeview.h
index fb242b2c6..f28f0f01e 100644
--- a/kio/kfile/kfiletreeview.h
+++ b/kio/kfile/kfiletreeview.h
@@ -37,7 +37,7 @@ class TQTimer;
 
 
 
-class KIO_EXPORT KFileTreeViewToolTip : public TQToolTip
+class TDEIO_EXPORT KFileTreeViewToolTip : public TQToolTip
 {
 public:
     KFileTreeViewToolTip( TQListView *view ) : TQToolTip( view ), m_view( view ) {}
@@ -63,7 +63,7 @@ private:
  * 3. retrieve the root item with KFileTreeBranch::root() and set it open
  *    if desired. That starts the listing.
  */
-class KIO_EXPORT KFileTreeView : public KListView
+class TDEIO_EXPORT KFileTreeView : public KListView
 {
     Q_OBJECT
 public:
diff --git a/kio/kfile/kfiletreeviewitem.h b/kio/kfile/kfiletreeviewitem.h
index fe338df3b..0fefc5dc1 100644
--- a/kio/kfile/kfiletreeviewitem.h
+++ b/kio/kfile/kfiletreeviewitem.h
@@ -37,7 +37,7 @@ class KFileTreeItem;
 /**
  * An item for a KFileTreeView that knows about its own KFileItem.
  */
-class KIO_EXPORT KFileTreeViewItem : public KListViewItem
+class TDEIO_EXPORT KFileTreeViewItem : public KListViewItem
 {
 public:
    KFileTreeViewItem( KFileTreeViewItem*, KFileItem*, KFileTreeBranch * );
diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h
index 5a6bfd002..7e88fc9d8 100644
--- a/kio/kfile/kfileview.h
+++ b/kio/kfile/kfileview.h
@@ -34,7 +34,7 @@ class KActionCollection;
  * internal class to make easier to use signals possible
  * @internal
  **/
-class KIO_EXPORT KFileViewSignaler : public TQObject
+class TDEIO_EXPORT KFileViewSignaler : public TQObject
 {
     Q_OBJECT
 
@@ -95,7 +95,7 @@ signals:
   * @short A base class for views of the KDE file selector
   * @author Stephan Kulow <coolo@kde.org>
   **/
-class KIO_EXPORT KFileView {
+class TDEIO_EXPORT KFileView {
 
 public:
     KFileView();
diff --git a/kio/kfile/kicondialog.h b/kio/kfile/kicondialog.h
index e533f6800..30d9f1579 100644
--- a/kio/kfile/kicondialog.h
+++ b/kio/kfile/kicondialog.h
@@ -32,7 +32,7 @@ class KIconLoader;
 /**
  * Icon canvas for KIconDialog.
  */
-class KIO_EXPORT KIconCanvas: public KIconView
+class TDEIO_EXPORT KIconCanvas: public KIconView
 {
     Q_OBJECT
 
@@ -88,7 +88,7 @@ private:
  *
  * @short An icon selection dialog.
  */
-class KIO_EXPORT KIconDialog: public KDialogBase
+class TDEIO_EXPORT KIconDialog: public KDialogBase
 {
     Q_OBJECT
 
@@ -254,7 +254,7 @@ private:
  * @see KIconDialog
  * @short A push button that allows selection of an icon.
  */
-class KIO_EXPORT KIconButton: public TQPushButton
+class TDEIO_EXPORT KIconButton: public TQPushButton
 {
     Q_OBJECT
     TQ_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon )
diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h
index a86f4f923..0604e08f0 100644
--- a/kio/kfile/kimagefilepreview.h
+++ b/kio/kfile/kimagefilepreview.h
@@ -28,7 +28,7 @@ namespace TDEIO { class Job; class PreviewJob; }
 /**
  * Image preview widget for the file dialog.
  */
-class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
+class TDEIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
 {
 	Q_OBJECT
 
diff --git a/kio/kfile/kmetaprops.h b/kio/kfile/kmetaprops.h
index 8bd83a3b3..c842499dd 100644
--- a/kio/kfile/kmetaprops.h
+++ b/kio/kfile/kmetaprops.h
@@ -28,7 +28,7 @@ class KFileMetaInfoItem;
  * 'MetaProps plugin
  * In this plugin you can modify meta information like id3 tags of mp3 files
  */
-class KIO_EXPORT KFileMetaPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KFileMetaPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h
index acab7e23f..9bb3210ea 100644
--- a/kio/kfile/knotifydialog.h
+++ b/kio/kfile/knotifydialog.h
@@ -49,7 +49,7 @@ namespace KNotify
  * @since 3.1
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KNotifyDialog : public KDialogBase
+class TDEIO_EXPORT KNotifyDialog : public KDialogBase
 {
     Q_OBJECT
 
@@ -148,7 +148,7 @@ namespace KNotify
     /**
      * @internal
      */
-    class KIO_EXPORT Application
+    class TDEIO_EXPORT Application
     {
     public:
         Application( const TQString &path );
@@ -173,7 +173,7 @@ namespace KNotify
     };
 
 
-    class KIO_EXPORT ApplicationList : public TQPtrList<Application>
+    class TDEIO_EXPORT ApplicationList : public TQPtrList<Application>
     {
         virtual int compareItems ( TQPtrCollection::Item item1,
                                    TQPtrCollection::Item item2 )
@@ -186,7 +186,7 @@ namespace KNotify
     /**
      * @internal
      */
-    class KIO_EXPORT KNotifyWidget : public KNotifyWidgetBase
+    class TDEIO_EXPORT KNotifyWidget : public KNotifyWidgetBase
     {
         Q_OBJECT
 
diff --git a/kio/kfile/kopenwith.h b/kio/kfile/kopenwith.h
index a6c570172..90c43ceb1 100644
--- a/kio/kfile/kopenwith.h
+++ b/kio/kfile/kopenwith.h
@@ -43,7 +43,7 @@ class KOpenWithDlgPrivate;
  *
  * @author David Faure <faure@kde.org>
  */
-class KIO_EXPORT KOpenWithDlg : public TQDialog //#TODO: Use KDialogBase for KDE4
+class TDEIO_EXPORT KOpenWithDlg : public TQDialog //#TODO: Use KDialogBase for KDE4
 {
     Q_OBJECT
 public:
@@ -189,7 +189,7 @@ protected:
  *
  *
  */
-class KIO_EXPORT_DEPRECATED KFileOpenWithHandler : public KOpenWithHandler
+class TDEIO_EXPORT_DEPRECATED KFileOpenWithHandler : public KOpenWithHandler
 {
 public:
   KFileOpenWithHandler() : KOpenWithHandler() {}
diff --git a/kio/kfile/kpreviewprops.h b/kio/kfile/kpreviewprops.h
index c34e70763..d934af22a 100644
--- a/kio/kfile/kpreviewprops.h
+++ b/kio/kfile/kpreviewprops.h
@@ -29,7 +29,7 @@ class KFileMetaPreview;
  * This plugin displays a preview of the given file
  * @since 3.5
  */
-class KIO_EXPORT KPreviewPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KPreviewPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 
diff --git a/kio/kfile/kpreviewwidgetbase.h b/kio/kfile/kpreviewwidgetbase.h
index e4c77c600..3597070ee 100644
--- a/kio/kfile/kpreviewwidgetbase.h
+++ b/kio/kfile/kpreviewwidgetbase.h
@@ -41,7 +41,7 @@ class KURL;
  * @short Abstract baseclass for all preview widgets.
  * @author Frerich Raabe <raabe@kde.org>
  */
-class KIO_EXPORT KPreviewWidgetBase : public TQWidget
+class TDEIO_EXPORT KPreviewWidgetBase : public TQWidget
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h
index df814f7d4..3f6d48c6a 100644
--- a/kio/kfile/kpropertiesdialog.h
+++ b/kio/kfile/kpropertiesdialog.h
@@ -67,7 +67,7 @@ namespace TDEIO { class Job; }
  * If you are looking for more flexibility, see KFileMetaInfo and
  * KFileMetaInfoWidget.
  */
-class KIO_EXPORT KPropertiesDialog : public KDialogBase
+class TDEIO_EXPORT KPropertiesDialog : public KDialogBase
 {
   Q_OBJECT
 
@@ -434,7 +434,7 @@ private:
  * You can also include X-TDE-Protocol=file if you want that plugin
  * to be loaded only for local files, for instance.
  */
-class KIO_EXPORT KPropsDlgPlugin : public TQObject
+class TDEIO_EXPORT KPropsDlgPlugin : public TQObject
 {
   Q_OBJECT
 public:
@@ -492,7 +492,7 @@ private:
  *  This plugin displays the name of the file, its size and access times.
  * @internal
  */
-class KIO_EXPORT KFilePropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KFilePropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -568,7 +568,7 @@ private:
  * the owner of a file.
  * @internal
  */
-class KIO_EXPORT KFilePermissionsPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KFilePermissionsPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -654,7 +654,7 @@ private:
  * Such files are used to represent a program in kicker and konqueror.
  * @internal
  */
-class KIO_EXPORT KURLPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KURLPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -689,7 +689,7 @@ private:
  * Type=MimeType
  * @internal
  */
-class KIO_EXPORT KBindingPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KBindingPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -719,7 +719,7 @@ private:
  * Properties plugin for device .desktop files
  * @internal
  */
-class KIO_EXPORT KDevicePropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KDevicePropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -771,7 +771,7 @@ class KPropertiesDesktopBase;
  * Such files are used to represent a program in kicker and konqueror.
  * @internal
  */
-class KIO_EXPORT KDesktopPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KDesktopPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -822,7 +822,7 @@ private:
  * @deprecated replaced with KDesktopPropsPlugin
  */
  /// Remove in KDE4
-class KIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -878,7 +878,7 @@ private:
  * @deprecated replaced with KDesktopPropsPlugin
  */
  /// Remove in KDE4
-class KIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
diff --git a/kio/kfile/krecentdirs.h b/kio/kfile/krecentdirs.h
index e8c6c9419..774655e51 100644
--- a/kio/kfile/krecentdirs.h
+++ b/kio/kfile/krecentdirs.h
@@ -47,7 +47,7 @@
  * a single ':' the file-class is specific to the current application.
  * If the file-class starts with '::' it is global to all applications.
  */
-class KIO_EXPORT KRecentDirs
+class TDEIO_EXPORT KRecentDirs
 {
 public:
     /**
diff --git a/kio/kfile/krecentdocument.h b/kio/kfile/krecentdocument.h
index 6bbd3f654..968559968 100644
--- a/kio/kfile/krecentdocument.h
+++ b/kio/kfile/krecentdocument.h
@@ -47,7 +47,7 @@
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
-class KIO_EXPORT KRecentDocument
+class TDEIO_EXPORT KRecentDocument
 {
 public:
 
diff --git a/kio/kfile/kurlbar.h b/kio/kfile/kurlbar.h
index df9d15790..32c05ec58 100644
--- a/kio/kfile/kurlbar.h
+++ b/kio/kfile/kurlbar.h
@@ -39,7 +39,7 @@ class KURLBar;
  * @see KURLBar
  * @see KURLBarListBox
  */
-class KIO_EXPORT KURLBarItem : public TQListBoxPixmap
+class TDEIO_EXPORT KURLBarItem : public TQListBoxPixmap
 {
 public:
     /**
@@ -227,7 +227,7 @@ class KURLBarListBox;
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  * @short A URL-bar widget, as used in the KFileDialog
  */
-class KIO_EXPORT KURLBar : public TQFrame
+class TDEIO_EXPORT KURLBar : public TQFrame
 {
     Q_OBJECT
 
@@ -490,7 +490,7 @@ class KURLBarToolTip;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KURLBarListBox : public KListBox
+class TDEIO_EXPORT KURLBarListBox : public KListBox
 {
     Q_OBJECT
 
@@ -564,7 +564,7 @@ class KURLRequester;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KURLBarItemDialog : public KDialogBase
+class TDEIO_EXPORT KURLBarItemDialog : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kurlcombobox.h b/kio/kfile/kurlcombobox.h
index 0a9451075..a1fd9182d 100644
--- a/kio/kfile/kurlcombobox.h
+++ b/kio/kfile/kurlcombobox.h
@@ -38,7 +38,7 @@
  * @short A combo box showing a number of recent URLs/directories
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KURLComboBox : public KComboBox
+class TDEIO_EXPORT KURLComboBox : public KComboBox
 {
     Q_OBJECT
     TQ_PROPERTY(TQStringList urls READ urls WRITE setURLs DESIGNABLE true)
diff --git a/kio/kfile/kurlrequester.h b/kio/kfile/kurlrequester.h
index f5402788a..aa2f6894b 100644
--- a/kio/kfile/kurlrequester.h
+++ b/kio/kfile/kurlrequester.h
@@ -53,7 +53,7 @@ class TQTimer;
  * @short A widget to request a filename/url from the user
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KURLRequester : public TQHBox
+class TDEIO_EXPORT KURLRequester : public TQHBox
 {
     Q_OBJECT
     TQ_PROPERTY( TQString url READ url WRITE setURL )
@@ -287,7 +287,7 @@ private:
 /**
  * URL requester with a combo box, for use in Designer
  */
-class KIO_EXPORT KURLComboRequester : public KURLRequester
+class TDEIO_EXPORT KURLComboRequester : public KURLRequester
 {
     Q_OBJECT
 public:
diff --git a/kio/kfile/kurlrequesterdlg.h b/kio/kfile/kurlrequesterdlg.h
index 3f13a844d..07b70d745 100644
--- a/kio/kfile/kurlrequesterdlg.h
+++ b/kio/kfile/kurlrequesterdlg.h
@@ -35,7 +35,7 @@ class KFileDialog;
  * @short Simple dialog to enter a filename/url.
  * @author Wilco Greven <greven@kde.org>
  */
-class KIO_EXPORT KURLRequesterDlg : public KDialogBase
+class TDEIO_EXPORT KURLRequesterDlg : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/kio/kio/authinfo.h b/kio/kio/authinfo.h
index 130db0857..019311ef8 100644
--- a/kio/kio/authinfo.h
+++ b/kio/kio/authinfo.h
@@ -48,10 +48,10 @@ namespace TDEIO {
  * @short A two way messaging class for passing authentication information.
  * @author Dawit Alemayehu <adawit@kde.org>
  */
-class KIO_EXPORT AuthInfo
+class TDEIO_EXPORT AuthInfo
 {
-    KIO_EXPORT friend TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a);
-    KIO_EXPORT friend TQDataStream& operator>> (TQDataStream& s, AuthInfo& a);
+    TDEIO_EXPORT friend TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a);
+    TDEIO_EXPORT friend TQDataStream& operator>> (TQDataStream& s, AuthInfo& a);
 
 public:
    /**
@@ -225,8 +225,8 @@ private:
     class AuthInfoPrivate* d;
 };
 
-KIO_EXPORT TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a);
-KIO_EXPORT TQDataStream& operator>> (TQDataStream& s, AuthInfo& a);
+TDEIO_EXPORT TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a);
+TDEIO_EXPORT TQDataStream& operator>> (TQDataStream& s, AuthInfo& a);
 
 /**
  * A Singleton class that provides access to passwords
@@ -237,7 +237,7 @@ KIO_EXPORT TQDataStream& operator>> (TQDataStream& s, AuthInfo& a);
  * @short An interface to the ftp .netrc files
  * @author Dawit Alemayehu <adawit@kde.org>
  */
-class KIO_EXPORT NetRC
+class TDEIO_EXPORT NetRC
 {
 public:
 
diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp
index e1c8a64e4..f589da957 100644
--- a/kio/kio/chmodjob.cpp
+++ b/kio/kio/chmodjob.cpp
@@ -227,7 +227,7 @@ void ChmodJob::slotResult( TDEIO::Job * job )
 }
 
 // antlarr: KDE 4: Make owner and group be const TQString &
-KIO_EXPORT ChmodJob *TDEIO::chmod( const KFileItemList& lstItems, int permissions, int mask,
+TDEIO_EXPORT ChmodJob *TDEIO::chmod( const KFileItemList& lstItems, int permissions, int mask,
                       TQString owner, TQString group,
                       bool recursive, bool showProgressInfo )
 {
diff --git a/kio/kio/chmodjob.h b/kio/kio/chmodjob.h
index c501add6a..81b614562 100644
--- a/kio/kio/chmodjob.h
+++ b/kio/kio/chmodjob.h
@@ -35,7 +35,7 @@ namespace TDEIO {
      * optionally in a recursive manner.
      * @see TDEIO::chmod()
      */
-    class KIO_EXPORT ChmodJob : public TDEIO::Job
+    class TDEIO_EXPORT ChmodJob : public TDEIO::Job
     {
         Q_OBJECT
     public:
@@ -100,7 +100,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progess information
      * @return The job handling the operation.
      */
-    KIO_EXPORT ChmodJob * chmod( const KFileItemList& lstItems, int permissions, int mask,
+    TDEIO_EXPORT ChmodJob * chmod( const KFileItemList& lstItems, int permissions, int mask,
                       TQString newOwner, TQString newGroup,
                       bool recursive, bool showProgressInfo = true );
 
diff --git a/kio/kio/connection.h b/kio/kio/connection.h
index 720e4e935..fb0b50e15 100644
--- a/kio/kio/connection.h
+++ b/kio/kio/connection.h
@@ -35,7 +35,7 @@ class TQSocketNotifier;
 
 namespace TDEIO {
 
-    struct KIO_EXPORT Task {
+    struct TDEIO_EXPORT Task {
 	int cmd;
 	TQByteArray data;
     };
@@ -46,7 +46,7 @@ namespace TDEIO {
      * It handles a queue of commands to be sent which makes it possible to
      * queue data before an actual connection has been established.
      */
-    class KIO_EXPORT Connection : public TQObject
+    class TDEIO_EXPORT Connection : public TQObject
     {
 	Q_OBJECT
     public:
diff --git a/kio/kio/davjob.h b/kio/kio/davjob.h
index 3232f9e00..02eaa6a78 100644
--- a/kio/kio/davjob.h
+++ b/kio/kio/davjob.h
@@ -54,7 +54,7 @@ namespace TDEIO {
      * @see TDEIO::davSearch()
      * @since 3.1
      */
-    class KIO_EXPORT DavJob : public TransferJob {
+    class TDEIO_EXPORT DavJob : public TransferJob {
     Q_OBJECT
 
     public:
@@ -95,7 +95,7 @@ namespace TDEIO {
     * @param showProgressInfo true to show progress information
     * @return the new DavJob
     */
-   KIO_EXPORT DavJob* davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo=true );
+   TDEIO_EXPORT DavJob* davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo=true );
 
    /**
     * Creates a new DavJob that issues a PROPPATCH command. PROPPATCH sets
@@ -107,7 +107,7 @@ namespace TDEIO {
     * @param showProgressInfo true to show progress information
     * @return the new DavJob
     */
-   KIO_EXPORT DavJob* davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo=true );
+   TDEIO_EXPORT DavJob* davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo=true );
 
    /**
     * Creates a new DavJob that issues a SEARCH command.
@@ -119,7 +119,7 @@ namespace TDEIO {
     * @param showProgressInfo true to show progress information
     * @return the new DavJob
     */
-   KIO_EXPORT DavJob* davSearch( const KURL &url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo=true ); 
+   TDEIO_EXPORT DavJob* davSearch( const KURL &url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo=true ); 
 
 }
 
diff --git a/kio/kio/defaultprogress.h b/kio/kio/defaultprogress.h
index 68d405b24..44ffff6c4 100644
--- a/kio/kio/defaultprogress.h
+++ b/kio/kio/defaultprogress.h
@@ -34,7 +34,7 @@ namespace TDEIO {
  * A default implementation of the progress dialog ProgressBase.
  * ProgressBase
  */
-class KIO_EXPORT DefaultProgress : public ProgressBase {
+class TDEIO_EXPORT DefaultProgress : public ProgressBase {
 
   Q_OBJECT
 
diff --git a/kio/kio/forwardingslavebase.h b/kio/kio/forwardingslavebase.h
index 49d01f4e2..f765e38a6 100644
--- a/kio/kio/forwardingslavebase.h
+++ b/kio/kio/forwardingslavebase.h
@@ -85,7 +85,7 @@ class ForwardingSlaveBasePrivate;
  * @since 3.4
  * @author Kevin Ottens <ervin@ipsquad.net>
  */
-class KIO_EXPORT ForwardingSlaveBase : public TQObject, public SlaveBase
+class TDEIO_EXPORT ForwardingSlaveBase : public TQObject, public SlaveBase
 {
 Q_OBJECT
 public:
diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp
index 36706a6cf..3a7cadb8f 100644
--- a/kio/kio/global.cpp
+++ b/kio/kio/global.cpp
@@ -42,7 +42,7 @@
 #include <volmgt.h>
 #endif
 
-KIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size )
+TDEIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size )
 {
     if ( size >= 1024 )
         return convertSize( size ) + " (" + i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(size, 0) ) + ")";
@@ -50,7 +50,7 @@ KIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size )
 	return convertSize( size );
 }
 
-KIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size )
+TDEIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size )
 {
     double fsize = size;
     TQString s;
@@ -88,19 +88,19 @@ KIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size )
     return s;
 }
 
-KIO_EXPORT TQString TDEIO::convertSizeFromKB( TDEIO::filesize_t kbSize )
+TDEIO_EXPORT TQString TDEIO::convertSizeFromKB( TDEIO::filesize_t kbSize )
 {
     return convertSize(kbSize * 1024);
 }
 
-KIO_EXPORT TQString TDEIO::number( TDEIO::filesize_t size )
+TDEIO_EXPORT TQString TDEIO::number( TDEIO::filesize_t size )
 {
     char charbuf[256];
     sprintf(charbuf, "%lld", size);
     return TQString::fromLatin1(charbuf);
 }
 
-KIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t totalSize,
+TDEIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t totalSize,
                                                         TDEIO::filesize_t processedSize, TDEIO::filesize_t speed )
 {
   if ( (speed != 0) && (totalSize != 0) )
@@ -109,7 +109,7 @@ KIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t tota
     return 0;
 }
 
-KIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds )
+TDEIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds )
 {
   unsigned int days  = seconds / 86400;
   unsigned int hours = (seconds - (days * 86400)) / 3600;
@@ -124,7 +124,7 @@ KIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds )
     return timeStr;
 }
 
-KIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed )
+TDEIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed )
 {
   TQTime remainingTime;
 
@@ -147,7 +147,7 @@ KIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO:
   return remainingTime;
 }
 
-KIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize)
+TDEIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize)
 {
     TQString text = items == 0 ? i18n( "No Items" ) : i18n( "One Item", "%n Items", items );
     text += " - ";
@@ -162,7 +162,7 @@ KIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs,
     return text;
 }
 
-KIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str )
+TDEIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str )
 {
   TQString str( _str );
 
@@ -177,7 +177,7 @@ KIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str )
   return str;
 }
 
-KIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str )
+TDEIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str )
 {
   TQString str;
 
@@ -205,12 +205,12 @@ KIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str )
   return str;
 }
 
-KIO_EXPORT TQString TDEIO::Job::errorString() const
+TDEIO_EXPORT TQString TDEIO::Job::errorString() const
 {
   return TDEIO::buildErrorString(m_error, m_errorText);
 }
 
-KIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &errorText)
+TDEIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &errorText)
 {
   TQString result;
 
@@ -419,7 +419,7 @@ KIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &error
   return result;
 }
 
-KIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol, int cmd) {
+TDEIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol, int cmd) {
   switch (cmd) {
     case CMD_CONNECT:
       return i18n("Opening connections is not supported with the protocol %1." ).arg(protocol);
@@ -458,7 +458,7 @@ KIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol
   }/*end switch*/
 }
 
-KIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/,
+TDEIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/,
                                             int method /*= -1*/ ) const
 {
   TQString errorName, techName, description, ret2;
@@ -508,7 +508,7 @@ KIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*=
   return ret;
 }
 
-KIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &errorText,
+TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &errorText,
                                const KURL *reqUrl /*= 0L*/, int /*method = -1*/ )
 {
   TQString url, host, protocol, datetime, domain, path, dir, filename;
diff --git a/kio/kio/global.h b/kio/kio/global.h
index 0091c4801..44b9df616 100644
--- a/kio/kio/global.h
+++ b/kio/kio/global.h
@@ -44,7 +44,7 @@ namespace TDEIO
    * @param  size  size in bytes
    * @return converted size as a string - e.g. 123.4 kB , 12.0 MB
    */
-  KIO_EXPORT TQString convertSize( TDEIO::filesize_t size );
+  TDEIO_EXPORT TQString convertSize( TDEIO::filesize_t size );
 
   /**
    * Converts @p size from bytes to a string representation with includes
@@ -53,7 +53,7 @@ namespace TDEIO
    * @param  size  size in bytes
    * @return converted size as a string - e.g. 1.4 KB (1495 B), 45 B
    */
-  KIO_EXPORT TQString convertSizeWithBytes( TDEIO::filesize_t size );
+  TDEIO_EXPORT TQString convertSizeWithBytes( TDEIO::filesize_t size );
   /**
    * Converts a size to a string representation
    * Not unlike TQString::number(...)
@@ -61,7 +61,7 @@ namespace TDEIO
    * @param size size in bytes
    * @return  converted size as a string - e.g. 123456789
    */
-  KIO_EXPORT TQString number( TDEIO::filesize_t size );
+  TDEIO_EXPORT TQString number( TDEIO::filesize_t size );
 
   /**
    * Converts size from kilo-bytes to the string representation.
@@ -69,7 +69,7 @@ namespace TDEIO
    * @param  kbSize  size in kilo-bytes
    * @return converted size as a string - e.g. 123.4 kB , 12.0 MB
    */
-   KIO_EXPORT TQString convertSizeFromKB( TDEIO::filesize_t kbSize );
+   TDEIO_EXPORT TQString convertSizeFromKB( TDEIO::filesize_t kbSize );
 
   /**
    * Calculates remaining time in seconds from total size, processed size and speed.
@@ -81,7 +81,7 @@ namespace TDEIO
    *
    * @since 3.4
    */
-  KIO_EXPORT unsigned int calculateRemainingSeconds( TDEIO::filesize_t totalSize,
+  TDEIO_EXPORT unsigned int calculateRemainingSeconds( TDEIO::filesize_t totalSize,
                                                      TDEIO::filesize_t processedSize, TDEIO::filesize_t speed );
 
   /**
@@ -92,7 +92,7 @@ namespace TDEIO
    *
    * @since 3.4
    */
-  KIO_EXPORT TQString convertSeconds( unsigned int seconds );
+  TDEIO_EXPORT TQString convertSeconds( unsigned int seconds );
 
   /**
    * Calculates remaining time from total size, processed size and speed.
@@ -103,7 +103,7 @@ namespace TDEIO
    * @param  speed          speed in bytes per second
    * @return calculated remaining time
    */
-  KIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) KDE_DEPRECATED;
+  TDEIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) KDE_DEPRECATED;
 
   /**
    * Helper for showing information about a set of files and directories
@@ -114,7 +114,7 @@ namespace TDEIO
    * @param showSize whether to show the size in the result
    * @return the summary string
    */
-  KIO_EXPORT TQString itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize);
+  TDEIO_EXPORT TQString itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize);
 
   /**
    * Encodes (from the text displayed to the real filename)
@@ -123,14 +123,14 @@ namespace TDEIO
    * @param str the file name to encode
    * @return the encoded file name
    */
-  KIO_EXPORT TQString encodeFileName( const TQString & str );
+  TDEIO_EXPORT TQString encodeFileName( const TQString & str );
   /**
    * Decodes (from the filename to the text displayed)
    * This translates %2[fF] into / and %% into %
    * @param str the file name to decode
    * @return the decoded file name
    */
-  KIO_EXPORT TQString decodeFileName( const TQString & str );
+  TDEIO_EXPORT TQString decodeFileName( const TQString & str );
 
   /**
    * Commands that can be invoked by a job.
@@ -258,7 +258,7 @@ namespace TDEIO
    * @param errorText the additional error text
    * @return the created error string
    */
-  KIO_EXPORT TQString buildErrorString(int errorCode, const TQString &errorText);
+  TDEIO_EXPORT TQString buildErrorString(int errorCode, const TQString &errorText);
 
   /**
    * Returns a translated html error message for @p errorCode using the
@@ -270,7 +270,7 @@ namespace TDEIO
    * @param method the ioslave method
    * @return the created error string
    */
-  KIO_EXPORT TQString buildHTMLErrorString(int errorCode, const TQString &errorText,
+  TDEIO_EXPORT TQString buildHTMLErrorString(int errorCode, const TQString &errorText,
                                 const KURL *reqUrl = 0L, int method = -1 );
 
   /**
@@ -289,7 +289,7 @@ namespace TDEIO
    * @li TQStringList causes - a list of possible causes of the error
    * @li TQStringList solutions - a liso of solutions for the error
    */
-  KIO_EXPORT TQByteArray rawErrorDetail(int errorCode, const TQString &errorText,
+  TDEIO_EXPORT TQByteArray rawErrorDetail(int errorCode, const TQString &errorText,
                                 const KURL *reqUrl = 0L, int method = -1 );
 
   /**
@@ -300,7 +300,7 @@ namespace TDEIO
    * @see enum Command
    * @since 3.2
    */
-  KIO_EXPORT TQString unsupportedActionErrorString(const TQString &protocol, int cmd);
+  TDEIO_EXPORT TQString unsupportedActionErrorString(const TQString &protocol, int cmd);
 
   /**
    * Constants used to specify the type of a KUDSAtom.
@@ -401,7 +401,7 @@ namespace TDEIO
    * @return the cache control value
    * @see getCacheControlString()
    */
-  KIO_EXPORT TDEIO::CacheControl parseCacheControl(const TQString &cacheControl);
+  TDEIO_EXPORT TDEIO::CacheControl parseCacheControl(const TQString &cacheControl);
 
   /**
    * Returns a string representation of the given cache control method.
@@ -410,14 +410,14 @@ namespace TDEIO
    * @return the string representation
    * @see parseCacheControl()
    */
-  KIO_EXPORT TQString getCacheControlString(TDEIO::CacheControl cacheControl);
+  TDEIO_EXPORT TQString getCacheControlString(TDEIO::CacheControl cacheControl);
 
   /**
    * Returns the mount point where @p device is mounted
    * right now. This means, it has to be mounted, not just
    * defined in fstab.
    */
-  KIO_EXPORT TQString findDeviceMountPoint( const TQString& device );
+  TDEIO_EXPORT TQString findDeviceMountPoint( const TQString& device );
 
   /**
    * Returns the mount point on which resides @p filename.
@@ -426,7 +426,7 @@ namespace TDEIO
    * @param filename the file name to check
    * @return the mount point of the given @p filename
    */
-  KIO_EXPORT TQString findPathMountPoint( const TQString & filename );
+  TDEIO_EXPORT TQString findPathMountPoint( const TQString & filename );
 
   /**
    * Checks if the path belongs to a filesystem that is probably
@@ -435,7 +435,7 @@ namespace TDEIO
    * @param filename the file name to check
    * @return true if the filesystem is probably slow
    */
-  KIO_EXPORT bool probably_slow_mounted(const TQString& filename);
+  TDEIO_EXPORT bool probably_slow_mounted(const TQString& filename);
 
   /**
    * Checks if the path belongs to a filesystem that is manually
@@ -443,7 +443,7 @@ namespace TDEIO
    * @param filename the file name to check
    * @return true if the filesystem is manually mounted
    */
-  KIO_EXPORT bool manually_mounted(const TQString& filename);
+  TDEIO_EXPORT bool manually_mounted(const TQString& filename);
 
   enum FileSystemFlag { SupportsChmod, SupportsChown, SupportsUTime,
                         SupportsSymlinks, CaseInsensitive };
@@ -467,7 +467,7 @@ namespace TDEIO
    * "foo" and "FOO" as being the same file (true for msdos systems)
    *
    */
-  KIO_EXPORT bool testFileSystemFlag(const TQString& filename, FileSystemFlag flag);
+  TDEIO_EXPORT bool testFileSystemFlag(const TQString& filename, FileSystemFlag flag);
 
 
 /************
@@ -483,7 +483,7 @@ namespace TDEIO
  *
  * Each atom contains a specific bit of information for the file
  */
-class KIO_EXPORT UDSAtom
+class TDEIO_EXPORT UDSAtom
 {
 public:
   /**
@@ -512,7 +512,7 @@ typedef TQValueListConstIterator<UDSEntry> UDSEntryListConstIterator;
 /**
  * MetaData is a simple map of key/value strings.
  */
-class KIO_EXPORT MetaData : public TQMap<TQString, TQString>
+class TDEIO_EXPORT MetaData : public TQMap<TQString, TQString>
 {
 public:
   /**
diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp
index 01bb2c60d..d72eae574 100644
--- a/kio/kio/job.cpp
+++ b/kio/kio/job.cpp
@@ -2307,7 +2307,7 @@ void CopyJob::slotStart()
 }
 
 // For unit test purposes
-KIO_EXPORT bool kio_resolve_local_urls = true;
+TDEIO_EXPORT bool kio_resolve_local_urls = true;
 
 void CopyJob::slotResultStating( Job *job )
 {
diff --git a/kio/kio/job.h b/kio/kio/job.h
index 03985b637..f5254df39 100644
--- a/kio/kio/job.h
+++ b/kio/kio/job.h
@@ -38,7 +38,7 @@ namespace TDEIO {
      *                    directory (unix-style), -1 for default permissions.
      * @return A pointer to the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * mkdir( const KURL& url, int permissions = -1 );
+    TDEIO_EXPORT SimpleJob * mkdir( const KURL& url, int permissions = -1 );
 
     /**
      * Removes a single directory.
@@ -50,7 +50,7 @@ namespace TDEIO {
      * @param url The URL of the directory to remove.
      * @return A pointer to the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * rmdir( const KURL& url );
+    TDEIO_EXPORT SimpleJob * rmdir( const KURL& url );
 
     /**
      * Changes permissions on a file or directory.
@@ -61,7 +61,7 @@ namespace TDEIO {
      * @param permissions The permissions to set.
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * chmod( const KURL& url, int permissions );
+    TDEIO_EXPORT SimpleJob * chmod( const KURL& url, int permissions );
 
     /**
      * Rename a file or directory.
@@ -74,7 +74,7 @@ namespace TDEIO {
      * @param overwrite whether to automatically overwrite if the dest exists
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * rename( const KURL& src, const KURL & dest, bool overwrite );
+    TDEIO_EXPORT SimpleJob * rename( const KURL& src, const KURL & dest, bool overwrite );
 
     /**
      * Create or move a symlink.
@@ -87,7 +87,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * symlink( const TQString & target, const KURL& dest, bool overwrite, bool showProgressInfo = true );
+    TDEIO_EXPORT SimpleJob * symlink( const TQString & target, const KURL& dest, bool overwrite, bool showProgressInfo = true );
 
     /**
      * Execute any command that is specific to one slave (protocol).
@@ -101,7 +101,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * special( const KURL& url, const TQByteArray & data, bool showProgressInfo = true );
+    TDEIO_EXPORT SimpleJob * special( const KURL& url, const TQByteArray & data, bool showProgressInfo = true );
 
     /**
      * Mount filesystem.
@@ -115,7 +115,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob *mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo = true );
+    TDEIO_EXPORT SimpleJob *mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo = true );
 
     /**
      * Unmount filesystem.
@@ -126,7 +126,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob *unmount( const TQString & point, bool showProgressInfo = true );
+    TDEIO_EXPORT SimpleJob *unmount( const TQString & point, bool showProgressInfo = true );
 
     /**
      * Retrieve local URL if available
@@ -134,7 +134,7 @@ namespace TDEIO {
      * @param remoteURL the remote URL to get the local URL for
      * @return the job handling the operation.
      */
-    KIO_EXPORT LocalURLJob *localURL( const KURL& remoteUrl );
+    TDEIO_EXPORT LocalURLJob *localURL( const KURL& remoteUrl );
 
     /**
      * HTTP cache update
@@ -145,7 +145,7 @@ namespace TDEIO {
      * supposed to expire.
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob *http_update_cache( const KURL& url, bool no_cache, time_t expireDate);
+    TDEIO_EXPORT SimpleJob *http_update_cache( const KURL& url, bool no_cache, time_t expireDate);
 
     /**
      * Find all details for one file or directory.
@@ -154,7 +154,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT StatJob * stat( const KURL& url, bool showProgressInfo = true );
+    TDEIO_EXPORT StatJob * stat( const KURL& url, bool showProgressInfo = true );
     /**
      * Find all details for one file or directory.
      * This version of the call includes two additional booleans, @p sideIsSource and @p details.
@@ -182,7 +182,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT StatJob * stat( const KURL& url, bool sideIsSource, short int details, bool showProgressInfo = true );
+    TDEIO_EXPORT StatJob * stat( const KURL& url, bool sideIsSource, short int details, bool showProgressInfo = true );
 
     /**
      * Get (a.k.a. read).
@@ -193,7 +193,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT TransferJob *get( const KURL& url, bool reload=false, bool showProgressInfo = true );
+    TDEIO_EXPORT TransferJob *get( const KURL& url, bool reload=false, bool showProgressInfo = true );
 
     /**
      * Put (a.k.a. write)
@@ -207,7 +207,7 @@ namespace TDEIO {
      * @return the job handling the operation.
      * @see multi_get()
      */
-    KIO_EXPORT TransferJob *put( const KURL& url, int permissions,
+    TDEIO_EXPORT TransferJob *put( const KURL& url, int permissions,
                       bool overwrite, bool resume, bool showProgressInfo = true );
 
     /**
@@ -238,7 +238,7 @@ namespace TDEIO {
      * @param showProgressInfo true to display
      * @return the job handling the operation.
      */
-    KIO_EXPORT TransferJob *http_post( const KURL& url, const TQByteArray &postData,
+    TDEIO_EXPORT TransferJob *http_post( const KURL& url, const TQByteArray &postData,
                             bool showProgressInfo = true );
 
     /**
@@ -251,7 +251,7 @@ namespace TDEIO {
      * @return the job handling the operation.
      * @since 3.3
      */
-    KIO_EXPORT StoredTransferJob *storedGet( const KURL& url, bool reload=false, bool showProgressInfo = true );
+    TDEIO_EXPORT StoredTransferJob *storedGet( const KURL& url, bool reload=false, bool showProgressInfo = true );
 
     /**
      * Put (a.k.a. write) data from a single TQByteArray.
@@ -267,7 +267,7 @@ namespace TDEIO {
      * @return the job handling the operation.
      * @since 3.3
      */
-    KIO_EXPORT StoredTransferJob *storedPut( const TQByteArray& arr, const KURL& url, int permissions,
+    TDEIO_EXPORT StoredTransferJob *storedPut( const TQByteArray& arr, const KURL& url, int permissions,
                                   bool overwrite, bool resume, bool showProgressInfo = true );
 
     /**
@@ -280,7 +280,7 @@ namespace TDEIO {
      * @return the job handling the operation.
      * @see get()
      */
-    KIO_EXPORT MultiGetJob *multi_get( long id, const KURL &url, const MetaData &metaData);
+    TDEIO_EXPORT MultiGetJob *multi_get( long id, const KURL &url, const MetaData &metaData);
 
     /**
      * Find mimetype for one file or directory.
@@ -289,7 +289,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT MimetypeJob * mimetype( const KURL& url,
+    TDEIO_EXPORT MimetypeJob * mimetype( const KURL& url,
                             bool showProgressInfo = true );
 
     /**
@@ -308,7 +308,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT FileCopyJob *file_copy( const KURL& src, const KURL& dest, int permissions=-1,
+    TDEIO_EXPORT FileCopyJob *file_copy( const KURL& src, const KURL& dest, int permissions=-1,
                             bool overwrite=false, bool resume=false,
                             bool showProgressInfo = true);
 
@@ -327,7 +327,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT FileCopyJob *file_move( const KURL& src, const KURL& dest, int permissions=-1,
+    TDEIO_EXPORT FileCopyJob *file_move( const KURL& src, const KURL& dest, int permissions=-1,
                             bool overwrite=false, bool resume=false,
                             bool showProgressInfo = true);
 
@@ -338,7 +338,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob *file_delete( const KURL& src, bool showProgressInfo = true);
+    TDEIO_EXPORT SimpleJob *file_delete( const KURL& src, bool showProgressInfo = true);
 
     /**
      * List the contents of @p url, which is assumed to be a directory.
@@ -352,7 +352,7 @@ namespace TDEIO {
      *                      files/dirs (whose names start with dot)
      * @return the job handling the operation.
      */
-    KIO_EXPORT ListJob *listDir( const KURL& url, bool showProgressInfo = true,
+    TDEIO_EXPORT ListJob *listDir( const KURL& url, bool showProgressInfo = true,
                       bool includeHidden = true );
 
     /**
@@ -368,7 +368,7 @@ namespace TDEIO {
      *                      files/dirs (whose names start with dot)
      * @return the job handling the operation.
      */
-    KIO_EXPORT ListJob *listRecursive( const KURL& url, bool showProgressInfo = true,
+    TDEIO_EXPORT ListJob *listRecursive( const KURL& url, bool showProgressInfo = true,
                             bool includeHidden = true );
 
     /**
@@ -384,7 +384,7 @@ namespace TDEIO {
      * @return the job handling the operation
      * @see copyAs()
      */
-    KIO_EXPORT CopyJob *copy( const KURL& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *copy( const KURL& src, const KURL& dest, bool showProgressInfo = true );
 
     /**
      * Copy a file or directory @p src into the destination @p dest,
@@ -399,7 +399,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation
      */
-    KIO_EXPORT CopyJob *copyAs( const KURL& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *copyAs( const KURL& src, const KURL& dest, bool showProgressInfo = true );
 
     /**
      * Copy a list of file/dirs @p src into a destination directory @p dest.
@@ -409,7 +409,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation
      */
-    KIO_EXPORT CopyJob *copy( const KURL::List& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *copy( const KURL::List& src, const KURL& dest, bool showProgressInfo = true );
 
     /**
      * Moves a file or directory @p src to the given destination @p dest.
@@ -421,7 +421,7 @@ namespace TDEIO {
      * @see copy()
      * @see moveAs()
      */
-    KIO_EXPORT CopyJob *move( const KURL& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *move( const KURL& src, const KURL& dest, bool showProgressInfo = true );
     /**
      * Moves a file or directory @p src to the given destination @p dest. Unlike move()
      * this operation will fail when the directory already exists.
@@ -432,7 +432,7 @@ namespace TDEIO {
      * @return the job handling the operation
      * @see copyAs()
      */
-    KIO_EXPORT CopyJob *moveAs( const KURL& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *moveAs( const KURL& src, const KURL& dest, bool showProgressInfo = true );
     /**
      * Moves a list of files or directories @p src to the given destination @p dest.
      *
@@ -442,7 +442,7 @@ namespace TDEIO {
      * @return the job handling the operation
      * @see copy()
      */
-    KIO_EXPORT CopyJob *move( const KURL::List& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *move( const KURL::List& src, const KURL& dest, bool showProgressInfo = true );
 
     /**
      * Create a link.
@@ -454,7 +454,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation
      */
-    KIO_EXPORT CopyJob *link( const KURL& src, const KURL& destDir, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *link( const KURL& src, const KURL& destDir, bool showProgressInfo = true );
 
     /**
      * Create several links
@@ -467,7 +467,7 @@ namespace TDEIO {
      * @return the job handling the operation
      * @see link()
      */
-    KIO_EXPORT CopyJob *link( const KURL::List& src, const KURL& destDir, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *link( const KURL::List& src, const KURL& destDir, bool showProgressInfo = true );
 
     /**
      * Create a link. Unlike link() this operation will fail when the directory already
@@ -482,7 +482,7 @@ namespace TDEIO {
      * @see link ()
      * @see copyAs()
      */
-    KIO_EXPORT CopyJob *linkAs( const KURL& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *linkAs( const KURL& src, const KURL& dest, bool showProgressInfo = true );
 
     /**
      * Trash a file or directory.
@@ -494,7 +494,7 @@ namespace TDEIO {
      * @return the job handling the operation
      * @since 3.4
      */
-    KIO_EXPORT CopyJob *trash( const KURL& src, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *trash( const KURL& src, bool showProgressInfo = true );
 
     /**
      * Trash a list of files or directories.
@@ -505,7 +505,7 @@ namespace TDEIO {
      * @return the job handling the operation
      * @since 3.4
      */
-    KIO_EXPORT CopyJob *trash( const KURL::List& src, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *trash( const KURL::List& src, bool showProgressInfo = true );
 
     /**
      * Delete a file or directory.
@@ -515,7 +515,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation
      */
-    KIO_EXPORT DeleteJob *del( const KURL& src, bool shred = false, bool showProgressInfo = true );
+    TDEIO_EXPORT DeleteJob *del( const KURL& src, bool shred = false, bool showProgressInfo = true );
 
     /**
      * Deletes a list of files or directories.
@@ -525,7 +525,7 @@ namespace TDEIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation
      */
-    KIO_EXPORT DeleteJob *del( const KURL::List& src, bool shred = false, bool showProgressInfo = true );
+    TDEIO_EXPORT DeleteJob *del( const KURL::List& src, bool shred = false, bool showProgressInfo = true );
 }
 
 #endif
diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h
index 9858b1ce1..3438406fa 100644
--- a/kio/kio/jobclasses.h
+++ b/kio/kio/jobclasses.h
@@ -65,7 +65,7 @@ namespace TDEIO {
      * @see TDEIO::Scheduler
      * @see TDEIO::Slave
      */
-    class KIO_EXPORT Job : public TQObject {
+    class TDEIO_EXPORT Job : public TQObject {
         Q_OBJECT
 
     protected:
@@ -525,7 +525,7 @@ namespace TDEIO {
      * Other jobs are high-level jobs (CopyJob, DeleteJob, FileCopyJob...)
      * that manage subjobs but aren't scheduled directly.
      */
-    class KIO_EXPORT SimpleJob : public TDEIO::Job {
+    class TDEIO_EXPORT SimpleJob : public TDEIO::Job {
     Q_OBJECT
 
     public:
@@ -685,7 +685,7 @@ namespace TDEIO {
      * A KIO job that retrieves information about a file or directory.
      * @see TDEIO::stat()
      */
-    class KIO_EXPORT StatJob : public SimpleJob {
+    class TDEIO_EXPORT StatJob : public SimpleJob {
 
     Q_OBJECT
 
@@ -777,7 +777,7 @@ namespace TDEIO {
      * @see TDEIO::mkdir()
      * @since 3.3
      */
-    class KIO_EXPORT MkdirJob : public SimpleJob {
+    class TDEIO_EXPORT MkdirJob : public SimpleJob {
 
     Q_OBJECT
 
@@ -836,7 +836,7 @@ namespace TDEIO {
      * @internal
      * Used for direct copy from or to the local filesystem (i.e. SlaveBase::copy())
      */
-    class KIO_EXPORT DirectCopyJob : public SimpleJob {
+    class TDEIO_EXPORT DirectCopyJob : public SimpleJob {
     Q_OBJECT
 
     public:
@@ -872,7 +872,7 @@ namespace TDEIO {
      * If data coming from the slave can not be handled, the
      * reading of data from the slave should be suspended.
      */
-    class KIO_EXPORT TransferJob : public SimpleJob {
+    class TDEIO_EXPORT TransferJob : public SimpleJob {
     Q_OBJECT
 
     public:
@@ -1072,7 +1072,7 @@ namespace TDEIO {
      *
      * @since 3.3
      */
-    class KIO_EXPORT StoredTransferJob : public TDEIO::TransferJob {
+    class TDEIO_EXPORT StoredTransferJob : public TDEIO::TransferJob {
         Q_OBJECT
 
     public:
@@ -1117,7 +1117,7 @@ namespace TDEIO {
      * but use TDEIO::multi_get() instead.
      * @see TDEIO::multi_get()
      */
-    class KIO_EXPORT MultiGetJob : public TransferJob {
+    class TDEIO_EXPORT MultiGetJob : public TransferJob {
     Q_OBJECT
 
     public:
@@ -1205,7 +1205,7 @@ namespace TDEIO {
      * but use TDEIO::mimetype() instead.
      * @see TDEIO::mimetype()
      */
-    class KIO_EXPORT MimetypeJob : public TransferJob {
+    class TDEIO_EXPORT MimetypeJob : public TransferJob {
     Q_OBJECT
 
     public:
@@ -1247,7 +1247,7 @@ namespace TDEIO {
      * @see TDEIO::file_copy()
      * @see TDEIO::file_move()
      */
-    class KIO_EXPORT FileCopyJob : public Job {
+    class TDEIO_EXPORT FileCopyJob : public Job {
     Q_OBJECT
 
     public:
@@ -1389,7 +1389,7 @@ namespace TDEIO {
      * @see TDEIO::listRecursive()
      * @see TDEIO::listDir()
      */
-    class KIO_EXPORT ListJob : public SimpleJob {
+    class TDEIO_EXPORT ListJob : public SimpleJob {
     Q_OBJECT
 
     public:
@@ -1481,7 +1481,7 @@ namespace TDEIO {
     };
 
     /// @internal
-    struct KIO_EXPORT CopyInfo
+    struct TDEIO_EXPORT CopyInfo
     {
         KURL uSource;
         KURL uDest;
@@ -1505,7 +1505,7 @@ namespace TDEIO {
      * @see TDEIO::link()
      * @see TDEIO::linkAs()
      */
-    class KIO_EXPORT CopyJob : public Job {
+    class TDEIO_EXPORT CopyJob : public Job {
     Q_OBJECT
 
     public:
@@ -1760,7 +1760,7 @@ namespace TDEIO {
      *
      * @see TDEIO::del()
      */
-    class KIO_EXPORT DeleteJob : public Job {
+    class TDEIO_EXPORT DeleteJob : public Job {
     Q_OBJECT
 
     public:
@@ -1863,7 +1863,7 @@ namespace TDEIO {
      * @see TDEIO::localURL()
      * @since R14.0.0
      */
-    class KIO_EXPORT LocalURLJob : public SimpleJob {
+    class TDEIO_EXPORT LocalURLJob : public SimpleJob {
 
     Q_OBJECT
 
diff --git a/kio/kio/kacl.h b/kio/kio/kacl.h
index 53bc762b0..1f60fde60 100644
--- a/kio/kio/kacl.h
+++ b/kio/kio/kacl.h
@@ -39,7 +39,7 @@ typedef TQValueListConstIterator<ACLGroupPermissions> ACLGroupPermissionsConstIt
  * @short a POSIX ACL encapsulation
  * @author Till Adam <adam@kde.org>
  */
-class KIO_EXPORT KACL
+class TDEIO_EXPORT KACL
 {
 public:
   /**
@@ -197,11 +197,11 @@ protected:
 private:
   class KACLPrivate;
   KACLPrivate * d;
-  KIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KACL & a );
-  KIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KACL & a );
+  TDEIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KACL & a );
+  TDEIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KACL & a );
 };
 
-KIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KACL & a );
-KIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KACL & a );
+TDEIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KACL & a );
+TDEIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KACL & a );
 
 #endif
diff --git a/kio/kio/kar.h b/kio/kio/kar.h
index 1b8f2cef2..83d94e75c 100644
--- a/kio/kio/kar.h
+++ b/kio/kio/kar.h
@@ -35,7 +35,7 @@
  * @author Laurence Anderson <l.d.anderson@warwick.ac.uk>
  * @since 3.1
  */
-class KIO_EXPORT KAr : public KArchive
+class TDEIO_EXPORT KAr : public KArchive
 {
 public:
     /**
diff --git a/kio/kio/karchive.h b/kio/kio/karchive.h
index 6f0b57cbc..840c560b7 100644
--- a/kio/kio/karchive.h
+++ b/kio/kio/karchive.h
@@ -39,7 +39,7 @@ class KArchiveFile;
  * @short generic class for reading/writing archives
  * @author David Faure <faure@kde.org>
  */
-class KIO_EXPORT KArchive
+class TDEIO_EXPORT KArchive
 {
 protected:
     /**
@@ -392,7 +392,7 @@ private:
  * @see KArchiveFile
  * @see KArchiveDirectory
  */
-class KIO_EXPORT KArchiveEntry
+class TDEIO_EXPORT KArchiveEntry
 {
 public:
     /**
@@ -487,7 +487,7 @@ private:
  * @see KArchive
  * @see KArchiveDirectory
  */
-class KIO_EXPORT KArchiveFile : public KArchiveEntry
+class TDEIO_EXPORT KArchiveFile : public KArchiveEntry
 {
 public:
     /**
@@ -570,7 +570,7 @@ private:
  * @see KArchive
  * @see KArchiveFile
  */
-class KIO_EXPORT KArchiveDirectory : public KArchiveEntry
+class TDEIO_EXPORT KArchiveDirectory : public KArchiveEntry
 {
 public:
     /**
diff --git a/kio/kio/kautomount.h b/kio/kio/kautomount.h
index 68eecdbbd..203c037d9 100644
--- a/kio/kio/kautomount.h
+++ b/kio/kio/kautomount.h
@@ -42,7 +42,7 @@ class Job;
  *
  * @short This class implements synchronous mounting of devices.
  */
-class KIO_EXPORT KAutoMount : public TQObject
+class TDEIO_EXPORT KAutoMount : public TQObject
 {
   Q_OBJECT
   friend class gcc_gives_a_warning_without_this;
@@ -87,7 +87,7 @@ private:
  *
  * @short This class implements synchronous unmounting of devices,
  */
-class KIO_EXPORT KAutoUnmount : public TQObject
+class TDEIO_EXPORT KAutoUnmount : public TQObject
 {
   Q_OBJECT
   friend class gcc_gives_a_warning_without_this;
diff --git a/kio/kio/kdatatool.h b/kio/kio/kdatatool.h
index 46005ada3..1258767fc 100644
--- a/kio/kio/kdatatool.h
+++ b/kio/kio/kdatatool.h
@@ -44,7 +44,7 @@ class TDEInstance;
  * described by the service.
  * @see KDataTool
  */
-class KIO_EXPORT KDataToolInfo
+class TDEIO_EXPORT KDataToolInfo
 {
 public:
     /**
@@ -191,7 +191,7 @@ private:
  * The slot defined for step 2 is called when the action is activated, and
  * that's where the tool should be created and run.
  */
-class KIO_EXPORT KDataToolAction : public KAction
+class TDEIO_EXPORT KDataToolAction : public KAction
 {
     Q_OBJECT
     
@@ -251,7 +251,7 @@ private:
  * @see KDataToolAction, and for activating a tool, passing it the data
  * (and possibly getting modified data from it).
  */
-class KIO_EXPORT KDataTool : public TQObject
+class TDEIO_EXPORT KDataTool : public TQObject
 {
     Q_OBJECT
     
diff --git a/kio/kio/kdcopservicestarter.h b/kio/kio/kdcopservicestarter.h
index b267476e7..f70f0173e 100644
--- a/kio/kio/kdcopservicestarter.h
+++ b/kio/kio/kdcopservicestarter.h
@@ -31,7 +31,7 @@ class TQCString;
  * also be reimplemented by specific applications to provide dlopened in-process DCOP objects.
  * @author David Faure <faure@kde.org>
  */
-class KIO_EXPORT KDCOPServiceStarter {
+class TDEIO_EXPORT KDCOPServiceStarter {
     friend class KStaticDeleter<KDCOPServiceStarter>;
 public:
 
diff --git a/kio/kio/kdirlister.h b/kio/kio/kdirlister.h
index 87aa6c694..2688fcd9c 100644
--- a/kio/kio/kdirlister.h
+++ b/kio/kio/kdirlister.h
@@ -52,7 +52,7 @@ namespace TDEIO { class Job; class ListJob; }
  * @short Helper class for the kiojob used to list and update a directory.
  * @author Michael Brade <brade@kde.org>
  */
-class KIO_EXPORT KDirLister : public TQObject
+class TDEIO_EXPORT KDirLister : public TQObject
 {
   class KDirListerPrivate;
   friend class KDirListerPrivate;
diff --git a/kio/kio/kdirnotify.h b/kio/kio/kdirnotify.h
index 2082569a1..14d864609 100644
--- a/kio/kio/kdirnotify.h
+++ b/kio/kio/kdirnotify.h
@@ -29,7 +29,7 @@
  * The information comes from the konqueror/kdesktop instance where the
  * operation was done, and can interest KDirListers, bookmark handlers, etc.
  */
-class KIO_EXPORT KDirNotify : public DCOPObject
+class TDEIO_EXPORT KDirNotify : public DCOPObject
 {
    K_DCOP
 protected:
diff --git a/kio/kio/kdirnotify_stub.h b/kio/kio/kdirnotify_stub.h
index a807ecf82..56ab168c4 100644
--- a/kio/kio/kdirnotify_stub.h
+++ b/kio/kio/kdirnotify_stub.h
@@ -14,7 +14,7 @@
 #include <kurl.h>
 
 
-class KIO_EXPORT KDirNotify_stub : virtual public DCOPStub
+class TDEIO_EXPORT KDirNotify_stub : virtual public DCOPStub
 {
 public:
     KDirNotify_stub( const TQCString& app, const TQCString& id );
diff --git a/kio/kio/kdirwatch.h b/kio/kio/kdirwatch.h
index ac33a6ed5..4abaa302e 100644
--- a/kio/kio/kdirwatch.h
+++ b/kio/kio/kdirwatch.h
@@ -60,7 +60,7 @@ class KDirWatchPrivate;
   * @short Class for watching directory and file changes.
   * @author Sven Radej <sven@lisa.exp.univie.ac.at>
   */
-class KIO_EXPORT KDirWatch : public TQObject
+class TDEIO_EXPORT KDirWatch : public TQObject
 {
   Q_OBJECT
     
diff --git a/kio/kio/kemailsettings.h b/kio/kio/kemailsettings.h
index 9d35675c6..0ade4520e 100644
--- a/kio/kio/kemailsettings.h
+++ b/kio/kio/kemailsettings.h
@@ -43,7 +43,7 @@ class KEMailSettingsPrivate;
   *
   * @author Alex Zepeda zipzippy@sonic.net
   **/
-class KIO_EXPORT KEMailSettings {
+class TDEIO_EXPORT KEMailSettings {
 public:
 	/**
 	  * The list of settings that I thought of when I wrote this 
diff --git a/kio/kio/kfilefilter.h b/kio/kio/kfilefilter.h
index b17d2fe74..2891e800e 100644
--- a/kio/kio/kfilefilter.h
+++ b/kio/kio/kfilefilter.h
@@ -38,7 +38,7 @@ class KFileItem;
  * reimplement passesFilter().
  * @short Base class for file filters.
  */
-class KIO_EXPORT KFileFilter
+class TDEIO_EXPORT KFileFilter
 {
 public:
     /**
@@ -56,7 +56,7 @@ protected:
  * by mime type and by mode.
  * @short A simple file filter.
  */
-class KIO_EXPORT KSimpleFileFilter : public KFileFilter
+class TDEIO_EXPORT KSimpleFileFilter : public KFileFilter
 {
 public:
     /**
diff --git a/kio/kio/kfileitem.h b/kio/kio/kfileitem.h
index 5e75ac16f..0fcba9f4a 100644
--- a/kio/kio/kfileitem.h
+++ b/kio/kio/kfileitem.h
@@ -38,7 +38,7 @@
  * (UDSEntry isn't very friendly to use).
  * It includes many file attributes such as mimetype, icon, text, mode, link...
  */
-class KIO_EXPORT KFileItem
+class TDEIO_EXPORT KFileItem
 {
 public:
   enum { Unknown = (mode_t) - 1 };
@@ -650,8 +650,8 @@ protected:
 private:
   class KFileItemPrivate;
   KFileItemPrivate * d;
-  KIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a );
-  KIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KFileItem & a );
+  TDEIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a );
+  TDEIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KFileItem & a );
 };
 
 /**
@@ -664,8 +664,8 @@ typedef TQPtrList<KFileItem> KFileItemList;
  */
 typedef TQPtrListIterator<KFileItem> KFileItemListIterator;
 
-KIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a );
-KIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KFileItem & a );
+TDEIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a );
+TDEIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KFileItem & a );
 
 
 #endif
diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp
index 0ccbb577b..85fb1a37f 100644
--- a/kio/kio/kfilemetainfo.cpp
+++ b/kio/kio/kfilemetainfo.cpp
@@ -1705,7 +1705,7 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle
    first a bool that says if the items is valid, and if yes,
    all the elements of the Data
 */
-KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& item )
+TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& item )
 {
 
      KFileMetaInfoItem::Data* d = item.d;
@@ -1725,7 +1725,7 @@ KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& i
 }
 
 
-KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& item )
+TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& item )
 {
      bool isValid;
      s >> isValid;
@@ -1758,7 +1758,7 @@ KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& item )
 // serialization of a KFileMetaInfoGroup
 // we serialize the name of the mimetype here instead of the mimetype info
 // on the other side, we can simply use this to ask the provider for the info
-KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& group )
+TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& group )
 {
     KFileMetaInfoGroup::Data* d = group.d;
 
@@ -1775,7 +1775,7 @@ KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup&
     return s;
 }
 
-KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& group )
+TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& group )
 {
     TQString mimeType;
     bool isValid;
@@ -1812,7 +1812,7 @@ KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& group
 // serialization of a KFileMetaInfo object
 // we serialize the name of the mimetype here instead of the mimetype info
 // on the other side, we can simply use this to ask the provider for the info
-KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& info )
+TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& info )
 {
     KFileMetaInfo::Data* d = info.d;
 
@@ -1830,7 +1830,7 @@ KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& info
     return s;
 }
 
-KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& info )
+TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& info )
 {
     TQString mimeType;
     bool isValid;
diff --git a/kio/kio/kfilemetainfo.h b/kio/kio/kfilemetainfo.h
index 63a08c277..ea843a5f3 100644
--- a/kio/kio/kfilemetainfo.h
+++ b/kio/kio/kfilemetainfo.h
@@ -47,7 +47,7 @@ class KFileMetaInfoGroup;
  * @author Rolf Magnus
  * @author Carsten Pfeiffer
  */
-class KIO_EXPORT KFileMimeTypeInfo
+class TDEIO_EXPORT KFileMimeTypeInfo
 {
     // the plugin needs to be a friend because it puts the data into the object,
     // and it should be the only one allowed to do this.
@@ -135,7 +135,7 @@ public:
      *  It contains, among other things, the information about the group's name
      *  and a list of supported items.
      */
-    class KIO_EXPORT GroupInfo
+    class TDEIO_EXPORT GroupInfo
     {
 
     friend class KFilePlugin;
@@ -247,7 +247,7 @@ public:
      *  It contains every information about a KFileMetaInfoItem that this
      *  item has in common for each file of a specific mimetype.
      **/
-    class KIO_EXPORT ItemInfo
+    class TDEIO_EXPORT ItemInfo
     {
     friend class KFilePlugin;
     friend class GroupInfo;
@@ -493,7 +493,7 @@ protected:
  * This is one item of the meta information about a file (see
  * KFileMetaInfo).
  */
-class KIO_EXPORT KFileMetaInfoItem
+class TDEIO_EXPORT KFileMetaInfoItem
 {
 public:
     class Data;
@@ -660,9 +660,9 @@ public:
      */
     bool isValid() const;
 
-    KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& );
-    KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& );
-    KIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& );
+    TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& );
+    TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& );
+    TDEIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& );
     friend class KFileMetaInfoGroup;
 
 protected:
@@ -681,12 +681,12 @@ protected:
  * This is one group of meta information items about a file (see
  * KFileMetaInfo).
  */
-class KIO_EXPORT KFileMetaInfoGroup
+class TDEIO_EXPORT KFileMetaInfoGroup
 {
   friend class KFilePlugin;
   friend class KFileMetaInfo;
-  KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& );
-  KIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& );
+  TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& );
+  TDEIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& );
 
 public:
     class Data;
@@ -923,7 +923,7 @@ protected:
  * The groups and the What enum are not yet supported, but already added to
  * the interface so that adding support doesn't break compatibility.
  */
-class KIO_EXPORT KFileMetaInfo
+class TDEIO_EXPORT KFileMetaInfo
 {
 public:
     typedef KFileMimeTypeInfo::Hint Hint;
@@ -1223,8 +1223,8 @@ public:
      */
     KURL url() const;
 
-    KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& );
-    KIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& );
+    TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& );
+    TDEIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& );
     friend class KFilePlugin;
 
 protected:
@@ -1391,7 +1391,7 @@ private:
  *  PreferredItems=Items,Size
  *  @endcode
  **/
-class KIO_EXPORT KFilePlugin : public TQObject
+class TDEIO_EXPORT KFilePlugin : public TQObject
 {
     Q_OBJECT
 
@@ -1643,7 +1643,7 @@ private:
  *  supported and which groups and items are provided for it, you can ask
  *  the KFileMetainfoProvider for it.
  **/
-class KIO_EXPORT KFileMetaInfoProvider: private QObject
+class TDEIO_EXPORT KFileMetaInfoProvider: private QObject
 {
     friend class KFilePlugin;
 
@@ -1725,14 +1725,14 @@ private:
 
 };
 
-KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& );
-KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& );
+TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& );
+TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& );
 
-KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& );
-KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& );
+TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& );
+TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& );
 
-KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& );
-KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& );
+TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& );
+TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& );
 
 
 #endif // KILEMETAINFO_H
diff --git a/kio/kio/kfileshare.h b/kio/kio/kfileshare.h
index e46d0903b..ff473c122 100644
--- a/kio/kio/kfileshare.h
+++ b/kio/kio/kfileshare.h
@@ -48,7 +48,7 @@ protected slots: // this is why this class needs to be in the .h
  * (communication with the backend)
  * @since 3.1
  */
-class KIO_EXPORT KFileShare
+class TDEIO_EXPORT KFileShare
 {
 
   
diff --git a/kio/kio/kfilterbase.h b/kio/kio/kfilterbase.h
index a9d143b6c..25613c101 100644
--- a/kio/kio/kfilterbase.h
+++ b/kio/kio/kfilterbase.h
@@ -35,7 +35,7 @@ class TQIODevice;
  * such as gzip and bzip2. It's pretty much internal.
  * Don't use directly, use KFilterDev instead.
  */
-class KIO_EXPORT KFilterBase : public TQObject // needs to inherit TQObject for KLibFactory::create
+class TDEIO_EXPORT KFilterBase : public TQObject // needs to inherit TQObject for KLibFactory::create
 {
     Q_OBJECT
 public:
diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h
index 2df49f2cc..8dd0999a9 100644
--- a/kio/kio/kfilterdev.h
+++ b/kio/kio/kfilterdev.h
@@ -33,7 +33,7 @@ class KFilterBase;
  *
  * @author David Faure <faure@kde.org>
  */
-class KIO_EXPORT KFilterDev : public TQIODevice
+class TDEIO_EXPORT KFilterDev : public TQIODevice
 {
 public:
     /**
diff --git a/kio/kio/kimageio.h b/kio/kio/kimageio.h
index 3c14fb54d..671fb5f61 100644
--- a/kio/kio/kimageio.h
+++ b/kio/kio/kimageio.h
@@ -66,7 +66,7 @@
  * @see KImageIO, TQPixmap, TQImage, QImageIO
  * @author Sirtaj Singh Kang
  */
-class KIO_EXPORT KImageIO
+class TDEIO_EXPORT KImageIO
 {
 public:
   /**
diff --git a/kio/kio/kimageiofactory.h b/kio/kio/kimageiofactory.h
index 2ffe58e60..603ef2c0e 100644
--- a/kio/kio/kimageiofactory.h
+++ b/kio/kio/kimageiofactory.h
@@ -15,7 +15,7 @@ class KImageIOFormat;
 class KImageIOFormatList;
 
 /** \internal */
-class KIO_EXPORT KImageIOFormat : public KSycocaEntry
+class TDEIO_EXPORT KImageIOFormat : public KSycocaEntry
 {
   K_SYCOCATYPE( KST_KImageIOFormat, KSycocaEntry )
 
@@ -76,7 +76,7 @@ protected:
 };
 
 /** \internal */
-class KIO_EXPORT KImageIOFormatList : public KImageIOFormat::List
+class TDEIO_EXPORT KImageIOFormatList : public KImageIOFormat::List
 {
 public:
    KImageIOFormatList() { }
@@ -84,7 +84,7 @@ public:
 
 
 /** \internal */
-class KIO_EXPORT KImageIOFactory : public KSycocaFactory
+class TDEIO_EXPORT KImageIOFactory : public KSycocaFactory
 {
   friend class KImageIO;
   K_SYCOCAFACTORY( KST_KImageIO )
diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h
index e2946d37a..602ba45a0 100644
--- a/kio/kio/klimitediodevice.h
+++ b/kio/kio/klimitediodevice.h
@@ -28,7 +28,7 @@
  * @author David Faure <david@mandrakesoft.com>
  * @since 3.1
  */
-class KIO_EXPORT KLimitedIODevice : public TQIODevice
+class TDEIO_EXPORT KLimitedIODevice : public TQIODevice
 {
 public:
     /**
diff --git a/kio/kio/kmessageboxwrapper.h b/kio/kio/kmessageboxwrapper.h
index 356d98042..3590b5e89 100644
--- a/kio/kio/kmessageboxwrapper.h
+++ b/kio/kio/kmessageboxwrapper.h
@@ -27,7 +27,7 @@
  * Allows KIO classes to display dialog boxes with the correct
  * theme/style even in non-GUI apps like kded and kfmclient
  */
-class KIO_EXPORT KMessageBoxWrapper : public KMessageBox
+class TDEIO_EXPORT KMessageBoxWrapper : public KMessageBox
 {
 public:
   static void error(TQWidget *parent, 
diff --git a/kio/kio/kmimemagic.h b/kio/kio/kmimemagic.h
index 49fb300ad..f5430a219 100644
--- a/kio/kio/kmimemagic.h
+++ b/kio/kio/kmimemagic.h
@@ -43,7 +43,7 @@ class KMimeMagic; // see below (read this one first)
  * It contains the mimetype and the encoding of
  * the file or buffer read.
  */
-class KIO_EXPORT_DEPRECATED KMimeMagicResult
+class TDEIO_EXPORT_DEPRECATED KMimeMagicResult
 {
 public:
   KMimeMagicResult() { m_iAccuracy = 100; }
@@ -98,7 +98,7 @@ protected:
  *
  * The result is contained in the class KMimeMagicResult.
  */
-class KIO_EXPORT_DEPRECATED KMimeMagic
+class TDEIO_EXPORT_DEPRECATED KMimeMagic
 {
 public:
   /**
diff --git a/kio/kio/kmimetype.h b/kio/kio/kmimetype.h
index 1d53f3713..8302fa8da 100644
--- a/kio/kio/kmimetype.h
+++ b/kio/kio/kmimetype.h
@@ -44,7 +44,7 @@ class KSimpleConfig;
  *
  * @see KServiceType
  */
-class KIO_EXPORT KMimeType : public KServiceType
+class TDEIO_EXPORT KMimeType : public KServiceType
 {
   K_SYCOCATYPE( KST_KMimeType, KServiceType )
 
@@ -474,7 +474,7 @@ protected:
  * Folder mime type. Handles locked folders, for instance.
  * @short Mimetype for a folder (inode/directory)
  */
-class KIO_EXPORT KFolderType : public KMimeType
+class TDEIO_EXPORT KFolderType : public KMimeType
 {
   K_SYCOCATYPE( KST_KFolderType, KMimeType )
 
@@ -503,7 +503,7 @@ protected:
  * Handles mount/umount icon, and user-defined properties.
  * @short Mimetype for a .desktop file
  */
-class KIO_EXPORT KDEDesktopMimeType : public KMimeType
+class TDEIO_EXPORT KDEDesktopMimeType : public KMimeType
 {
   K_SYCOCATYPE( KST_KDEDesktopMimeType, KMimeType )
 
@@ -619,7 +619,7 @@ protected:
  * The mime type for executable files.
  * @short MimeType for any executable, like /bin/ls
  */
-class KIO_EXPORT KExecMimeType : public KMimeType
+class TDEIO_EXPORT KExecMimeType : public KMimeType
 {
   K_SYCOCATYPE( KST_KExecMimeType, KMimeType )
 
diff --git a/kio/kio/kmimetypechooser.h b/kio/kio/kmimetypechooser.h
index 355eeb707..16ec052f5 100644
--- a/kio/kio/kmimetypechooser.h
+++ b/kio/kio/kmimetypechooser.h
@@ -31,7 +31,7 @@
  *
  * @author Anders Lund (anders at alweb dk), jan 23, 2002
  */
-class KIO_EXPORT KMimeTypeChooser : public TQVBox
+class TDEIO_EXPORT KMimeTypeChooser : public TQVBox
 {
   Q_OBJECT
 
@@ -128,7 +128,7 @@ class KIO_EXPORT KMimeTypeChooser : public TQVBox
   *
   * @author Anders Lund (anders at alweb dk) dec 19, 2001
   */
-class KIO_EXPORT KMimeTypeChooserDialog : public KDialogBase
+class TDEIO_EXPORT KMimeTypeChooserDialog : public KDialogBase
 {
   public:
     /**
diff --git a/kio/kio/kmimetyperesolver.h b/kio/kio/kmimetyperesolver.h
index fdbbb1e5b..c8828a0da 100644
--- a/kio/kio/kmimetyperesolver.h
+++ b/kio/kio/kmimetyperesolver.h
@@ -31,7 +31,7 @@
  * A baseclass for KMimeTypeResolver, with the interface,
  * KMimeTypeResolverHelper uses.
  */
-class KIO_EXPORT KMimeTypeResolverBase
+class TDEIO_EXPORT KMimeTypeResolverBase
 {
 public:
     virtual void slotViewportAdjusted() = 0;
@@ -46,7 +46,7 @@ protected:
  * itself. So an object of this class is used to handle signals, slots etc.
  * and forwards them to the KMimeTypeResolver instance.
  */
-class KIO_EXPORT KMimeTypeResolverHelper : public TQObject
+class TDEIO_EXPORT KMimeTypeResolverHelper : public TQObject
 {
     Q_OBJECT
 
diff --git a/kio/kio/knfsshare.h b/kio/kio/knfsshare.h
index fd6587600..64cd28dcf 100644
--- a/kio/kio/knfsshare.h
+++ b/kio/kio/knfsshare.h
@@ -32,7 +32,7 @@ class KNFSSharePrivate;
  * It parses the /etc/exports file to get its information.
  * Singleton class, call instance() to get an instance.
  */
-class KIO_EXPORT KNFSShare : public TQObject 
+class TDEIO_EXPORT KNFSShare : public TQObject 
 {
 Q_OBJECT
 public:
diff --git a/kio/kio/kprotocolinfo.cpp b/kio/kio/kprotocolinfo.cpp
index f297907e0..9523b70cb 100644
--- a/kio/kio/kprotocolinfo.cpp
+++ b/kio/kio/kprotocolinfo.cpp
@@ -18,8 +18,8 @@
 */
 
 #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32)
-#undef KIO_EXPORT
-#define KIO_EXPORT KDE_EXPORT
+#undef TDEIO_EXPORT
+#define TDEIO_EXPORT KDE_EXPORT
 #endif
 
 #include "kprotocolinfo.h"
diff --git a/kio/kio/kprotocolinfo.h b/kio/kio/kprotocolinfo.h
index a3c579034..8ce7ce500 100644
--- a/kio/kio/kprotocolinfo.h
+++ b/kio/kio/kprotocolinfo.h
@@ -41,7 +41,7 @@
  *
  * @author Torben Weis <weis@kde.org>
  */
-class KIO_EXPORT KProtocolInfo : public KSycocaEntry
+class TDEIO_EXPORT KProtocolInfo : public KSycocaEntry
 {
   friend class KProtocolInfoFactory;
   K_SYCOCATYPE( KST_KProtocolInfo, KSycocaEntry )
@@ -682,7 +682,7 @@ private:
   KProtocolInfoPrivate* d;
 };
 
-KIO_EXPORT TQDataStream& operator>>( TQDataStream& s, KProtocolInfo::ExtraField& field );
-KIO_EXPORT TQDataStream& operator<<( TQDataStream& s, const KProtocolInfo::ExtraField& field );
+TDEIO_EXPORT TQDataStream& operator>>( TQDataStream& s, KProtocolInfo::ExtraField& field );
+TDEIO_EXPORT TQDataStream& operator<<( TQDataStream& s, const KProtocolInfo::ExtraField& field );
 
 #endif
diff --git a/kio/kio/kprotocolmanager.h b/kio/kio/kprotocolmanager.h
index e1d425ebd..f7e27164b 100644
--- a/kio/kio/kprotocolmanager.h
+++ b/kio/kio/kprotocolmanager.h
@@ -51,7 +51,7 @@ class TDEConfig;
  * @author Dawit Alemayehu <adawit@kde.org>
  * @see KPAC
  */
-class KIO_EXPORT KProtocolManager
+class TDEIO_EXPORT KProtocolManager
 {
 public:
 
diff --git a/kio/kio/kremoteencoding.h b/kio/kio/kremoteencoding.h
index 6f5eea5fd..18dfe1fdb 100644
--- a/kio/kio/kremoteencoding.h
+++ b/kio/kio/kremoteencoding.h
@@ -41,7 +41,7 @@ class KRemoteEncodingPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @since 3.3
  */
-class KIO_EXPORT KRemoteEncoding
+class TDEIO_EXPORT KRemoteEncoding
 {
 public:
   /**
diff --git a/kio/kio/krun.h b/kio/kio/krun.h
index 44bff6dee..03186af85 100644
--- a/kio/kio/krun.h
+++ b/kio/kio/krun.h
@@ -55,7 +55,7 @@ namespace TDEIO {
  *
  * @short Opens files with their associated applications in KDE
  */
-class KIO_EXPORT KRun : public TQObject
+class TDEIO_EXPORT KRun : public TQObject
 {
   Q_OBJECT
 public:
@@ -461,7 +461,7 @@ private:
  * KRun can open the openwith dialog directly now.
  * Use KRun::displayOpenWithDialog() if you were using KOpenWithHandler directly.
  */
-class KIO_EXPORT_DEPRECATED KOpenWithHandler
+class TDEIO_EXPORT_DEPRECATED KOpenWithHandler
 {
 public:
   KOpenWithHandler() {}
@@ -475,7 +475,7 @@ public:
  * It sends a notification when the process exits (for the taskbar)
  * and it will show an error message if necessary (e.g. "program not found").
  */
-class KIO_EXPORT TDEProcessRunner : public TQObject
+class TDEIO_EXPORT TDEProcessRunner : public TQObject
 {
   Q_OBJECT
 
diff --git a/kio/kio/ksambashare.h b/kio/kio/ksambashare.h
index ba922ecf5..ffd298588 100644
--- a/kio/kio/ksambashare.h
+++ b/kio/kio/ksambashare.h
@@ -31,7 +31,7 @@ class KSambaSharePrivate;
  * any suid script.
  * Singleton class, call instance() to get an instance.
  */
-class KIO_EXPORT KSambaShare : public TQObject 
+class TDEIO_EXPORT KSambaShare : public TQObject 
 {
 Q_OBJECT
 public:
diff --git a/kio/kio/kscan.h b/kio/kio/kscan.h
index 755d4972a..940b8ceaa 100644
--- a/kio/kio/kscan.h
+++ b/kio/kio/kscan.h
@@ -60,7 +60,7 @@ class TQImage;
  * @short A baseclass and accessor for Scanning Dialogs
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KScanDialog : public KDialogBase
+class TDEIO_EXPORT KScanDialog : public KDialogBase
 {
     Q_OBJECT
 
@@ -179,7 +179,7 @@ private:
  * createDialog().
  * @short Factory for creating KScanDialogs
  */
-class KIO_EXPORT KScanDialogFactory : public KLibFactory
+class TDEIO_EXPORT KScanDialogFactory : public KLibFactory
 {
 public:
     virtual ~KScanDialogFactory();
@@ -233,7 +233,7 @@ private:
 /**
  * Base class for OCR Dialogs.
  */
-class KIO_EXPORT KOCRDialog : public KDialogBase
+class TDEIO_EXPORT KOCRDialog : public KDialogBase
 {
     Q_OBJECT
 
@@ -315,7 +315,7 @@ private:
  * createDialog().
  * @short Factory for creating KScanDialogs
  */
-class KIO_EXPORT KOCRDialogFactory : public KLibFactory
+class TDEIO_EXPORT KOCRDialogFactory : public KLibFactory
 {
 public:
     virtual ~KOCRDialogFactory();
diff --git a/kio/kio/kservice.h b/kio/kio/kservice.h
index 37f0e0f25..800bacf11 100644
--- a/kio/kio/kservice.h
+++ b/kio/kio/kservice.h
@@ -45,7 +45,7 @@ class TQWidget;
  * @see KServiceGroup
  * @author Torben Weis <weis@kde.org>
  */
-class KIO_EXPORT KService : public KSycocaEntry
+class TDEIO_EXPORT KService : public KSycocaEntry
 {
   K_SYCOCATYPE( KST_KService, KSycocaEntry )
 
diff --git a/kio/kio/kservicefactory.h b/kio/kio/kservicefactory.h
index 8e86f8cbc..2fd9dd822 100644
--- a/kio/kio/kservicefactory.h
+++ b/kio/kio/kservicefactory.h
@@ -35,7 +35,7 @@ class KSycocaDict;
  * It loads the services from parsing directories (e.g. applnk/)
  * but can also create service from data streams or single config files
  */
-class KIO_EXPORT KServiceFactory : public KSycocaFactory
+class TDEIO_EXPORT KServiceFactory : public KSycocaFactory
 {
   K_SYCOCAFACTORY( KST_KServiceFactory )
 public:
diff --git a/kio/kio/kservicegroup.h b/kio/kio/kservicegroup.h
index afc043adf..8e2fa42e6 100644
--- a/kio/kio/kservicegroup.h
+++ b/kio/kio/kservicegroup.h
@@ -65,7 +65,7 @@ class KBuildServiceGroupFactory;
  * \endcode
  * @short Represents a group of services
  */
-class KIO_EXPORT KServiceGroup : public KSycocaEntry
+class TDEIO_EXPORT KServiceGroup : public KSycocaEntry
 {
   friend class KBuildServiceGroupFactory;
   K_SYCOCATYPE( KST_KServiceGroup, KSycocaEntry )
@@ -327,7 +327,7 @@ private:
   Private* d;
 };
 
-class KIO_EXPORT KServiceSeparator : public KSycocaEntry
+class TDEIO_EXPORT KServiceSeparator : public KSycocaEntry
 {
   K_SYCOCATYPE( KST_KServiceSeparator, KSycocaEntry )
 
diff --git a/kio/kio/kservicegroupfactory.h b/kio/kio/kservicegroupfactory.h
index b1131b398..5fad77ce6 100644
--- a/kio/kio/kservicegroupfactory.h
+++ b/kio/kio/kservicegroupfactory.h
@@ -33,7 +33,7 @@ class KSycocaDict;
  * A sycoca factory for service groups (e.g. list of applications)
  * It loads the services from parsing directories (e.g. applnk/)
  */
-class KIO_EXPORT KServiceGroupFactory : public KSycocaFactory
+class TDEIO_EXPORT KServiceGroupFactory : public KSycocaFactory
 {
   K_SYCOCAFACTORY( KST_KServiceGroupFactory )
 public:
diff --git a/kio/kio/kservicetype.h b/kio/kio/kservicetype.h
index b96984d43..f17eb0394 100644
--- a/kio/kio/kservicetype.h
+++ b/kio/kio/kservicetype.h
@@ -42,7 +42,7 @@
  * Service types are stored as desktop files in $TDEHOME/share/servicetypes.
  * @see KService
  */
-class KIO_EXPORT KServiceType : public KSycocaEntry
+class TDEIO_EXPORT KServiceType : public KSycocaEntry
 {
   K_SYCOCATYPE( KST_KServiceType, KSycocaEntry )
 
diff --git a/kio/kio/kservicetypefactory.h b/kio/kio/kservicetypefactory.h
index fd3c96a1a..b1a3c5dab 100644
--- a/kio/kio/kservicetypefactory.h
+++ b/kio/kio/kservicetypefactory.h
@@ -42,7 +42,7 @@ class KExecMimeType;
  * It loads the service types from parsing directories (e.g. mimelnk/)
  * but can also create service types from data streams or single config files
  */
-class KIO_EXPORT KServiceTypeFactory : public KSycocaFactory
+class TDEIO_EXPORT KServiceTypeFactory : public KSycocaFactory
 {
   K_SYCOCAFACTORY( KST_KServiceTypeFactory )
 public:
diff --git a/kio/kio/kshellcompletion.h b/kio/kio/kshellcompletion.h
index acfa638cf..fa90c509e 100644
--- a/kio/kio/kshellcompletion.h
+++ b/kio/kio/kshellcompletion.h
@@ -37,7 +37,7 @@ class KShellCompletionPrivate;
  * @short Shell-like completion of file names
  * @author David Smith <dsmith@algonet.se>
  */
-class KIO_EXPORT KShellCompletion : public KURLCompletion 
+class TDEIO_EXPORT KShellCompletion : public KURLCompletion 
 {
 	Q_OBJECT
 
diff --git a/kio/kio/kshred.h b/kio/kio/kshred.h
index c7669122a..7f817c1ea 100644
--- a/kio/kio/kshred.h
+++ b/kio/kio/kshred.h
@@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * @author Andreas F. Pour <bugs@mieterra.com>
  * @author David Faure <faure@kde.org> (integration into KDE and progress signal)
  */
-class KIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove
+class TDEIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove
 
   Q_OBJECT
 
diff --git a/kio/kio/ktar.h b/kio/kio/ktar.h
index 67f004a39..fc238073c 100644
--- a/kio/kio/ktar.h
+++ b/kio/kio/ktar.h
@@ -37,7 +37,7 @@
  * 
  * @author Torben Weis <weis@kde.org>, David Faure <faure@kde.org>
  */
-class KIO_EXPORT KTar : public KArchive
+class TDEIO_EXPORT KTar : public KArchive
 {
 public:
     /**
diff --git a/kio/kio/ktrader.h b/kio/kio/ktrader.h
index 8abf09870..772f0be3a 100644
--- a/kio/kio/ktrader.h
+++ b/kio/kio/ktrader.h
@@ -82,7 +82,7 @@
  *        applications or components.
  * @author Torben Weis <weis@kde.org>
  */
-class KIO_EXPORT KTrader : public TQObject
+class TDEIO_EXPORT KTrader : public TQObject
 {
     Q_OBJECT
 public:
diff --git a/kio/kio/ktraderparsetree.h b/kio/kio/ktraderparsetree.h
index 8cc466abd..a08b61a5a 100644
--- a/kio/kio/ktraderparsetree.h
+++ b/kio/kio/ktraderparsetree.h
@@ -36,7 +36,7 @@ namespace TDEIO {
 class ParseTreeBase;
 
 /** \internal */
-struct KIO_EXPORT PreferencesReturn
+struct TDEIO_EXPORT PreferencesReturn
 {
   enum Type { PRT_DOUBLE, PRT_ERROR };
 
@@ -59,20 +59,20 @@ struct KIO_EXPORT PreferencesReturn
  *         1  => Does match
  *         <0 => Error
  */
-KIO_EXPORT int matchConstraint( const ParseTreeBase *_tree, const KService::Ptr &,
+TDEIO_EXPORT int matchConstraint( const ParseTreeBase *_tree, const KService::Ptr &,
 		     const KServiceTypeProfile::OfferList& );
 
 /**
  * @internal
  * @return 1 on success or <0 on Error
  */
-KIO_EXPORT PreferencesReturn matchPreferences( const ParseTreeBase *_tree, const KService::Ptr &,
+TDEIO_EXPORT PreferencesReturn matchPreferences( const ParseTreeBase *_tree, const KService::Ptr &,
 				    const KServiceTypeProfile::OfferList& );
 
 /**
  * @internal
  */
-struct KIO_EXPORT PreferencesMaxima
+struct TDEIO_EXPORT PreferencesMaxima
 {
   enum Type { PM_ERROR, PM_INVALID_INT, PM_INVALID_DOUBLE, PM_DOUBLE, PM_INT };
 
@@ -86,7 +86,7 @@ struct KIO_EXPORT PreferencesMaxima
 /**
  * @internal
  */
-class KIO_EXPORT ParseContext
+class TDEIO_EXPORT ParseContext
 {
 public:
   /**
@@ -120,7 +120,7 @@ public:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeBase : public KShared
+class TDEIO_EXPORT ParseTreeBase : public KShared
 {
 public:
   typedef KSharedPtr<ParseTreeBase> Ptr;
@@ -131,13 +131,13 @@ protected:
   virtual ~ParseTreeBase() { };
 };
 
-KIO_EXPORT ParseTreeBase::Ptr parseConstraints( const TQString& _constr );
-KIO_EXPORT ParseTreeBase::Ptr parsePreferences( const TQString& _prefs );
+TDEIO_EXPORT ParseTreeBase::Ptr parseConstraints( const TQString& _constr );
+TDEIO_EXPORT ParseTreeBase::Ptr parsePreferences( const TQString& _prefs );
 
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeOR : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeOR : public ParseTreeBase
 {
 public:
   ParseTreeOR( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; }
@@ -152,7 +152,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeAND : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeAND : public ParseTreeBase
 {
 public:
   ParseTreeAND( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; }
@@ -167,7 +167,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeCMP : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeCMP : public ParseTreeBase
 {
 public:
   ParseTreeCMP( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2, int _i ) { m_pLeft = _ptr1; m_pRight = _ptr2; m_cmd = _i; }
@@ -183,7 +183,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeIN : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeIN : public ParseTreeBase
 {
 public:
   ParseTreeIN( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; }
@@ -198,7 +198,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeMATCH : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeMATCH : public ParseTreeBase
 {
 public:
   ParseTreeMATCH( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; }
@@ -213,7 +213,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeCALC : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeCALC : public ParseTreeBase
 {
 public:
   ParseTreeCALC( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2, int _i ) { m_pLeft = _ptr1; m_pRight = _ptr2; m_cmd = _i; }
@@ -229,7 +229,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeBRACKETS : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeBRACKETS : public ParseTreeBase
 {
 public:
   ParseTreeBRACKETS( ParseTreeBase *_ptr ) { m_pLeft = _ptr; }
@@ -243,7 +243,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeNOT : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeNOT : public ParseTreeBase
 {
 public:
   ParseTreeNOT( ParseTreeBase *_ptr ) { m_pLeft = _ptr; }
@@ -257,7 +257,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeEXIST : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeEXIST : public ParseTreeBase
 {
 public:
   ParseTreeEXIST( const char *_id ) { m_id = _id; }
@@ -271,7 +271,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeID : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeID : public ParseTreeBase
 {
 public:
   ParseTreeID( const char *arg ) { m_str = arg; }
@@ -285,7 +285,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeSTRING : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeSTRING : public ParseTreeBase
 {
 public:
   ParseTreeSTRING( const char *arg ) { m_str = arg; }
@@ -299,7 +299,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeNUM : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeNUM : public ParseTreeBase
 {
 public:
   ParseTreeNUM( int arg ) { m_int = arg; }
@@ -313,7 +313,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeDOUBLE : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeDOUBLE : public ParseTreeBase
 {
 public:
   ParseTreeDOUBLE( double arg ) { m_double = arg; }
@@ -327,7 +327,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeBOOL : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeBOOL : public ParseTreeBase
 {
 public:
   ParseTreeBOOL( bool arg ) { m_bool = arg; }
@@ -341,7 +341,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeMAX2 : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeMAX2 : public ParseTreeBase
 {
 public:
   ParseTreeMAX2( const char *_id ) { m_strId = _id; }
@@ -355,7 +355,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeMIN2 : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeMIN2 : public ParseTreeBase
 {
 public:
   ParseTreeMIN2( const char *_id ) { m_strId = _id; }
diff --git a/kio/kio/kurifilter.h b/kio/kio/kurifilter.h
index 0084129bf..fd7cb9b3c 100644
--- a/kio/kio/kurifilter.h
+++ b/kio/kio/kurifilter.h
@@ -76,7 +76,7 @@ class TDECModule;
 * @author Dawit Alemayehu <adawit at kde.org>
 */
 
-class KIO_EXPORT KURIFilterData
+class TDEIO_EXPORT KURIFilterData
 {
 friend class KURIFilterPlugin;
 
@@ -360,7 +360,7 @@ private:
  *
  * @short Abstract class for URI filter plugins.
  */
-class KIO_EXPORT KURIFilterPlugin : public TQObject
+class TDEIO_EXPORT KURIFilterPlugin : public TQObject
 {
     Q_OBJECT
     
@@ -460,7 +460,7 @@ private:
 /**
  * A list of filter plugins.
  */
-class KIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
+class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
 {
 public:
     virtual int compareItems(Item a, Item b)
@@ -545,7 +545,7 @@ private:
  * @short Filters a given URL into its proper format whenever possible.
  */
 
-class KIO_EXPORT KURIFilter
+class TDEIO_EXPORT KURIFilter
 {
 public:
     /**
diff --git a/kio/kio/kurlcompletion.h b/kio/kio/kurlcompletion.h
index 62eda9f8d..f785696b4 100644
--- a/kio/kio/kurlcompletion.h
+++ b/kio/kio/kurlcompletion.h
@@ -38,7 +38,7 @@ class KURLCompletionPrivate;
  * @short Completion of a single URL
  * @author David Smith <dsmith@algonet.se>
  */
-class KIO_EXPORT KURLCompletion : public KCompletion
+class TDEIO_EXPORT KURLCompletion : public KCompletion
 {
 	Q_OBJECT
 
diff --git a/kio/kio/kurlpixmapprovider.h b/kio/kio/kurlpixmapprovider.h
index 1fa400c1e..82be4bd1b 100644
--- a/kio/kio/kurlpixmapprovider.h
+++ b/kio/kio/kurlpixmapprovider.h
@@ -39,7 +39,7 @@
  * @short Resolves pixmaps for URLs
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KURLPixmapProvider : public KPixmapProvider
+class TDEIO_EXPORT KURLPixmapProvider : public KPixmapProvider
 {
 public:
     /**
diff --git a/kio/kio/kuserprofile.h b/kio/kio/kuserprofile.h
index 061657625..45b58fe6a 100644
--- a/kio/kio/kuserprofile.h
+++ b/kio/kio/kuserprofile.h
@@ -37,7 +37,7 @@
  * @see KService
  * @short Holds the user's preference of a service.
  */
-class KIO_EXPORT KServiceOffer
+class TDEIO_EXPORT KServiceOffer
 {
 public:
   /**
@@ -114,7 +114,7 @@ private:
  * @see KTrader
  * @short Represents the user's preferences for services of a service type
  */
-class KIO_EXPORT KServiceTypeProfile
+class TDEIO_EXPORT KServiceTypeProfile
 {
 public:
   typedef TQValueList<KServiceOffer> OfferList;
diff --git a/kio/kio/kzip.h b/kio/kio/kzip.h
index 26bfc71d3..9e4d24eeb 100644
--- a/kio/kio/kzip.h
+++ b/kio/kio/kzip.h
@@ -50,7 +50,7 @@ class KZipFileEntry;
  * @author Holger Schroeder <holger-kde@holgis.net>
  * @since 3.1
  */
-class KIO_EXPORT KZip : public KArchive
+class TDEIO_EXPORT KZip : public KArchive
 {
 public:
     /**
@@ -223,7 +223,7 @@ private:
 /**
  * @internal
  */
-class KIO_EXPORT KZipFileEntry : public KArchiveFile
+class TDEIO_EXPORT KZipFileEntry : public KArchiveFile
 {
 public:
     /*KZipFileEntry() : st(-1)
diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp
index 545c841b0..3787fac80 100644
--- a/kio/kio/metainfojob.cpp
+++ b/kio/kio/metainfojob.cpp
@@ -169,12 +169,12 @@ TQStringList MetaInfoJob::supportedMimeTypes()
     return result;
 }
 
-KIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KFileItemList &items)
+TDEIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KFileItemList &items)
 {
     return new MetaInfoJob(items, false);
 }
 
-KIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KURL::List &items)
+TDEIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KURL::List &items)
 {
     KFileItemList fileItems;
     for (KURL::List::ConstIterator it = items.begin(); it != items.end(); ++it)
diff --git a/kio/kio/metainfojob.h b/kio/kio/metainfojob.h
index 0f7d485b3..e2152bded 100644
--- a/kio/kio/metainfojob.h
+++ b/kio/kio/metainfojob.h
@@ -32,7 +32,7 @@ namespace TDEIO {
      * @short KIO Job to retrieve meta information from files.
      * @since 3.1
      */
-    class KIO_EXPORT MetaInfoJob : public TDEIO::Job
+    class TDEIO_EXPORT MetaInfoJob : public TDEIO::Job
     {
         Q_OBJECT
     public:
@@ -105,7 +105,7 @@ namespace TDEIO {
      * @param items files to get metainfo for
      * @return the MetaInfoJob to retrieve the items
      */
-    KIO_EXPORT MetaInfoJob* fileMetaInfo(const KFileItemList& items);
+    TDEIO_EXPORT MetaInfoJob* fileMetaInfo(const KFileItemList& items);
 
     /**
      * Retrieves meta information for the given items.
@@ -113,7 +113,7 @@ namespace TDEIO {
      * @param items files to get metainfo for
      * @return the MetaInfoJob to retrieve the items
      */
-    KIO_EXPORT MetaInfoJob* fileMetaInfo(const KURL::List& items);
+    TDEIO_EXPORT MetaInfoJob* fileMetaInfo(const KURL::List& items);
 }
 
 #endif
diff --git a/kio/kio/netaccess.h b/kio/kio/netaccess.h
index ba8988dfc..54dd02974 100644
--- a/kio/kio/netaccess.h
+++ b/kio/kio/netaccess.h
@@ -56,7 +56,7 @@ namespace TDEIO {
    *
    * @short Provides an easy, synchronous interface to KIO file operations.
    */
-class KIO_EXPORT NetAccess : public TQObject
+class TDEIO_EXPORT NetAccess : public TQObject
 {
   Q_OBJECT
 
diff --git a/kio/kio/observer.h b/kio/kio/observer.h
index 8c20e6f92..1869e5638 100644
--- a/kio/kio/observer.h
+++ b/kio/kio/observer.h
@@ -52,7 +52,7 @@ namespace TDEIO {
  * @short Observer for TDEIO::Job progress information
  * @author David Faure <faure@kde.org>
  */
-class KIO_EXPORT Observer : public TQObject, public DCOPObject {
+class TDEIO_EXPORT Observer : public TQObject, public DCOPObject {
 
   K_DCOP
   Q_OBJECT
diff --git a/kio/kio/passdlg.h b/kio/kio/passdlg.h
index b071ddef0..864023398 100644
--- a/kio/kio/passdlg.h
+++ b/kio/kio/passdlg.h
@@ -33,7 +33,7 @@ namespace TDEIO {
  * instead of directly instantiating this dialog.
  * @short dialog for requesting login and password from the end user
  */
-class KIO_EXPORT PasswordDialog : public KDialogBase
+class TDEIO_EXPORT PasswordDialog : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp
index 55102c5ed..472f4e313 100644
--- a/kio/kio/paste.cpp
+++ b/kio/kio/paste.cpp
@@ -143,7 +143,7 @@ static TDEIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
 #endif
 
 // KDE4: remove
-KIO_EXPORT bool TDEIO::isClipboardEmpty()
+TDEIO_EXPORT bool TDEIO::isClipboardEmpty()
 {
 #ifndef QT_NO_MIMECLIPBOARD
   TQMimeSource *data = TQApplication::clipboard()->data();
@@ -207,7 +207,7 @@ TDEIO::CopyJob* TDEIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url
 #endif
 
 // The main method for pasting
-KIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move )
+TDEIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move )
 {
   if ( !dest_url.isValid() ) {
     KMessageBox::error( 0L, i18n( "Malformed URL\n%1" ).arg( dest_url.url() ) );
@@ -256,7 +256,7 @@ KIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move )
 }
 
 
-KIO_EXPORT void TDEIO::pasteData( const KURL& u, const TQByteArray& _data )
+TDEIO_EXPORT void TDEIO::pasteData( const KURL& u, const TQByteArray& _data )
 {
     KURL new_url = getNewFileName( u, TQString::null );
     // We could use TDEIO::put here, but that would require a class
@@ -273,12 +273,12 @@ KIO_EXPORT void TDEIO::pasteData( const KURL& u, const TQByteArray& _data )
     (void) TDEIO::NetAccess::upload( tempFile.name(), new_url, 0 );
 }
 
-KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data )
+TDEIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data )
 {
     return pasteDataAsync( u, _data, TQString::null );
 }
 
-KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data, const TQString& text )
+TDEIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data, const TQString& text )
 {
     KURL new_url = getNewFileName( u, text );
 
@@ -288,7 +288,7 @@ KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArr
     return pasteDataAsyncTo( new_url, _data );
 }
 
-KIO_EXPORT TQString TDEIO::pasteActionText()
+TDEIO_EXPORT TQString TDEIO::pasteActionText()
 {
     TQMimeSource *data = TQApplication::clipboard()->data();
     KURL::List urls;
diff --git a/kio/kio/paste.h b/kio/kio/paste.h
index 36befcd65..66579831a 100644
--- a/kio/kio/paste.h
+++ b/kio/kio/paste.h
@@ -42,7 +42,7 @@ namespace TDEIO {
    * @return the job that handles the operation
    * @see pasteData()
    */
-  KIO_EXPORT Job *pasteClipboard( const KURL& destURL, bool move = false );
+  TDEIO_EXPORT Job *pasteClipboard( const KURL& destURL, bool move = false );
 
   /**
    * Pastes the given @p data to the given destination URL.
@@ -54,7 +54,7 @@ namespace TDEIO {
    * @param data the data to copy
    * @see pasteClipboard()
    */
-  KIO_EXPORT void pasteData( const KURL& destURL, const TQByteArray& data );
+  TDEIO_EXPORT void pasteData( const KURL& destURL, const TQByteArray& data );
 
   /**
    * Pastes the given @p data to the given destination URL.
@@ -66,7 +66,7 @@ namespace TDEIO {
    * @param data the data to copy
    * @see pasteClipboard()
    */
-  KIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data );
+  TDEIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data );
 
   /**
    * Pastes the given @p data to the given destination URL.
@@ -79,7 +79,7 @@ namespace TDEIO {
    * @param dialogText the text to show in the dialog
    * @see pasteClipboard()
    */
-  KIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data, const TQString& dialogText ); // KDE4: merge with above
+  TDEIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data, const TQString& dialogText ); // KDE4: merge with above
 
 
   /**
@@ -100,7 +100,7 @@ namespace TDEIO {
    *
    * @since 3.5
    */
-  KIO_EXPORT CopyJob* pasteMimeSource( TQMimeSource* data, const KURL& destURL,
+  TDEIO_EXPORT CopyJob* pasteMimeSource( TQMimeSource* data, const KURL& destURL,
                                        const TQString& dialogText, TQWidget* widget,
                                        bool clipboard = false );
 
@@ -109,7 +109,7 @@ namespace TDEIO {
    * @return true if not
    * Not used anymore, wrong method name, so it will disappear in KDE4.
    */
-  KIO_EXPORT_DEPRECATED bool isClipboardEmpty();
+  TDEIO_EXPORT_DEPRECATED bool isClipboardEmpty();
 
   /**
    * Returns the text to use for the Paste action, when the application supports
@@ -119,7 +119,7 @@ namespace TDEIO {
    *
    * @since 3.5
    */
-  KIO_EXPORT TQString pasteActionText();
+  TDEIO_EXPORT TQString pasteActionText();
 }
 
 #endif
diff --git a/kio/kio/previewjob.h b/kio/kio/previewjob.h
index a0a137ff4..fe8e16c0f 100644
--- a/kio/kio/previewjob.h
+++ b/kio/kio/previewjob.h
@@ -34,7 +34,7 @@ namespace TDEIO {
      * This class catches a preview (thumbnail) for files.
      * @short KIO Job to get a thumbnail picture
      */
-    class KIO_EXPORT PreviewJob : public TDEIO::Job
+    class TDEIO_EXPORT PreviewJob : public TDEIO::Job
     {
         Q_OBJECT
     public:
@@ -154,7 +154,7 @@ namespace TDEIO {
      * @return the new PreviewJob
      * @see PreviewJob::availablePlugins()
      */
-    KIO_EXPORT PreviewJob *filePreview( const KFileItemList &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 );
+    TDEIO_EXPORT PreviewJob *filePreview( const KFileItemList &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 );
 
     /**
      * Creates a PreviewJob to generate or retrieve a preview image 
@@ -176,7 +176,7 @@ namespace TDEIO {
      * @return the new PreviewJob
      * @see PreviewJob::availablePlugins()
      */
-    KIO_EXPORT PreviewJob *filePreview( const KURL::List &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 );
+    TDEIO_EXPORT PreviewJob *filePreview( const KURL::List &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 );
 }
 
 #endif
diff --git a/kio/kio/progressbase.h b/kio/kio/progressbase.h
index cbcab06be..2be545621 100644
--- a/kio/kio/progressbase.h
+++ b/kio/kio/progressbase.h
@@ -67,7 +67,7 @@ namespace TDEIO
 * @short Base class for IO progress dialogs.
 * @author Matej Koss <koss@miesto.sk>
 */
-class KIO_EXPORT ProgressBase : public TQWidget {
+class TDEIO_EXPORT ProgressBase : public TQWidget {
 
   Q_OBJECT
 
diff --git a/kio/kio/renamedlg.h b/kio/kio/renamedlg.h
index b2347539b..38dcac925 100644
--- a/kio/kio/renamedlg.h
+++ b/kio/kio/renamedlg.h
@@ -45,7 +45,7 @@ enum RenameDlg_Result { R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERW
  * @short A dialog for renaming files.
  * @since 3.1
  */
-class KIO_EXPORT RenameDlg : public TQDialog
+class TDEIO_EXPORT RenameDlg : public TQDialog
 {
   Q_OBJECT
 public:
@@ -135,7 +135,7 @@ private:
    * @param mtimeDest modification time of destination file
    * @return the result
    */
-KIO_EXPORT RenameDlg_Result open_RenameDlg( const TQString & caption,
+TDEIO_EXPORT RenameDlg_Result open_RenameDlg( const TQString & caption,
                                  // KDE4: make those KURLs
                                  const TQString& src, const TQString & dest,
                                  RenameDlg_Mode mode, TQString& newDestPath,
diff --git a/kio/kio/renamedlgplugin.h b/kio/kio/renamedlgplugin.h
index ab50e6b6a..b3604b084 100644
--- a/kio/kio/renamedlgplugin.h
+++ b/kio/kio/renamedlgplugin.h
@@ -31,7 +31,7 @@
  * @short Base class for RenameDlg plugins. 
  * @since 3.1
  */
-class KIO_EXPORT RenameDlgPlugin : public TQWidget
+class TDEIO_EXPORT RenameDlgPlugin : public TQWidget
 {
 public:
   /**
diff --git a/kio/kio/scheduler.h b/kio/kio/scheduler.h
index 9871cd1c2..ac0764dc4 100644
--- a/kio/kio/scheduler.h
+++ b/kio/kio/scheduler.h
@@ -108,7 +108,7 @@ namespace TDEIO {
      * @see TDEIO::Job
      **/
 
-    class KIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject {
+    class TDEIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject {
         Q_OBJECT
 
     public:
diff --git a/kio/kio/sessiondata.h b/kio/kio/sessiondata.h
index 80b28ace6..4fef02161 100644
--- a/kio/kio/sessiondata.h
+++ b/kio/kio/sessiondata.h
@@ -32,7 +32,7 @@ class SlaveConfig;
 /**
  * @internal
  */
-class KIO_EXPORT SessionData : public TQObject
+class TDEIO_EXPORT SessionData : public TQObject
 {
     Q_OBJECT
 
diff --git a/kio/kio/skipdlg.h b/kio/kio/skipdlg.h
index e1199de97..56252dace 100644
--- a/kio/kio/skipdlg.h
+++ b/kio/kio/skipdlg.h
@@ -29,12 +29,12 @@ namespace TDEIO {
 
   enum SkipDlg_Result { S_SKIP = 1, S_AUTO_SKIP = 2, S_CANCEL = 0 };
 
-  KIO_EXPORT SkipDlg_Result open_SkipDlg( bool _multi, const TQString& _error_text = TQString::null );
+  TDEIO_EXPORT SkipDlg_Result open_SkipDlg( bool _multi, const TQString& _error_text = TQString::null );
 
 /**
  * @internal
  */
-class KIO_EXPORT SkipDlg : public KDialog
+class TDEIO_EXPORT SkipDlg : public KDialog
 {
   Q_OBJECT
 public:
diff --git a/kio/kio/slave.h b/kio/kio/slave.h
index bbede6637..6f9f02a2f 100644
--- a/kio/kio/slave.h
+++ b/kio/kio/slave.h
@@ -41,7 +41,7 @@ namespace TDEIO {
     * do *not* use connection() or slaveconn but the respective TDEIO::Slave
     * accessor methods. Otherwise classes derived from Slave might break. (LS)
     */
-    class KIO_EXPORT Slave : public TDEIO::SlaveInterface
+    class TDEIO_EXPORT Slave : public TDEIO::SlaveInterface
     {
 	Q_OBJECT
 	
diff --git a/kio/kio/slavebase.h b/kio/kio/slavebase.h
index 332646875..a65a1f94f 100644
--- a/kio/kio/slavebase.h
+++ b/kio/kio/slavebase.h
@@ -42,7 +42,7 @@ class SlaveBasePrivate;
  *
  * A call to foo() results in a call to slotFoo() on the other end.
  */
-class KIO_EXPORT SlaveBase
+class TDEIO_EXPORT SlaveBase
 {
 public:
     SlaveBase( const TQCString &protocol, const TQCString &pool_socket, const TQCString &app_socket);
diff --git a/kio/kio/slaveconfig.h b/kio/kio/slaveconfig.h
index 59abb74ac..5bdc6cda8 100644
--- a/kio/kio/slaveconfig.h
+++ b/kio/kio/slaveconfig.h
@@ -44,7 +44,7 @@ namespace TDEIO {
      * only applied when the slave is connecting with a host that matches with 
      * the host and/or domain specified by the group.
      */
-    class KIO_EXPORT SlaveConfig : public TQObject
+    class TDEIO_EXPORT SlaveConfig : public TQObject
     {
 	Q_OBJECT
     public:
diff --git a/kio/kio/slaveinterface.h b/kio/kio/slaveinterface.h
index 79d797e08..8ac7b683e 100644
--- a/kio/kio/slaveinterface.h
+++ b/kio/kio/slaveinterface.h
@@ -90,7 +90,7 @@ class SlaveInterfacePrivate;
  *
  * A call to foo() results in a call to slotFoo() on the other end.
  */
-class KIO_EXPORT SlaveInterface : public TQObject
+class TDEIO_EXPORT SlaveInterface : public TQObject
 {
     Q_OBJECT
 
@@ -284,7 +284,7 @@ inline TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSAtom &a )
     return s;
 }
 
-KIO_EXPORT TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSEntry &e );
-KIO_EXPORT TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSEntry &e );
+TDEIO_EXPORT TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSEntry &e );
+TDEIO_EXPORT TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSEntry &e );
 
 #endif
diff --git a/kio/kio/statusbarprogress.h b/kio/kio/statusbarprogress.h
index 58bd77fa9..d1d591fbe 100644
--- a/kio/kio/statusbarprogress.h
+++ b/kio/kio/statusbarprogress.h
@@ -57,7 +57,7 @@ class Job;
 * @short IO progress widget for embedding in a statusbar.
 * @author Matej Koss <koss@miesto.sk>
 */
-class KIO_EXPORT StatusbarProgress : public ProgressBase {
+class TDEIO_EXPORT StatusbarProgress : public ProgressBase {
 
   Q_OBJECT
 
diff --git a/kio/kio/tcpslavebase.h b/kio/kio/tcpslavebase.h
index 8a4e436ce..52081c807 100644
--- a/kio/kio/tcpslavebase.h
+++ b/kio/kio/tcpslavebase.h
@@ -42,7 +42,7 @@ namespace TDEIO {
  *
  * A call to foo() results in a call to slotFoo() on the other end.
  */
-class KIO_EXPORT TCPSlaveBase : public SlaveBase
+class TDEIO_EXPORT TCPSlaveBase : public SlaveBase
 {
 public:
     TCPSlaveBase(unsigned short int defaultPort, const TQCString &protocol,
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:
diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h
index 462624fcd..06b8febab 100644
--- a/kio/misc/kntlm/kntlm.h
+++ b/kio/misc/kntlm/kntlm.h
@@ -38,7 +38,7 @@
  * This class doesn't maintain any state information, so all methods are static.
  */
 
-class KIO_EXPORT KNTLM {
+class TDEIO_EXPORT KNTLM {
 public:
 
   enum Flags {
diff --git a/kio/misc/tdesasl/tdesasl.h b/kio/misc/tdesasl/tdesasl.h
index 1f68ac688..0c57096a8 100644
--- a/kio/misc/tdesasl/tdesasl.h
+++ b/kio/misc/tdesasl/tdesasl.h
@@ -69,7 +69,7 @@ class TQStrIList;
  * @version $Id$
  */
 
-class KIO_EXPORT KDESasl
+class TDEIO_EXPORT KDESasl
 {
 
 public:
diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h
index c7cfaf5c0..abe935ad5 100644
--- a/kio/misc/uiserver.h
+++ b/kio/misc/uiserver.h
@@ -55,7 +55,7 @@ struct ListProgressColumnConfig
 * List view in the UIServer.
 * @internal
 */
-class KIO_EXPORT ListProgress : public KListView {
+class TDEIO_EXPORT ListProgress : public KListView {
 
   Q_OBJECT
 
@@ -103,7 +103,7 @@ protected:
 * One item in the ListProgress
 * @internal
 */
-class KIO_EXPORT ProgressItem : public TQObject, public TQListViewItem {
+class TDEIO_EXPORT ProgressItem : public TQObject, public TQListViewItem {
 
   Q_OBJECT
 
@@ -214,7 +214,7 @@ class UIServerSystemTray;
  *
  * @internal
  */
-class KIO_EXPORT UIServer : public KMainWindow, public DCOPObject {
+class TDEIO_EXPORT UIServer : public KMainWindow, public DCOPObject {
 
   K_DCOP
   Q_OBJECT
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index a0da57244..e811aaec4 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -551,7 +551,7 @@ void JobTest::copyFileToSystem()
 void JobTest::copyFileToSystem( bool resolve_local_urls )
 {
     kdDebug() << k_funcinfo << resolve_local_urls << endl;
-    extern KIO_EXPORT bool kio_resolve_local_urls;
+    extern TDEIO_EXPORT bool kio_resolve_local_urls;
     kio_resolve_local_urls = resolve_local_urls;
 
     const TQString src = homeTmpDir() + "fileFromHome";
diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
index cbff13fdf..0973b0b3b 100644
--- a/kioslave/http/http.cc
+++ b/kioslave/http/http.cc
@@ -2152,7 +2152,7 @@ bool HTTPProtocol::httpOpenConnection()
  * data to be sent in addition to the header (POST requests) and there is no
  * way for this function to get that data.  This function is called in the
  * slotPut() or slotGet() functions which, in turn, are called (indirectly) as
- * a result of a KIOJob::put() or KIOJob::get().  It is those latter functions
+ * a result of a TDEIOJob::put() or TDEIOJob::get().  It is those latter functions
  * which are responsible for starting up this ioslave in the first place.
  * This means that 'httpOpen' is called (essentially) as soon as the ioslave
  * is created -- BEFORE any data gets to this slave.
@@ -4317,7 +4317,7 @@ void HTTPProtocol::slotData(const TQByteArray &_d)
 /**
  * This function is our "receive" function.  It is responsible for
  * downloading the message (not the header) from the HTTP server.  It
- * is called either as a response to a client's KIOJob::dataEnd()
+ * is called either as a response to a client's TDEIOJob::dataEnd()
  * (meaning that the client is done sending data) or by 'httpOpen()'
  * (if we are in the process of a PUT/POST request). It can also be
  * called by a webDAV function, to receive stat/list/property/etc.
diff --git a/kparts/COMMENTS b/kparts/COMMENTS
index 80e5671d1..1a9773212 100644
--- a/kparts/COMMENTS
+++ b/kparts/COMMENTS
@@ -180,7 +180,7 @@ What do you think ? Did I overlook something ?
 
 (Simon) I don't think there's a problem with the async stuff
 	(BrowserView/KReadOnlyPart) . Mosfet's KGhostView browserview or
-	his dviview are both 100% like KReadOnlyPart (yes, they launch KIOJob::copy()
+	his dviview are both 100% like KReadOnlyPart (yes, they launch TDEIOJob::copy()
 	and copy the file to some local temp) . It works :-) and noone complains :-))
 	-> I see no problem with that :-)
 (David) Sure - but does that answer the question : KReadOnlyPart==KBrowserPart ?
diff --git a/kwallet/client/kwallet.h b/kwallet/client/kwallet.h
index cbe8188a5..38157955b 100644
--- a/kwallet/client/kwallet.h
+++ b/kwallet/client/kwallet.h
@@ -50,7 +50,7 @@ namespace KWallet {
  * @author George Staikos <staikos@kde.org>
  * @short KDE Wallet Class
  */
-class KIO_EXPORT Wallet : public TQObject, public DCOPObject {
+class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject {
 	K_DCOP
 	Q_OBJECT
 	protected:
diff --git a/tdecore/kbufferedio.cpp b/tdecore/kbufferedio.cpp
index 951c41244..2424c95e9 100644
--- a/tdecore/kbufferedio.cpp
+++ b/tdecore/kbufferedio.cpp
@@ -29,7 +29,7 @@
 /**
  * @section impldetails Implementation Details
  *
- * The KBufferedIO class has two purposes: first, it defines an API on how
+ * The TDEBufferedIO class has two purposes: first, it defines an API on how
  * that classes providing buffered I/O should provide. Next, it implements on
  * top of that API a generic buffering, that should suffice for most cases.
  *
@@ -86,7 +86,7 @@
  */
 
 // constructor
-KBufferedIO::KBufferedIO() :
+TDEBufferedIO::TDEBufferedIO() :
   inBufIndex(0), outBufIndex(0)
 {
   inBuf.setAutoDelete(true);
@@ -94,14 +94,14 @@ KBufferedIO::KBufferedIO() :
 }
 
 // destructor
-KBufferedIO::~KBufferedIO()
+TDEBufferedIO::~TDEBufferedIO()
 {
 }
 
 // sets the buffer sizes
 // this implementation doesn't support setting the buffer sizes
 // if any parameter is different than -1 or -2, fail
-bool KBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */)
+bool TDEBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */)
 {
   if (wsize != -2 && wsize != -1)
     return false;
@@ -112,27 +112,27 @@ bool KBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */)
 }
 
 #ifdef USE_QT3
-int KBufferedIO::bytesAvailable() const
+int TDEBufferedIO::bytesAvailable() const
 #endif // USE_QT3
 #ifdef USE_QT4
-qint64 KBufferedIO::bytesAvailable() const
+qint64 TDEBufferedIO::bytesAvailable() const
 #endif // USE_QT4
 {
   return readBufferSize();
 }
 
 #ifdef USE_QT3
-int KBufferedIO::bytesToWrite() const
+int TDEBufferedIO::bytesToWrite() const
 #endif // USE_QT3
 #ifdef USE_QT4
-qint64 KBufferedIO::bytesToWrite() const
+qint64 TDEBufferedIO::bytesToWrite() const
 #endif // USE_QT4
 {
   return writeBufferSize();
 }
 
 // This function will scan the read buffer for a '\n'
-bool KBufferedIO::canReadLine() const
+bool TDEBufferedIO::canReadLine() const
 {
   if (bytesAvailable() == 0)
     return false;		// no new line in here
@@ -140,7 +140,7 @@ bool KBufferedIO::canReadLine() const
   TQByteArray* buf;
 
   // scan each TQByteArray for the occurrence of '\n'
-  TQPtrList<TQByteArray> &buflist = ((KBufferedIO*)this)->inBuf;
+  TQPtrList<TQByteArray> &buflist = ((TDEBufferedIO*)this)->inBuf;
   buf = buflist.first();
   char *p = buf->data() + inBufIndex;
   int n = buf->size() - inBufIndex;
@@ -162,7 +162,7 @@ bool KBufferedIO::canReadLine() const
 
 // unreads the current data
 // that is, writes into the read buffer, at the beginning
-int KBufferedIO::unreadBlock(const char *data, uint len)
+int TDEBufferedIO::unreadBlock(const char *data, uint len)
 {
   return feedReadBuffer(len, data, true);
 }
@@ -171,7 +171,7 @@ int KBufferedIO::unreadBlock(const char *data, uint len)
 // protected member functions
 //
 
-unsigned KBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool discard)
+unsigned TDEBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool discard)
 {
   {
     register unsigned u = readBufferSize();
@@ -221,7 +221,7 @@ unsigned KBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool
   return copied;
 }
 
-void KBufferedIO::consumeWriteBuffer(unsigned nbytes)
+void TDEBufferedIO::consumeWriteBuffer(unsigned nbytes)
 {
   TQByteArray *buf = outBuf.first();
   if (buf == NULL)
@@ -250,7 +250,7 @@ void KBufferedIO::consumeWriteBuffer(unsigned nbytes)
     }
 }
 
-unsigned KBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool atBeginning)
+unsigned TDEBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool atBeginning)
 {
   if (nbytes == 0)
     return 0;
@@ -266,7 +266,7 @@ unsigned KBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool a
   return nbytes;
 }
 
-unsigned KBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer)
+unsigned TDEBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer)
 {
   if (nbytes == 0)
     return 0;
@@ -277,33 +277,33 @@ unsigned KBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer)
   return nbytes;
 }
 
-unsigned KBufferedIO::readBufferSize() const
+unsigned TDEBufferedIO::readBufferSize() const
 {
   unsigned count = 0;
-  TQByteArray *buf = ((KBufferedIO*)this)->inBuf.first();
+  TQByteArray *buf = ((TDEBufferedIO*)this)->inBuf.first();
   while (buf != NULL)
     {
       count += buf->size();
-      buf = ((KBufferedIO*)this)->inBuf.next();
+      buf = ((TDEBufferedIO*)this)->inBuf.next();
     }
 
   return count - inBufIndex;
 }
 
-unsigned KBufferedIO::writeBufferSize() const
+unsigned TDEBufferedIO::writeBufferSize() const
 {
   unsigned count = 0;
-  TQByteArray *buf = ((KBufferedIO*)this)->outBuf.first();
+  TQByteArray *buf = ((TDEBufferedIO*)this)->outBuf.first();
   while (buf != NULL)
     {
       count += buf->size();
-      buf = (const_cast<KBufferedIO*>(this))->outBuf.next();
+      buf = (const_cast<TDEBufferedIO*>(this))->outBuf.next();
     }
 
   return count - outBufIndex;
 }
 
-void KBufferedIO::virtual_hook( int id, void* data )
+void TDEBufferedIO::virtual_hook( int id, void* data )
 { KAsyncIO::virtual_hook( id, data ); }
 
 #include "kbufferedio.moc"
diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h
index 78bccc9ef..f00ab52b6 100644
--- a/tdecore/kbufferedio.h
+++ b/tdecore/kbufferedio.h
@@ -25,7 +25,7 @@
 #include <tqptrlist.h>
 #include "kasyncio.h"
 
-class KBufferedIOPrivate;
+class TDEBufferedIOPrivate;
 /**
  * This abstract class implements basic functionality for buffered
  * input/output.
@@ -39,7 +39,7 @@ class KBufferedIOPrivate;
  * written using QSocket's buffering characteristics will be more easily
  * ported to the more powerful KExtendedSocket class.
  *
- * KBufferedIO already provides a powerful internal buffering algorithm. However,
+ * TDEBufferedIO already provides a powerful internal buffering algorithm. However,
  * this does not include the I/O itself, which must be implemented in
  * derived classes. Thus, to implement a class that does some I/O, you must
  * override, in addition to the pure virtual TQIODevice methods, these two:
@@ -53,14 +53,14 @@ class KBufferedIOPrivate;
  * @author Thiago Macieira <thiagom@mail.com>
  * @short Buffered I/O
  */
-class TDECORE_EXPORT KBufferedIO: public KAsyncIO
+class TDECORE_EXPORT TDEBufferedIO: public KAsyncIO
 {
   Q_OBJECT
   
 
 protected:
   // no default public constructor
-  KBufferedIO();
+  TDEBufferedIO();
 
 public:
   /**
@@ -79,7 +79,7 @@ public:
    * Destroys this class. The flushing of the buffers is implementation dependant.
    * The default implementation discards the contents
    */
-  virtual ~KBufferedIO();
+  virtual ~TDEBufferedIO();
 
   /**
    * Closes the stream now, discarding the contents of the
@@ -294,7 +294,7 @@ protected:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KBufferedIOPrivate *d;
+  TDEBufferedIOPrivate *d;
 };
 
 #endif // KBUFFEREDIO_H
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index 9813a0e16..ab08d0ed2 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -228,7 +228,7 @@
 7004        kio (KDirListerCache)
 7005        kio (Filter)
 7006        kio (Scheduler)
-7007        kio (KIOJob)
+7007        kio (TDEIOJob)
 7009        kio (KMimeType)
 7010        kio (KRun)
 7011        kio (KSycoca)
diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp
index d77d2c561..de1735382 100644
--- a/tdecore/kextsock.cpp
+++ b/tdecore/kextsock.cpp
@@ -1570,7 +1570,7 @@ qint64 KExtendedSocket::bytesAvailable() const
   // as of now, we don't do any extra processing
   // we only work in input-buffered sockets
   if (d->flags & inputBufferedSocket)
-    return KBufferedIO::bytesAvailable();
+    return TDEBufferedIO::bytesAvailable();
 
   return 0;			// TODO: FIONREAD ioctl
 }
@@ -2246,6 +2246,6 @@ const char* KAddressInfo::canonname() const
 }
 
 void KExtendedSocket::virtual_hook( int id, void* data )
-{ KBufferedIO::virtual_hook( id, data ); }
+{ TDEBufferedIO::virtual_hook( id, data ); }
 
 #include "kextsock.moc"
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index 6327d51dc..fad502c04 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -92,7 +92,7 @@ class KExtendedSocketPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short an extended socket
  */
-class TDECORE_EXPORT KExtendedSocket: public KBufferedIO // public TQObject, public QIODevice
+class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public QIODevice
 {
   Q_OBJECT
   
@@ -582,7 +582,7 @@ public:
    * @li #closed() will only be sent if we are indeed reading from the input
    *    stream. That is, if this socket is buffering the input. See setBufferSize
    *
-   * Note that, in general, functions inherited/overridden from KBufferedIO will only
+   * Note that, in general, functions inherited/overridden from TDEBufferedIO will only
    * work on buffered sockets, like bytesAvailable and bytesToWrite.
    * @return    The return values are:
    * @li 0: success
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index 943ad1b9a..1c6232068 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -17,8 +17,8 @@
 */
 
 #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32)
-#undef KIO_EXPORT
-#define KIO_EXPORT KDE_EXPORT
+#undef TDEIO_EXPORT
+#define TDEIO_EXPORT KDE_EXPORT
 #endif
 
 #define KPROTOCOLINFO_TDECORE
diff --git a/tdecore/ksimpledirwatch.h b/tdecore/ksimpledirwatch.h
index 36ceafba6..4dcae30b7 100644
--- a/tdecore/ksimpledirwatch.h
+++ b/tdecore/ksimpledirwatch.h
@@ -63,7 +63,7 @@ class KSimpleDirWatchPrivate;
   * @short Class for watching directory and file changes.
   * @author Sven Radej <sven@lisa.exp.univie.ac.at>
   */
-class KIO_EXPORT KSimpleDirWatch : public TQObject
+class TDEIO_EXPORT KSimpleDirWatch : public TQObject
 {
   Q_OBJECT
     
diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp
index 1b08d121e..3e9462922 100644
--- a/tdecore/network/kbufferedsocket.cpp
+++ b/tdecore/network/kbufferedsocket.cpp
@@ -35,28 +35,28 @@
 using namespace KNetwork;
 using namespace KNetwork::Internal;
 
-class KNetwork::KBufferedSocketPrivate
+class KNetwork::TDEBufferedSocketPrivate
 {
 public:
   mutable TDESocketBuffer *input, *output;
 
-  KBufferedSocketPrivate()
+  TDEBufferedSocketPrivate()
   {
     input = 0L;
     output = 0L;
   }
 };
 
-KBufferedSocket::KBufferedSocket(const TQString& host, const TQString& service,
+TDEBufferedSocket::TDEBufferedSocket(const TQString& host, const TQString& service,
 				 TQObject *parent, const char *name)
   : KStreamSocket(host, service, parent, name),
-    d(new KBufferedSocketPrivate)
+    d(new TDEBufferedSocketPrivate)
 {
   setInputBuffering(true);
   setOutputBuffering(true);
 }
 
-KBufferedSocket::~KBufferedSocket()
+TDEBufferedSocket::~TDEBufferedSocket()
 {
   closeNow();
   delete d->input;
@@ -64,13 +64,13 @@ KBufferedSocket::~KBufferedSocket()
   delete d;
 }
 
-void KBufferedSocket::setSocketDevice(TDESocketDevice* device)
+void TDEBufferedSocket::setSocketDevice(TDESocketDevice* device)
 {
   KStreamSocket::setSocketDevice(device);
   device->setBlocking(false);
 }
 
-bool KBufferedSocket::setSocketOptions(int opts)
+bool TDEBufferedSocket::setSocketOptions(int opts)
 {
   if (opts == Blocking)
     return false;
@@ -79,7 +79,7 @@ bool KBufferedSocket::setSocketOptions(int opts)
   return KStreamSocket::setSocketOptions(opts);
 }
 
-void KBufferedSocket::close()
+void TDEBufferedSocket::close()
 {
   if (!d->output || d->output->isEmpty())
     closeNow();
@@ -94,10 +94,10 @@ void KBufferedSocket::close()
 }
 
 #ifdef USE_QT3
-TQ_LONG KBufferedSocket::bytesAvailable() const
+TQ_LONG TDEBufferedSocket::bytesAvailable() const
 #endif
 #ifdef USE_QT4
-qint64 KBufferedSocket::bytesAvailable() const
+qint64 TDEBufferedSocket::bytesAvailable() const
 #endif
 {
   if (!d->input)
@@ -106,7 +106,7 @@ qint64 KBufferedSocket::bytesAvailable() const
   return d->input->length();
 }
 
-TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
+TQ_LONG TDEBufferedSocket::waitForMore(int msecs, bool *timeout)
 {
   TQ_LONG retval = KStreamSocket::waitForMore(msecs, timeout);
   if (d->input)
@@ -118,7 +118,7 @@ TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
   return retval;
 }
 
-TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
+TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
 {
   if (d->input)
     {
@@ -134,13 +134,13 @@ TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
   return KStreamSocket::tqreadBlock(data, maxlen);
 }
 
-TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from)
+TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from)
 {
   from = peerAddress();
   return tqreadBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
+TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
 {
   if (d->input)
     {
@@ -156,13 +156,13 @@ TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
   return KStreamSocket::peekBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
+TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
 {
   from = peerAddress();
   return peekBlock(data, maxlen);
 }
 
-TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
+TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
 {
   if (state() != Connected)
     {
@@ -192,14 +192,14 @@ TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len
   return KStreamSocket::tqwriteBlock(data, len);
 }
 
-TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen,
+TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen,
 				   const TDESocketAddress&)
 {
   // ignore the third parameter
   return tqwriteBlock(data, maxlen);
 }
 
-void KBufferedSocket::enableRead(bool enable)
+void TDEBufferedSocket::enableRead(bool enable)
 {
   KStreamSocket::enableRead(enable);
   if (!enable && d->input)
@@ -216,7 +216,7 @@ void KBufferedSocket::enableRead(bool enable)
     TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity()));
 }
 
-void KBufferedSocket::enableWrite(bool enable)
+void TDEBufferedSocket::enableWrite(bool enable)
 {
   KStreamSocket::enableWrite(enable);
   if (!enable && d->output && !d->output->isEmpty())
@@ -228,7 +228,7 @@ void KBufferedSocket::enableWrite(bool enable)
     }
 }
 
-void KBufferedSocket::stateChanging(SocketState newState)
+void TDEBufferedSocket::stateChanging(SocketState newState)
 {
   if (newState == Connecting || newState == Connected)
     {
@@ -246,7 +246,7 @@ void KBufferedSocket::stateChanging(SocketState newState)
   KStreamSocket::stateChanging(newState);
 }
 
-void KBufferedSocket::setInputBuffering(bool enable)
+void TDEBufferedSocket::setInputBuffering(bool enable)
 {
   TQMutexLocker locker(mutex());
   if (!enable)
@@ -260,12 +260,12 @@ void KBufferedSocket::setInputBuffering(bool enable)
     }
 }
 
-KIOBufferBase* KBufferedSocket::inputBuffer()
+TDEIOBufferBase* TDEBufferedSocket::inputBuffer()
 {
   return d->input;
 }
 
-void KBufferedSocket::setOutputBuffering(bool enable)
+void TDEBufferedSocket::setOutputBuffering(bool enable)
 {
   TQMutexLocker locker(mutex());
   if (!enable)
@@ -279,16 +279,16 @@ void KBufferedSocket::setOutputBuffering(bool enable)
     }
 }
 
-KIOBufferBase* KBufferedSocket::outputBuffer()
+TDEIOBufferBase* TDEBufferedSocket::outputBuffer()
 {
   return d->output;
 }
 
 #ifdef USE_QT3
-TQ_ULONG KBufferedSocket::bytesToWrite() const
+TQ_ULONG TDEBufferedSocket::bytesToWrite() const
 #endif
 #ifdef USE_QT4
-qint64 KBufferedSocket::bytesToWrite() const
+qint64 TDEBufferedSocket::bytesToWrite() const
 #endif
 {
   if (!d->output)
@@ -297,14 +297,14 @@ qint64 KBufferedSocket::bytesToWrite() const
   return d->output->length();
 }
 
-void KBufferedSocket::closeNow()
+void TDEBufferedSocket::closeNow()
 {
   KStreamSocket::close();
   if (d->output)
     d->output->clear();
 }
 
-bool KBufferedSocket::canReadLine() const
+bool TDEBufferedSocket::canReadLine() const
 {
   if (!d->input)
     return false;
@@ -312,12 +312,12 @@ bool KBufferedSocket::canReadLine() const
   return d->input->canReadLine();
 }
 
-TQCString KBufferedSocket::readLine()
+TQCString TDEBufferedSocket::readLine()
 {
   return d->input->readLine();
 }
 
-void KBufferedSocket::waitForConnect()
+void TDEBufferedSocket::waitForConnect()
 {
   if (state() != Connecting)
     return;			// nothing to be waited on
@@ -327,7 +327,7 @@ void KBufferedSocket::waitForConnect()
   KStreamSocket::setSocketOptions(socketOptions() & ~Blocking);
 }
 
-void KBufferedSocket::slotReadActivity()
+void TDEBufferedSocket::slotReadActivity()
 {
   if (d->input && state() == Connected)
     {
@@ -374,7 +374,7 @@ void KBufferedSocket::slotReadActivity()
     }
 }
 
-void KBufferedSocket::slotWriteActivity()
+void TDEBufferedSocket::slotWriteActivity()
 {
   if (d->output && !d->output->isEmpty() &&
       (state() == Connected || state() == Closing))
diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h
index 158a5a434..60ad3e81d 100644
--- a/tdecore/network/kbufferedsocket.h
+++ b/tdecore/network/kbufferedsocket.h
@@ -31,12 +31,12 @@
 #include "kstreamsocket.h"
 #include <tdelibs_export.h>
 
-class KIOBufferBase;
+class TDEIOBufferBase;
 
 namespace KNetwork {
 
-class KBufferedSocketPrivate;
-/** @class KBufferedSocket kbufferedsocket.h kbufferedsocket.h
+class TDEBufferedSocketPrivate;
+/** @class TDEBufferedSocket kbufferedsocket.h kbufferedsocket.h
  *  @brief Buffered stream sockets.
  *
  * This class allows the user to create and operate buffered stream sockets
@@ -55,7 +55,7 @@ class KBufferedSocketPrivate;
  * @see KNetwork::KStreamSocket, KNetwork::TDEServerSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
-class TDECORE_EXPORT KBufferedSocket: public KStreamSocket
+class TDECORE_EXPORT TDEBufferedSocket: public KStreamSocket
 {
   Q_OBJECT
   
@@ -68,13 +68,13 @@ public:
    * @param parent      the parent object for this object
    * @param name        the internal name for this object
    */
-  KBufferedSocket(const TQString& node = TQString::null, const TQString& service = TQString::null,
+  TDEBufferedSocket(const TQString& node = TQString::null, const TQString& service = TQString::null,
 		  TQObject* parent = 0L, const char *name = 0L);
 
   /**
    * Destructor.
    */
-  virtual ~KBufferedSocket();
+  virtual ~TDEBufferedSocket();
 
   /**
    * Be sure to catch new devices.
@@ -168,7 +168,7 @@ public:
   /**
    * Retrieves the input buffer object.
    */
-  KIOBufferBase* inputBuffer();
+  TDEIOBufferBase* inputBuffer();
 
   /**
    * Sets the use of output buffering.
@@ -178,7 +178,7 @@ public:
   /**
    * Retrieves the output buffer object.
    */
-  KIOBufferBase* outputBuffer();
+  TDEIOBufferBase* outputBuffer();
 
   /**
    * Returns the length of the output buffer.
@@ -240,10 +240,10 @@ signals:
   void bytesWritten(int bytes);
 
 private:
-  KBufferedSocket(const KBufferedSocket&);
-  KBufferedSocket& operator=(const KBufferedSocket&);
+  TDEBufferedSocket(const TDEBufferedSocket&);
+  TDEBufferedSocket& operator=(const TDEBufferedSocket&);
 
-  KBufferedSocketPrivate *d;
+  TDEBufferedSocketPrivate *d;
 
 public:
   // KDE4: remove this function
@@ -253,7 +253,7 @@ public:
    *
    * This function is provided to ease porting from KExtendedSocket,
    * which required a call to reset() in order to be able to connect again
-   * using the same device. This is not necessary in KBufferedSocket any more.
+   * using the same device. This is not necessary in TDEBufferedSocket any more.
    */
 #ifdef USE_QT3
   inline void reset()
diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h
index 68c45dd28..27da219a9 100644
--- a/tdecore/network/kclientsocketbase.h
+++ b/tdecore/network/kclientsocketbase.h
@@ -46,7 +46,7 @@ class KClientSocketBasePrivate;
  * such as, and especially, name resolution and signals.
  *
  * @note This class is abstract. If you're looking for a normal,
- *       client socket class, see @ref KStreamSocket and KBufferedSocket
+ *       client socket class, see @ref KStreamSocket and TDEBufferedSocket
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
diff --git a/tdecore/network/kiobuffer.h b/tdecore/network/kiobuffer.h
index ac1352a4d..c79daaa70 100644
--- a/tdecore/network/kiobuffer.h
+++ b/tdecore/network/kiobuffer.h
@@ -32,41 +32,41 @@
 class TQIODevice;
 
 /**
- * @class KIOBufferBase kiobuffer.h kiobuffer.h
+ * @class TDEIOBufferBase kiobuffer.h kiobuffer.h
  * @brief base for I/O buffer implementation
  *
  * This class declares the base methods to interface with an I/O buffer.
  * Most applications will not need to access this class directly, since
- * it is all handled by @ref KNetwork::KBufferedSocket and other buffering
+ * it is all handled by @ref KNetwork::TDEBufferedSocket and other buffering
  * classes.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KIOBufferBase
+class TDEIOBufferBase
 {
 public:
   /**
    * Default constructor. Does nothing.
    */
-  KIOBufferBase()
+  TDEIOBufferBase()
   { }
 
   /**
    * Copy constructor. Does nothing here.
    */
-  KIOBufferBase(const KIOBufferBase& )
+  TDEIOBufferBase(const TDEIOBufferBase& )
   { }
 
   /**
    * Virtual destructor. Does nothing.
    */
-  virtual ~KIOBufferBase()
+  virtual ~TDEIOBufferBase()
   { }
 
   /**
    * Assignment operator. Does nothing.
    */
-  KIOBufferBase& operator=(const KIOBufferBase& )
+  TDEIOBufferBase& operator=(const TDEIOBufferBase& )
   { return *this; }
 
   /**
diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp
index d5a1b90bb..16a48cdf2 100644
--- a/tdecore/network/kserversocket.cpp
+++ b/tdecore/network/kserversocket.cpp
@@ -47,11 +47,11 @@ public:
   int backlog;
   int timeout;
 
-  bool bindWhenFound : 1, listenWhenBound : 1, useKBufferedSocket : 1;
+  bool bindWhenFound : 1, listenWhenBound : 1, useTDEBufferedSocket : 1;
 
   TDEServerSocketPrivate()
     : state(None), timeout(0), bindWhenFound(false), listenWhenBound(false),
-      useKBufferedSocket(true)
+      useTDEBufferedSocket(true)
   { 
     resolver.setFlags(KResolver::Passive);
     resolver.setFamily(KResolver::KnownFamily);
@@ -277,7 +277,7 @@ void TDEServerSocket::close()
 
 void TDEServerSocket::setAcceptBuffered(bool enable)
 {
-  d->useKBufferedSocket = enable;
+  d->useTDEBufferedSocket = enable;
 }
 
 KActiveSocketBase* TDEServerSocket::accept()
@@ -319,8 +319,8 @@ KActiveSocketBase* TDEServerSocket::accept()
     }
 
   KStreamSocket* streamsocket;
-  if (d->useKBufferedSocket)
-    streamsocket = new KBufferedSocket();
+  if (d->useTDEBufferedSocket)
+    streamsocket = new TDEBufferedSocket();
   else
     streamsocket = new KStreamSocket();
   streamsocket->setSocketDevice(accepted);
diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h
index 6821a886a..edb86d0b2 100644
--- a/tdecore/network/kserversocket.h
+++ b/tdecore/network/kserversocket.h
@@ -95,13 +95,13 @@ class TDEServerSocketPrivate;
  *
  * It is important to note that @ref accept can return either an
  * object of type KNetwork::KStreamSocket or
- * KNetwork::KBufferedSocket (default). If you want to accept a
+ * KNetwork::TDEBufferedSocket (default). If you want to accept a
  * non-buffered socket, you must first call setAcceptBuffered.
  *
  * @warning If you use TDEServerSocket in an auxiliary (non-GUI) thread,
  *          you need to accept only KNetwork::KStreamSocket objects.
  *
- * @see KNetwork::KStreamSocket, KNetwork::KBufferedSocket
+ * @see KNetwork::KStreamSocket, KNetwork::TDEBufferedSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
 class TDECORE_EXPORT TDEServerSocket: public TQObject, public KPassiveSocketBase
@@ -338,7 +338,7 @@ public:
    * Toggles whether the accepted socket will be buffered or not.
    * That is, the @ref accept function will always return a KStreamSocket
    * object or descended from it. If buffering is enabled, the class
-   * to be returned will be KBufferedSocket.
+   * to be returned will be TDEBufferedSocket.
    *
    * By default, this flag is set to true.
    *
@@ -361,7 +361,7 @@ public:
    *       the base class for active sockets, but it is guaranteed
    *       that the object will be a KStreamSocket or derived from it.
    *
-   * @sa KBufferedSocket
+   * @sa TDEBufferedSocket
    * @sa setAcceptBuffered
    */
   virtual KActiveSocketBase* accept();
diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h
index d077296c1..c1f9e5848 100644
--- a/tdecore/network/kstreamsocket.h
+++ b/tdecore/network/kstreamsocket.h
@@ -35,7 +35,7 @@ namespace KNetwork {
 class KResolverEntry;
 class KResolverResults;
 class TDEServerSocket;
-class KBufferedSocket;
+class TDEBufferedSocket;
 
 class KStreamSocketPrivate;
 /** @class KStreamSocket kstreamsocket.h kstreamsocket.h
@@ -50,7 +50,7 @@ class KStreamSocketPrivate;
  *
  * KStreamSocket objects are thread-safe and can be used in auxiliary
  * threads (i.e., not the thread in which the Qt event loop runs in).
- * Note that KBufferedSocket cannot be used reliably in an auxiliary thread.
+ * Note that TDEBufferedSocket cannot be used reliably in an auxiliary thread.
  *
  * Sample usage:
  * \code
@@ -91,7 +91,7 @@ class KStreamSocketPrivate;
  *  }
  * \endcode
  *
- * @see KNetwork::KBufferedSocket, KNetwork::TDEServerSocket
+ * @see KNetwork::TDEBufferedSocket, KNetwork::TDEServerSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
 class TDECORE_EXPORT KStreamSocket: public KClientSocketBase
@@ -242,7 +242,7 @@ private:
   KStreamSocketPrivate *d;
 
   friend class TDEServerSocket;
-  friend class KBufferedSocket;
+  friend class TDEBufferedSocket;
 };
 
 } 				// namespace KNetwork
diff --git a/tdecore/network/tdesocketbuffer.cpp b/tdecore/network/tdesocketbuffer.cpp
index 52988d344..33b8fe776 100644
--- a/tdecore/network/tdesocketbuffer.cpp
+++ b/tdecore/network/tdesocketbuffer.cpp
@@ -39,7 +39,7 @@ TDESocketBuffer::TDESocketBuffer(TQ_LONG size)
 }
 
 TDESocketBuffer::TDESocketBuffer(const TDESocketBuffer& other)
-  : KIOBufferBase(other), m_mutex(true)
+  : TDEIOBufferBase(other), m_mutex(true)
 {
   *this = other;
 }
@@ -54,7 +54,7 @@ TDESocketBuffer& TDESocketBuffer::operator=(const TDESocketBuffer& other)
   TQMutexLocker locker1(&m_mutex);
   TQMutexLocker locker2(&other.m_mutex);
 
-  KIOBufferBase::operator=(other);
+  TDEIOBufferBase::operator=(other);
 
   m_list = other.m_list;	// copy-on-write
   m_offset = other.m_offset;
diff --git a/tdecore/network/tdesocketbuffer_p.h b/tdecore/network/tdesocketbuffer_p.h
index be71f462e..0fa5d4e37 100644
--- a/tdecore/network/tdesocketbuffer_p.h
+++ b/tdecore/network/tdesocketbuffer_p.h
@@ -41,11 +41,11 @@ class KActiveSocketBase;
  * @class TDESocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h
  * @brief generic socket buffering code
  *
- * This class implements generic buffering used by @ref KBufferedSocket.
+ * This class implements generic buffering used by @ref TDEBufferedSocket.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDESocketBuffer: public KIOBufferBase
+class TDESocketBuffer: public TDEIOBufferBase
 {
 public:
   /**
diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h
index 767752689..a226eac94 100644
--- a/tdecore/tdelibs_export.h
+++ b/tdecore/tdelibs_export.h
@@ -37,7 +37,7 @@
 #define TDEFX_EXPORT KDE_EXPORT
 #define TDEPRINT_EXPORT KDE_EXPORT
 #define KDNSSD_EXPORT KDE_EXPORT
-#define KIO_EXPORT KDE_EXPORT
+#define TDEIO_EXPORT KDE_EXPORT
 #define DCOP_EXPORT KDE_EXPORT
 #define KPARTS_EXPORT KDE_EXPORT
 #define KTEXTEDITOR_EXPORT KDE_EXPORT
@@ -73,8 +73,8 @@
 # ifndef TDECORE_EXPORT_DEPRECATED
 #  define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT
 # endif
-# ifndef KIO_EXPORT_DEPRECATED
-#  define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT
+# ifndef TDEIO_EXPORT_DEPRECATED
+#  define TDEIO_EXPORT_DEPRECATED KDE_DEPRECATED TDEIO_EXPORT
 # endif
 # ifndef TDEUI_EXPORT_DEPRECATED
 #  define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index b0d61b8ac..e5d45a42a 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -992,7 +992,7 @@ void KMCupsManager::checkUpdatePossibleInternal()
 {
 	kdDebug(500) << "Checking for update possible" << endl;
 	delete m_socket;
-        m_socket = new KNetwork::KBufferedSocket;
+        m_socket = new KNetwork::TDEBufferedSocket;
 	m_socket->setTimeout( 1500 );
 	connect( m_socket, TQT_SIGNAL( connected(const KResolverEntry&) ), 
                 TQT_SLOT( slotConnectionSuccess() ) );
diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h
index 17663a5fa..a61464ed3 100644
--- a/win/tdelibs_export_win.h
+++ b/win/tdelibs_export_win.h
@@ -63,11 +63,11 @@
 # define TDEPRINT_EXPORT KDE_IMPORT
 #endif
 
-#ifndef KIO_EXPORT
+#ifndef TDEIO_EXPORT
 # ifdef MAKE_KIO_LIB
-#  define KIO_EXPORT KDE_EXPORT
+#  define TDEIO_EXPORT KDE_EXPORT
 # else
-#  define KIO_EXPORT KDE_IMPORT
+#  define TDEIO_EXPORT KDE_IMPORT
 # endif
 #endif