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

12 files changed, 47 insertions, 47 deletions

diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp
index 904683b..b9dc2a9 100644
--- a/src/misc/k3bblankingdialog.cpp
+++ b/src/misc/k3bblankingdialog.cpp
@@ -160,7 +160,7 @@ void K3bBlankingDialog::slotStartClicked()
   if( d->jobRunning ) // in case the job already finished in the start slot
     d->erasingDlg->exec(false);
 
-  if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
+  if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
       !exitLoopOnHide() )
     show();
   else
@@ -265,7 +265,7 @@ void K3bBlankingDialog::loadK3bDefaults()
   m_comboEraseMode->setCurrentItem( d->typeComboMap[K3bBlankingJob::Fast] );
 }
 
-void K3bBlankingDialog::loadUserDefaults( KConfigBase* c )
+void K3bBlankingDialog::loadUserDefaults( TDEConfigBase* c )
 {
   m_writerSelectionWidget->loadConfig( c );
   slotWritingAppChanged( m_writerSelectionWidget->writingApp() );
@@ -285,7 +285,7 @@ void K3bBlankingDialog::loadUserDefaults( KConfigBase* c )
   }
 }
 
-void K3bBlankingDialog::saveUserDefaults( KConfigBase* c )
+void K3bBlankingDialog::saveUserDefaults( TDEConfigBase* c )
 {
   TQString mode;
   switch( d->comboTypeMap[m_comboEraseMode->currentItem()] ) {
diff --git a/src/misc/k3bblankingdialog.h b/src/misc/k3bblankingdialog.h
index 0a5d643..0816c1d 100644
--- a/src/misc/k3bblankingdialog.h
+++ b/src/misc/k3bblankingdialog.h
@@ -73,8 +73,8 @@ Q_OBJECT
  private:
   void setupGui();
   void loadK3bDefaults();
-  void loadUserDefaults( KConfigBase* );
-  void saveUserDefaults( KConfigBase* );
+  void loadUserDefaults( TDEConfigBase* );
+  void saveUserDefaults( TDEConfigBase* );
 
   K3bWriterSelectionWidget* m_writerSelectionWidget;
 
diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp
index b5e6d71..3245906 100644
--- a/src/misc/k3bcdcopydialog.cpp
+++ b/src/misc/k3bcdcopydialog.cpp
@@ -357,7 +357,7 @@ void K3bCdCopyDialog::slotStartClicked()
   delete dlg;
   delete burnJob;
 
-  if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
+  if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
       !exitLoopOnHide() )
     show();
   else
@@ -456,7 +456,7 @@ void K3bCdCopyDialog::updateOverrideDevice()
 }
 
 
-void K3bCdCopyDialog::loadUserDefaults( KConfigBase* c )
+void K3bCdCopyDialog::loadUserDefaults( TDEConfigBase* c )
 {
   m_writerSelectionWidget->loadConfig( c );
   m_comboSourceDevice->setSelectedDevice( k3bcore->deviceManager()->findDevice( c->readEntry( "source_device" ) ) );
@@ -489,7 +489,7 @@ void K3bCdCopyDialog::loadUserDefaults( KConfigBase* c )
 }
 
 
-void K3bCdCopyDialog::saveUserDefaults( KConfigBase* c )
+void K3bCdCopyDialog::saveUserDefaults( TDEConfigBase* c )
 {
   m_writingModeWidget->saveConfig( c );
   c->writeEntry( "simulate", m_checkSimulate->isChecked() );
@@ -545,7 +545,7 @@ void K3bCdCopyDialog::loadK3bDefaults()
 }
 
 
-KIO::filesize_t K3bCdCopyDialog::neededSize() const
+TDEIO::filesize_t K3bCdCopyDialog::neededSize() const
 {
   if( m_comboCopyMode->currentItem() == 0 )
     return k3bappcore->mediaCache()->medium( m_comboSourceDevice->selectedDevice() ).diskInfo().size().mode1Bytes();
diff --git a/src/misc/k3bcdcopydialog.h b/src/misc/k3bcdcopydialog.h
index d1421dd..4b17fa8 100644
--- a/src/misc/k3bcdcopydialog.h
+++ b/src/misc/k3bcdcopydialog.h
@@ -65,11 +65,11 @@ class K3bCdCopyDialog : public K3bInteractionDialog
   void toggleAll();
 
  private:
-  void loadUserDefaults( KConfigBase* );
-  void saveUserDefaults( KConfigBase* );
+  void loadUserDefaults( TDEConfigBase* );
+  void saveUserDefaults( TDEConfigBase* );
   void loadK3bDefaults();
 
-  KIO::filesize_t neededSize() const;
+  TDEIO::filesize_t neededSize() const;
 
   K3bWriterSelectionWidget* m_writerSelectionWidget;
   K3bTempDirSelectionWidget* m_tempDirSelectionWidget;
diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp
index 57b313b..5c73381 100644
--- a/src/misc/k3bcdimagewritingdialog.cpp
+++ b/src/misc/k3bcdimagewritingdialog.cpp
@@ -163,7 +163,7 @@ void K3bCdImageWritingDialog::init()
   if( !d->imageForced ) {
     // when opening the dialog first the default settings are loaded and afterwards we set the 
     // last written image because that's what most users want
-    KConfig* c = k3bcore->config();
+    TDEConfig* c = k3bcore->config();
     c->setGroup( configGroup() );
     TQString image = c->readPathEntry( "last written image" );
     if( TQFile::exists( image ) )
@@ -337,7 +337,7 @@ void K3bCdImageWritingDialog::slotStartClicked()
   d->md5Job->cancel();
 
   // save the path
-  KConfig* c = k3bcore->config();
+  TDEConfig* c = k3bcore->config();
   c->setGroup( configGroup() );
   c->writePathEntry( "last written image", imagePath() );
 
@@ -404,7 +404,7 @@ void K3bCdImageWritingDialog::slotStartClicked()
     {
       K3bIso9660 isoFs( d->imageFile );
       if( isoFs.open() ) {
-	if( K3b::filesize( KURL::fromPathOrURL(d->imageFile) ) < (KIO::filesize_t)(isoFs.primaryDescriptor().volumeSpaceSize*2048) ) {
+	if( K3b::filesize( KURL::fromPathOrURL(d->imageFile) ) < (TDEIO::filesize_t)(isoFs.primaryDescriptor().volumeSpaceSize*2048) ) {
 	  if( KMessageBox::questionYesNo( this, 
 					  i18n("<p>This image has an invalid file size."
 					       "If it has been downloaded make sure the download is complete."
@@ -447,7 +447,7 @@ void K3bCdImageWritingDialog::slotStartClicked()
     
     delete job;
 
-    if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
+    if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
 	!exitLoopOnHide() )
       show();
     else
@@ -591,10 +591,10 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
   isoRootItem->setForegroundColor( 0, palette().disabled().foreground() );
   isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
 
-  KIO::filesize_t size = K3b::filesize( KURL::fromPathOrURL(isoF->fileName()) );
+  TDEIO::filesize_t size = K3b::filesize( KURL::fromPathOrURL(isoF->fileName()) );
   K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
 					       i18n("Filesize:"), 
-					       KIO::convertSize( size ) );
+					       TDEIO::convertSize( size ) );
   item->setForegroundColor( 0, palette().disabled().foreground() );
 
   item = new K3bListViewItem( isoRootItem, 
@@ -657,7 +657,7 @@ void K3bCdImageWritingDialog::createCdrecordCloneItems( const TQString& tocFile,
   isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
 
   K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
-					       i18n("Filesize:"), KIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) );
+					       i18n("Filesize:"), TDEIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) );
   item->setForegroundColor( 0, palette().disabled().foreground() );
 
   item = new K3bListViewItem( isoRootItem, 
@@ -685,7 +685,7 @@ void K3bCdImageWritingDialog::createCueBinItems( const TQString& cueFile, const
   isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
 
   K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
-					       i18n("Filesize:"), KIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) );
+					       i18n("Filesize:"), TDEIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) );
   item->setForegroundColor( 0, palette().disabled().foreground() );
 
   item = new K3bListViewItem( isoRootItem, 
@@ -912,7 +912,7 @@ void K3bCdImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, cons
 }
 
 
-void K3bCdImageWritingDialog::loadUserDefaults( KConfigBase* c )
+void K3bCdImageWritingDialog::loadUserDefaults( TDEConfigBase* c )
 {
   m_writingModeWidget->loadConfig( c );
   m_checkDummy->setChecked( c->readBoolEntry("simulate", false ) );
@@ -954,7 +954,7 @@ void K3bCdImageWritingDialog::loadUserDefaults( KConfigBase* c )
 }
 
 
-void K3bCdImageWritingDialog::saveUserDefaults( KConfigBase* c )
+void K3bCdImageWritingDialog::saveUserDefaults( TDEConfigBase* c )
 {
   m_writingModeWidget->saveConfig( c ),
   c->writeEntry( "simulate", m_checkDummy->isChecked() );
diff --git a/src/misc/k3bcdimagewritingdialog.h b/src/misc/k3bcdimagewritingdialog.h
index 0941a13..85dbc05 100644
--- a/src/misc/k3bcdimagewritingdialog.h
+++ b/src/misc/k3bcdimagewritingdialog.h
@@ -66,8 +66,8 @@ class K3bCdImageWritingDialog : public K3bInteractionDialog
   void slotUpdateImage( const TQString& );
 
  protected:
-  void loadUserDefaults( KConfigBase* );
-  void saveUserDefaults( KConfigBase* );
+  void loadUserDefaults( TDEConfigBase* );
+  void saveUserDefaults( TDEConfigBase* );
   void loadK3bDefaults();
 
   void calculateMd5Sum( const TQString& );
diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp
index 24aeace..729c4c7 100644
--- a/src/misc/k3bdvdcopydialog.cpp
+++ b/src/misc/k3bdvdcopydialog.cpp
@@ -277,7 +277,7 @@ void K3bDvdCopyDialog::slotStartClicked()
   delete dlg;
   delete job;
 
-  if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
+  if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
       !exitLoopOnHide() )
     show();
   else
@@ -285,7 +285,7 @@ void K3bDvdCopyDialog::slotStartClicked()
 }
 
 
-void K3bDvdCopyDialog::loadUserDefaults( KConfigBase* c )
+void K3bDvdCopyDialog::loadUserDefaults( TDEConfigBase* c )
 {
   m_comboSourceDevice->setSelectedDevice( k3bcore->deviceManager()->findDevice( c->readEntry( "source_device" ) ) );
 
@@ -308,7 +308,7 @@ void K3bDvdCopyDialog::loadUserDefaults( KConfigBase* c )
 }
 
 
-void K3bDvdCopyDialog::saveUserDefaults( KConfigBase* c )
+void K3bDvdCopyDialog::saveUserDefaults( TDEConfigBase* c )
 {
   m_tempDirSelectionWidget->saveConfig();
 
@@ -440,14 +440,14 @@ void K3bDvdCopyDialog::updateOverrideDevice()
 }
 
 
-KIO::filesize_t K3bDvdCopyDialog::neededSize() const
+TDEIO::filesize_t K3bDvdCopyDialog::neededSize() const
 {
   K3bMedium medium = k3bappcore->mediaCache()->medium( m_comboSourceDevice->selectedDevice() );
 
   if( medium.diskInfo().diskState() == K3bDevice::STATE_NO_MEDIA )
     return 0;
   else if( medium.diskInfo().mediaType() & (K3bDevice::MEDIA_DVD_RW_OVWR|K3bDevice::MEDIA_DVD_PLUS_RW) )
-    return (KIO::filesize_t)medium.iso9660Descriptor().volumeSpaceSize * (KIO::filesize_t)2048;
+    return (TDEIO::filesize_t)medium.iso9660Descriptor().volumeSpaceSize * (TDEIO::filesize_t)2048;
   else
     return medium.diskInfo().size().mode1Bytes();
 }
diff --git a/src/misc/k3bdvdcopydialog.h b/src/misc/k3bdvdcopydialog.h
index 13561c9..390ee2e 100644
--- a/src/misc/k3bdvdcopydialog.h
+++ b/src/misc/k3bdvdcopydialog.h
@@ -57,11 +57,11 @@ class K3bDvdCopyDialog : public K3bInteractionDialog
   void toggleAll();
 
  private:
-  void loadUserDefaults( KConfigBase* );
-  void saveUserDefaults( KConfigBase* );
+  void loadUserDefaults( TDEConfigBase* );
+  void saveUserDefaults( TDEConfigBase* );
   void loadK3bDefaults();
 
-  KIO::filesize_t neededSize() const;
+  TDEIO::filesize_t neededSize() const;
 
   K3bWriterSelectionWidget* m_writerSelectionWidget;
   K3bTempDirSelectionWidget* m_tempDirSelectionWidget;
diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp
index 309f48c..6524d05 100644
--- a/src/misc/k3bdvdformattingdialog.cpp
+++ b/src/misc/k3bdvdformattingdialog.cpp
@@ -141,7 +141,7 @@ void K3bDvdFormattingDialog::slotStartClicked()
 
   delete job;
 
-  if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
+  if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
       !exitLoopOnHide() )
     show();
   else
@@ -155,7 +155,7 @@ void K3bDvdFormattingDialog::slotWriterChanged()
 } 
 
 
-void K3bDvdFormattingDialog::loadUserDefaults( KConfigBase* c )
+void K3bDvdFormattingDialog::loadUserDefaults( TDEConfigBase* c )
 {
   m_checkForce->setChecked( c->readBoolEntry( "force", false ) );
   m_checkQuickFormat->setChecked( c->readBoolEntry( "quick format", true ) );
@@ -164,7 +164,7 @@ void K3bDvdFormattingDialog::loadUserDefaults( KConfigBase* c )
 } 
 
 
-void K3bDvdFormattingDialog::saveUserDefaults( KConfigBase* c )
+void K3bDvdFormattingDialog::saveUserDefaults( TDEConfigBase* c )
 {
   c->writeEntry( "force", m_checkForce->isChecked() );
   c->writeEntry( "quick format", m_checkQuickFormat->isChecked() );
diff --git a/src/misc/k3bdvdformattingdialog.h b/src/misc/k3bdvdformattingdialog.h
index 3f8db52..a30c97a 100644
--- a/src/misc/k3bdvdformattingdialog.h
+++ b/src/misc/k3bdvdformattingdialog.h
@@ -43,8 +43,8 @@ class K3bDvdFormattingDialog : public K3bInteractionDialog
   void slotWriterChanged();
 
  private:
-  void loadUserDefaults( KConfigBase* );
-  void saveUserDefaults( KConfigBase* );
+  void loadUserDefaults( TDEConfigBase* );
+  void saveUserDefaults( TDEConfigBase* );
   void loadK3bDefaults();
 
   K3bWriterSelectionWidget* m_writerSelectionWidget;
diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp
index 3d23020..32461df 100644
--- a/src/misc/k3bisoimagewritingdialog.cpp
+++ b/src/misc/k3bisoimagewritingdialog.cpp
@@ -134,7 +134,7 @@ void K3bIsoImageWritingDialog::init()
   if( !d->imageForced ) {
     // when opening the dialog first the default settings are loaded and afterwards we set the
     // last written image because that's what most users want
-    KConfig* c = k3bcore->config();
+    TDEConfig* c = k3bcore->config();
     c->setGroup( configGroup() );
     TQString image = c->readPathEntry( "last written image" );
     if( TQFile::exists( image ) )
@@ -244,7 +244,7 @@ void K3bIsoImageWritingDialog::slotStartClicked()
 
   K3bIso9660 isoFs( imagePath() );
   if( isoFs.open() ) {
-    if( K3b::imageFilesize( KURL::fromPathOrURL( imagePath() ) ) < (KIO::filesize_t)(isoFs.primaryDescriptor().volumeSpaceSize*2048) ) {
+    if( K3b::imageFilesize( KURL::fromPathOrURL( imagePath() ) ) < (TDEIO::filesize_t)(isoFs.primaryDescriptor().volumeSpaceSize*2048) ) {
       if( KMessageBox::questionYesNo( this, 
 				      i18n("<p>This image has an invalid file size."
 					   "If it has been downloaded make sure the download is complete."
@@ -259,7 +259,7 @@ void K3bIsoImageWritingDialog::slotStartClicked()
   m_md5Job->cancel();
 
   // save the path
-  KConfig* c = k3bcore->config();
+  TDEConfig* c = k3bcore->config();
   c->setGroup( configGroup() );
   if( c->readPathEntry( "last written image" ).isEmpty() )
     c->writePathEntry( "last written image", imagePath() );
@@ -288,7 +288,7 @@ void K3bIsoImageWritingDialog::slotStartClicked()
 
   delete job;
 
-  if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
+  if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
       !exitLoopOnHide() )
     show();
   else
@@ -307,7 +307,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
   TQFileInfo info( path );
   if( info.isFile() ) {
 
-    KIO::filesize_t imageSize = K3b::filesize( KURL::fromPathOrURL(path) );
+    TDEIO::filesize_t imageSize = K3b::filesize( KURL::fromPathOrURL(path) );
 
     // ------------------------------------------------
     // Test for iso9660 image
@@ -323,7 +323,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
       isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
 
       K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
-						   i18n("Filesize:"), KIO::convertSize( imageSize ) );
+						   i18n("Filesize:"), TDEIO::convertSize( imageSize ) );
       item->setForegroundColor( 0, palette().disabled().foreground() );
 
       item = new K3bListViewItem( isoRootItem,
@@ -514,7 +514,7 @@ void K3bIsoImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, con
 }
 
 
-void K3bIsoImageWritingDialog::loadUserDefaults( KConfigBase* c )
+void K3bIsoImageWritingDialog::loadUserDefaults( TDEConfigBase* c )
 {
   m_writingModeWidget->loadConfig( c );
   m_checkDummy->setChecked( c->readBoolEntry("simulate", false ) );
@@ -531,7 +531,7 @@ void K3bIsoImageWritingDialog::loadUserDefaults( KConfigBase* c )
 }
 
 
-void K3bIsoImageWritingDialog::saveUserDefaults( KConfigBase* c )
+void K3bIsoImageWritingDialog::saveUserDefaults( TDEConfigBase* c )
 {
   m_writingModeWidget->saveConfig( c ),
   c->writeEntry( "simulate", m_checkDummy->isChecked() );
diff --git a/src/misc/k3bisoimagewritingdialog.h b/src/misc/k3bisoimagewritingdialog.h
index a357ddb..68b277b 100644
--- a/src/misc/k3bisoimagewritingdialog.h
+++ b/src/misc/k3bisoimagewritingdialog.h
@@ -59,8 +59,8 @@ class K3bIsoImageWritingDialog : public K3bInteractionDialog
   void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& pos );
 
  protected:
-  void loadUserDefaults( KConfigBase* );
-  void saveUserDefaults( KConfigBase* );
+  void loadUserDefaults( TDEConfigBase* );
+  void saveUserDefaults( TDEConfigBase* );
   void loadK3bDefaults();
 
   void calculateMd5Sum( const TQString& );