From 83b79bb29aaa412caec6abcdb42ca21d248b3b3a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:06:28 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 src/option/k3bburningoptiontab.cpp | 6 +++---
 src/option/k3bcddboptiontab.cpp    | 4 ++--
 src/option/k3bdevicewidget.cpp     | 2 +-
 src/option/k3bmiscoptiontab.cpp    | 4 ++--
 src/option/k3bthemeoptiontab.cpp   | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/option')

diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp
index 55a65ee..97a5aaf 100644
--- a/src/option/k3bburningoptiontab.cpp
+++ b/src/option/k3bburningoptiontab.cpp
@@ -151,7 +151,7 @@ void K3bBurningOptionTab::setupGui()
 
 void K3bBurningOptionTab::readSettings()
 {
-  KConfig* c = k3bcore->config();
+  TDEConfig* c = k3bcore->config();
 
   c->setGroup( "General Options" );
   m_checkAutoErasingRewritable->setChecked( c->readBoolEntry( "auto rewritable erasing", false ) );
@@ -169,7 +169,7 @@ void K3bBurningOptionTab::readSettings()
 
 void K3bBurningOptionTab::saveSettings()
 {
-  KConfig* c = k3bcore->config();
+  TDEConfig* c = k3bcore->config();
 
   c->setGroup( "General Options" );
   c->writeEntry( "auto rewritable erasing", m_checkAutoErasingRewritable->isChecked() );
@@ -182,7 +182,7 @@ void K3bBurningOptionTab::saveSettings()
   k3bcore->globalSettings()->setBufferSize( m_editWritingBufferSize->value() );
   k3bcore->globalSettings()->setForce( m_checkForceUnsafeOperations->isChecked() );
 
-  // FIXME: remove this once libk3b does not use KConfig anymore for these values
+  // FIXME: remove this once libk3b does not use TDEConfig anymore for these values
   k3bcore->globalSettings()->saveSettings( c );
 }
 
diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp
index 9252b90..1db1ba2 100644
--- a/src/option/k3bcddboptiontab.cpp
+++ b/src/option/k3bcddboptiontab.cpp
@@ -130,7 +130,7 @@ K3bCddbOptionTab::~K3bCddbOptionTab()
 
 void K3bCddbOptionTab::readSettings()
 {
-  KConfig* c = kapp->config();
+  TDEConfig* c = kapp->config();
 
   c->setGroup( "Cddb" );
 
@@ -188,7 +188,7 @@ void K3bCddbOptionTab::readSettings()
 
 void K3bCddbOptionTab::apply()
 {
-  KConfig* c = kapp->config();
+  TDEConfig* c = kapp->config();
 
   c->setGroup( "Cddb" );
 
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index c592956..bcc890d 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -319,7 +319,7 @@ void K3bDeviceWidget::updateDeviceListViews()
     if( dev->device->bufferSize() > 0 ) {
       typeItem = new K3bListViewItem( devRoot, typeItem,
 				      i18n("Buffer Size:"),
-				      KIO::convertSizeFromKB(dev->device->bufferSize()) );
+				      TDEIO::convertSizeFromKB(dev->device->bufferSize()) );
       typeItem->setForegroundColor( 1, palette().disabled().foreground() );
     }
 
diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp
index 19d3b28..884291f 100644
--- a/src/option/k3bmiscoptiontab.cpp
+++ b/src/option/k3bmiscoptiontab.cpp
@@ -69,7 +69,7 @@ K3bMiscOptionTab::~K3bMiscOptionTab()
 
 void K3bMiscOptionTab::readSettings()
 {
-  KConfig* c = kapp->config();
+  TDEConfig* c = kapp->config();
   c->setGroup( "General Options" );
   m_checkSaveOnExit->setChecked( c->readBoolEntry( "ask_for_saving_changes_on_exit", true ) );
   m_checkShowSplash->setChecked( c->readBoolEntry("Show splash", true) );
@@ -106,7 +106,7 @@ void K3bMiscOptionTab::readSettings()
 
 bool K3bMiscOptionTab::saveSettings()
 {
-  KConfig* c = kapp->config();
+  TDEConfig* c = kapp->config();
   c->setGroup( "General Options" );
   c->writeEntry( "ask_for_saving_changes_on_exit", m_checkSaveOnExit->isChecked() );
   c->writeEntry( "Show splash", m_checkShowSplash->isChecked() );
diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp
index ec4ca6c..ebb92be 100644
--- a/src/option/k3bthemeoptiontab.cpp
+++ b/src/option/k3bthemeoptiontab.cpp
@@ -140,7 +140,7 @@ void K3bThemeOptionTab::slotInstallTheme()
   TQString themeTmpFile;
   // themeTmpFile contains the name of the downloaded file
 
-  if( !KIO::NetAccess::download( themeURL, themeTmpFile, this ) ) {
+  if( !TDEIO::NetAccess::download( themeURL, themeTmpFile, this ) ) {
     TQString sorryText;
     if (themeURL.isLocalFile())
        sorryText = i18n("Unable to find the icon theme archive %1.");
@@ -196,7 +196,7 @@ void K3bThemeOptionTab::slotInstallTheme()
   }
 
   archive.close();
-  KIO::NetAccess::removeTempFile(themeTmpFile);
+  TDEIO::NetAccess::removeTempFile(themeTmpFile);
 
   readSettings();
 }
@@ -227,7 +227,7 @@ void K3bThemeOptionTab::slotRemoveTheme()
     readSettings();
 
     // delete the theme data itself
-    KIO::del( path, false, false );
+    TDEIO::del( path, false, false );
   }
 }
 
-- 
cgit v1.2.1