Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 2a3289ab87
commit 2a3ced9fbd

@ -434,7 +434,7 @@ Fixed VideoDVD project with a HACK. mkisofs is not able to create a VideoDVD usi
0.11.1
fixed an issue introduced with KDE 3.2rc1 which caused on-the-fly data writing to fail all the time.
(If you need to know: For some reason KProcess makes the Stdin fd O_NONBLOCK. This way mkisofs is
(If you need to know: For some reason TDEProcess makes the Stdin fd O_NONBLOCK. This way mkisofs is
not able to write properly to cdrecord's stdin anymore.)
0.11

@ -148,11 +148,11 @@ bool K3bCdrecordProgram::scan( const TQString& p )
K3bExternalBin* bin = 0;
// probe version
KProcess vp;
TDEProcess vp;
K3bProcessOutputCollector out( &vp );
vp << path << "-version";
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
int pos = -1;
if( wodim ) {
pos = out.output().find( "Wodim" );
@ -199,10 +199,10 @@ bool K3bCdrecordProgram::scan( const TQString& p )
}
// probe features
KProcess fp;
TDEProcess fp;
out.setProcess( &fp );
fp << path << "-help";
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( fp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
if( out.output().contains( "gracetime" ) )
bin->addFeature( "gracetime" );
if( out.output().contains( "-overburn" ) )
@ -297,10 +297,10 @@ bool K3bMkisofsProgram::scan( const TQString& p )
K3bExternalBin* bin = 0;
// probe version
KProcess vp;
TDEProcess vp;
vp << path << "-version";
K3bProcessOutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
int pos = -1;
if( genisoimage )
pos = out.output().find( "genisoimage" );
@ -333,10 +333,10 @@ bool K3bMkisofsProgram::scan( const TQString& p )
// probe features
KProcess fp;
TDEProcess fp;
fp << path << "-help";
out.setProcess( &fp );
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( fp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
if( out.output().contains( "-udf" ) )
bin->addFeature( "udf" );
if( out.output().contains( "-dvd-video" ) )
@ -412,10 +412,10 @@ bool K3bReadcdProgram::scan( const TQString& p )
K3bExternalBin* bin = 0;
// probe version
KProcess vp;
TDEProcess vp;
vp << path << "-version";
K3bProcessOutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
int pos = -1;
if( readom )
pos = out.output().find( "readom" );
@ -447,10 +447,10 @@ bool K3bReadcdProgram::scan( const TQString& p )
// probe features
KProcess fp;
TDEProcess fp;
fp << path << "-help";
out.setProcess( &fp );
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( fp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
if( out.output().contains( "-clone" ) )
bin->addFeature( "clone" );
@ -503,10 +503,10 @@ bool K3bCdrdaoProgram::scan( const TQString& p )
K3bExternalBin* bin = 0;
// probe version
KProcess vp;
TDEProcess vp;
vp << path ;
K3bProcessOutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
int pos = out.output().find( "Cdrdao version" );
if( pos < 0 )
return false;
@ -535,10 +535,10 @@ bool K3bCdrdaoProgram::scan( const TQString& p )
// probe features
KProcess fp;
TDEProcess fp;
fp << path << "write" << "-h";
out.setProcess( &fp );
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( fp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
if( out.output().contains( "--overburn" ) )
bin->addFeature( "overburn" );
if( out.output().contains( "--multi" ) )
@ -601,10 +601,10 @@ bool K3bTranscodeProgram::scan( const TQString& p )
K3bExternalBin* bin = 0;
// probe version
KProcess vp;
TDEProcess vp;
vp << appPath << "-v";
K3bProcessOutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
int pos = out.output().find( "transcode v" );
if( pos < 0 )
return false;
@ -628,10 +628,10 @@ bool K3bTranscodeProgram::scan( const TQString& p )
// Check features
//
TQString modInfoBin = path + "tcmodinfo";
KProcess modp;
TDEProcess modp;
modp << modInfoBin << "-p";
out.setProcess( &modp );
if( modp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( modp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
TQString modPath = out.output().stripWhiteSpace();
TQDir modDir( modPath );
if( !modDir.entryList( "*export_xvid*", TQDir::Files ).isEmpty() )
@ -675,10 +675,10 @@ bool K3bVcdbuilderProgram::scan( const TQString& p )
K3bExternalBin* bin = 0;
// probe version
KProcess vp;
TDEProcess vp;
vp << path << "-V";
K3bProcessOutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
int pos = out.output().find( "GNU VCDImager" );
if( pos < 0 )
return false;
@ -732,11 +732,11 @@ bool K3bNormalizeProgram::scan( const TQString& p )
K3bExternalBin* bin = 0;
// probe version
KProcess vp;
TDEProcess vp;
K3bProcessOutputCollector out( &vp );
vp << path << "--version";
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
int pos = out.output().find( "normalize" );
if( pos < 0 )
return false;
@ -791,11 +791,11 @@ bool K3bGrowisofsProgram::scan( const TQString& p )
K3bExternalBin* bin = 0;
// probe version
KProcess vp;
TDEProcess vp;
K3bProcessOutputCollector out( &vp );
vp << path << "-version";
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
int pos = out.output().find( "growisofs" );
if( pos < 0 )
return false;
@ -856,11 +856,11 @@ bool K3bDvdformatProgram::scan( const TQString& p )
K3bExternalBin* bin = 0;
// probe version
KProcess vp;
TDEProcess vp;
K3bProcessOutputCollector out( &vp );
vp << path;
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
// different locales make searching for the +- char difficult
// so we simply ignore it.
int pos = out.output().find( TQRegExp("DVD.*RAM format utility") );
@ -926,11 +926,11 @@ bool K3bDvdBooktypeProgram::scan( const TQString& p )
K3bExternalBin* bin = 0;
// probe version
KProcess vp;
TDEProcess vp;
K3bProcessOutputCollector out( &vp );
vp << path;
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
int pos = out.output().find( "dvd+rw-booktype" );
if( pos < 0 )
return false;
@ -975,11 +975,11 @@ bool K3bCdda2wavProgram::scan( const TQString& p )
K3bExternalBin* bin = 0;
// probe version
KProcess vp;
TDEProcess vp;
K3bProcessOutputCollector out( &vp );
vp << path << "-h";
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
int pos = out.output().find( "cdda2wav" );
if( pos < 0 )
return false;

@ -25,7 +25,7 @@
#include "k3bversion.h"
class KConfig;
class KProcess;
class TDEProcess;
class K3bExternalProgram;

@ -177,7 +177,7 @@ TQString K3b::defaultTempPath()
{
TQString oldGroup = kapp->config()->group();
kapp->config()->setGroup( "General Options" );
TQString url = kapp->config()->readPathEntry( "Temp Dir", KGlobal::dirs()->resourceDirs( "tmp" ).first() );
TQString url = kapp->config()->readPathEntry( "Temp Dir", TDEGlobal::dirs()->resourceDirs( "tmp" ).first() );
kapp->config()->setGroup( oldGroup );
return prepareDir(url);
}
@ -560,11 +560,11 @@ bool K3b::unmount( K3bDevice::Device* dev )
TQString umountBin = K3b::findExe( "umount" );
if( !umountBin.isEmpty() ) {
KProcess p;
TDEProcess p;
p << umountBin;
p << "-l"; // lazy unmount
p << dev->blockDeviceName();
p.start( KProcess::Block );
p.start( TDEProcess::Block );
if( !p.exitStatus() )
return true;
}
@ -572,11 +572,11 @@ bool K3b::unmount( K3bDevice::Device* dev )
// now try pmount
TQString pumountBin = K3b::findExe( "pumount" );
if( !pumountBin.isEmpty() ) {
KProcess p;
TDEProcess p;
p << pumountBin;
p << "-l"; // lazy unmount
p << dev->blockDeviceName();
p.start( KProcess::Block );
p.start( TDEProcess::Block );
return !p.exitStatus();
}
else {
@ -610,10 +610,10 @@ bool K3b::mount( K3bDevice::Device* dev )
// now try pmount
TQString pmountBin = K3b::findExe( "pmount" );
if( !pmountBin.isEmpty() ) {
KProcess p;
TDEProcess p;
p << pmountBin;
p << mntDev;
p.start( KProcess::Block );
p.start( TDEProcess::Block );
return !p.exitStatus();
}
return false;

@ -54,7 +54,7 @@ public:
K3bProcess::K3bProcess()
: KProcess(),
: TDEProcess(),
m_bSplitStdout(false)
{
d = new Data();
@ -78,25 +78,25 @@ K3bProcess& K3bProcess::operator<<( const K3bExternalBin* bin )
K3bProcess& K3bProcess::operator<<( const TQString& arg )
{
static_cast<KProcess*>(this)->operator<<( arg );
static_cast<TDEProcess*>(this)->operator<<( arg );
return *this;
}
K3bProcess& K3bProcess::operator<<( const char* arg )
{
static_cast<KProcess*>(this)->operator<<( arg );
static_cast<TDEProcess*>(this)->operator<<( arg );
return *this;
}
K3bProcess& K3bProcess::operator<<( const TQCString& arg )
{
static_cast<KProcess*>(this)->operator<<( arg );
static_cast<TDEProcess*>(this)->operator<<( arg );
return *this;
}
K3bProcess& K3bProcess::operator<<( const TQStringList& args )
{
static_cast<KProcess*>(this)->operator<<( args );
static_cast<TDEProcess*>(this)->operator<<( args );
return *this;
}
@ -104,19 +104,19 @@ K3bProcess& K3bProcess::operator<<( const TQStringList& args )
bool K3bProcess::start( RunMode run, Communication com )
{
if( com & Stderr ) {
connect( this, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotSplitStderr(KProcess*, char*, int)) );
connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotSplitStderr(TDEProcess*, char*, int)) );
}
if( com & Stdout ) {
connect( this, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this, TQT_SLOT(slotSplitStdout(KProcess*, char*, int)) );
connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotSplitStdout(TDEProcess*, char*, int)) );
}
return KProcess::start( run, com );
return TDEProcess::start( run, com );
}
void K3bProcess::slotSplitStdout( KProcess*, char* data, int len )
void K3bProcess::slotSplitStdout( TDEProcess*, char* data, int len )
{
if( m_bSplitStdout ) {
TQStringList lines = splitOutput( data, len, d->unfinishedStdoutLine, d->suppressEmptyLines );
@ -134,7 +134,7 @@ void K3bProcess::slotSplitStdout( KProcess*, char* data, int len )
}
void K3bProcess::slotSplitStderr( KProcess*, char* data, int len )
void K3bProcess::slotSplitStderr( TDEProcess*, char* data, int len )
{
TQStringList lines = splitOutput( data, len, d->unfinishedStderrLine, d->suppressEmptyLines );
@ -208,7 +208,7 @@ TQStringList K3bProcess::splitOutput( char* data, int len,
int K3bProcess::setupCommunication( Communication comm )
{
if( KProcess::setupCommunication( comm ) ) {
if( TDEProcess::setupCommunication( comm ) ) {
//
// Setup our own socketpair
@ -255,13 +255,13 @@ void K3bProcess::commClose()
d->out[0] = -1;
}
KProcess::commClose();
TDEProcess::commClose();
}
int K3bProcess::commSetupDoneP()
{
int ok = KProcess::commSetupDoneP();
int ok = TDEProcess::commSetupDoneP();
if( d->rawStdin )
close(d->in[0]);
@ -276,7 +276,7 @@ int K3bProcess::commSetupDoneP()
int K3bProcess::commSetupDoneC()
{
int ok = KProcess::commSetupDoneC();
int ok = TDEProcess::commSetupDoneC();
if( d->dupStdoutFd != -1 ) {
//
@ -396,7 +396,7 @@ bool K3bProcess::closeStdin()
return true;
}
else
return KProcess::closeStdin();
return TDEProcess::closeStdin();
}
@ -408,27 +408,27 @@ bool K3bProcess::closeStdout()
return true;
}
else
return KProcess::closeStdout();
return TDEProcess::closeStdout();
}
K3bProcessOutputCollector::K3bProcessOutputCollector( KProcess* p )
K3bProcessOutputCollector::K3bProcessOutputCollector( TDEProcess* p )
: m_process(0)
{
setProcess( p );
}
void K3bProcessOutputCollector::setProcess( KProcess* p )
void K3bProcessOutputCollector::setProcess( TDEProcess* p )
{
if( m_process )
m_process->disconnect( this );
m_process = p;
if( p ) {
connect( p, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this, TQT_SLOT(slotGatherStdout(KProcess*, char*, int)) );
connect( p, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotGatherStderr(KProcess*, char*, int)) );
connect( p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotGatherStdout(TDEProcess*, char*, int)) );
connect( p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotGatherStderr(TDEProcess*, char*, int)) );
}
m_gatheredOutput.truncate( 0 );
@ -436,13 +436,13 @@ void K3bProcessOutputCollector::setProcess( KProcess* p )
m_stdoutOutput.truncate( 0 );
}
void K3bProcessOutputCollector::slotGatherStderr( KProcess*, char* data, int len )
void K3bProcessOutputCollector::slotGatherStderr( TDEProcess*, char* data, int len )
{
m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) );
m_stderrOutput.append( TQString::fromLocal8Bit( data, len ) );
}
void K3bProcessOutputCollector::slotGatherStdout( KProcess*, char* data, int len )
void K3bProcessOutputCollector::slotGatherStdout( TDEProcess*, char* data, int len )
{
m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) );
m_stdoutOutput.append( TQString::fromLocal8Bit( data, len ) );

@ -26,7 +26,7 @@ class K3bExternalBin;
/**
* This is an enhanced KProcess.
* This is an enhanced TDEProcess.
* It splits the stderr output to lines making sure the client gets every line as it
* was written by the process.
* Aditionally one may set raw stdout and stdin handling using the stdin() and stdout() methods
@ -35,7 +35,7 @@ class K3bExternalBin;
* K3bProcesses like used in K3bDataJob to duplicate mkisofs' stdout to the stdin of the writer
* (cdrecord or cdrdao)
*/
class LIBK3B_EXPORT K3bProcess : public KProcess
class LIBK3B_EXPORT K3bProcess : public TDEProcess
{
Q_OBJECT
@ -135,8 +135,8 @@ class LIBK3B_EXPORT K3bProcess : public KProcess
bool closeStdout();
private slots:
void slotSplitStderr( KProcess*, char*, int );
void slotSplitStdout( KProcess*, char*, int );
void slotSplitStderr( TDEProcess*, char*, int );
void slotSplitStdout( TDEProcess*, char*, int );
signals:
void stderrLine( const TQString& line );
@ -150,22 +150,22 @@ class LIBK3B_EXPORT K3bProcess : public KProcess
protected:
/**
* reimplemeted from KProcess
* reimplemeted from TDEProcess
*/
int commSetupDoneP();
/**
* reimplemeted from KProcess
* reimplemeted from TDEProcess
*/
int commSetupDoneC();
/**
* reimplemeted from KProcess
* reimplemeted from TDEProcess
*/
int setupCommunication( Communication comm );
/**
* reimplemeted from KProcess
* reimplemeted from TDEProcess
*/
void commClose();
@ -184,22 +184,22 @@ class LIBK3B_EXPORT K3bProcessOutputCollector: public TQObject
public:
K3bProcessOutputCollector( KProcess* );
void setProcess( KProcess* );
K3bProcessOutputCollector( TDEProcess* );
void setProcess( TDEProcess* );
const TQString& output() const { return m_gatheredOutput; }
const TQString& stderrOutput() const { return m_stderrOutput; }
const TQString& stdoutOutput() const { return m_stdoutOutput; }
private slots:
void slotGatherStderr( KProcess*, char*, int );
void slotGatherStdout( KProcess*, char*, int );
void slotGatherStderr( TDEProcess*, char*, int );
void slotGatherStdout( TDEProcess*, char*, int );
private:
TQString m_gatheredOutput;
TQString m_stderrOutput;
TQString m_stdoutOutput;
KProcess* m_process;
TDEProcess* m_process;
};

@ -18,7 +18,7 @@
#include <k3bjob.h>
#include "k3b_export.h"
class KProcess;
class TDEProcess;
class TQString;
class K3bDevice::Device;
class K3bAbstractWriter;

@ -109,7 +109,7 @@ void K3bCdda2wavReader::start( bool onlyInfo )
d->process->setWorkingDirectory( m_imagePath );
connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotProcessLine(const TQString&)) );
connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotProcessLine(const TQString&)) );
connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) );
connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
// create the command line
*d->process << d->cdda2wavBin->path;
@ -130,7 +130,7 @@ void K3bCdda2wavReader::start( bool onlyInfo )
*d->process << *it;
// start the thing
if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
if( !d->process->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bCdda2wavReader) could not start cdda2wav" << endl;
@ -222,7 +222,7 @@ void K3bCdda2wavReader::slotProcessLine( const TQString& line )
}
void K3bCdda2wavReader::slotProcessExited( KProcess* p )
void K3bCdda2wavReader::slotProcessExited( TDEProcess* p )
{
d->running = false;

@ -18,7 +18,7 @@
#include <k3bjob.h>
class KProcess;
class TDEProcess;
namespace K3bDevice {
class Device;
};
@ -57,7 +57,7 @@ class K3bCdda2wavReader : public K3bJob
private slots:
void slotProcessLine( const TQString& );
void slotProcessExited( KProcess* );
void slotProcessExited( TDEProcess* );
private:
K3bDevice::Device* m_device;

@ -249,7 +249,7 @@ void K3bDvdFormattingJob::slotStderrLine( const TQString& line )
}
void K3bDvdFormattingJob::slotProcessFinished( KProcess* p )
void K3bDvdFormattingJob::slotProcessFinished( TDEProcess* p )
{
if( d->canceled ) {
emit canceled();
@ -468,7 +468,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
d->process->setRunPrivileged(true);
// d->process->setSuppressEmptyLines(false);
connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStderrLine(const TQString&)) );
connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessFinished(KProcess*)) );
connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessFinished(TDEProcess*)) );
d->dvdFormatBin = k3bcore->externalBinManager()->binObject( "dvd+rw-format" );
if( !d->dvdFormatBin ) {
@ -513,7 +513,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
kdDebug() << s << endl << flush;
emit debuggingOutput( "dvd+rw-format command:", s );
if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
if( !d->process->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bDvdFormattingJob) could not start " << d->dvdFormatBin->path << endl;

@ -20,7 +20,7 @@
#include <k3bjob.h>
#include "k3b_export.h"
class KProcess;
class TDEProcess;
namespace K3bDevice {
class Device;
class DeviceHandler;
@ -77,7 +77,7 @@ class LIBK3B_EXPORT K3bDvdFormattingJob : public K3bBurnJob
private slots:
void slotStderrLine( const TQString& );
void slotProcessFinished( KProcess* );
void slotProcessFinished( TDEProcess* );
void slotDeviceHandlerFinished( K3bDevice::DeviceHandler* );
void slotEjectingFinished( K3bDevice::DeviceHandler* );

@ -139,7 +139,7 @@ void K3bReadcdReader::start()
delete d->process;
d->process = new K3bProcess();
connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) );
connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) );
connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
*d->process << d->readcdBinObject;
@ -204,7 +204,7 @@ void K3bReadcdReader::start()
d->canceled = false;
if( !d->process->start( KProcess::NotifyOnExit, KProcess::AllOutput) ) {
if( !d->process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) {
// something went wrong when starting the program
// it "should" be the executable
kdError() << "(K3bReadcdReader) could not start readcd" << endl;
@ -303,7 +303,7 @@ void K3bReadcdReader::slotStdLine( const TQString& line )
}
}
void K3bReadcdReader::slotProcessExited( KProcess* p )
void K3bReadcdReader::slotProcessExited( TDEProcess* p )
{
if( d->canceled ) {
emit canceled();

@ -21,7 +21,7 @@
class K3bProcess;
class KProcess;
class TDEProcess;
class K3bExternalBin;
namespace K3bDevice {
class Device;
@ -71,7 +71,7 @@ class K3bReadcdReader : public K3bJob
private slots:
void slotStdLine( const TQString& line );
void slotProcessExited(KProcess*);
void slotProcessExited(TDEProcess*);
private:
bool m_noCorr;

@ -138,7 +138,7 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter )
d->process->setSplitStdout(true);
// connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) );
connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) );
connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotTranscodeExited(KProcess*)) );
connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotTranscodeExited(TDEProcess*)) );
// the executable
*d->process << d->usedTranscodeBin;
@ -178,7 +178,7 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter )
emit debuggingOutput( d->usedTranscodeBin->name() + " command:", s);
// start the process
if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
if( !d->process->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
// something went wrong when starting the program
// it "should" be the executable
emit infoMessage( i18n("Could not start %1.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR );
@ -249,7 +249,7 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeStderr( const TQString& lin
}
void K3bVideoDVDTitleDetectClippingJob::slotTranscodeExited( KProcess* p )
void K3bVideoDVDTitleDetectClippingJob::slotTranscodeExited( TDEProcess* p )
{
switch( p->exitStatus() ) {
case 0:

@ -20,7 +20,7 @@
#include <k3bjob.h>
#include <k3bvideodvd.h>
class KProcess;
class TDEProcess;
/**
* Job to detect the clipping values for a Video DVD title.
@ -84,7 +84,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleDetectClippingJob : public K3bJob
private slots:
void slotTranscodeStderr( const TQString& );
void slotTranscodeExited( KProcess* );
void slotTranscodeExited( TDEProcess* );
private:
void startTranscode( int chapter );

@ -196,7 +196,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
d->process->setSplitStdout(true);
connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) );
connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) );
connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotTranscodeExited(KProcess*)) );
connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotTranscodeExited(TDEProcess*)) );
// the executable
*d->process << d->usedTranscodeBin;
@ -336,7 +336,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
emit debuggingOutput( d->usedTranscodeBin->name() + " command:", s);
// start the process
if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
if( !d->process->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
// something went wrong when starting the program
// it "should" be the executable
emit infoMessage( i18n("Could not start %1.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR );
@ -414,7 +414,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeStderr( const TQString& line )
}
void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p )
void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( TDEProcess* p )
{
if( d->canceled ) {
emit canceled();

@ -20,7 +20,7 @@
#include <k3bjob.h>
#include <k3bvideodvd.h>
class KProcess;
class TDEProcess;
class K3bExternalBin;
@ -230,7 +230,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob
private slots:
void slotTranscodeStderr( const TQString& );
void slotTranscodeExited( KProcess* );
void slotTranscodeExited( TDEProcess* );
private:
/**

@ -43,7 +43,7 @@ class K3bPluginFactory : public KLibFactory
~K3bPluginFactory() {
if ( s_instance )
KGlobal::locale()->removeCatalogue( s_instance->instanceName() );
TDEGlobal::locale()->removeCatalogue( s_instance->instanceName() );
delete s_instance;
s_instance = 0;
s_self = 0;
@ -54,7 +54,7 @@ class K3bPluginFactory : public KLibFactory
protected:
virtual void setupTranslations( void ) {
if( instance() )
KGlobal::locale()->insertCatalogue( instance()->instanceName() );
TDEGlobal::locale()->insertCatalogue( instance()->instanceName() );
}
void initializeMessageCatalogue() {

@ -145,7 +145,7 @@ void K3bPluginManager::loadPlugin( const TQString& fileName )
void K3bPluginManager::loadAll()
{
// we simply search the K3b plugin dir for now
TQStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/plugins/" );
TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", "k3b/plugins/" );
for( TQStringList::const_iterator it = dirs.begin();
it != dirs.end(); ++it ) {

@ -50,7 +50,7 @@ void K3bAudioNormalizeJob::start()
m_process = new K3bProcess();
connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) );
connect( m_process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) );
connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" );
@ -79,7 +79,7 @@ void K3bAudioNormalizeJob::start()
*m_process << m_files[i];
// now start the process
if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bAudioNormalizeJob) could not start normalize-audio" << endl;
@ -175,7 +175,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
}
void K3bAudioNormalizeJob::slotProcessExited( KProcess* p )
void K3bAudioNormalizeJob::slotProcessExited( TDEProcess* p )
{
if( p->normalExit() ) {
switch( p->exitStatus() ) {

@ -23,7 +23,7 @@
#include <tqvaluevector.h>
class K3bProcess;
class KProcess;
class TDEProcess;
class K3bAudioNormalizeJob : public K3bJob
@ -43,7 +43,7 @@ class K3bAudioNormalizeJob : public K3bJob
private slots:
void slotStdLine( const TQString& line );
void slotProcessExited( KProcess* p );
void slotProcessExited( TDEProcess* p );
private:
K3bProcess* m_process;

@ -155,7 +155,7 @@ void K3bIsoImager::handleMkisofsInfoMessage( const TQString& line, int type )
}
void K3bIsoImager::slotProcessExited( KProcess* p )
void K3bIsoImager::slotProcessExited( TDEProcess* p )
{
kdDebug() << k_funcinfo << endl;
@ -340,11 +340,11 @@ void K3bIsoImager::startSizeCalculation()
// TODO: use K3bProcess::OutputCollector instead iof our own two slots.
connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int)) );
connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotCollectMkisofsPrintSizeStderr(TDEProcess*, char*, int)) );
connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)),
this, TQT_SLOT(slotCollectMkisofsPrintSizeStdout(const TQString&)) );
connect( m_process, TQT_SIGNAL(processExited(KProcess*)),
connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotMkisofsPrintSizeFinished()) );
// we also want error messages
@ -355,7 +355,7 @@ void K3bIsoImager::startSizeCalculation()
m_collectedMkisofsPrintSizeStderr = TQString();
m_mkisofsPrintSizeResult = 0;
if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR );
cleanup();
@ -365,7 +365,7 @@ void K3bIsoImager::startSizeCalculation()
}
void K3bIsoImager::slotCollectMkisofsPrintSizeStderr(KProcess*, char* data , int len)
void K3bIsoImager::slotCollectMkisofsPrintSizeStderr(TDEProcess*, char* data , int len)
{
emit debuggingOutput( "mkisofs", TQString::fromLocal8Bit( data, len ) );
m_collectedMkisofsPrintSizeStderr.append( TQString::fromLocal8Bit( data, len ) );
@ -485,8 +485,8 @@ void K3bIsoImager::start()
return;
}
connect( m_process, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotProcessExited(KProcess*)) );
connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )),
this, TQT_SLOT(slotReceivedStderr( const TQString& )) );
@ -528,7 +528,7 @@ void K3bIsoImager::start()
kdDebug() << s << endl << flush;
emit debuggingOutput("mkisofs command:", s);
if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput) ) {
if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) {
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bIsoImager) could not start mkisofs" << endl;

@ -28,7 +28,7 @@ class K3bDataItem;
class K3bFileItem;
class TQTextStream;
class K3bProcess;
class KProcess;
class TDEProcess;
class K3bDevice::Device;
class KTempFile;
@ -146,10 +146,10 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler
protected slots:
virtual void slotReceivedStderr( const TQString& );
virtual void slotProcessExited( KProcess* );
virtual void slotProcessExited( TDEProcess* );
private slots:
void slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int);
void slotCollectMkisofsPrintSizeStderr(TDEProcess*, char*, int);
void slotCollectMkisofsPrintSizeStdout( const TQString& );
void slotMkisofsPrintSizeFinished();
void slotDataPreparationDone( bool success );

@ -79,7 +79,7 @@ void K3bMsInfoFetcher::start()
void K3bMsInfoFetcher::getMsInfo()
{
delete m_process;
m_process = new KProcess();
m_process = new TDEProcess();
const K3bExternalBin* bin = 0;
if( m_dvd ) {
@ -116,18 +116,18 @@ void K3bMsInfoFetcher::getMsInfo()
emit debuggingOutput( "msinfo command:", s );
// connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
// this, TQT_SLOT(slotCollectOutput(KProcess*, char*, int)) );
connect( m_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this, TQT_SLOT(slotCollectOutput(KProcess*, char*, int)) );
connect( m_process, TQT_SIGNAL(processExited(KProcess*)),
// connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
// this, TQT_SLOT(slotCollectOutput(TDEProcess*, char*, int)) );
connect( m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotCollectOutput(TDEProcess*, char*, int)) );
connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotProcessExited()) );
m_msInfo = TQString();
m_collectedOutput = TQString();
m_canceled = false;
if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
emit infoMessage( i18n("Could not start %1.").arg(bin->name()), K3bJob::ERROR );
jobFinished(false);
}
@ -218,7 +218,7 @@ void K3bMsInfoFetcher::slotProcessExited()
}
void K3bMsInfoFetcher::slotCollectOutput( KProcess*, char* output, int len )
void K3bMsInfoFetcher::slotCollectOutput( TDEProcess*, char* output, int len )
{
emit debuggingOutput( "msinfo", TQString::fromLocal8Bit( output, len ) );

@ -22,7 +22,7 @@ namespace K3bDevice {
class Device;
class DeviceHandler;
}
class KProcess;
class TDEProcess;
class K3bMsInfoFetcher : public K3bJob
{
@ -45,7 +45,7 @@ class K3bMsInfoFetcher : public K3bJob
private slots:
void slotProcessExited();
void slotCollectOutput( KProcess*, char* output, int len );
void slotCollectOutput( TDEProcess*, char* output, int len );
void slotMediaDetectionFinished( K3bDevice::DeviceHandler* );
void getMsInfo();
@ -55,7 +55,7 @@ class K3bMsInfoFetcher : public K3bJob
int m_nextSessionStart;
TQString m_collectedOutput;
KProcess* m_process;
TDEProcess* m_process;
K3bDevice::Device* m_device;
bool m_canceled;

@ -177,7 +177,7 @@ void K3bDvdBooktypeJob::slotStderrLine( const TQString& line )
}
void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p )
void K3bDvdBooktypeJob::slotProcessFinished( TDEProcess* p )
{
if( d->canceled ) {
emit canceled();
@ -281,7 +281,7 @@ void K3bDvdBooktypeJob::startBooktypeChange()
d->process->setRunPrivileged(true);
d->process->setSuppressEmptyLines(true);
connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStderrLine(const TQString&)) );
connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessFinished(KProcess*)) );
connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessFinished(TDEProcess*)) );
d->dvdBooktypeBin = k3bcore->externalBinManager()->binObject( "dvd+rw-booktype" );
if( !d->dvdBooktypeBin ) {
@ -335,7 +335,7 @@ void K3bDvdBooktypeJob::startBooktypeChange()
emit debuggingOutput( "dvd+rw-booktype command:", s );
if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
if( !d->process->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
// something went wrong when starting the program
// it "should" be the executable
emit infoMessage( i18n("Could not start %1.").arg(d->dvdBooktypeBin->name()), K3bJob::ERROR );

@ -20,7 +20,7 @@
#include <k3bjob.h>
class KProcess;
class TDEProcess;
namespace K3bDevice {
class Device;
class DeviceHandler;
@ -83,7 +83,7 @@ class K3bDvdBooktypeJob : public K3bJob
private slots:
void slotStderrLine( const TQString& );
void slotProcessFinished( KProcess* );
void slotProcessFinished( TDEProcess* );
void slotDeviceHandlerFinished( K3bDevice::DeviceHandler* );
void slotEjectingFinished( K3bDevice::DeviceHandler* );

@ -466,8 +466,8 @@ void K3bCdrdaoWriter::start()
m_process->setRawStdin(true);
connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)),
this, TQT_SLOT(slotStdLine(const TQString&)) );
connect( m_process, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotProcessExited(KProcess*)) );
connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
m_canceled = false;
m_knownError = false;
@ -577,7 +577,7 @@ void K3bCdrdaoWriter::start()
burnDevice()->close();
burnDevice()->usageLock();
if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
// something went wrong when starting the program
// it "should" be the executable
@ -709,7 +709,7 @@ void K3bCdrdaoWriter::slotStdLine( c