TDE
/
k3b
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/k3b
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 10 years ago
parent 2a3ced9fbd
commit 83b79bb29a
192 changed files with 603 additions and 603 deletions
Show Stats Download Patch File Download Diff File

8
k3bsetup/k3bsetup2.cpp
Unescape View File

@ -101,16 +101,16 @@ public:
TQMap<TQCheckListItem*, K3bExternalBin*> listBinMap;
TQMap<K3bExternalBin*, TQCheckListItem*> binListMap;
KConfig* config;
TDEConfig* config;
};
K3bSetup2::K3bSetup2( TQWidget *parent, const char *, const TQStringList& )
: KCModule( parent, "k3bsetup" )
: TDECModule( parent, "k3bsetup" )
{
d = new Private();
d->config = new KConfig( "k3bsetup2rc" );
d->config = new TDEConfig( "k3bsetup2rc" );
m_aboutData = new TDEAboutData("k3bsetup2",
"K3bSetup 2",
@ -118,7 +118,7 @@ K3bSetup2::K3bSetup2( TQWidget *parent, const char *, const TQStringList& )
"(C) 2003-2007 Sebastian Trueg");
m_aboutData->addAuthor("Sebastian Trueg", 0, "trueg@k3b.org");
setButtons( KCModule::Apply|KCModule::Cancel|KCModule::Ok|KCModule::Default );
setButtons( TDECModule::Apply|TDECModule::Cancel|TDECModule::Ok|TDECModule::Default );
TQHBoxLayout* box = new TQHBoxLayout( this );
box->setAutoAdd(true);

2
k3bsetup/k3bsetup2.h
Unescape View File

@ -25,7 +25,7 @@ class base_K3bSetup2;
class TQCheckListItem;
class K3bSetup2: public KCModule
class K3bSetup2: public TDECModule
{
Q_OBJECT

50
kioslaves/videodvd/videodvd.cpp
Unescape View File

@ -36,7 +36,7 @@
#include "videodvd.h"
using namespace KIO;
using namespace TDEIO;
extern "C"
{
@ -93,34 +93,34 @@ kio_videodvdProtocol::~kio_videodvdProtocol()
}
KIO::UDSEntry kio_videodvdProtocol::createUDSEntry( const K3bIso9660Entry* e ) const
TDEIO::UDSEntry kio_videodvdProtocol::createUDSEntry( const K3bIso9660Entry* e ) const
{
KIO::UDSEntry uds;
KIO::UDSAtom a;
TDEIO::UDSEntry uds;
TDEIO::UDSAtom a;
a.m_uds = KIO::UDS_NAME;
a.m_uds = TDEIO::UDS_NAME;
a.m_str = e->name();
uds.append( a );
a.m_uds = KIO::UDS_ACCESS;
a.m_uds = TDEIO::UDS_ACCESS;
a.m_long = e->permissions();
uds.append( a );
a.m_uds = KIO::UDS_CREATION_TIME;
a.m_uds = TDEIO::UDS_CREATION_TIME;
a.m_long = e->date();
uds.append( a );
a.m_uds = KIO::UDS_MODIFICATION_TIME;
a.m_uds = TDEIO::UDS_MODIFICATION_TIME;
a.m_long = e->date();
uds.append( a );
if( e->isDirectory() )
{
a.m_uds = KIO::UDS_FILE_TYPE;
a.m_uds = TDEIO::UDS_FILE_TYPE;
a.m_long = S_IFDIR;
uds.append( a );
a.m_uds = KIO::UDS_MIME_TYPE;
a.m_uds = TDEIO::UDS_MIME_TYPE;
a.m_str = "inode/directory";
uds.append( a );
}
@ -128,15 +128,15 @@ KIO::UDSEntry kio_videodvdProtocol::createUDSEntry( const K3bIso9660Entry* e ) c
{
const K3bIso9660File* file = static_cast<const K3bIso9660File*>( e );
a.m_uds = KIO::UDS_SIZE;
a.m_uds = TDEIO::UDS_SIZE;
a.m_long = file->size();
uds.append( a );
a.m_uds = KIO::UDS_FILE_TYPE;
a.m_uds = TDEIO::UDS_FILE_TYPE;
a.m_long = S_IFREG;
uds.append( a );
a.m_uds = KIO::UDS_MIME_TYPE;
a.m_uds = TDEIO::UDS_MIME_TYPE;
if( e->name().endsWith( "VOB" ) )
a.m_str = "video/mpeg";
else
@ -198,7 +198,7 @@ void kio_videodvdProtocol::get(const KURL& url )
TQByteArray buffer( 10*2048 );
int read = 0;
int cnt = 0;
KIO::filesize_t totalRead = 0;
TDEIO::filesize_t totalRead = 0;
while( (read = file->read( totalRead, buffer.data(), buffer.size() )) > 0 )
{
buffer.resize( read );
@ -286,22 +286,22 @@ void kio_videodvdProtocol::listVideoDVDs()
// FIXME: cache the entry for speedup
UDSEntryList udsl;
KIO::UDSEntry uds;
KIO::UDSAtom a;
TDEIO::UDSEntry uds;
TDEIO::UDSAtom a;
a.m_uds = KIO::UDS_NAME;
a.m_uds = TDEIO::UDS_NAME;
a.m_str = iso.primaryDescriptor().volumeId;
uds.append( a );
a.m_uds = KIO::UDS_FILE_TYPE;
a.m_uds = TDEIO::UDS_FILE_TYPE;
a.m_long = S_IFDIR;
uds.append( a );
a.m_uds = KIO::UDS_MIME_TYPE;
a.m_uds = TDEIO::UDS_MIME_TYPE;
a.m_str = "inode/directory";
uds.append( a );
a.m_uds = KIO::UDS_ICON_NAME;
a.m_uds = TDEIO::UDS_ICON_NAME;
a.m_str = "dvd_unmount";
uds.append( a );
@ -327,18 +327,18 @@ void kio_videodvdProtocol::stat( const KURL& url )
//
// stat the root path
//
KIO::UDSEntry uds;
KIO::UDSAtom a;
TDEIO::UDSEntry uds;
TDEIO::UDSAtom a;
a.m_uds = KIO::UDS_NAME;
a.m_uds = TDEIO::UDS_NAME;
a.m_str = "/";
uds.append( a );
a.m_uds = KIO::UDS_FILE_TYPE;
a.m_uds = TDEIO::UDS_FILE_TYPE;
a.m_long = S_IFDIR;
uds.append( a );
a.m_uds = KIO::UDS_MIME_TYPE;
a.m_uds = TDEIO::UDS_MIME_TYPE;
a.m_str = "inode/directory";
uds.append( a );

4
kioslaves/videodvd/videodvd.h
Unescape View File

@ -32,7 +32,7 @@ namespace K3bDevice
class DeviceManager;
}
class kio_videodvdProtocol : public KIO::SlaveBase
class kio_videodvdProtocol : public TDEIO::SlaveBase
{
public:
kio_videodvdProtocol(const TQCString &pool_socket, const TQCString &app_socket);
@ -45,7 +45,7 @@ public:
private:
K3bIso9660* openIso( const KURL&, TQString& plainIsoPath );
KIO::UDSEntry createUDSEntry( const K3bIso9660Entry* e ) const;
TDEIO::UDSEntry createUDSEntry( const K3bIso9660Entry* e ) const;
void listVideoDVDs();
static K3bDevice::DeviceManager* s_deviceManager;

2
libk3b/cddb/k3bcddb.cpp
Unescape View File

@ -53,7 +53,7 @@ K3bCddb::~K3bCddb()
}
void K3bCddb::readConfig( KConfig* c )
void K3bCddb::readConfig( TDEConfig* c )
{
c->setGroup( "Cddb" );

4
libk3b/cddb/k3bcddb.h
Unescape View File

@ -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:

14
libk3b/cddb/k3bcddbhttpquery.cpp
Unescape View File

@ -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() );

6
libk3b/cddb/k3bcddbhttpquery.h
Unescape View File

@ -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& );

14
libk3b/core/k3bcore.cpp
Unescape View File

@ -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();

8
libk3b/core/k3bcore.h
Unescape View File

@ -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.

4
libk3b/core/k3bexternalbinmanager.cpp
Unescape View File

@ -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 );

6
libk3b/core/k3bexternalbinmanager.h
Unescape View File

@ -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 );

40
libk3b/core/k3bglobals.cpp
Unescape View File

@ -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

8
libk3b/core/k3bglobals.h
Unescape View File

@ -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* );

4
libk3b/core/k3bglobalsettings.cpp
Unescape View File

@ -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" );

6
libk3b/core/k3bglobalsettings.h
Unescape View File

@ -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; }

8
libk3b/jobs/k3bcdcopyjob.cpp
Unescape View File

@ -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;
}
}

2
libk3b/jobs/k3bdvdcopyjob.cpp
Unescape View File

@ -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 ) ) {

2
libk3b/jobs/k3biso9660imagewritingjob.cpp
Unescape View File

@ -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))));
}

2
libk3b/plugin/k3baudioencoder.h
Unescape View File

@ -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"; }

2
libk3b/plugin/k3bpluginconfigwidget.h
Unescape View File

@ -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();

4
libk3b/plugin/k3bprojectplugin.h
Unescape View File

@ -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

2
libk3b/projects/audiocd/k3baudiodatasource.h
Unescape View File

@ -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;

2
libk3b/projects/audiocd/k3baudiodoc.cpp
Unescape View File

@ -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();

4
libk3b/projects/audiocd/k3baudiodoc.h
Unescape View File

@ -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

2
libk3b/projects/audiocd/k3baudiotrack.cpp
Unescape View File

@ -210,7 +210,7 @@ K3b::Msf K3bAudioTrack::length() const
}
KIO::filesize_t K3bAudioTrack::size() const
TDEIO::filesize_t K3bAudioTrack::size() const
{
return length().audioBytes();
}

2
libk3b/projects/audiocd/k3baudiotrack.h
Unescape View File

@ -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(); }

6
libk3b/projects/datacd/k3bdatadoc.cpp
Unescape View File

@ -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,

12
libk3b/projects/datacd/k3bdatadoc.h
Unescape View File

@ -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;

2
libk3b/projects/datacd/k3bdataitem.cpp
Unescape View File

@ -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() ||

4
libk3b/projects/datacd/k3bdataitem.h
Unescape View File

@ -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

4
libk3b/projects/datacd/k3bdatajob.cpp
Unescape View File

@ -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() ));
}

2
libk3b/projects/datacd/k3bdiritem.cpp
Unescape View File

@ -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;

6
libk3b/projects/datacd/k3bdiritem.h
Unescape View File

@ -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;

10
libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp
Unescape View File

@ -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;

2
libk3b/projects/datacd/k3bfilecompilationsizehandler.h
Unescape View File

@ -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.

10
libk3b/projects/datacd/k3bfileitem.cpp
Unescape View File

@ -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;

6
libk3b/projects/datacd/k3bfileitem.h
Unescape View File

@ -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;

2
libk3b/projects/datacd/k3bisoimager.cpp
Unescape View File

@ -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;
}

4
libk3b/projects/datacd/k3bisooptions.cpp
Unescape View File

@ -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;

6
libk3b/projects/datacd/k3bisooptions.h
Unescape View File

@ -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:

4
libk3b/projects/datacd/k3bsessionimportitem.h
Unescape View File

@ -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

6
libk3b/projects/datacd/k3bspecialdataitem.h