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

16 files changed, 43 insertions, 43 deletions

diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp
index 79e6625..c48650e 100644
--- a/libk3b/projects/datacd/k3bdatadoc.cpp
+++ b/libk3b/projects/datacd/k3bdatadoc.cpp
@@ -229,7 +229,7 @@ K3bDirItem* K3bDataDoc::addEmptyDir( const TQString& name, K3bDirItem* parent )
 }
 
 
-KIO::filesize_t K3bDataDoc::size() const
+TDEIO::filesize_t K3bDataDoc::size() const
 {
   if( m_isoOptions.doNotCacheInodes() )
     return root()->blocks().mode1Bytes() + m_oldSessionSize;
@@ -239,7 +239,7 @@ KIO::filesize_t K3bDataDoc::size() const
 }
 
 
-KIO::filesize_t K3bDataDoc::burningSize() const
+TDEIO::filesize_t K3bDataDoc::burningSize() const
 {
   return size() - m_oldSessionSize; //m_oldSessionSizeHandler->size();
 }
@@ -1171,7 +1171,7 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device )
     // anyway since there might be files overwritten or removed
     m_oldSessionSize = toc.last().lastSector().mode1Bytes();
     
-    kdDebug() << "(K3bDataDoc) imported session size: " << KIO::convertSize(m_oldSessionSize) << endl;
+    kdDebug() << "(K3bDataDoc) imported session size: " << TDEIO::convertSize(m_oldSessionSize) << endl;
     
     // the track size for DVD+RW media and DVD-RW Overwrite media has nothing to do with the filesystem 
     // size. in that case we need to use the filesystem's size (which is ok since it's one track anyway,
diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h
index ec80d5b..00312b6 100644
--- a/libk3b/projects/datacd/k3bdatadoc.h
+++ b/libk3b/projects/datacd/k3bdatadoc.h
@@ -40,7 +40,7 @@ class K3bFileCompilationSizeHandler;
 
 class KProgressDialog;
 //class K3bView;
-class KConfig;
+class TDEConfig;
 class TQString;
 class TQStringList;
 class TQWidget;
@@ -89,12 +89,12 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
   K3bRootItem* root() const { return m_root; }
 
   virtual bool newDocument();
-  virtual KIO::filesize_t size() const;
+  virtual TDEIO::filesize_t size() const;
 
   /**
    * This is used for multisession where size() also returnes the imported session's size
    */
-  virtual KIO::filesize_t burningSize() const;
+  virtual TDEIO::filesize_t burningSize() const;
   virtual K3b::Msf length() const;
   virtual K3b::Msf burningLength() const;
 
@@ -131,7 +131,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
   /**
    * Most of the options that map to the mkisofs parameters are grouped
    * together in the K3bIsoOptions class to allow easy saving to and loading
-   * from a KConfig object.
+   * from a TDEConfig object.
    */
   const K3bIsoOptions& isoOptions() const { return m_isoOptions; }
   void setIsoOptions( const K3bIsoOptions& );
@@ -242,7 +242,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
   K3bFileCompilationSizeHandler* m_sizeHandler;
 
   //  K3bFileCompilationSizeHandler* m_oldSessionSizeHandler;
-  KIO::filesize_t m_oldSessionSize;
+  TDEIO::filesize_t m_oldSessionSize;
 
  private:
   void prepareFilenamesInDir( K3bDirItem* dir );
@@ -274,7 +274,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
 
   bool m_verifyData;
 
-  KIO::filesize_t m_size;
+  TDEIO::filesize_t m_size;
 		
   K3bIsoOptions m_isoOptions;
 
diff --git a/libk3b/projects/datacd/k3bdataitem.cpp b/libk3b/projects/datacd/k3bdataitem.cpp
index f5ce21d..40cedbb 100644
--- a/libk3b/projects/datacd/k3bdataitem.cpp
+++ b/libk3b/projects/datacd/k3bdataitem.cpp
@@ -89,7 +89,7 @@ bool K3bDataItem::isBootItem() const
 }
 
 
-KIO::filesize_t K3bDataItem::size() const
+TDEIO::filesize_t K3bDataItem::size() const
 {
   return itemSize( m_doc 
 		   ? m_doc->isoOptions().followSymbolicLinks() || 
diff --git a/libk3b/projects/datacd/k3bdataitem.h b/libk3b/projects/datacd/k3bdataitem.h
index 043a0d5..1f68d68 100644
--- a/libk3b/projects/datacd/k3bdataitem.h
+++ b/libk3b/projects/datacd/k3bdataitem.h
@@ -117,7 +117,7 @@ class LIBK3B_EXPORT K3bDataItem
   /**
    * The size of the item
    */
-  KIO::filesize_t size() const;
+  TDEIO::filesize_t size() const;
 
   /**
    * \return The number of blocks (2048 bytes) occupied by this item.
@@ -183,7 +183,7 @@ class LIBK3B_EXPORT K3bDataItem
   void setExtraInfo( const TQString& i ) { m_extraInfo = i; }
 
  protected:
-  virtual KIO::filesize_t itemSize( bool followSymlinks ) const = 0;
+  virtual TDEIO::filesize_t itemSize( bool followSymlinks ) const = 0;
 
   /**
    * \param followSymlinks If true symlinks will be followed and their
diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp
index 442b035..8eb7d11 100644
--- a/libk3b/projects/datacd/k3bdatajob.cpp
+++ b/libk3b/projects/datacd/k3bdatajob.cpp
@@ -935,10 +935,10 @@ TQString K3bDataJob::jobDetails() const
     return i18n("ISO9660 Filesystem (Size: %1) - %n copy",
 		"ISO9660 Filesystem (Size: %1) - %n copies",
 		d->doc->copies() )
-      .arg(KIO::convertSize( d->doc->size() ));
+      .arg(TDEIO::convertSize( d->doc->size() ));
   else
     return i18n("ISO9660 Filesystem (Size: %1)")
-      .arg(KIO::convertSize( d->doc->size() ));
+      .arg(TDEIO::convertSize( d->doc->size() ));
 }
 
 
diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp
index f43f1d5..9cd0f31 100644
--- a/libk3b/projects/datacd/k3bdiritem.cpp
+++ b/libk3b/projects/datacd/k3bdiritem.cpp
@@ -271,7 +271,7 @@ bool K3bDirItem::mkdir( const TQString& dirPath )
 }
 
 
-KIO::filesize_t K3bDirItem::itemSize( bool followsylinks ) const
+TDEIO::filesize_t K3bDirItem::itemSize( bool followsylinks ) const
 {
   if( followsylinks )
     return m_followSymlinksSize;
diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h
index a624529..c33610f 100644
--- a/libk3b/projects/datacd/k3bdiritem.h
+++ b/libk3b/projects/datacd/k3bdiritem.h
@@ -101,7 +101,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
    * between files with the same inode in an iso9660 filesystem.
    * For that one has to use K3bFileCompilationSizeHandler.
    */
-  KIO::filesize_t itemSize( bool followSymlinks ) const;
+  TDEIO::filesize_t itemSize( bool followSymlinks ) const;
 
   /*
    * Normally one does not use this method but K3bDataItem::blocks()
@@ -124,8 +124,8 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
   mutable TQPtrList<K3bDataItem> m_children;
 
   // size of the items simply added
-  KIO::filesize_t m_size;
-  KIO::filesize_t m_followSymlinksSize;
+  TDEIO::filesize_t m_size;
+  TDEIO::filesize_t m_followSymlinksSize;
 
   // number of blocks (2048 bytes) used by all the items
   long m_blocks;
diff --git a/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp b/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp
index 2d4b2fb..cb38794 100644
--- a/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp
+++ b/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp
@@ -28,7 +28,7 @@
 // or we just update the sizes!
 
 
-static long usedBlocks( const KIO::filesize_t& bytes )
+static long usedBlocks( const TDEIO::filesize_t& bytes )
 {
   if( bytes % 2048 )
     return bytes/2048 + 1;
@@ -62,9 +62,9 @@ public:
    * This way we always use the size of the first added file and may
    * warn the user if sizes differ.
    */
-  KIO::filesize_t savedSize;
+  TDEIO::filesize_t savedSize;
 
-  KIO::filesize_t completeSize() const { return savedSize*number; }
+  TDEIO::filesize_t completeSize() const { return savedSize*number; }
 
   /**
    * In an iso9660 filesystem a file occupies complete blocks of 2048 bytes.
@@ -154,7 +154,7 @@ public:
    */
   TQMap<K3bFileItem::Id, InodeInfo> inodeMap;
 
-  KIO::filesize_t size;
+  TDEIO::filesize_t size;
   K3b::Msf blocks;
 
   TQPtrList<K3bDataItem> specialItems;
@@ -175,7 +175,7 @@ K3bFileCompilationSizeHandler::~K3bFileCompilationSizeHandler()
 }
 
 
-const KIO::filesize_t& K3bFileCompilationSizeHandler::size( bool followSymlinks ) const
+const TDEIO::filesize_t& K3bFileCompilationSizeHandler::size( bool followSymlinks ) const
 {
   if( followSymlinks )
     return d_noSymlinks->size;
diff --git a/libk3b/projects/datacd/k3bfilecompilationsizehandler.h b/libk3b/projects/datacd/k3bfilecompilationsizehandler.h
index c996657..4745264 100644
--- a/libk3b/projects/datacd/k3bfilecompilationsizehandler.h
+++ b/libk3b/projects/datacd/k3bfilecompilationsizehandler.h
@@ -43,7 +43,7 @@ class K3bFileCompilationSizeHandler
    * This does NOT equal blocks() * 2048.
    * This is the sum of the actual file sizes.
    */
-  const KIO::filesize_t& size( bool followSymlinks = false ) const;
+  const TDEIO::filesize_t& size( bool followSymlinks = false ) const;
 
   /**
    * Number of blocks the files will occupy.
diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp
index 7cabec8..3e20982 100644
--- a/libk3b/projects/datacd/k3bfileitem.cpp
+++ b/libk3b/projects/datacd/k3bfileitem.cpp
@@ -87,7 +87,7 @@ K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem*
     }
   }
   else {
-    m_size = (KIO::filesize_t)statBuf.st_size;
+    m_size = (TDEIO::filesize_t)statBuf.st_size;
 
     m_bSymLink = S_ISLNK(statBuf.st_mode);
 
@@ -108,7 +108,7 @@ K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem*
       m_idFollowed.inode = statBuf.st_ino;
       m_idFollowed.device = statBuf.st_dev;
 
-      m_sizeFollowed = (KIO::filesize_t)statBuf.st_size;
+      m_sizeFollowed = (TDEIO::filesize_t)statBuf.st_size;
     }
   }
 
@@ -130,7 +130,7 @@ K3bFileItem::K3bFileItem( const k3b_struct_stat* stat,
   else
     m_k3bName = k3bName;
 
-  m_size = (KIO::filesize_t)stat->st_size;
+  m_size = (TDEIO::filesize_t)stat->st_size;
   m_bSymLink = S_ISLNK(stat->st_mode);
 
   //
@@ -144,7 +144,7 @@ K3bFileItem::K3bFileItem( const k3b_struct_stat* stat,
     m_idFollowed.inode = followedStat->st_ino;
     m_idFollowed.device = followedStat->st_dev;
     
-    m_sizeFollowed = (KIO::filesize_t)followedStat->st_size;
+    m_sizeFollowed = (TDEIO::filesize_t)followedStat->st_size;
   }
   else {
     m_idFollowed = m_id;
@@ -182,7 +182,7 @@ K3bDataItem* K3bFileItem::copy() const
 }
 
 
-KIO::filesize_t K3bFileItem::itemSize( bool followSymlinks ) const
+TDEIO::filesize_t K3bFileItem::itemSize( bool followSymlinks ) const
 {
   if( followSymlinks )
     return m_sizeFollowed;
diff --git a/libk3b/projects/datacd/k3bfileitem.h b/libk3b/projects/datacd/k3bfileitem.h
index 46e2930..45e5b08 100644
--- a/libk3b/projects/datacd/k3bfileitem.h
+++ b/libk3b/projects/datacd/k3bfileitem.h
@@ -103,13 +103,13 @@ public:
   /**
    * Normally one does not use this method but K3bDataItem::size()
    */
-  KIO::filesize_t itemSize( bool followSymlinks ) const;
+  TDEIO::filesize_t itemSize( bool followSymlinks ) const;
 
  private:
   K3bDataItem* m_replacedItemFromOldSession;
 
-  KIO::filesize_t m_size;
-  KIO::filesize_t m_sizeFollowed;
+  TDEIO::filesize_t m_size;
+  TDEIO::filesize_t m_sizeFollowed;
   Id m_id;
   Id m_idFollowed;
 
diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp
index 6b1de51..dea41b6 100644
--- a/libk3b/projects/datacd/k3bisoimager.cpp
+++ b/libk3b/projects/datacd/k3bisoimager.cpp
@@ -894,7 +894,7 @@ void K3bIsoImager::writePathSpecForFile( K3bFileItem* item, TQTextStream& stream
     TQString tempPath = temp.name();
     temp.unlink();
 
-    if( !KIO::NetAccess::copy( KURL(item->localPath()), KURL::fromPathOrURL(tempPath) ) ) {
+    if( !TDEIO::NetAccess::copy( KURL(item->localPath()), KURL::fromPathOrURL(tempPath) ) ) {
       emit infoMessage( i18n("Failed to backup boot image file %1").arg(item->localPath()), ERROR );
       return;
     }
diff --git a/libk3b/projects/datacd/k3bisooptions.cpp b/libk3b/projects/datacd/k3bisooptions.cpp
index f239f2a..91b6302 100644
--- a/libk3b/projects/datacd/k3bisooptions.cpp
+++ b/libk3b/projects/datacd/k3bisooptions.cpp
@@ -66,7 +66,7 @@ K3bIsoOptions::K3bIsoOptions()
 }
 
 
-void K3bIsoOptions::save( KConfigBase* c, bool saveVolumeDesc )
+void K3bIsoOptions::save( TDEConfigBase* c, bool saveVolumeDesc )
 {
   if( saveVolumeDesc ) {
     c->writeEntry( "volume id", m_volumeID );
@@ -134,7 +134,7 @@ void K3bIsoOptions::save( KConfigBase* c, bool saveVolumeDesc )
 }
 
 
-K3bIsoOptions K3bIsoOptions::load( KConfigBase* c, bool loadVolumeDesc )
+K3bIsoOptions K3bIsoOptions::load( TDEConfigBase* c, bool loadVolumeDesc )
 {
   K3bIsoOptions options;
 
diff --git a/libk3b/projects/datacd/k3bisooptions.h b/libk3b/projects/datacd/k3bisooptions.h
index 3d51d3d..04dab2e 100644
--- a/libk3b/projects/datacd/k3bisooptions.h
+++ b/libk3b/projects/datacd/k3bisooptions.h
@@ -19,7 +19,7 @@
 #include <tqstring.h>
 #include "k3b_export.h"
 
-class KConfigBase;
+class TDEConfigBase;
 
 
 class LIBK3B_EXPORT K3bIsoOptions
@@ -124,9 +124,9 @@ class LIBK3B_EXPORT K3bIsoOptions
   bool doNotCacheInodes() const { return m_doNotCacheInodes; }
   void setDoNotCacheInodes( bool b ) { m_doNotCacheInodes = b; }
 
-  void save( KConfigBase* c, bool saveVolumeDesc = true );
+  void save( TDEConfigBase* c, bool saveVolumeDesc = true );
 
-  static K3bIsoOptions load( KConfigBase* c, bool loadVolumeDesc = true );
+  static K3bIsoOptions load( TDEConfigBase* c, bool loadVolumeDesc = true );
   static K3bIsoOptions defaults();
 
  private:
diff --git a/libk3b/projects/datacd/k3bsessionimportitem.h b/libk3b/projects/datacd/k3bsessionimportitem.h
index 33f8124..e97b201 100644
--- a/libk3b/projects/datacd/k3bsessionimportitem.h
+++ b/libk3b/projects/datacd/k3bsessionimportitem.h
@@ -53,11 +53,11 @@ class K3bSessionImportItem : public K3bDataItem
   /**
    * Normally one does not use this method but K3bDataItem::size()
    */
-  KIO::filesize_t itemSize( bool ) const { return m_size; }
+  TDEIO::filesize_t itemSize( bool ) const { return m_size; }
 
  private:
   K3bFileItem* m_replaceItem;
-  KIO::filesize_t m_size;
+  TDEIO::filesize_t m_size;
 };
 
 #endif
diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h
index 1dc3bb7..cb7f708 100644
--- a/libk3b/projects/datacd/k3bspecialdataitem.h
+++ b/libk3b/projects/datacd/k3bspecialdataitem.h
@@ -29,7 +29,7 @@
 class K3bSpecialDataItem : public K3bDataItem
 {
  public:
-  K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* parent = 0, const TQString& k3bName = TQString() )
+  K3bSpecialDataItem( K3bDataDoc* doc, TDEIO::filesize_t size, K3bDirItem* parent = 0, const TQString& k3bName = TQString() )
     : K3bDataItem( doc, parent ),
     m_size( size )
     {
@@ -65,11 +65,11 @@ class K3bSpecialDataItem : public K3bDataItem
   /**
    * Normally one does not use this method but K3bDataItem::size()
    */
-  KIO::filesize_t itemSize( bool ) const { return m_size; }
+  TDEIO::filesize_t itemSize( bool ) const { return m_size; }
 
  private:
   TQString m_mimeType;
-  KIO::filesize_t m_size;
+  TDEIO::filesize_t m_size;
 };
 
 #endif