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

---
 libk3bdevice/k3bdevicemanager.cpp |  4 ++--
 libk3bdevice/k3bdevicemanager.h   |  6 +++---
 libk3bdevice/k3bmsf.cpp           | 20 ++++++++++----------
 libk3bdevice/k3bmsf.h             | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'libk3bdevice')

diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp
index 63f8492..d5bf336 100644
--- a/libk3bdevice/k3bdevicemanager.cpp
+++ b/libk3bdevice/k3bdevicemanager.cpp
@@ -530,7 +530,7 @@ void K3bDevice::DeviceManager::clear()
 }
 
 
-bool K3bDevice::DeviceManager::readConfig( KConfig* c )
+bool K3bDevice::DeviceManager::readConfig( TDEConfig* c )
 {
   //
   // New configuration format since K3b 0.11.94
@@ -572,7 +572,7 @@ bool K3bDevice::DeviceManager::readConfig( KConfig* c )
 }
 
 
-bool K3bDevice::DeviceManager::saveConfig( KConfig* c )
+bool K3bDevice::DeviceManager::saveConfig( TDEConfig* c )
 {
   //
   // New configuration format since K3b 0.11.94
diff --git a/libk3bdevice/k3bdevicemanager.h b/libk3bdevice/k3bdevicemanager.h
index 4381a52..fa687a9 100644
--- a/libk3bdevice/k3bdevicemanager.h
+++ b/libk3bdevice/k3bdevicemanager.h
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 
 class TDEProcess;
-class KConfig;
+class TDEConfig;
 class K3bExternalBin;
 
 
@@ -171,9 +171,9 @@ namespace K3bDevice {
       /**
        * Reads the device information from the config file.
        */
-      virtual bool readConfig( KConfig* );
+      virtual bool readConfig( TDEConfig* );
 
-      virtual bool saveConfig( KConfig* );
+      virtual bool saveConfig( TDEConfig* );
 
 
     public slots:
diff --git a/libk3bdevice/k3bmsf.cpp b/libk3bdevice/k3bmsf.cpp
index c8f6c70..235f6a6 100644
--- a/libk3bdevice/k3bmsf.cpp
+++ b/libk3bdevice/k3bmsf.cpp
@@ -169,29 +169,29 @@ TQString K3b::Msf::toString( bool showFrames ) const
 }
 
 
-KIO::filesize_t K3b::Msf::mode1Bytes() const
+TDEIO::filesize_t K3b::Msf::mode1Bytes() const
 {
-  return (KIO::filesize_t)2048 * ( (KIO::filesize_t)lba() );
+  return (TDEIO::filesize_t)2048 * ( (TDEIO::filesize_t)lba() );
 }
 
-KIO::filesize_t K3b::Msf::mode2Form1Bytes() const
+TDEIO::filesize_t K3b::Msf::mode2Form1Bytes() const
 {
-  return (KIO::filesize_t)2048 * ( (KIO::filesize_t)lba() );
+  return (TDEIO::filesize_t)2048 * ( (TDEIO::filesize_t)lba() );
 }
 
-KIO::filesize_t K3b::Msf::mode2Form2Bytes() const
+TDEIO::filesize_t K3b::Msf::mode2Form2Bytes() const
 {
-  return (KIO::filesize_t)2324 * ( (KIO::filesize_t)lba() );
+  return (TDEIO::filesize_t)2324 * ( (TDEIO::filesize_t)lba() );
 }
 
-KIO::filesize_t K3b::Msf::audioBytes() const
+TDEIO::filesize_t K3b::Msf::audioBytes() const
 {
-  return (KIO::filesize_t)2352 * ( (KIO::filesize_t)lba() );
+  return (TDEIO::filesize_t)2352 * ( (TDEIO::filesize_t)lba() );
 }
 
-KIO::filesize_t K3b::Msf::rawBytes() const
+TDEIO::filesize_t K3b::Msf::rawBytes() const
 {
-  return (KIO::filesize_t)2448 * ( (KIO::filesize_t)lba() );
+  return (TDEIO::filesize_t)2448 * ( (TDEIO::filesize_t)lba() );
 }
 
 void K3b::Msf::makeValid()
diff --git a/libk3bdevice/k3bmsf.h b/libk3bdevice/k3bmsf.h
index 973f6c3..052cadd 100644
--- a/libk3bdevice/k3bmsf.h
+++ b/libk3bdevice/k3bmsf.h
@@ -67,11 +67,11 @@ namespace K3b
 
       TQString toString( bool showFrames = true ) const;
 
-      KIO::filesize_t mode1Bytes() const;
-      KIO::filesize_t mode2Form1Bytes() const;
-      KIO::filesize_t mode2Form2Bytes() const;
-      KIO::filesize_t audioBytes() const;
-      KIO::filesize_t rawBytes() const;
+      TDEIO::filesize_t mode1Bytes() const;
+      TDEIO::filesize_t mode2Form1Bytes() const;
+      TDEIO::filesize_t mode2Form2Bytes() const;
+      TDEIO::filesize_t audioBytes() const;
+      TDEIO::filesize_t rawBytes() const;
       unsigned long long pcmSamples() const { return lba()*588; }
 
       /**
-- 
cgit v1.2.3