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

36 files changed, 59 insertions, 59 deletions

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