Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

8 files changed, 94 insertions, 94 deletions

diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index 188c3c394..2082821a8 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -67,36 +67,36 @@ void KonqInfoListViewItem::updateContents()
       {
          switch (tmpColumn->udsId)
          {
-         case KIO::UDS_USER:
+         case TDEIO::UDS_USER:
             setText(tmpColumn->displayInColumn,m_fileitem->user());
             break;
-         case KIO::UDS_GROUP:
+         case TDEIO::UDS_GROUP:
             setText(tmpColumn->displayInColumn,m_fileitem->group());
             break;
-         case KIO::UDS_FILE_TYPE:
+         case TDEIO::UDS_FILE_TYPE:
             setText(tmpColumn->displayInColumn,m_fileitem->mimeComment());
             break;
-         case KIO::UDS_MIME_TYPE:
+         case TDEIO::UDS_MIME_TYPE:
             setText(tmpColumn->displayInColumn,m_fileitem->mimetype());
             break;
-         case KIO::UDS_URL:
+         case TDEIO::UDS_URL:
             setText(tmpColumn->displayInColumn,m_fileitem->url().prettyURL());
             break;
-         case KIO::UDS_LINK_DEST:
+         case TDEIO::UDS_LINK_DEST:
             setText(tmpColumn->displayInColumn,m_fileitem->linkDest());
             break;
-         case KIO::UDS_SIZE:
+         case TDEIO::UDS_SIZE:
             if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() )
                 setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
             else
-                setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" ");
+                setText(tmpColumn->displayInColumn,TDEIO::convertSize(m_fileitem->size())+" ");
             break;
-         case KIO::UDS_ACCESS:
+         case TDEIO::UDS_ACCESS:
             setText(tmpColumn->displayInColumn,m_fileitem->permissionsString());
             break;
-         case KIO::UDS_MODIFICATION_TIME:
-         case KIO::UDS_ACCESS_TIME:
-         case KIO::UDS_CREATION_TIME:
+         case TDEIO::UDS_MODIFICATION_TIME:
+         case TDEIO::UDS_ACCESS_TIME:
+         case TDEIO::UDS_CREATION_TIME:
             {
                TQDateTime dt;
                time_t _time = m_fileitem->time( tmpColumn->udsId );
@@ -265,12 +265,12 @@ void KonqBaseListViewItem::mimetypeFound()
     for (unsigned int i=0; i<KonqBaseListViewWidget::NumberOfAtoms && done < 2; i++)
     {
         ColumnInfo *tmpColumn=&lv->columnConfigInfo()[i];
-        if (lv->columnConfigInfo()[i].udsId==KIO::UDS_FILE_TYPE && tmpColumn->displayThisOne)
+        if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_FILE_TYPE && tmpColumn->displayThisOne)
         {
             setText(tmpColumn->displayInColumn, m_fileitem->mimeComment());
             done++;
         }
-        if (lv->columnConfigInfo()[i].udsId==KIO::UDS_MIME_TYPE && tmpColumn->displayThisOne)
+        if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_MIME_TYPE && tmpColumn->displayThisOne)
         {
             setText(tmpColumn->displayInColumn, m_fileitem->mimetype());
             done++;
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index ff829c4c0..cb942dfe8 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -235,10 +235,10 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
     }
     else
     {
-        m_metaInfoJob = KIO::fileMetaInfo(list);
+        m_metaInfoJob = TDEIO::fileMetaInfo(list);
         connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
              this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
-        connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)),
+        connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)),
              this, TQT_SLOT( slotMetaInfoResult()));
     }
 }
@@ -255,10 +255,10 @@ void KonqInfoListViewWidget::slotRefreshItems( const KFileItemList& list)
     }
     else
     {
-        m_metaInfoJob = KIO::fileMetaInfo(list);
+        m_metaInfoJob = TDEIO::fileMetaInfo(list);
         connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
              this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
-        connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)),
+        connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)),
              this, TQT_SLOT( slotMetaInfoResult()));
     }
     KonqBaseListViewWidget::slotRefreshItems(list);
@@ -311,10 +311,10 @@ void KonqInfoListViewWidget::slotMetaInfoResult()
     }
     else
     {
-        m_metaInfoJob = KIO::fileMetaInfo(m_metaInfoTodo);
+        m_metaInfoJob = TDEIO::fileMetaInfo(m_metaInfoTodo);
         connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
              this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
-        connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)),
+        connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)),
              this, TQT_SLOT( slotMetaInfoResult()));
         m_metaInfoTodo.clear();
     }
diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h
index 5ae497ac2..c4dcf5076 100644
--- a/konqueror/listview/konq_infolistviewwidget.h
+++ b/konqueror/listview/konq_infolistviewwidget.h
@@ -25,7 +25,7 @@
 #include <tqmap.h>
 #include <tqpair.h>
 
-namespace KIO {class MetaInfoJob;}
+namespace TDEIO {class MetaInfoJob;}
 class KonqListView;
 class KSelectAction;
 
@@ -82,7 +82,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget
       KonqILVMimeType                 m_favorite;
       
       KSelectAction*                  m_mtSelector;
-      KIO::MetaInfoJob*               m_metaInfoJob;
+      TDEIO::MetaInfoJob*               m_metaInfoJob;
       KFileItemList                   m_metaInfoTodo;
 };
 
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index 94f9211ac..a1f522bf6 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -264,18 +264,18 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char
    setupActions();
 
    m_pListView->confColumns.resize( 11 );
-   m_pListView->confColumns[0].setData(I18N_NOOP("MimeType"),"Type",KIO::UDS_MIME_TYPE,m_paShowMimeType);
-   m_pListView->confColumns[1].setData(I18N_NOOP("Size"),"Size",KIO::UDS_SIZE,m_paShowSize);
-   m_pListView->confColumns[2].setData(I18N_NOOP("Modified"),"Date",KIO::UDS_MODIFICATION_TIME,m_paShowTime);
-   m_pListView->confColumns[3].setData(I18N_NOOP("Accessed"),"AccessDate",KIO::UDS_ACCESS_TIME,m_paShowAccessTime);
-   m_pListView->confColumns[4].setData(I18N_NOOP("Created"),"CreationDate",KIO::UDS_CREATION_TIME,m_paShowCreateTime);
-   m_pListView->confColumns[5].setData(I18N_NOOP("Permissions"),"Access",KIO::UDS_ACCESS,m_paShowPermissions);
-   m_pListView->confColumns[6].setData(I18N_NOOP("Owner"),"Owner",KIO::UDS_USER,m_paShowOwner);
-   m_pListView->confColumns[7].setData(I18N_NOOP("Group"),"Group",KIO::UDS_GROUP,m_paShowGroup);
-   m_pListView->confColumns[8].setData(I18N_NOOP("Link"),"Link",KIO::UDS_LINK_DEST,m_paShowLinkDest);
-   m_pListView->confColumns[9].setData(I18N_NOOP("URL"),"URL",KIO::UDS_URL,m_paShowURL);
+   m_pListView->confColumns[0].setData(I18N_NOOP("MimeType"),"Type",TDEIO::UDS_MIME_TYPE,m_paShowMimeType);
+   m_pListView->confColumns[1].setData(I18N_NOOP("Size"),"Size",TDEIO::UDS_SIZE,m_paShowSize);
+   m_pListView->confColumns[2].setData(I18N_NOOP("Modified"),"Date",TDEIO::UDS_MODIFICATION_TIME,m_paShowTime);
+   m_pListView->confColumns[3].setData(I18N_NOOP("Accessed"),"AccessDate",TDEIO::UDS_ACCESS_TIME,m_paShowAccessTime);
+   m_pListView->confColumns[4].setData(I18N_NOOP("Created"),"CreationDate",TDEIO::UDS_CREATION_TIME,m_paShowCreateTime);
+   m_pListView->confColumns[5].setData(I18N_NOOP("Permissions"),"Access",TDEIO::UDS_ACCESS,m_paShowPermissions);
+   m_pListView->confColumns[6].setData(I18N_NOOP("Owner"),"Owner",TDEIO::UDS_USER,m_paShowOwner);
+   m_pListView->confColumns[7].setData(I18N_NOOP("Group"),"Group",TDEIO::UDS_GROUP,m_paShowGroup);
+   m_pListView->confColumns[8].setData(I18N_NOOP("Link"),"Link",TDEIO::UDS_LINK_DEST,m_paShowLinkDest);
+   m_pListView->confColumns[9].setData(I18N_NOOP("URL"),"URL",TDEIO::UDS_URL,m_paShowURL);
    // Note: File Type is in fact the mimetype comment. We use UDS_FILE_TYPE but that's not what we show in fact :/
-   m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",KIO::UDS_FILE_TYPE,m_paShowType);
+   m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",TDEIO::UDS_FILE_TYPE,m_paShowType);
 
 
    connect( m_pListView, TQT_SIGNAL( selectionChanged() ),
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc
index 616559bad..925f33f8f 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -30,12 +30,12 @@
 static TQString retrieveExtraEntry( KFileItem* fileitem, int numExtra )
 {
     /// ######## SLOOOOW
-    KIO::UDSEntry::ConstIterator it = fileitem->entry().begin();
-    const KIO::UDSEntry::ConstIterator end = fileitem->entry().end();
+    TDEIO::UDSEntry::ConstIterator it = fileitem->entry().begin();
+    const TDEIO::UDSEntry::ConstIterator end = fileitem->entry().end();
     int n = 0;
     for( ; it != end; ++it )
     {
-        if ((*it).m_uds == KIO::UDS_EXTRA)
+        if ((*it).m_uds == TDEIO::UDS_EXTRA)
         {
             ++n;
             if ( n == numExtra )
@@ -99,36 +99,36 @@ void KonqListViewItem::updateContents()
       {
          switch (tmpColumn->udsId)
          {
-         case KIO::UDS_USER:
+         case TDEIO::UDS_USER:
             setText(tmpColumn->displayInColumn,m_fileitem->user());
             break;
-         case KIO::UDS_GROUP:
+         case TDEIO::UDS_GROUP:
             setText(tmpColumn->displayInColumn,m_fileitem->group());
             break;
-         case KIO::UDS_FILE_TYPE:
+         case TDEIO::UDS_FILE_TYPE:
             setText(tmpColumn->displayInColumn,m_fileitem->mimeComment());
             break;
-         case KIO::UDS_MIME_TYPE:
+         case TDEIO::UDS_MIME_TYPE:
             setText(tmpColumn->displayInColumn,m_fileitem->mimetype());
             break;
-         case KIO::UDS_URL:
+         case TDEIO::UDS_URL:
             setText(tmpColumn->displayInColumn,m_fileitem->url().prettyURL());
             break;
-         case KIO::UDS_LINK_DEST:
+         case TDEIO::UDS_LINK_DEST:
             setText(tmpColumn->displayInColumn,m_fileitem->linkDest());
             break;
-         case KIO::UDS_SIZE:
+         case TDEIO::UDS_SIZE:
             if ( m_pListViewWidget->m_pSettings->fileSizeInBytes() )
                 setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
             else
-                setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" ");
+                setText(tmpColumn->displayInColumn,TDEIO::convertSize(m_fileitem->size())+" ");
             break;
-         case KIO::UDS_ACCESS:
+         case TDEIO::UDS_ACCESS:
             setText(tmpColumn->displayInColumn,m_fileitem->permissionsString());	    
             break;
-         case KIO::UDS_MODIFICATION_TIME:
-         case KIO::UDS_ACCESS_TIME:
-         case KIO::UDS_CREATION_TIME:
+         case TDEIO::UDS_MODIFICATION_TIME:
+         case TDEIO::UDS_ACCESS_TIME:
+         case TDEIO::UDS_CREATION_TIME:
             {
                TQDateTime dt;
                time_t _time = m_fileitem->time( tmpColumn->udsId );
@@ -139,7 +139,7 @@ void KonqListViewItem::updateContents()
                }
             }
             break;
-         case KIO::UDS_EXTRA:
+         case TDEIO::UDS_EXTRA:
          {
              const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra );
              if ( tmpColumn->type == TQVariant::DateTime )
@@ -251,27 +251,27 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending
    for ( unsigned int i=0; i<m_pListViewWidget->NumberOfAtoms; i++ )
    {
       ColumnInfo *cInfo = &m_pListViewWidget->columnConfigInfo()[i];
-      if ( cInfo->udsId == KIO::UDS_EXTRA )
+      if ( cInfo->udsId == TDEIO::UDS_EXTRA )
           ++numExtra;
       if ( col == cInfo->displayInColumn )
       {
          switch ( cInfo->udsId )
          {
-            case KIO::UDS_MODIFICATION_TIME:
-            case KIO::UDS_ACCESS_TIME:
-            case KIO::UDS_CREATION_TIME:
+            case TDEIO::UDS_MODIFICATION_TIME:
+            case TDEIO::UDS_ACCESS_TIME:
+            case TDEIO::UDS_CREATION_TIME:
             {
                 time_t t1 = m_fileitem->time( cInfo->udsId );
                 time_t t2 = k->m_fileitem->time( cInfo->udsId );
                 return ( t1 > t2 ) ? 1 : ( t1 < t2 ) ? -1 : 0;
             }
-            case KIO::UDS_SIZE:
+            case TDEIO::UDS_SIZE:
             {
-                KIO::filesize_t s1 = m_fileitem->size();
-                KIO::filesize_t s2 = k->m_fileitem->size();
+                TDEIO::filesize_t s1 = m_fileitem->size();
+                TDEIO::filesize_t s2 = k->m_fileitem->size();
                 return ( s1 > s2 ) ? 1 : ( s1 < s2 ) ? -1 : 0;
             }
-            case KIO::UDS_EXTRA:
+            case TDEIO::UDS_EXTRA:
             {
                 if ( cInfo->type & TQVariant::DateTime ) {
                     const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra );
@@ -434,12 +434,12 @@ void KonqBaseListViewItem::mimetypeFound()
     for (unsigned int i=0; i<m_pListViewWidget->NumberOfAtoms && done < 2; i++)
     {
         ColumnInfo *tmpColumn=&lv->columnConfigInfo()[i];
-        if (lv->columnConfigInfo()[i].udsId==KIO::UDS_FILE_TYPE && tmpColumn->displayThisOne)
+        if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_FILE_TYPE && tmpColumn->displayThisOne)
         {
             setText(tmpColumn->displayInColumn, m_fileitem->mimeComment());
             done++;
         }
-        if (lv->columnConfigInfo()[i].udsId==KIO::UDS_MIME_TYPE && tmpColumn->displayThisOne)
+        if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_MIME_TYPE && tmpColumn->displayThisOne)
         {
             setText(tmpColumn->displayInColumn, m_fileitem->mimetype());
             done++;
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 8c4b17319..1dd7a25ad 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -238,7 +238,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
           t = TQVariant::DateTime;
       else
           kdWarning() << "Unsupported ExtraType '" << type << "'" << endl;
-      confColumns[extraIndex++].setData( column, TQString("Extra%1").arg(num), KIO::UDS_EXTRA, t, 0);
+      confColumns[extraIndex++].setData( column, TQString("Extra%1").arg(num), TDEIO::UDS_EXTRA, t, 0);
    }
 
    //disable everything
@@ -275,24 +275,24 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
                ColumnInfo *tmpColumn = &confColumns[j];
                TQString str;
 
-               if ( tmpColumn->udsId == KIO::UDS_SIZE )
+               if ( tmpColumn->udsId == TDEIO::UDS_SIZE )
                   str = TDEGlobal::locale()->formatNumber( 888888888, 0 ) + "  ";
-               else if ( tmpColumn->udsId == KIO::UDS_ACCESS )
+               else if ( tmpColumn->udsId == TDEIO::UDS_ACCESS )
                   str = "--Permissions--";
-               else if ( tmpColumn->udsId == KIO::UDS_USER )
+               else if ( tmpColumn->udsId == TDEIO::UDS_USER )
                   str = "a_long_username";
-               else if ( tmpColumn->udsId == KIO::UDS_GROUP )
+               else if ( tmpColumn->udsId == TDEIO::UDS_GROUP )
                   str = "a_groupname";
-               else if ( tmpColumn->udsId == KIO::UDS_LINK_DEST )
+               else if ( tmpColumn->udsId == TDEIO::UDS_LINK_DEST )
                   str = "a_quite_long_filename_for_link_dest";
-               else if ( tmpColumn->udsId == KIO::UDS_FILE_TYPE )
+               else if ( tmpColumn->udsId == TDEIO::UDS_FILE_TYPE )
                   str = "a_long_comment_for_mimetype";
-               else if ( tmpColumn->udsId == KIO::UDS_MIME_TYPE )
+               else if ( tmpColumn->udsId == TDEIO::UDS_MIME_TYPE )
                   str = "_a_long_/_mimetype_";
-               else if ( tmpColumn->udsId == KIO::UDS_URL )
+               else if ( tmpColumn->udsId == TDEIO::UDS_URL )
                   str = "a_long_lonq_long_very_long_url";
-               else if ( (tmpColumn->udsId & KIO::UDS_TIME)
-                         || (tmpColumn->udsId == KIO::UDS_EXTRA &&
+               else if ( (tmpColumn->udsId & TDEIO::UDS_TIME)
+                         || (tmpColumn->udsId == TDEIO::UDS_EXTRA &&
                              (tmpColumn->type & TQVariant::DateTime)) )
                {
                   TQDateTime dt( TQDate( 2000, 10, 10 ), TQTime( 20, 20, 20 ) );
@@ -318,8 +318,8 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
    listingList.append( "MimeType" );
    for ( unsigned int i = 0; i < NumberOfAtoms; i++ )
    {
-      if ( confColumns[i].udsId == KIO::UDS_URL ||
-           confColumns[i].udsId == KIO::UDS_MIME_TYPE ||
+      if ( confColumns[i].udsId == TDEIO::UDS_URL ||
+           confColumns[i].udsId == TDEIO::UDS_MIME_TYPE ||
            !confColumns[i].displayThisOne )
       {
          continue;
@@ -364,7 +364,7 @@ void KonqBaseListViewWidget::createColumns()
          addColumn( i18n(confColumns[i].name.utf8()), confColumns[i].width );
          if ( sortedByColumn == confColumns[i].desktopFileName )
             setSorting( currentColumn, m_bAscending );
-         if ( confColumns[i].udsId == KIO::UDS_SIZE )
+         if ( confColumns[i].udsId == TDEIO::UDS_SIZE )
              setColumnAlignment( currentColumn, AlignRight );
          i = -1;
          currentColumn++;
@@ -870,7 +870,7 @@ void KonqBaseListViewWidget::slotItemRenamed( TQListViewItem *item, const TQStri
    if( !name.isEmpty() )
    {
       // Actually attempt the rename. If it succeeds, KDirLister will update the name.
-      KonqOperations::rename( this, renamedItem->item()->url(), KIO::encodeFileName( name ) );
+      KonqOperations::rename( this, renamedItem->item()->url(), TDEIO::encodeFileName( name ) );
    }
 
    // When the KListViewLineEdit loses focus, focus tends to go to the location bar...
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index b1d536df9..5dd6aca11 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -30,7 +30,7 @@
 #include <konq_propsview.h>
 #include "konq_listviewitems.h"
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 class TQCursor;
 class TQRect;
diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc
index e594e8a9a..4b989a9e7 100644
--- a/konqueror/listview/konq_textviewitem.cc
+++ b/konqueror/listview/konq_textviewitem.cc
@@ -44,16 +44,16 @@ int KonqTextViewItem::compare( TQListViewItem *item, int col, bool ascending ) c
          ColumnInfo *cInfo=&lv->columnConfigInfo()[i];
          if (_column==cInfo->displayInColumn)
          {
-            if ((cInfo->udsId==KIO::UDS_MODIFICATION_TIME)
-                || (cInfo->udsId==KIO::UDS_ACCESS_TIME)
-                || (cInfo->udsId==KIO::UDS_CREATION_TIME))
+            if ((cInfo->udsId==TDEIO::UDS_MODIFICATION_TIME)
+                || (cInfo->udsId==TDEIO::UDS_ACCESS_TIME)
+                || (cInfo->udsId==TDEIO::UDS_CREATION_TIME))
             {
                tmp += TQString::number( m_fileitem->time(cInfo->udsId) ).rightJustify( 14, '0' );
                return tmp;
             }
-            else if (cInfo->udsId==KIO::UDS_SIZE)
+            else if (cInfo->udsId==TDEIO::UDS_SIZE)
             {
-               tmp += KIO::number( m_fileitem->size() ).rightJustify( 20, '0' );
+               tmp += TDEIO::number( m_fileitem->size() ).rightJustify( 20, '0' );
                return tmp;
             }
             else break;
@@ -68,7 +68,7 @@ int KonqTextViewItem::compare( TQListViewItem *item, int col, bool ascending ) c
 void KonqTextViewItem::updateContents()
 {
    TQString tmp;
-   KIO::filesize_t size=m_fileitem->size();
+   TDEIO::filesize_t size=m_fileitem->size();
    mode_t m=m_fileitem->mode();
 
    // The order is: .dir (0), dir (1), .file (2), file (3)
@@ -151,37 +151,37 @@ void KonqTextViewItem::updateContents()
       {
          switch (tmpColumn->udsId)
          {
-         case KIO::UDS_USER:
+         case TDEIO::UDS_USER:
             setText(tmpColumn->displayInColumn,m_fileitem->user());
             break;
-         case KIO::UDS_GROUP:
+         case TDEIO::UDS_GROUP:
             setText(tmpColumn->displayInColumn,m_fileitem->group());
             break;
-         case KIO::UDS_LINK_DEST:
+         case TDEIO::UDS_LINK_DEST:
             setText(tmpColumn->displayInColumn,m_fileitem->linkDest());
             break;
-         case KIO::UDS_FILE_TYPE:
+         case TDEIO::UDS_FILE_TYPE:
             setText(tmpColumn->displayInColumn,m_fileitem->mimeComment());
             break;
-         case KIO::UDS_MIME_TYPE:
+         case TDEIO::UDS_MIME_TYPE:
             setText(tmpColumn->displayInColumn,m_fileitem->mimetype());
             break;
-         case KIO::UDS_URL:
+         case TDEIO::UDS_URL:
             setText(tmpColumn->displayInColumn,m_fileitem->url().prettyURL());
             break;
-         case KIO::UDS_SIZE:
+         case TDEIO::UDS_SIZE:
             if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() )
                 setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber(size, 0)+" ");
             else
-                setText(tmpColumn->displayInColumn,KIO::convertSize(size)+" ");
+                setText(tmpColumn->displayInColumn,TDEIO::convertSize(size)+" ");
             break;
-         case KIO::UDS_ACCESS:
+         case TDEIO::UDS_ACCESS:
             setText(tmpColumn->displayInColumn,m_fileitem->permissionsString());
             break;
-         case KIO::UDS_MODIFICATION_TIME:
-         case KIO::UDS_ACCESS_TIME:
-         case KIO::UDS_CREATION_TIME:
-            for( KIO::UDSEntry::ConstIterator it = m_fileitem->entry().begin(); it != m_fileitem->entry().end(); it++ )
+         case TDEIO::UDS_MODIFICATION_TIME:
+         case TDEIO::UDS_ACCESS_TIME:
+         case TDEIO::UDS_CREATION_TIME:
+            for( TDEIO::UDSEntry::ConstIterator it = m_fileitem->entry().begin(); it != m_fileitem->entry().end(); it++ )
             {
                if ((*it).m_uds==(unsigned int)tmpColumn->udsId)
                {