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

4 files changed, 13 insertions, 13 deletions

diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index 3ba01b4..4aa571e 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -272,7 +272,7 @@ void K3bVideoDVDRippingDialog::slotUpdateFilenames()
 void K3bVideoDVDRippingDialog::slotUpdateFilesizes()
 {
   double bitrate = (double)m_w->m_spinVideoBitrate->value();
-  KIO::filesize_t overallSize = 0ULL;
+  TDEIO::filesize_t overallSize = 0ULL;
 
   // update file sizes
   for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin();
@@ -281,13 +281,13 @@ void K3bVideoDVDRippingDialog::slotUpdateFilesizes()
     double sec = m_dvd[it.data().title-1].playbackTime().totalSeconds();
 
     // estimate the filesize
-    KIO::filesize_t size = (KIO::filesize_t)( sec * bitrate * 1000.0 / 8.0 );
+    TDEIO::filesize_t size = (TDEIO::filesize_t)( sec * bitrate * 1000.0 / 8.0 );
 
     // add audio stream size
     // FIXME: consider AC3 passthrough
-    size += (KIO::filesize_t)( sec * m_w->selectedAudioBitrate() / 8.0 * 1024.0 );
+    size += (TDEIO::filesize_t)( sec * m_w->selectedAudioBitrate() / 8.0 * 1024.0 );
 
-    it.key()->setText( 2, KIO::convertSize( size ) );
+    it.key()->setText( 2, TDEIO::convertSize( size ) );
 
     overallSize += size;
   }
@@ -514,7 +514,7 @@ void K3bVideoDVDRippingDialog::loadK3bDefaults()
 }
 
 
-void K3bVideoDVDRippingDialog::loadUserDefaults( KConfigBase* c )
+void K3bVideoDVDRippingDialog::loadUserDefaults( TDEConfigBase* c )
 {
   m_w->m_spinVideoBitrate->setValue( c->readNumEntry( "video bitrate", 1200 ) );
   m_w->m_checkTwoPassEncoding->setChecked( c->readBoolEntry( "two pass encoding", true ) );
@@ -532,7 +532,7 @@ void K3bVideoDVDRippingDialog::loadUserDefaults( KConfigBase* c )
 }
 
 
-void K3bVideoDVDRippingDialog::saveUserDefaults( KConfigBase* c )
+void K3bVideoDVDRippingDialog::saveUserDefaults( TDEConfigBase* c )
 {
   c->writeEntry( "video bitrate", m_w->m_spinVideoBitrate->value() );
   c->writeEntry( "two pass encoding", m_w->m_checkTwoPassEncoding->isChecked() );
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.h b/src/rip/videodvd/k3bvideodvdrippingdialog.h
index 7f5408a..7180a2b 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.h
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.h
@@ -66,8 +66,8 @@ class K3bVideoDVDRippingDialog : public K3bInteractionDialog
   TQString createFilename( const K3bVideoDVDRippingJob::TitleRipInfo& info, const TQString& pattern ) const;
 
   void loadK3bDefaults();
-  void loadUserDefaults( KConfigBase* );
-  void saveUserDefaults( KConfigBase* );
+  void loadUserDefaults( TDEConfigBase* );
+  void saveUserDefaults( TDEConfigBase* );
 
   K3bVideoDVDRippingWidget* m_w;
 
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index 41489f7..51b74a2 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -253,7 +253,7 @@ void K3bVideoDVDRippingWidget::slotUpdateFreeTempSpace()
 
   unsigned long size, avail;
   if( K3b::kbFreeOnFs( path, size, avail ) ) {
-    m_labelFreeSpace->setText( KIO::convertSizeFromKB(avail) );
+    m_labelFreeSpace->setText( TDEIO::convertSizeFromKB(avail) );
     if( avail < m_neededSize/1024 )
       m_labelNeededSpace->setPaletteForegroundColor( TQt::red );
     else
@@ -266,11 +266,11 @@ void K3bVideoDVDRippingWidget::slotUpdateFreeTempSpace()
 }
 
 
-void K3bVideoDVDRippingWidget::setNeededSize( KIO::filesize_t size )
+void K3bVideoDVDRippingWidget::setNeededSize( TDEIO::filesize_t size )
 {
   m_neededSize = size;
   if( size > 0 )
-    m_labelNeededSpace->setText( KIO::convertSize( size ) );
+    m_labelNeededSpace->setText( TDEIO::convertSize( size ) );
   else
     m_labelNeededSpace->setText( i18n("unknown") );
 
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h
index 032ecb1..1642bbc 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.h
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h
@@ -46,7 +46,7 @@ class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget
   void setSelectedAudioBitrate( int bitrate );
   void setSelectedPictureSize( const TQSize& );
 
-  void setNeededSize( KIO::filesize_t );
+  void setNeededSize( TDEIO::filesize_t );
 
  signals:
   void changed();
@@ -60,7 +60,7 @@ class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget
 
  private:
   TQTimer* m_freeSpaceUpdateTimer;
-  KIO::filesize_t m_neededSize;
+  TDEIO::filesize_t m_neededSize;
 
   TQSize m_customVideoSize;
 };