summaryrefslogtreecommitdiffstats
path: root/libk3b
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:28 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:28 -0600
commit83b79bb29aaa412caec6abcdb42ca21d248b3b3a (patch)
treef48e8ae855d4a0be0c3ecf912a92168a829ff8c5 /libk3b
parent2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (diff)
downloadk3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.tar.gz
k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libk3b')
-rw-r--r--libk3b/cddb/k3bcddb.cpp2
-rw-r--r--libk3b/cddb/k3bcddb.h4
-rw-r--r--libk3b/cddb/k3bcddbhttpquery.cpp14
-rw-r--r--libk3b/cddb/k3bcddbhttpquery.h6
-rw-r--r--libk3b/core/k3bcore.cpp14
-rw-r--r--libk3b/core/k3bcore.h8
-rw-r--r--libk3b/core/k3bexternalbinmanager.cpp4
-rw-r--r--libk3b/core/k3bexternalbinmanager.h6
-rw-r--r--libk3b/core/k3bglobals.cpp40
-rw-r--r--libk3b/core/k3bglobals.h8
-rw-r--r--libk3b/core/k3bglobalsettings.cpp4
-rw-r--r--libk3b/core/k3bglobalsettings.h6
-rw-r--r--libk3b/jobs/k3bcdcopyjob.cpp8
-rw-r--r--libk3b/jobs/k3bdvdcopyjob.cpp2
-rw-r--r--libk3b/jobs/k3biso9660imagewritingjob.cpp2
-rw-r--r--libk3b/plugin/k3baudioencoder.h2
-rw-r--r--libk3b/plugin/k3bpluginconfigwidget.h2
-rw-r--r--libk3b/plugin/k3bprojectplugin.h4
-rw-r--r--libk3b/projects/audiocd/k3baudiodatasource.h2
-rw-r--r--libk3b/projects/audiocd/k3baudiodoc.cpp2
-rw-r--r--libk3b/projects/audiocd/k3baudiodoc.h4
-rw-r--r--libk3b/projects/audiocd/k3baudiotrack.cpp2
-rw-r--r--libk3b/projects/audiocd/k3baudiotrack.h2
-rw-r--r--libk3b/projects/datacd/k3bdatadoc.cpp6
-rw-r--r--libk3b/projects/datacd/k3bdatadoc.h12
-rw-r--r--libk3b/projects/datacd/k3bdataitem.cpp2
-rw-r--r--libk3b/projects/datacd/k3bdataitem.h4
-rw-r--r--libk3b/projects/datacd/k3bdatajob.cpp4
-rw-r--r--libk3b/projects/datacd/k3bdiritem.cpp2
-rw-r--r--libk3b/projects/datacd/k3bdiritem.h6
-rw-r--r--libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp10
-rw-r--r--libk3b/projects/datacd/k3bfilecompilationsizehandler.h2
-rw-r--r--libk3b/projects/datacd/k3bfileitem.cpp10
-rw-r--r--libk3b/projects/datacd/k3bfileitem.h6
-rw-r--r--libk3b/projects/datacd/k3bisoimager.cpp2
-rw-r--r--libk3b/projects/datacd/k3bisooptions.cpp4
-rw-r--r--libk3b/projects/datacd/k3bisooptions.h6
-rw-r--r--libk3b/projects/datacd/k3bsessionimportitem.h4
-rw-r--r--libk3b/projects/datacd/k3bspecialdataitem.h6
-rw-r--r--libk3b/projects/datadvd/k3bdvddoc.h2
-rw-r--r--libk3b/projects/datadvd/k3bdvdjob.cpp4
-rw-r--r--libk3b/projects/k3bcdrdaowriter.cpp10
-rw-r--r--libk3b/projects/k3bdoc.h4
-rw-r--r--libk3b/projects/mixedcd/k3bmixeddoc.cpp2
-rw-r--r--libk3b/projects/mixedcd/k3bmixeddoc.h4
-rw-r--r--libk3b/projects/mixedcd/k3bmixedjob.cpp6
-rw-r--r--libk3b/projects/movixcd/k3bmovixdoc.h2
-rw-r--r--libk3b/projects/movixcd/k3bmovixjob.cpp2
-rw-r--r--libk3b/projects/movixdvd/k3bmovixdvddoc.h2
-rw-r--r--libk3b/projects/movixdvd/k3bmovixdvdjob.cpp2
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.cpp8
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.h8
-rw-r--r--libk3b/projects/videocd/k3bvcdjob.cpp2
-rw-r--r--libk3b/projects/videocd/k3bvcdoptions.cpp4
-rw-r--r--libk3b/projects/videocd/k3bvcdoptions.h6
-rw-r--r--libk3b/projects/videocd/k3bvcdtrack.cpp2
-rw-r--r--libk3b/projects/videocd/k3bvcdtrack.h2
-rw-r--r--libk3b/projects/videodvd/k3bvideodvddoc.h2
-rw-r--r--libk3b/projects/videodvd/k3bvideodvdjob.cpp2
-rw-r--r--libk3b/tools/k3bdirsizejob.cpp18
-rw-r--r--libk3b/tools/k3bdirsizejob.h8
-rw-r--r--libk3b/tools/k3bfilesplitter.cpp10
-rw-r--r--libk3b/tools/k3bfilesplitter.h2
-rw-r--r--libk3b/tools/k3bmd5job.cpp2
64 files changed, 175 insertions, 175 deletions
diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp
index f89f9d2..d1852a8 100644
--- a/libk3b/cddb/k3bcddb.cpp
+++ b/libk3b/cddb/k3bcddb.cpp
@@ -53,7 +53,7 @@ K3bCddb::~K3bCddb()
}
-void K3bCddb::readConfig( KConfig* c )
+void K3bCddb::readConfig( TDEConfig* c )
{
c->setGroup( "Cddb" );
diff --git a/libk3b/cddb/k3bcddb.h b/libk3b/cddb/k3bcddb.h
index 554da46..bd6fff1 100644
--- a/libk3b/cddb/k3bcddb.h
+++ b/libk3b/cddb/k3bcddb.h
@@ -26,7 +26,7 @@
#include "k3bcddbresult.h"
#include "k3b_export.h"
-class KConfig;
+class TDEConfig;
class K3bCddbQuery;
class K3bCddbHttpQuery;
class K3bCddbpQuery;
@@ -55,7 +55,7 @@ class LIBK3B_EXPORT K3bCddb : public TQObject
public slots:
/** query a cd and connect to the queryFinished signal */
void query( const K3bDevice::Toc& );
- void readConfig( KConfig* c );
+ void readConfig( TDEConfig* c );
void saveEntry( const K3bCddbResultEntry& );
signals:
diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp
index 65eb915..63e5581 100644
--- a/libk3b/cddb/k3bcddbhttpquery.cpp
+++ b/libk3b/cddb/k3bcddbhttpquery.cpp
@@ -78,7 +78,7 @@ void K3bCddbHttpQuery::performCommand( const TQString& cmd )
kdDebug() << "(K3bCddbHttpQuery) getting url: " << url.prettyURL() << endl;
- KIO::TransferJob* job = KIO::get( url, false, false );
+ TDEIO::TransferJob* job = TDEIO::get( url, false, false );
if( !job ) {
setError( CONNECTION_ERROR );
@@ -87,15 +87,15 @@ void K3bCddbHttpQuery::performCommand( const TQString& cmd )
return;
}
- connect( job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
- TQT_SLOT(slotData(KIO::Job*, const TQByteArray&)) );
- connect( job, TQT_SIGNAL(result(KIO::Job*)),
- TQT_SLOT(slotResult(KIO::Job*)) );
+ connect( job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+ TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&)) );
+ connect( job, TQT_SIGNAL(result(TDEIO::Job*)),
+ TQT_SLOT(slotResult(TDEIO::Job*)) );
}
-void K3bCddbHttpQuery::slotData( KIO::Job*, const TQByteArray& data )
+void K3bCddbHttpQuery::slotData( TDEIO::Job*, const TQByteArray& data )
{
if( data.size() ) {
TQDataStream stream( m_data, IO_WriteOnly | IO_Append );
@@ -104,7 +104,7 @@ void K3bCddbHttpQuery::slotData( KIO::Job*, const TQByteArray& data )
}
-void K3bCddbHttpQuery::slotResult( KIO::Job* job )
+void K3bCddbHttpQuery::slotResult( TDEIO::Job* job )
{
if( job->error() ) {
emit infoMessage( job->errorString() );
diff --git a/libk3b/cddb/k3bcddbhttpquery.h b/libk3b/cddb/k3bcddbhttpquery.h
index 63774e3..de86aad 100644
--- a/libk3b/cddb/k3bcddbhttpquery.h
+++ b/libk3b/cddb/k3bcddbhttpquery.h
@@ -22,7 +22,7 @@
#include <tqvaluelist.h>
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -42,8 +42,8 @@ class K3bCddbHttpQuery : public K3bCddbQuery
protected slots:
void doQuery();
void doMatchQuery();
- void slotResult( KIO::Job* );
- void slotData( KIO::Job*, const TQByteArray& data );
+ void slotResult( TDEIO::Job* );
+ void slotData( TDEIO::Job*, const TQByteArray& data );
private:
void performCommand( const TQString& );
diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp
index 20ed3c7..4af572f 100644
--- a/libk3b/core/k3bcore.cpp
+++ b/libk3b/core/k3bcore.cpp
@@ -104,7 +104,7 @@ public:
}
K3bVersion version;
- KConfig* config;
+ TDEConfig* config;
bool deleteConfig;
K3bDevice::DeviceManager* deviceManager;
K3bExternalBinManager* externalBinManager;
@@ -178,13 +178,13 @@ const K3bVersion& K3bCore::version() const
}
-KConfig* K3bCore::config() const
+TDEConfig* K3bCore::config() const
{
if( !d->config ) {
kdDebug() << "(K3bCore) opening k3b config file." << endl;
kdDebug() << "(K3bCore) while I am a " << className() << endl;
d->deleteConfig = true;
- d->config = new KConfig( "k3brc" );
+ d->config = new TDEConfig( "k3brc" );
}
return d->config;
@@ -251,9 +251,9 @@ void K3bCore::initPluginManager()
}
-void K3bCore::readSettings( KConfig* cnf )
+void K3bCore::readSettings( TDEConfig* cnf )
{
- KConfig* c = cnf;
+ TDEConfig* c = cnf;
if( !c )
c = config();
@@ -267,9 +267,9 @@ void K3bCore::readSettings( KConfig* cnf )
}
-void K3bCore::saveSettings( KConfig* cnf )
+void K3bCore::saveSettings( TDEConfig* cnf )
{
- KConfig* c = cnf;
+ TDEConfig* c = cnf;
if( !c )
c = config();
diff --git a/libk3b/core/k3bcore.h b/libk3b/core/k3bcore.h
index 9ad04aa..8e40adc 100644
--- a/libk3b/core/k3bcore.h
+++ b/libk3b/core/k3bcore.h
@@ -30,7 +30,7 @@
class K3bExternalBinManager;
class K3bVersion;
-class KConfig;
+class TDEConfig;
class TDEAboutData;
class K3bJob;
class K3bBurnJob;
@@ -81,12 +81,12 @@ class LIBK3B_EXPORT K3bCore : public TQObject
/**
* @param c if 0 K3bCore uses the K3b configuration
*/
- virtual void readSettings( KConfig* c = 0 );
+ virtual void readSettings( TDEConfig* c = 0 );
/**
* @param c if 0 K3bCore uses the K3b configuration
*/
- virtual void saveSettings( KConfig* c = 0 );
+ virtual void saveSettings( TDEConfig* c = 0 );
/**
* If this is reimplemented it is recommended to also reimplement
@@ -121,7 +121,7 @@ class LIBK3B_EXPORT K3bCore : public TQObject
* Default implementation returns the K3b configuration from k3brc.
* Normally this should not be used.
*/
- virtual KConfig* config() const;
+ virtual TDEConfig* config() const;
/**
* Used by the writing jobs to block a device.
diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp
index 7895326..83ec1b6 100644
--- a/libk3b/core/k3bexternalbinmanager.cpp
+++ b/libk3b/core/k3bexternalbinmanager.cpp
@@ -173,7 +173,7 @@ K3bExternalBinManager::~K3bExternalBinManager()
}
-bool K3bExternalBinManager::readConfig( KConfig* c )
+bool K3bExternalBinManager::readConfig( TDEConfig* c )
{
loadDefaultSearchPath();
@@ -207,7 +207,7 @@ bool K3bExternalBinManager::readConfig( KConfig* c )
return true;
}
-bool K3bExternalBinManager::saveConfig( KConfig* c )
+bool K3bExternalBinManager::saveConfig( TDEConfig* c )
{
c->setGroup( "External Programs" );
c->writePathEntry( "search path", m_searchPath );
diff --git a/libk3b/core/k3bexternalbinmanager.h b/libk3b/core/k3bexternalbinmanager.h
index 74be6b7..18b601b 100644
--- a/libk3b/core/k3bexternalbinmanager.h
+++ b/libk3b/core/k3bexternalbinmanager.h
@@ -24,7 +24,7 @@
#include "k3b_export.h"
#include "k3bversion.h"
-class KConfig;
+class TDEConfig;
class TDEProcess;
@@ -126,12 +126,12 @@ class LIBK3B_EXPORT K3bExternalBinManager : public TQObject
* read config and add changes to current map.
* Takes care of setting the config group
*/
- bool readConfig( KConfig* );
+ bool readConfig( TDEConfig* );
/**
* Takes care of setting the config group
*/
- bool saveConfig( KConfig* );
+ bool saveConfig( TDEConfig* );
bool foundBin( const TQString& name );
const TQString& binPath( const TQString& name );
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index 23225b6..42ccebc 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -276,32 +276,32 @@ bool K3b::kbFreeOnFs( const TQString& path, unsigned long& size, unsigned long&
}
-KIO::filesize_t K3b::filesize( const KURL& url )
+TDEIO::filesize_t K3b::filesize( const KURL& url )
{
if( url.isLocalFile() ) {
k3b_struct_stat buf;
if ( !k3b_stat( TQFile::encodeName( url.path() ), &buf ) ) {
- return (KIO::filesize_t)buf.st_size;
+ return (TDEIO::filesize_t)buf.st_size;
}
}
- KIO::UDSEntry uds;
- KIO::NetAccess::stat( url, uds, 0 );
- for( KIO::UDSEntry::const_iterator it = uds.begin(); it != uds.end(); ++it ) {
- if( (*it).m_uds == KIO::UDS_SIZE ) {
+ TDEIO::UDSEntry uds;
+ TDEIO::NetAccess::stat( url, uds, 0 );
+ for( TDEIO::UDSEntry::const_iterator it = uds.begin(); it != uds.end(); ++it ) {
+ if( (*it).m_uds == TDEIO::UDS_SIZE ) {
return (*it).m_long;
}
}
- return ( KIO::filesize_t )0;
+ return ( TDEIO::filesize_t )0;
}
-KIO::filesize_t K3b::imageFilesize( const KURL& url )
+TDEIO::filesize_t K3b::imageFilesize( const KURL& url )
{
- KIO::filesize_t size = K3b::filesize( url );
+ TDEIO::filesize_t size = K3b::filesize( url );
int cnt = 0;
- while( KIO::NetAccess::exists( KURL::fromPathOrURL( url.url() + '.' + TQString::number(cnt).rightJustify( 3, '0' ) ), true ) )
+ while( TDEIO::NetAccess::exists( KURL::fromPathOrURL( url.url() + '.' + TQString::number(cnt).rightJustify( 3, '0' ) ), true ) )
size += K3b::filesize( KURL::fromPathOrURL( url.url() + '.' + TQString::number(cnt++).rightJustify( 3, '0' ) ) );
return size;
}
@@ -462,17 +462,17 @@ KURL K3b::convertToLocalUrl( const KURL& url )
{
if( !url.isLocalFile() ) {
#if KDE_IS_VERSION(3,4,91)
- return KIO::NetAccess::mostLocalURL( url, 0 );
+ return TDEIO::NetAccess::mostLocalURL( url, 0 );
#else
#ifndef UDS_LOCAL_PATH
-#define UDS_LOCAL_PATH (72 | KIO::UDS_STRING)
+#define UDS_LOCAL_PATH (72 | TDEIO::UDS_STRING)
#else
- using namespace KIO;
+ using namespace TDEIO;
#endif
- KIO::UDSEntry e;
- if( KIO::NetAccess::stat( url, e, 0 ) ) {
- const KIO::UDSEntry::ConstIterator end = e.end();
- for( KIO::UDSEntry::ConstIterator it = e.begin(); it != end; ++it ) {
+ TDEIO::UDSEntry e;
+ if( TDEIO::NetAccess::stat( url, e, 0 ) ) {
+ const TDEIO::UDSEntry::ConstIterator end = e.end();
+ for( TDEIO::UDSEntry::ConstIterator it = e.begin(); it != end; ++it ) {
if( (*it).m_uds == UDS_LOCAL_PATH && !(*it).m_str.isEmpty() )
return KURL::fromPathOrURL( (*it).m_str );
}
@@ -541,7 +541,7 @@ bool K3b::isMounted( K3bDevice::Device* dev )
if( !dev )
return false;
- return !KIO::findDeviceMountPoint( dev->blockDeviceName() ).isEmpty();
+ return !TDEIO::findDeviceMountPoint( dev->blockDeviceName() ).isEmpty();
}
@@ -554,7 +554,7 @@ bool K3b::unmount( K3bDevice::Device* dev )
#if KDE_IS_VERSION(3,4,0)
// first try to unmount it the standard way
- if( KIO::NetAccess::synchronousRun( KIO::unmount( mntDev, false ), 0 ) )
+ if( TDEIO::NetAccess::synchronousRun( TDEIO::unmount( mntDev, false ), 0 ) )
return true;
#endif
@@ -598,7 +598,7 @@ bool K3b::mount( K3bDevice::Device* dev )
#if KDE_IS_VERSION(3,4,0)
// first try to mount it the standard way
- if( KIO::NetAccess::synchronousRun( KIO::mount( true, 0, mntDev, false ), 0 ) )
+ if( TDEIO::NetAccess::synchronousRun( TDEIO::mount( true, 0, mntDev, false ), 0 ) )
return true;
#endif
diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h
index 0b58f58..0964258 100644
--- a/libk3b/core/k3bglobals.h
+++ b/libk3b/core/k3bglobals.h
@@ -28,7 +28,7 @@
#include <k3bdevicetypes.h>
#include "k3b_export.h"
-class KConfig;
+class TDEConfig;
class K3bVersion;
class K3bExternalBin;
@@ -187,7 +187,7 @@ namespace K3b
TQString systemName();
- LIBK3B_EXPORT KIO::filesize_t filesize( const KURL& );
+ LIBK3B_EXPORT TDEIO::filesize_t filesize( const KURL& );
/**
* Calculate the total size of an image file. This also includes
@@ -195,7 +195,7 @@ namespace K3b
*
* \returns the total size of the image file at url
*/
- LIBK3B_EXPORT KIO::filesize_t imageFilesize( const KURL& url );
+ LIBK3B_EXPORT TDEIO::filesize_t imageFilesize( const KURL& url );
/**
* true if the kernel supports ATAPI devices without SCSI emulation.
@@ -236,7 +236,7 @@ namespace K3b
/**
* Tries to unmount the device ignoring its actual mounting state.
- * This method uses both KIO::unmount and pumount if available.
+ * This method uses both TDEIO::unmount and pumount if available.
*/
LIBK3B_EXPORT bool unmount( K3bDevice::Device* );
diff --git a/libk3b/core/k3bglobalsettings.cpp b/libk3b/core/k3bglobalsettings.cpp
index ac6a2f0..1301b8b 100644
--- a/libk3b/core/k3bglobalsettings.cpp
+++ b/libk3b/core/k3bglobalsettings.cpp
@@ -29,7 +29,7 @@ K3bGlobalSettings::K3bGlobalSettings()
}
-void K3bGlobalSettings::readSettings( KConfig* c )
+void K3bGlobalSettings::readSettings( TDEConfig* c )
{
TQString lastG = c->group();
c->setGroup( "General Options" );
@@ -45,7 +45,7 @@ void K3bGlobalSettings::readSettings( KConfig* c )
}
-void K3bGlobalSettings::saveSettings( KConfig* c )
+void K3bGlobalSettings::saveSettings( TDEConfig* c )
{
TQString lastG = c->group();
c->setGroup( "General Options" );
diff --git a/libk3b/core/k3bglobalsettings.h b/libk3b/core/k3bglobalsettings.h
index 1194789..4765b7f 100644
--- a/libk3b/core/k3bglobalsettings.h
+++ b/libk3b/core/k3bglobalsettings.h
@@ -16,7 +16,7 @@
#ifndef _K3B_GLOBAL_SETTINGS_H_
#define _K3B_GLOBAL_SETTINGS_H_
#include "k3b_export.h"
-class KConfig;
+class TDEConfig;
/**
* Some global settings used throughout K3b.
@@ -29,12 +29,12 @@ class LIBK3B_EXPORT K3bGlobalSettings
/**
* This method takes care of settings the config group
*/
- void readSettings( KConfig* );
+ void readSettings( TDEConfig* );
/**
* This method takes care of settings the config group
*/
- void saveSettings( KConfig* );
+ void saveSettings( TDEConfig* );
bool ejectMedia() const { return m_eject; }
bool burnfree() const { return m_burnfree; }
diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp
index 980bfeb..76bc7d3 100644
--- a/libk3b/jobs/k3bcdcopyjob.cpp
+++ b/libk3b/jobs/k3bcdcopyjob.cpp
@@ -302,7 +302,7 @@ void K3bCdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
//
// check free temp space
//
- KIO::filesize_t imageSpaceNeeded = 0;
+ TDEIO::filesize_t imageSpaceNeeded = 0;
for( K3bDevice::Toc::const_iterator it = d->toc.begin(); it != d->toc.end(); ++it ) {
if( (*it).type() == K3bDevice::Track::AUDIO )
imageSpaceNeeded += (*it).length().audioBytes() + 44;
@@ -415,7 +415,7 @@ void K3bCdCopyJob::queryCddb()
this, TQT_SLOT(slotCddbQueryFinished(int)) );
}
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup("Cddb");
d->cddb->readConfig( c );
@@ -432,7 +432,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error )
emit infoMessage( i18n("Found Cddb entry (%1 - %2).").arg(d->cddbInfo.cdArtist).arg(d->cddbInfo.cdTitle), SUCCESS );
// save the entry locally
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup( "Cddb" );
if( c->readBoolEntry( "save cddb entries locally", true ) )
d->cddb->saveEntry( d->cddbInfo );
@@ -1084,7 +1084,7 @@ void K3bCdCopyJob::cleanup()
// remove the tempdir created in prepareImageFiles()
if( d->deleteTempDir ) {
- KIO::NetAccess::del( KURL::fromPathOrURL(m_tempPath), 0 );
+ TDEIO::NetAccess::del( KURL::fromPathOrURL(m_tempPath), 0 );
d->deleteTempDir = false;
}
}
diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp
index d5382a3..6f36bf6 100644
--- a/libk3b/jobs/k3bdvdcopyjob.cpp
+++ b/libk3b/jobs/k3bdvdcopyjob.cpp
@@ -312,7 +312,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
//
// check free temp space
//
- KIO::filesize_t imageSpaceNeeded = (KIO::filesize_t)(d->lastSector.lba()+1)*2048;
+ TDEIO::filesize_t imageSpaceNeeded = (TDEIO::filesize_t)(d->lastSector.lba()+1)*2048;
unsigned long avail, size;
TQString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) );
if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp
index 3a83553..e21e780 100644
--- a/libk3b/jobs/k3biso9660imagewritingjob.cpp
+++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp
@@ -451,7 +451,7 @@ TQString K3bIso9660ImageWritingJob::jobDescription() const
TQString K3bIso9660ImageWritingJob::jobDetails() const
{
- return m_imagePath.section("/", -1) + TQString( " (%1)" ).arg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath))));
+ return m_imagePath.section("/", -1) + TQString( " (%1)" ).arg(TDEIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath))));
}
diff --git a/libk3b/plugin/k3baudioencoder.h b/libk3b/plugin/k3baudioencoder.h
index 01314be..392e662 100644
--- a/libk3b/plugin/k3baudioencoder.h
+++ b/libk3b/plugin/k3baudioencoder.h
@@ -51,7 +51,7 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin
/**
* Force the plugin to read it's configuration
*/
- // virtual void readConfig( KConfig* );
+ // virtual void readConfig( TDEConfig* );
TQString group() const { return "AudioEncoder"; }
diff --git a/libk3b/plugin/k3bpluginconfigwidget.h b/libk3b/plugin/k3bpluginconfigwidget.h
index 9544703..48a91ff 100644
--- a/libk3b/plugin/k3bpluginconfigwidget.h
+++ b/libk3b/plugin/k3bpluginconfigwidget.h
@@ -32,7 +32,7 @@ class LIBK3B_EXPORT K3bPluginConfigWidget : public TQWidget
public slots:
/**
* Use k3bcore->config() to store the settings
- * FIXME: add a KConfig parameter here
+ * FIXME: add a TDEConfig parameter here
*/
virtual void loadConfig();
virtual void saveConfig();
diff --git a/libk3b/plugin/k3bprojectplugin.h b/libk3b/plugin/k3bprojectplugin.h
index 53040d9..59997af 100644
--- a/libk3b/plugin/k3bprojectplugin.h
+++ b/libk3b/plugin/k3bprojectplugin.h
@@ -43,8 +43,8 @@ class K3bProjectPluginGUIBase
virtual TQString title() const = 0;
virtual TQString subTitle() const { return TQString(); }
- virtual void readSettings( KConfigBase* ) {}
- virtual void saveSettings( KConfigBase* ) {}
+ virtual void readSettings( TDEConfigBase* ) {}
+ virtual void saveSettings( TDEConfigBase* ) {}
/**
* Load system defaults for the GUI
diff --git a/libk3b/projects/audiocd/k3baudiodatasource.h b/libk3b/projects/audiocd/k3baudiodatasource.h
index f3bc770..1cb6f71 100644
--- a/libk3b/projects/audiocd/k3baudiodatasource.h
+++ b/libk3b/projects/audiocd/k3baudiodatasource.h
@@ -67,7 +67,7 @@ class LIBK3B_EXPORT K3bAudioDataSource
/**
* @return The raw size in pcm samples (16bit, 44800 kHz, stereo)
*/
- KIO::filesize_t size() const { return length().audioBytes(); }
+ TDEIO::filesize_t size() const { return length().audioBytes(); }
virtual bool seek( const K3b::Msf& ) = 0;
diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp
index ab06fe2..c66e000 100644
--- a/libk3b/projects/audiocd/k3baudiodoc.cpp
+++ b/libk3b/projects/audiocd/k3baudiodoc.cpp
@@ -145,7 +145,7 @@ void K3bAudioDoc::setLastTrack( K3bAudioTrack* track )
}
-KIO::filesize_t K3bAudioDoc::size() const
+TDEIO::filesize_t K3bAudioDoc::size() const
{
// This is not really correct but what the user expects ;)
return length().mode1Bytes();
diff --git a/libk3b/projects/audiocd/k3baudiodoc.h b/libk3b/projects/audiocd/k3baudiodoc.h
index fde9879..e40a53e 100644
--- a/libk3b/projects/audiocd/k3baudiodoc.h
+++ b/libk3b/projects/audiocd/k3baudiodoc.h
@@ -38,7 +38,7 @@ class TQTimer;
class TQDomDocument;
class TQDomElement;
class K3bThreadJob;
-class KConfig;
+class TDEConfig;
class K3bAudioDataSource;
class K3bAudioDecoder;
class K3bAudioFile;
@@ -84,7 +84,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc
K3bAudioFile* createAudioFile( const KURL& url );
/** get the current size of the project */
- KIO::filesize_t size() const;
+ TDEIO::filesize_t size() const;
K3b::Msf length() const;
// CD-Text
diff --git a/libk3b/projects/audiocd/k3baudiotrack.cpp b/libk3b/projects/audiocd/k3baudiotrack.cpp
index 5f133a4..8738d99 100644
--- a/libk3b/projects/audiocd/k3baudiotrack.cpp
+++ b/libk3b/projects/audiocd/k3baudiotrack.cpp
@@ -210,7 +210,7 @@ K3b::Msf K3bAudioTrack::length() const
}
-KIO::filesize_t K3bAudioTrack::size() const
+TDEIO::filesize_t K3bAudioTrack::size() const
{
return length().audioBytes();
}
diff --git a/libk3b/projects/audiocd/k3baudiotrack.h b/libk3b/projects/audiocd/k3baudiotrack.h
index 410b1f0..0970662 100644
--- a/libk3b/projects/audiocd/k3baudiotrack.h
+++ b/libk3b/projects/audiocd/k3baudiotrack.h
@@ -56,7 +56,7 @@ class LIBK3B_EXPORT K3bAudioTrack
* @return length of track in frames
*/
K3b::Msf length() const;
- KIO::filesize_t size() const;
+ TDEIO::filesize_t size() const;
const TQString& artist() const { return m_cdText.performer(); }
const TQString& performer() const { return m_cdText.performer(); }
diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp
index 79e6625..c48650e 100644
--- a/libk3b/projects/datacd/k3bdatadoc.cpp
+++ b/libk3b/projects/datacd/k3bdatadoc.cpp
@@ -229,7 +229,7 @@ K3bDirItem* K3bDataDoc::addEmptyDir( const TQString& name, K3bDirItem* parent )
}
-KIO::filesize_t K3bDataDoc::size() const
+TDEIO::filesize_t K3bDataDoc::size() const
{
if( m_isoOptions.doNotCacheInodes() )
return root()->blocks().mode1Bytes() + m_oldSessionSize;
@@ -239,7 +239,7 @@ KIO::filesize_t K3bDataDoc::size() const
}
-KIO::filesize_t K3bDataDoc::burningSize() const
+TDEIO::filesize_t K3bDataDoc::burningSize() const
{
return size() - m_oldSessionSize; //m_oldSessionSizeHandler->size();
}
@@ -1171,7 +1171,7 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device )
// anyway since there might be files overwritten or removed
m_oldSessionSize = toc.last().lastSector().mode1Bytes();
- kdDebug() << "(K3bDataDoc) imported session size: " << KIO::convertSize(m_oldSessionSize) << endl;
+ kdDebug() << "(K3bDataDoc) imported session size: " << TDEIO::convertSize(m_oldSessionSize) << endl;
// the track size for DVD+RW media and DVD-RW Overwrite media has nothing to do with the filesystem
// size. in that case we need to use the filesystem's size (which is ok since it's one track anyway,
diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h
index ec80d5b..00312b6 100644
--- a/libk3b/projects/datacd/k3bdatadoc.h
+++ b/libk3b/projects/datacd/k3bdatadoc.h
@@ -40,7 +40,7 @@ class K3bFileCompilationSizeHandler;
class KProgressDialog;
//class K3bView;
-class KConfig;
+class TDEConfig;
class TQString;
class TQStringList;
class TQWidget;
@@ -89,12 +89,12 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
K3bRootItem* root() const { return m_root; }
virtual bool newDocument();
- virtual KIO::filesize_t size() const;
+ virtual TDEIO::filesize_t size() const;
/**
* This is used for multisession where size() also returnes the imported session's size
*/
- virtual KIO::filesize_t burningSize() const;
+ virtual TDEIO::filesize_t burningSize() const;
virtual K3b::Msf length() const;
virtual K3b::Msf burningLength() const;
@@ -131,7 +131,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
/**
* Most of the options that map to the mkisofs parameters are grouped
* together in the K3bIsoOptions class to allow easy saving to and loading
- * from a KConfig object.
+ * from a TDEConfig object.
*/
const K3bIsoOptions& isoOptions() const { return m_isoOptions; }
void setIsoOptions( const K3bIsoOptions& );
@@ -242,7 +242,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
K3bFileCompilationSizeHandler* m_sizeHandler;
// K3bFileCompilationSizeHandler* m_oldSessionSizeHandler;
- KIO::filesize_t m_oldSessionSize;
+ TDEIO::filesize_t m_oldSessionSize;
private:
void prepareFilenamesInDir( K3bDirItem* dir );
@@ -274,7 +274,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
bool m_verifyData;
- KIO::filesize_t m_size;
+ TDEIO::filesize_t m_size;
K3bIsoOptions m_isoOptions;
diff --git a/libk3b/projects/datacd/k3bdataitem.cpp b/libk3b/projects/datacd/k3bdataitem.cpp
index f5ce21d..40cedbb 100644
--- a/libk3b/projects/datacd/k3bdataitem.cpp
+++ b/libk3b/projects/datacd/k3bdataitem.cpp
@@ -89,7 +89,7 @@ bool K3bDataItem::isBootItem() const
}
-KIO::filesize_t K3bDataItem::size() const
+TDEIO::filesize_t K3bDataItem::size() const
{
return itemSize( m_doc
? m_doc->isoOptions().followSymbolicLinks() ||
diff --git a/libk3b/projects/datacd/k3bdataitem.h b/libk3b/projects/datacd/k3bdataitem.h
index 043a0d5..1f68d68 100644
--- a/libk3b/projects/datacd/k3bdataitem.h
+++ b/libk3b/projects/datacd/k3bdataitem.h
@@ -117,7 +117,7 @@ class LIBK3B_EXPORT K3bDataItem
/**
* The size of the item
*/
- KIO::filesize_t size() const;
+ TDEIO::filesize_t size() const;
/**
* \return The number of blocks (2048 bytes) occupied by this item.
@@ -183,7 +183,7 @@ class LIBK3B_EXPORT K3bDataItem
void setExtraInfo( const TQString& i ) { m_extraInfo = i; }
protected:
- virtual KIO::filesize_t itemSize( bool followSymlinks ) const = 0;
+ virtual TDEIO::filesize_t itemSize( bool followSymlinks ) const = 0;
/**
* \param followSymlinks If true symlinks will be followed and their
diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp
index 442b035..8eb7d11 100644
--- a/libk3b/projects/datacd/k3bdatajob.cpp
+++ b/libk3b/projects/datacd/k3bdatajob.cpp
@@ -935,10 +935,10 @@ TQString K3bDataJob::jobDetails() const
return i18n("ISO9660 Filesystem (Size: %1) - %n copy",
"ISO9660 Filesystem (Size: %1) - %n copies",
d->doc->copies() )
- .arg(KIO::convertSize( d->doc->size() ));
+ .arg(TDEIO::convertSize( d->doc->size() ));
else
return i18n("ISO9660 Filesystem (Size: %1)")
- .arg(KIO::convertSize( d->doc->size() ));
+ .arg(TDEIO::convertSize( d->doc->size() ));
}
diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp
index f43f1d5..9cd0f31 100644
--- a/libk3b/projects/datacd/k3bdiritem.cpp
+++ b/libk3b/projects/datacd/k3bdiritem.cpp
@@ -271,7 +271,7 @@ bool K3bDirItem::mkdir( const TQString& dirPath )
}
-KIO::filesize_t K3bDirItem::itemSize( bool followsylinks ) const
+TDEIO::filesize_t K3bDirItem::itemSize( bool followsylinks ) const
{
if( followsylinks )
return m_followSymlinksSize;
diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h
index a624529..c33610f 100644
--- a/libk3b/projects/datacd/k3bdiritem.h
+++ b/libk3b/projects/datacd/k3bdiritem.h
@@ -101,7 +101,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
* between files with the same inode in an iso9660 filesystem.
* For that one has to use K3bFileCompilationSizeHandler.
*/
- KIO::filesize_t itemSize( bool followSymlinks ) const;
+ TDEIO::filesize_t itemSize( bool followSymlinks ) const;
/*
* Normally one does not use this method but K3bDataItem::blocks()
@@ -124,8 +124,8 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
mutable TQPtrList<K3bDataItem> m_children;
// size of the items simply added
- KIO::filesize_t m_size;
- KIO::filesize_t m_followSymlinksSize;
+ TDEIO::filesize_t m_size;
+ TDEIO::filesize_t m_followSymlinksSize;
// number of blocks (2048 bytes) used by all the items
long m_blocks;
diff --git a/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp b/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp
index 2d4b2fb..cb38794 100644
--- a/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp
+++ b/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp
@@ -28,7 +28,7 @@
// or we just update the sizes!
-static long usedBlocks( const KIO::filesize_t& bytes )
+static long usedBlocks( const TDEIO::filesize_t& bytes )
{
if( bytes % 2048 )
return bytes/2048 + 1;
@@ -62,9 +62,9 @@ public:
* This way we always use the size of the first added file and may
* warn the user if sizes differ.
*/
- KIO::filesize_t savedSize;
+ TDEIO::filesize_t savedSize;
- KIO::filesize_t completeSize() const { return savedSize*number; }
+ TDEIO::filesize_t completeSize() const { return savedSize*number; }
/**
* In an iso9660 filesystem a file occupies complete blocks of 2048 bytes.
@@ -154,7 +154,7 @@ public:
*/
TQMap<K3bFileItem::Id, InodeInfo> inodeMap;
- KIO::filesize_t size;
+ TDEIO::filesize_t size;
K3b::Msf blocks;
TQPtrList<K3bDataItem> specialItems;
@@ -175,7 +175,7 @@ K3bFileCompilationSizeHandler::~K3bFileCompilationSizeHandler()
}
-const KIO::filesize_t& K3bFileCompilationSizeHandler::size( bool followSymlinks ) const
+const TDEIO::filesize_t& K3bFileCompilationSizeHandler::size( bool followSymlinks ) const
{
if( followSymlinks )
return d_noSymlinks->size;
diff --git a/libk3b/projects/datacd/k3bfilecompilationsizehandler.h b/libk3b/projects/datacd/k3bfilecompilationsizehandler.h
index c996657..4745264 100644
--- a/libk3b/projects/datacd/k3bfilecompilationsizehandler.h
+++ b/libk3b/projects/datacd/k3bfilecompilationsizehandler.h
@@ -43,7 +43,7 @@ class K3bFileCompilationSizeHandler
* This does NOT equal blocks() * 2048.
* This is the sum of the actual file sizes.
*/
- const KIO::filesize_t& size( bool followSymlinks = false ) const;
+ const TDEIO::filesize_t& size( bool followSymlinks = false ) const;
/**
* Number of blocks the files will occupy.
diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp
index 7cabec8..3e20982 100644
--- a/libk3b/projects/datacd/k3bfileitem.cpp
+++ b/libk3b/projects/datacd/k3bfileitem.cpp
@@ -87,7 +87,7 @@ K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem*
}
}
else {
- m_size = (KIO::filesize_t)statBuf.st_size;
+ m_size = (TDEIO::filesize_t)statBuf.st_size;
m_bSymLink = S_ISLNK(statBuf.st_mode);
@@ -108,7 +108,7 @@ K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem*
m_idFollowed.inode = statBuf.st_ino;
m_idFollowed.device = statBuf.st_dev;
- m_sizeFollowed = (KIO::filesize_t)statBuf.st_size;
+ m_sizeFollowed = (TDEIO::filesize_t)statBuf.st_size;
}
}
@@ -130,7 +130,7 @@ K3bFileItem::K3bFileItem( const k3b_struct_stat* stat,
else
m_k3bName = k3bName;
- m_size = (KIO::filesize_t)stat->st_size;
+ m_size = (TDEIO::filesize_t)stat->st_size;
m_bSymLink = S_ISLNK(stat->st_mode);
//
@@ -144,7 +144,7 @@ K3bFileItem::K3bFileItem( const k3b_struct_stat* stat,
m_idFollowed.inode = followedStat->st_ino;
m_idFollowed.device = followedStat->st_dev;
- m_sizeFollowed = (KIO::filesize_t)followedStat->st_size;
+ m_sizeFollowed = (TDEIO::filesize_t)followedStat->st_size;
}
else {
m_idFollowed = m_id;
@@ -182,7 +182,7 @@ K3bDataItem* K3bFileItem::copy() const
}
-KIO::filesize_t K3bFileItem::itemSize( bool followSymlinks ) const
+TDEIO::filesize_t K3bFileItem::itemSize( bool followSymlinks ) const
{
if( followSymlinks )
return m_sizeFollowed;
diff --git a/libk3b/projects/datacd/k3bfileitem.h b/libk3b/projects/datacd/k3bfileitem.h
index 46e2930..45e5b08 100644
--- a/libk3b/projects/datacd/k3bfileitem.h
+++ b/libk3b/projects/datacd/k3bfileitem.h
@@ -103,13 +103,13 @@ public:
/**
* Normally one does not use this method but K3bDataItem::size()
*/
- KIO::filesize_t itemSize( bool followSymlinks ) const;
+ TDEIO::filesize_t itemSize( bool followSymlinks ) const;
private:
K3bDataItem* m_replacedItemFromOldSession;
- KIO::filesize_t m_size;
- KIO::filesize_t m_sizeFollowed;
+ TDEIO::filesize_t m_size;
+ TDEIO::filesize_t m_sizeFollowed;
Id m_id;
Id m_idFollowed;
diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp
index 6b1de51..dea41b6 100644
--- a/libk3b/projects/datacd/k3bisoimager.cpp
+++ b/libk3b/projects/datacd/k3bisoimager.cpp
@@ -894,7 +894,7 @@ void K3bIsoImager::writePathSpecForFile( K3bFileItem* item, TQTextStream& stream
TQString tempPath = temp.name();
temp.unlink();
- if( !KIO::NetAccess::copy( KURL(item->localPath()), KURL::fromPathOrURL(tempPath) ) ) {
+ if( !TDEIO::NetAccess::copy( KURL(item->localPath()), KURL::fromPathOrURL(tempPath) ) ) {
emit infoMessage( i18n("Failed to backup boot image file %1").arg(item->localPath()), ERROR );
return;
}
diff --git a/libk3b/projects/datacd/k3bisooptions.cpp b/libk3b/projects/datacd/k3bisooptions.cpp
index f239f2a..91b6302 100644
--- a/libk3b/projects/datacd/k3bisooptions.cpp
+++ b/libk3b/projects/datacd/k3bisooptions.cpp
@@ -66,7 +66,7 @@ K3bIsoOptions::K3bIsoOptions()
}
-void K3bIsoOptions::save( KConfigBase* c, bool saveVolumeDesc )
+void K3bIsoOptions::save( TDEConfigBase* c, bool saveVolumeDesc )
{
if( saveVolumeDesc ) {
c->writeEntry( "volume id", m_volumeID );
@@ -134,7 +134,7 @@ void K3bIsoOptions::save( KConfigBase* c, bool saveVolumeDesc )
}
-K3bIsoOptions K3bIsoOptions::load( KConfigBase* c, bool loadVolumeDesc )
+K3bIsoOptions K3bIsoOptions::load( TDEConfigBase* c, bool loadVolumeDesc )
{
K3bIsoOptions options;
diff --git a/libk3b/projects/datacd/k3bisooptions.h b/libk3b/projects/datacd/k3bisooptions.h
index 3d51d3d..04dab2e 100644
--- a/libk3b/projects/datacd/k3bisooptions.h
+++ b/libk3b/projects/datacd/k3bisooptions.h
@@ -19,7 +19,7 @@
#include <tqstring.h>
#include "k3b_export.h"
-class KConfigBase;
+class TDEConfigBase;
class LIBK3B_EXPORT K3bIsoOptions
@@ -124,9 +124,9 @@ class LIBK3B_EXPORT K3bIsoOptions
bool doNotCacheInodes() const { return m_doNotCacheInodes; }
void setDoNotCacheInodes( bool b ) { m_doNotCacheInodes = b; }
- void save( KConfigBase* c, bool saveVolumeDesc = true );
+ void save( TDEConfigBase* c, bool saveVolumeDesc = true );
- static K3bIsoOptions load( KConfigBase* c, bool loadVolumeDesc = true );
+ static K3bIsoOptions load( TDEConfigBase* c, bool loadVolumeDesc = true );
static K3bIsoOptions defaults();
private:
diff --git a/libk3b/projects/datacd/k3bsessionimportitem.h b/libk3b/projects/datacd/k3bsessionimportitem.h
index 33f8124..e97b201 100644
--- a/libk3b/projects/datacd/k3bsessionimportitem.h
+++ b/libk3b/projects/datacd/k3bsessionimportitem.h
@@ -53,11 +53,11 @@ class K3bSessionImportItem : public K3bDataItem
/**
* Normally one does not use this method but K3bDataItem::size()
*/
- KIO::filesize_t itemSize( bool ) const { return m_size; }
+ TDEIO::filesize_t itemSize( bool ) const { return m_size; }
private:
K3bFileItem* m_replaceItem;
- KIO::filesize_t m_size;
+ TDEIO::filesize_t m_size;
};
#endif
diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h
index 1dc3bb7..cb7f708 100644
--- a/libk3b/projects/datacd/k3bspecialdataitem.h
+++ b/libk3b/projects/datacd/k3bspecialdataitem.h
@@ -29,7 +29,7 @@
class K3bSpecialDataItem : public K3bDataItem
{
public:
- K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* parent = 0, const TQString& k3bName = TQString() )
+ K3bSpecialDataItem( K3bDataDoc* doc, TDEIO::filesize_t size, K3bDirItem* parent = 0, const TQString& k3bName = TQString() )
: K3bDataItem( doc, parent ),
m_size( size )
{
@@ -65,11 +65,11 @@ class K3bSpecialDataItem : public K3bDataItem
/**
* Normally one does not use this method but K3bDataItem::size()
*/
- KIO::filesize_t itemSize( bool ) const { return m_size; }
+ TDEIO::filesize_t itemSize( bool ) const { return m_size; }
private:
TQString m_mimeType;
- KIO::filesize_t m_size;
+ TDEIO::filesize_t m_size;
};
#endif
diff --git a/libk3b/projects/datadvd/k3bdvddoc.h b/libk3b/projects/datadvd/k3bdvddoc.h
index ff3ebbf..405dbde 100644
--- a/libk3b/projects/datadvd/k3bdvddoc.h
+++ b/libk3b/projects/datadvd/k3bdvddoc.h
@@ -18,7 +18,7 @@
#include <k3bdatadoc.h>
#include "k3b_export.h"
-class KConfig;
+class TDEConfig;
class LIBK3B_EXPORT K3bDvdDoc : public K3bDataDoc
{
diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp
index dda717d..7e5a19d 100644
--- a/libk3b/projects/datadvd/k3bdvdjob.cpp
+++ b/libk3b/projects/datadvd/k3bdvdjob.cpp
@@ -335,10 +335,10 @@ TQString K3bDvdJob::jobDetails() const
return i18n("ISO9660 Filesystem (Size: %1) - %n copy",
"ISO9660 Filesystem (Size: %1) - %n copies",
m_doc->copies())
- .arg(KIO::convertSize( m_doc->size() ));
+ .arg(TDEIO::convertSize( m_doc->size() ));
else
return i18n("ISO9660 Filesystem (Size: %1)")
- .arg(KIO::convertSize( m_doc->size() ));
+ .arg(TDEIO::convertSize( m_doc->size() ));
}
#include "k3bdvdjob.moc"
diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp
index 6d61005..be7f38c 100644
--- a/libk3b/projects/k3bcdrdaowriter.cpp
+++ b/libk3b/projects/k3bcdrdaowriter.cpp
@@ -516,7 +516,7 @@ void K3bCdrdaoWriter::start()
m_backupTocFile = m_tocFile + ".k3bbak";
// workaround, cdrdao deletes the tocfile when --remote parameter is set
- if ( !KIO::NetAccess::copy(KURL(m_tocFile),KURL(m_backupTocFile), (TQWidget*) 0) )
+ if ( !TDEIO::NetAccess::copy(KURL(m_tocFile),KURL(m_backupTocFile), (TQWidget*) 0) )
{
kdDebug() << "(K3bCdrdaoWriter) could not backup " << m_tocFile << " to " << m_backupTocFile << endl;
emit infoMessage( i18n("Could not backup tocfile."), ERROR );
@@ -722,20 +722,20 @@ void K3bCdrdaoWriter::slotProcessExited( TDEProcess* p )
case WRITE:
case COPY:
if ( !m_binFileLnk.isEmpty() ) {
- KIO::NetAccess::del(KURL::fromPathOrURL(m_cueFileLnk), (TQWidget*) 0);
- KIO::NetAccess::del(KURL::fromPathOrURL(m_binFileLnk), (TQWidget*) 0);
+ TDEIO::NetAccess::del(KURL::fromPathOrURL(m_cueFileLnk), (TQWidget*) 0);
+ TDEIO::NetAccess::del(KURL::fromPathOrURL(m_binFileLnk), (TQWidget*) 0);
}
else if( (!TQFile::exists( m_tocFile ) || K3b::filesize( KURL::fromPathOrURL(m_tocFile) ) == 0 ) && !m_onTheFly )
{
// cdrdao removed the tocfile :(
// we need to recover it
- if ( !KIO::NetAccess::copy(KURL::fromPathOrURL(m_backupTocFile), KURL::fromPathOrURL(m_tocFile), (TQWidget*) 0) )
+ if ( !TDEIO::NetAccess::copy(KURL::fromPathOrURL(m_backupTocFile), KURL::fromPathOrURL(m_tocFile), (TQWidget*) 0) )
{
kdDebug() << "(K3bCdrdaoWriter) restoring tocfile " << m_tocFile << " failed." << endl;
emit infoMessage( i18n("Due to a bug in cdrdao the toc/cue file %1 has been deleted. "
"K3b was unable to restore it from the backup %2.").arg(m_tocFile).arg(m_backupTocFile), ERROR );
}
- else if ( !KIO::NetAccess::del(KURL::fromPathOrURL(m_backupTocFile), (TQWidget*) 0) )
+ else if ( !TDEIO::NetAccess::del(KURL::fromPathOrURL(m_backupTocFile), (TQWidget*) 0) )
{
kdDebug() << "(K3bCdrdaoWriter) delete tocfile backkup " << m_backupTocFile << " failed." << endl;
}
diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h
index e3306b3..9d7474a 100644
--- a/libk3b/projects/k3bdoc.h
+++ b/libk3b/projects/k3bdoc.h
@@ -38,7 +38,7 @@ class KTempFile;
class K3bBurnJob;
class TQDomDocument;
class TQDomElement;
-class KConfig;
+class TDEConfig;
class KActionCollection;
class K3bJobHandler;
@@ -141,7 +141,7 @@ class LIBK3B_EXPORT K3bDoc : public TQObject
int copies() const { return m_copies; }
int speed() const { return m_speed; }
K3bDevice::Device* burner() const { return m_burner; }
- virtual KIO::filesize_t size() const = 0;
+ virtual TDEIO::filesize_t size() const = 0;
virtual K3b::Msf length() const = 0;
// FIXME: rename this to something like imagePath
diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp
index 8bd8eac..07e1fcf 100644
--- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp
+++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp
@@ -85,7 +85,7 @@ bool K3bMixedDoc::isModified() const
}
-KIO::filesize_t K3bMixedDoc::size() const
+TDEIO::filesize_t K3bMixedDoc::size() const
{
return m_dataDoc->size() + m_audioDoc->size();
}
diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.h b/libk3b/projects/mixedcd/k3bmixeddoc.h
index f302c66..3e55064 100644
--- a/libk3b/projects/mixedcd/k3bmixeddoc.h
+++ b/libk3b/projects/mixedcd/k3bmixeddoc.h
@@ -27,7 +27,7 @@ class TQDomElement;
class K3bBurnJob;
//class K3bView;
class TQWidget;
-class KConfig;
+class TDEConfig;
class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc
@@ -46,7 +46,7 @@ class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc
void setModified( bool m = true );
bool isModified() const;
- KIO::filesize_t size() const;
+ TDEIO::filesize_t size() const;
K3b::Msf length() const;
int numOfTracks() const;
diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp
index 556e606..bcbe019 100644
--- a/libk3b/projects/mixedcd/k3bmixedjob.cpp
+++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp
@@ -793,8 +793,8 @@ bool K3bMixedJob::writeTocFile()
m_tocFile->close();
// backup for debugging
-// KIO::NetAccess::del("/tmp/trueg/tocfile_debug_backup.toc",0L);
-// KIO::NetAccess::copy( m_tocFile->name(), "/tmp/trueg/tocfile_debug_backup.toc",0L );
+// TDEIO::NetAccess::del("/tmp/trueg/tocfile_debug_backup.toc",0L);
+// TDEIO::NetAccess::copy( m_tocFile->name(), "/tmp/trueg/tocfile_debug_backup.toc",0L );
return success;
}
@@ -1330,7 +1330,7 @@ TQString K3bMixedJob::jobDetails() const
return ( i18n("%1 tracks (%2 minutes audio data, %3 ISO9660 data)")
.arg(m_doc->numOfTracks())
.arg(m_doc->audioDoc()->length().toString())
- .arg(KIO::convertSize(m_doc->dataDoc()->size()))
+ .arg(TDEIO::convertSize(m_doc->dataDoc()->size()))
+ ( m_doc->copies() > 1 && !m_doc->dummy()
? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) );
diff --git a/libk3b/projects/movixcd/k3bmovixdoc.h b/libk3b/projects/movixcd/k3bmovixdoc.h
index 0ceb8c3..1436eba 100644
--- a/libk3b/projects/movixcd/k3bmovixdoc.h
+++ b/libk3b/projects/movixcd/k3bmovixdoc.h
@@ -28,7 +28,7 @@ class TQDomElement;
class K3bFileItem;
class K3bMovixFileItem;
class K3bDataItem;
-class KConfig;
+class TDEConfig;
class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc
diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp
index eb8b276..70a639d 100644
--- a/libk3b/projects/movixcd/k3bmovixjob.cpp
+++ b/libk3b/projects/movixcd/k3bmovixjob.cpp
@@ -123,7 +123,7 @@ TQString K3bMovixJob::jobDetails() const
{
return ( i18n("1 file (%1) and about 8 MB eMovix data",
"%n files (%1) and about 8 MB eMovix data",
- m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size()))
+ m_doc->movixFileItems().count()).arg(TDEIO::convertSize(m_doc->size()))
+ ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) );
diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.h b/libk3b/projects/movixdvd/k3bmovixdvddoc.h
index 7897441..c5472e3 100644
--- a/libk3b/projects/movixdvd/k3bmovixdvddoc.h
+++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.h
@@ -18,7 +18,7 @@
#include <k3bmovixdoc.h>
#include "k3b_export.h"
-class KConfig;
+class TDEConfig;
class LIBK3B_EXPORT K3bMovixDvdDoc : public K3bMovixDoc
diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
index 097d004..9c12741 100644
--- a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
+++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
@@ -122,7 +122,7 @@ TQString K3bMovixDvdJob::jobDetails() const
{
return ( i18n("1 file (%1) and about 8 MB eMovix data",
"%n files (%1) and about 8 MB eMovix data",
- m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size()))
+ m_doc->movixFileItems().count()).arg(TDEIO::convertSize(m_doc->size()))
+ ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) );
diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp
index 42b3170..d28e942 100644
--- a/libk3b/projects/videocd/k3bvcddoc.cpp
+++ b/libk3b/projects/videocd/k3bvcddoc.cpp
@@ -95,7 +95,7 @@ TQString K3bVcdDoc::name() const
}
-KIO::filesize_t K3bVcdDoc::calcTotalSize() const
+TDEIO::filesize_t K3bVcdDoc::calcTotalSize() const
{
unsigned long long sum = 0;
if ( m_tracks ) {
@@ -106,7 +106,7 @@ KIO::filesize_t K3bVcdDoc::calcTotalSize() const
return sum;
}
-KIO::filesize_t K3bVcdDoc::size() const
+TDEIO::filesize_t K3bVcdDoc::size() const
{
// mode2 -> mode1 int(( n+2047 ) / 2048) * 2352
// mode1 -> mode2 int(( n+2351 ) / 2352) * 2048
@@ -114,7 +114,7 @@ KIO::filesize_t K3bVcdDoc::size() const
return tracksize + ISOsize();
}
-KIO::filesize_t K3bVcdDoc::ISOsize() const
+TDEIO::filesize_t K3bVcdDoc::ISOsize() const
{
// 136000b for vcd iso reseved
long long iso_size = 136000;
@@ -841,7 +841,7 @@ bool K3bVcdDoc::saveDocumentData( TQDomElement * docElem )
++iterTrack;
TQDomElement trackElem = doc.createElement( "track" );
- trackElem.setAttribute( "url", KIO::decodeFileName( track->absPath() ) );
+ trackElem.setAttribute( "url", TDEIO::decodeFileName( track->absPath() ) );
trackElem.setAttribute( "playtime", track->getPlayTime() );
trackElem.setAttribute( "waittime", track->getWaitTime() );
trackElem.setAttribute( "reactivity", track->Reactivity() );
diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h
index f9dd6ed..e752a98 100644
--- a/libk3b/projects/videocd/k3bvcddoc.h
+++ b/libk3b/projects/videocd/k3bvcddoc.h
@@ -41,7 +41,7 @@ class TQWidget;
class TQTimer;
class TQDomDocument;
class TQDomElement;
-class KConfig;
+class TDEConfig;
@@ -106,7 +106,7 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc
}
/** get the current size of the project */
- KIO::filesize_t size() const;
+ TDEIO::filesize_t size() const;
K3b::Msf length() const;
K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent );
@@ -178,8 +178,8 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc
TQTimer* m_urlAddingTimer;
TQPtrList<K3bVcdTrack>* m_tracks;
- KIO::filesize_t calcTotalSize() const;
- KIO::filesize_t ISOsize() const;
+ TDEIO::filesize_t calcTotalSize() const;
+ TDEIO::filesize_t ISOsize() const;
bool isImage( const KURL& url );
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp
index fe62515..7b2d4ff 100644
--- a/libk3b/projects/videocd/k3bvcdjob.cpp
+++ b/libk3b/projects/videocd/k3bvcdjob.cpp
@@ -558,7 +558,7 @@ TQString K3bVcdJob::jobDetails() const
{
return ( i18n( "1 MPEG (%1)",
"%n MPEGs (%1)",
- m_doc->tracks() ->count() ).arg( KIO::convertSize( m_doc->size() ) )
+ m_doc->tracks() ->count() ).arg( TDEIO::convertSize( m_doc->size() ) )
+ ( m_doc->copies() > 1
? i18n( " - %n copy", " - %n copies", m_doc->copies() )
: TQString() ) );
diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp
index 9b80a8d..f963be8 100644
--- a/libk3b/projects/videocd/k3bvcdoptions.cpp
+++ b/libk3b/projects/videocd/k3bvcdoptions.cpp
@@ -82,7 +82,7 @@ bool K3bVcdOptions::checkCdiFiles()
return true;
}
-void K3bVcdOptions::save( KConfigBase* c )
+void K3bVcdOptions::save( TDEConfigBase* c )
{
c->writeEntry( "volume_id", m_volumeID );
c->writeEntry( "album_id", m_albumID );
@@ -109,7 +109,7 @@ void K3bVcdOptions::save( KConfigBase* c )
}
-K3bVcdOptions K3bVcdOptions::load( KConfigBase* c )
+K3bVcdOptions K3bVcdOptions::load( TDEConfigBase* c )
{
K3bVcdOptions options;
diff --git a/libk3b/projects/videocd/k3bvcdoptions.h b/libk3b/projects/videocd/k3bvcdoptions.h
index 420e593..cfa382f 100644
--- a/libk3b/projects/videocd/k3bvcdoptions.h
+++ b/libk3b/projects/videocd/k3bvcdoptions.h
@@ -19,7 +19,7 @@
#include <tqstring.h>
#include "k3b_export.h"
-class KConfigBase;
+class TDEConfigBase;
class LIBK3B_EXPORT K3bVcdOptions
{
@@ -242,9 +242,9 @@ class LIBK3B_EXPORT K3bVcdOptions
}
bool checkCdiFiles();
- void save( KConfigBase* c );
+ void save( TDEConfigBase* c );
- static K3bVcdOptions load( KConfigBase* c );
+ static K3bVcdOptions load( TDEConfigBase* c );
static K3bVcdOptions defaults();
void setPbcEnabled( const bool& b )
diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp
index 3ed27f9..59d6387 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.cpp
+++ b/libk3b/projects/videocd/k3bvcdtrack.cpp
@@ -58,7 +58,7 @@ K3bVcdTrack::~K3bVcdTrack()
{}
-KIO::filesize_t K3bVcdTrack::size() const
+TDEIO::filesize_t K3bVcdTrack::size() const
{
return m_file.size();
}
diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h
index c48be55..f36eb8c 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.h
+++ b/libk3b/projects/videocd/k3bvcdtrack.h
@@ -42,7 +42,7 @@ class LIBK3B_EXPORT K3bVcdTrack
{
return TQFileInfo( m_file ).absFilePath();
}
- KIO::filesize_t size() const;
+ TDEIO::filesize_t size() const;
int index() const;
const TQString& title() const
diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.h b/libk3b/projects/videodvd/k3bvideodvddoc.h
index e12ee07..390089a 100644
--- a/libk3b/projects/videodvd/k3bvideodvddoc.h
+++ b/libk3b/projects/videodvd/k3bvideodvddoc.h
@@ -18,7 +18,7 @@
#include <k3bdvddoc.h>
#include "k3b_export.h"
-class KConfig;
+class TDEConfig;
class LIBK3B_EXPORT K3bVideoDvdDoc : public K3bDvdDoc
{
diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp
index 9b6a178..e261c77 100644
--- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp
+++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp
@@ -92,7 +92,7 @@ TQString K3bVideoDvdJob::jobDescription() const
TQString K3bVideoDvdJob::jobDetails() const
{
- return ( i18n("ISO9660/Udf Filesystem (Size: %1)").arg(KIO::convertSize( doc()->size() ))
+ return ( i18n("ISO9660/Udf Filesystem (Size: %1)").arg(TDEIO::convertSize( doc()->size() ))
+ ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) );
diff --git a/libk3b/tools/k3bdirsizejob.cpp b/libk3b/tools/k3bdirsizejob.cpp
index eedca01..131e0ff 100644
--- a/libk3b/tools/k3bdirsizejob.cpp
+++ b/libk3b/tools/k3bdirsizejob.cpp
@@ -105,7 +105,7 @@ public:
}
else if( !S_ISLNK( s.st_mode ) ) {
++totalFiles;
- totalSize += (KIO::filesize_t)s.st_size;
+ totalSize += (TDEIO::filesize_t)s.st_size;
}
}
@@ -121,10 +121,10 @@ public:
KURL::List urls;
bool followSymlinks;
- KIO::filesize_t totalSize;
- KIO::filesize_t totalFiles;
- KIO::filesize_t totalDirs;
- KIO::filesize_t totalSymlinks;
+ TDEIO::filesize_t totalSize;
+ TDEIO::filesize_t totalFiles;
+ TDEIO::filesize_t totalDirs;
+ TDEIO::filesize_t totalSymlinks;
private:
bool m_canceled;
@@ -146,25 +146,25 @@ K3bDirSizeJob::~K3bDirSizeJob()
}
-KIO::filesize_t K3bDirSizeJob::totalSize() const
+TDEIO::filesize_t K3bDirSizeJob::totalSize() const
{
return d->totalSize;
}
-KIO::filesize_t K3bDirSizeJob::totalFiles() const
+TDEIO::filesize_t K3bDirSizeJob::totalFiles() const
{
return d->totalFiles;
}
-KIO::filesize_t K3bDirSizeJob::totalDirs() const
+TDEIO::filesize_t K3bDirSizeJob::totalDirs() const
{
return d->totalDirs;
}
-KIO::filesize_t K3bDirSizeJob::totalSymlinks() const
+TDEIO::filesize_t K3bDirSizeJob::totalSymlinks() const
{
return d->totalSymlinks;
}
diff --git a/libk3b/tools/k3bdirsizejob.h b/libk3b/tools/k3bdirsizejob.h
index 3aa5755..2acce4b 100644
--- a/libk3b/tools/k3bdirsizejob.h
+++ b/libk3b/tools/k3bdirsizejob.h
@@ -37,24 +37,24 @@ class LIBK3B_EXPORT K3bDirSizeJob : public K3bThreadJob
K3bDirSizeJob( TQObject* parent = 0 );
~K3bDirSizeJob();
- KIO::filesize_t totalSize() const;
+ TDEIO::filesize_t totalSize() const;
/**
* Does also include symlinks to files, devices, and fifos
*/
- KIO::filesize_t totalFiles() const;
+ TDEIO::filesize_t totalFiles() const;
/**
* Total number of counted dirs. This does also
* include the first dirs the job was started with.
* Does also include symlinks to dirs.
*/
- KIO::filesize_t totalDirs() const;
+ TDEIO::filesize_t totalDirs() const;
/**
* Includes symlinks to files and folders
*/
- KIO::filesize_t totalSymlinks() const;
+ TDEIO::filesize_t totalSymlinks() const;
public slots:
void setUrls( const KURL::List& urls );
diff --git a/libk3b/tools/k3bfilesplitter.cpp b/libk3b/tools/k3bfilesplitter.cpp
index 7833f86..a4f0553 100644
--- a/libk3b/tools/k3bfilesplitter.cpp
+++ b/libk3b/tools/k3bfilesplitter.cpp
@@ -33,10 +33,10 @@ public:
int counter;
// TQIODevice::Offset is too small on most compilations
- KIO::filesize_t maxFileSize;
+ TDEIO::filesize_t maxFileSize;
- KIO::filesize_t currentOverallPos;
- KIO::filesize_t currentFilePos;
+ TDEIO::filesize_t currentOverallPos;
+ TDEIO::filesize_t currentFilePos;
void determineMaxFileSize() {
if( maxFileSize == 0 ) {
@@ -210,7 +210,7 @@ TQ_LONG K3bFileSplitter::readBlock( char *data, TQ_ULONG maxlen )
TQ_LONG K3bFileSplitter::writeBlock( const char *data, TQ_ULONG len )
{
// We cannot rely on TQFile::at since it uses long on most copmpilations
- TQ_ULONG max = (TQ_ULONG)TQMIN( (KIO::filesize_t)len, d->maxFileSize - d->currentFilePos );
+ TQ_ULONG max = (TQ_ULONG)TQMIN( (TDEIO::filesize_t)len, d->maxFileSize - d->currentFilePos );
TQ_LONG r = d->file.writeBlock( data, max );
@@ -304,7 +304,7 @@ void K3bFileSplitter::remove()
}
-void K3bFileSplitter::setMaxFileSize( KIO::filesize_t size )
+void K3bFileSplitter::setMaxFileSize( TDEIO::filesize_t size )
{
d->maxFileSize = size;
}
diff --git a/libk3b/tools/k3bfilesplitter.h b/libk3b/tools/k3bfilesplitter.h
index 40af5ab..06cef32 100644
--- a/libk3b/tools/k3bfilesplitter.h
+++ b/libk3b/tools/k3bfilesplitter.h
@@ -53,7 +53,7 @@ class LIBK3B_EXPORT K3bFileSplitter : public TQIODevice
*
* Be aware that setName will reset the max file size.
*/
- void setMaxFileSize( KIO::filesize_t size );
+ void setMaxFileSize( TDEIO::filesize_t size );
const TQString& name() const;
diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp
index 7c20a05..1d3d04c 100644
--- a/libk3b/tools/k3bmd5job.cpp
+++ b/libk3b/tools/k3bmd5job.cpp
@@ -62,7 +62,7 @@ public:
int lastProgress;
- KIO::filesize_t imageSize;
+ TDEIO::filesize_t imageSize;
static const int BUFFERSIZE = 2048*10;
};