diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:06:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:06:28 -0600 |
| commit | 83b79bb29aaa412caec6abcdb42ca21d248b3b3a (patch) | |
| tree | f48e8ae855d4a0be0c3ecf912a92168a829ff8c5 /libk3bdevice | |
| parent | 2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (diff) | |
| download | k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.tar.gz k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libk3bdevice')
| -rw-r--r-- | libk3bdevice/k3bdevicemanager.cpp | 4 | ||||
| -rw-r--r-- | libk3bdevice/k3bdevicemanager.h | 6 | ||||
| -rw-r--r-- | libk3bdevice/k3bmsf.cpp | 20 | ||||
| -rw-r--r-- | libk3bdevice/k3bmsf.h | 10 |
4 files changed, 20 insertions, 20 deletions
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; } /** |