summaryrefslogtreecommitdiffstats
path: root/libk3b
diff options
context:
space:
mode:
Diffstat (limited to 'libk3b')
-rw-r--r--libk3b/core/k3bdefaultexternalprograms.cpp64
-rw-r--r--libk3b/core/k3bexternalbinmanager.h2
-rw-r--r--libk3b/core/k3bglobals.cpp14
-rw-r--r--libk3b/core/k3bprocess.cpp52
-rw-r--r--libk3b/core/k3bprocess.h26
-rw-r--r--libk3b/jobs/k3bblankingjob.h2
-rw-r--r--libk3b/jobs/k3bcdda2wavreader.cpp6
-rw-r--r--libk3b/jobs/k3bcdda2wavreader.h4
-rw-r--r--libk3b/jobs/k3bdvdformattingjob.cpp6
-rw-r--r--libk3b/jobs/k3bdvdformattingjob.h4
-rw-r--r--libk3b/jobs/k3breadcdreader.cpp6
-rw-r--r--libk3b/jobs/k3breadcdreader.h4
-rw-r--r--libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp6
-rw-r--r--libk3b/jobs/k3bvideodvdtitledetectclippingjob.h4
-rw-r--r--libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp6
-rw-r--r--libk3b/jobs/k3bvideodvdtitletranscodingjob.h4
-rw-r--r--libk3b/plugin/k3bpluginfactory.h4
-rw-r--r--libk3b/plugin/k3bpluginmanager.cpp2
-rw-r--r--libk3b/projects/audiocd/k3baudionormalizejob.cpp6
-rw-r--r--libk3b/projects/audiocd/k3baudionormalizejob.h4
-rw-r--r--libk3b/projects/datacd/k3bisoimager.cpp18
-rw-r--r--libk3b/projects/datacd/k3bisoimager.h6
-rw-r--r--libk3b/projects/datacd/k3bmsinfofetcher.cpp16
-rw-r--r--libk3b/projects/datacd/k3bmsinfofetcher.h6
-rw-r--r--libk3b/projects/datadvd/k3bdvdbooktypejob.cpp6
-rw-r--r--libk3b/projects/datadvd/k3bdvdbooktypejob.h4
-rw-r--r--libk3b/projects/k3bcdrdaowriter.cpp10
-rw-r--r--libk3b/projects/k3bcdrdaowriter.h4
-rw-r--r--libk3b/projects/k3bcdrecordwriter.cpp10
-rw-r--r--libk3b/projects/k3bcdrecordwriter.h4
-rw-r--r--libk3b/projects/k3bdvdrecordwriter.cpp4
-rw-r--r--libk3b/projects/k3bgrowisofshandler.cpp2
-rw-r--r--libk3b/projects/k3bgrowisofswriter.cpp10
-rw-r--r--libk3b/projects/k3bgrowisofswriter.h4
-rw-r--r--libk3b/projects/movixcd/k3bmovixprogram.cpp16
-rw-r--r--libk3b/projects/videocd/k3bvcdjob.cpp14
-rw-r--r--libk3b/projects/videocd/k3bvcdjob.h4
-rw-r--r--libk3b/projects/videodvd/k3bvideodvdimager.cpp2
-rw-r--r--libk3b/tools/k3bbusywidget.cpp2
-rw-r--r--libk3b/tools/k3bdirsizejob.cpp4
-rw-r--r--libk3b/tools/k3bpushbutton.cpp2
-rw-r--r--libk3b/tools/k3brichtextlabel.cpp4
-rw-r--r--libk3b/tools/k3btempfile.cpp2
-rw-r--r--libk3b/tools/k3btoolbutton.cpp2
44 files changed, 191 insertions, 191 deletions
diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp
index 2cece94..4b86055 100644
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
@@ -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;
diff --git a/libk3b/core/k3bexternalbinmanager.h b/libk3b/core/k3bexternalbinmanager.h
index 3ba57ae..74be6b7 100644
--- a/libk3b/core/k3bexternalbinmanager.h
+++ b/libk3b/core/k3bexternalbinmanager.h
@@ -25,7 +25,7 @@
#include "k3bversion.h"
class KConfig;
-class KProcess;
+class TDEProcess;
class K3bExternalProgram;
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index c01e289..23225b6 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -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;
diff --git a/libk3b/core/k3bprocess.cpp b/libk3b/core/k3bprocess.cpp
index c46fd0a..304c0f5 100644
--- a/libk3b/core/k3bprocess.cpp
+++ b/libk3b/core/k3bprocess.cpp
@@ -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 ) );
diff --git a/libk3b/core/k3bprocess.h b/libk3b/core/k3bprocess.h
index 009280d..19fb024 100644
--- a/libk3b/core/k3bprocess.h
+++ b/libk3b/core/k3bprocess.h
@@ -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;
};
diff --git a/libk3b/jobs/k3bblankingjob.h b/libk3b/jobs/k3bblankingjob.h
index f081318..18234bd 100644
--- a/libk3b/jobs/k3bblankingjob.h
+++ b/libk3b/jobs/k3bblankingjob.h
@@ -18,7 +18,7 @@
#include <k3bjob.h>
#include "k3b_export.h"
-class KProcess;
+class TDEProcess;
class TQString;
class K3bDevice::Device;
class K3bAbstractWriter;
diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp
index cab71b9..889993b 100644
--- a/libk3b/jobs/k3bcdda2wavreader.cpp
+++ b/libk3b/jobs/k3bcdda2wavreader.cpp
@@ -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;
diff --git a/libk3b/jobs/k3bcdda2wavreader.h b/libk3b/jobs/k3bcdda2wavreader.h
index 2979367..24a2246 100644
--- a/libk3b/jobs/k3bcdda2wavreader.h
+++ b/libk3b/jobs/k3bcdda2wavreader.h
@@ -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;
diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp
index 21858e4..e0d177f 100644
--- a/libk3b/jobs/k3bdvdformattingjob.cpp
+++ b/libk3b/jobs/k3bdvdformattingjob.cpp
@@ -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;
diff --git a/libk3b/jobs/k3bdvdformattingjob.h b/libk3b/jobs/k3bdvdformattingjob.h
index 949e470..49481d0 100644
--- a/libk3b/jobs/k3bdvdformattingjob.h
+++ b/libk3b/jobs/k3bdvdformattingjob.h
@@ -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* );
diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp
index b8b2b0a..ed4aacd 100644
--- a/libk3b/jobs/k3breadcdreader.cpp
+++ b/libk3b/jobs/k3breadcdreader.cpp
@@ -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();
diff --git a/libk3b/jobs/k3breadcdreader.h b/libk3b/jobs/k3breadcdreader.h
index 81eabf3..b2b7135 100644
--- a/libk3b/jobs/k3breadcdreader.h
+++ b/libk3b/jobs/k3breadcdreader.h
@@ -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;
diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
index 96d9619..67832b9 100644
--- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
@@ -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:
diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h
index 4594793..9118e6e 100644
--- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h
+++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h
@@ -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 );
diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
index fd115ff..39eb7dc 100644
--- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
@@ -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();
diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h
index 43d9063..b618a41 100644
--- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h
+++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h
@@ -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:
/**
diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h
index 6e4da16..ab415fa 100644
--- a/libk3b/plugin/k3bpluginfactory.h
+++ b/libk3b/plugin/k3bpluginfactory.h
@@ -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() {
diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp
index bf6d914..2e3724d 100644
--- a/libk3b/plugin/k3bpluginmanager.cpp
+++ b/libk3b/plugin/k3bpluginmanager.cpp
@@ -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 ) {
diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
index d78862e..89fdb99 100644
--- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp
+++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
@@ -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() ) {
diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.h b/libk3b/projects/audiocd/k3baudionormalizejob.h
index db033e2..f4340b1 100644
--- a/libk3b/projects/audiocd/k3baudionormalizejob.h
+++ b/libk3b/projects/audiocd/k3baudionormalizejob.h
@@ -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;
diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp
index d83581c..6b1de51 100644
--- a/libk3b/projects/datacd/k3bisoimager.cpp
+++ b/libk3b/projects/datacd/k3bisoimager.cpp
@@ -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;
diff --git a/libk3b/projects/datacd/k3bisoimager.h b/libk3b/projects/datacd/k3bisoimager.h
index 51bee7b..42277c2 100644
--- a/libk3b/projects/datacd/k3bisoimager.h
+++ b/libk3b/projects/datacd/k3bisoimager.h
@@ -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 );
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
index 3aa90b3..e81c98b 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
@@ -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 ) );
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.h b/libk3b/projects/datacd/k3bmsinfofetcher.h
index a661519..88a174f 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.h
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.h
@@ -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;
diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
index 358bfde..cefafdf 100644
--- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
+++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
@@ -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 );
diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.h b/libk3b/projects/datadvd/k3bdvdbooktypejob.h
index d720563..165c29b 100644
--- a/libk3b/projects/datadvd/k3bdvdbooktypejob.h
+++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.h
@@ -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* );
diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp
index 2ac9559..6d61005 100644
--- a/libk3b/projects/k3bcdrdaowriter.cpp
+++ b/libk3b/projects/k3bcdrdaowriter.cpp
@@ -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( const TQString& line )
}
-void K3bCdrdaoWriter::slotProcessExited( KProcess* p )
+void K3bCdrdaoWriter::slotProcessExited( TDEProcess* p )
{
// release the device within this process
burnDevice()->usageUnlock();
@@ -775,7 +775,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p )
if( m_command == WRITE || m_command == COPY ) {
int s = d->speedEst->average();
- emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
+ emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(TDEGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
}
jobFinished( true );
diff --git a/libk3b/projects/k3bcdrdaowriter.h b/libk3b/projects/k3bcdrdaowriter.h
index c6457ff..c1d1457 100644
--- a/libk3b/projects/k3bcdrdaowriter.h
+++ b/libk3b/projects/k3bcdrdaowriter.h
@@ -23,7 +23,7 @@
class K3bExternalBin;
class K3bProcess;
-class KProcess;
+class TDEProcess;
class K3bDevice::Device;
class TQSocket;
@@ -93,7 +93,7 @@ class K3bCdrdaoWriter : public K3bAbstractWriter
private slots:
void slotStdLine( const TQString& line );
- void slotProcessExited(KProcess*);
+ void slotProcessExited(TDEProcess*);
void parseCdrdaoMessage();
void slotThroughput( int t );
diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp
index 78ffb6a..15047a1 100644
--- a/libk3b/projects/k3bcdrecordwriter.cpp
+++ b/libk3b/projects/k3bcdrecordwriter.cpp
@@ -141,13 +141,13 @@ void K3bCdrecordWriter::prepareProcess()
if( m_process ) delete m_process; // tdelibs want this!
m_process = new K3bProcess();
m_process->setRunPrivileged(true);
- // m_process->setPriority( KProcess::PrioHighest );
+ // m_process->setPriority( TDEProcess::PrioHighest );
m_process->setSplitStdout(true);
m_process->setSuppressEmptyLines(true);
m_process->setRawStdin(true); // we only use stdin when writing on-the-fly
connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) );
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_cdrecordBinObject = k3bcore->externalBinManager()->binObject("cdrecord");
@@ -339,7 +339,7 @@ void K3bCdrecordWriter::start()
burnDevice()->close();
burnDevice()->usageLock();
- if( !m_process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
+ if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bCdrecordWriter) could not start " << m_cdrecordBinObject->name() << endl;
@@ -653,7 +653,7 @@ void K3bCdrecordWriter::slotStdLine( const TQString& line )
}
-void K3bCdrecordWriter::slotProcessExited( KProcess* p )
+void K3bCdrecordWriter::slotProcessExited( TDEProcess* p )
{
// remove temporary cdtext file
delete d->cdTextFile;
@@ -682,7 +682,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p )
emit infoMessage( i18n("Writing successfully completed"), K3bJob::SUCCESS );
int s = d->speedEst->average();
- emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
+ emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(TDEGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
jobFinished( true );
}
diff --git a/libk3b/projects/k3bcdrecordwriter.h b/libk3b/projects/k3bcdrecordwriter.h
index 1ebc1e5..dd81402 100644
--- a/libk3b/projects/k3bcdrecordwriter.h
+++ b/libk3b/projects/k3bcdrecordwriter.h
@@ -24,7 +24,7 @@
class K3bExternalBin;
class K3bProcess;
-class KProcess;
+class TDEProcess;
class K3bDevice::Device;
@@ -67,7 +67,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter
protected slots:
void slotStdLine( const TQString& line );
- void slotProcessExited(KProcess*);
+ void slotProcessExited(TDEProcess*);
void slotThroughput( int t );
protected:
diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp
index 052315b..46dc75a 100644
--- a/libk3b/projects/k3bdvdrecordwriter.cpp
+++ b/libk3b/projects/k3bdvdrecordwriter.cpp
@@ -44,8 +44,8 @@ void K3bDvdrecordWriter::prepareProcess()
m_process->setSplitStdout(true);
connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) );
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(wroteStdin(KProcess*)), this, TQT_SIGNAL(dataWritten()) );
+ connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
+ connect( m_process, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SIGNAL(dataWritten()) );
// if( k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "dvd-patch" ) )
// m_cdrecordBinObject = k3bcore->externalBinManager()->binObject("cdrecord");
diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp
index d38e0d2..edaaa40 100644
--- a/libk3b/projects/k3bgrowisofshandler.cpp
+++ b/libk3b/projects/k3bgrowisofshandler.cpp
@@ -178,7 +178,7 @@ void K3bGrowisofsHandler::handleLine( const TQString& line )
if( ok )
emit infoMessage( i18n("Writing speed: %1 KB/s (%2x)")
.arg((int)(speed*1385.0))
- .arg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO );
+ .arg(TDEGlobal::locale()->formatNumber(speed)), K3bJob::INFO );
else
kdDebug() << "(K3bGrowisofsHandler) parsing error: '" << line.mid( pos, endPos-pos ) << "'" << endl;
}
diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp
index b17f9b8..f8b64a3 100644
--- a/libk3b/projects/k3bgrowisofswriter.cpp
+++ b/libk3b/projects/k3bgrowisofswriter.cpp
@@ -179,12 +179,12 @@ bool K3bGrowisofsWriter::prepareProcess()
delete d->process;
d->process = new K3bProcess();
d->process->setRunPrivileged(true);
- // d->process->setPriority( KProcess::PrioHighest );
+ // d->process->setPriority( TDEProcess::PrioHighest );
d->process->setSplitStdout(true);
d->process->setRawStdin(true);
connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotReceivedStderr(const TQString&)) );
connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotReceivedStderr(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*)) );
//
@@ -370,7 +370,7 @@ void K3bGrowisofsWriter::start()
burnDevice()->close();
burnDevice()->usageLock();
- 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() << "(K3bGrowisofsWriter) could not start " << d->growisofsBin->path << endl;
@@ -524,7 +524,7 @@ void K3bGrowisofsWriter::slotReceivedStderr( const TQString& line )
}
-void K3bGrowisofsWriter::slotProcessExited( KProcess* p )
+void K3bGrowisofsWriter::slotProcessExited( TDEProcess* p )
{
d->inputFile.close();
@@ -551,7 +551,7 @@ void K3bGrowisofsWriter::slotProcessExited( KProcess* p )
int s = d->speedEst->average();
if( s > 0 )
emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)")
- .arg(s).arg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO );
+ .arg(s).arg(TDEGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO );
if( simulate() )
emit infoMessage( i18n("Simulation successfully completed"), K3bJob::SUCCESS );
diff --git a/libk3b/projects/k3bgrowisofswriter.h b/libk3b/projects/k3bgrowisofswriter.h
index b8d46cc..723bce3 100644
--- a/libk3b/projects/k3bgrowisofswriter.h
+++ b/libk3b/projects/k3bgrowisofswriter.h
@@ -23,7 +23,7 @@ namespace K3bDevice {
class Device;
class DeviceHandler;
}
-class KProcess;
+class TDEProcess;
@@ -93,7 +93,7 @@ class K3bGrowisofsWriter : public K3bAbstractWriter
protected slots:
void slotReceivedStderr( const TQString& );
- void slotProcessExited( KProcess* );
+ void slotProcessExited( TDEProcess* );
void slotEjectingFinished( K3bDevice::DeviceHandler* dh );
void slotThroughput( int t );
void slotFlushingCache();
diff --git a/libk3b/projects/movixcd/k3bmovixprogram.cpp b/libk3b/projects/movixcd/k3bmovixprogram.cpp
index 4c609db..24f7a98 100644
--- a/libk3b/projects/movixcd/k3bmovixprogram.cpp
+++ b/libk3b/projects/movixcd/k3bmovixprogram.cpp
@@ -49,11 +49,11 @@ bool K3bMovixProgram::scan( const TQString& p )
//
// probe version and data dir
//
- KProcess vp, dp;
+ TDEProcess vp, dp;
vp << path + "movix-version";
dp << path + "movix-conf";
K3bProcessOutputCollector vout( &vp ), dout( &dp );
- if( vp.start( KProcess::Block, KProcess::AllOutput ) && dp.start( KProcess::Block, KProcess::AllOutput ) ) {
+ if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) && dp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
// movix-version just gives us the version number on stdout
if( !vout.output().isEmpty() && !dout.output().isEmpty() ) {
bin = new K3bMovixBin( this );
@@ -133,10 +133,10 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const TQString& path )
if( TQFile::exists( path + "movix-files" ) ) {
bin->addFeature( "files" );
- KProcess p;
+ TDEProcess p;
K3bProcessOutputCollector out( &p );
p << bin->path + "movix-files";
- if( p.start( KProcess::Block, KProcess::AllOutput ) ) {
+ if( p.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
bin->m_movixFiles = TQStringList::split( "\n", out.output() );
}
}
@@ -300,10 +300,10 @@ TQStringList K3bMovixBin::supportedCodecs() const
TQStringList K3bMovixBin::supported( const TQString& type ) const
{
- KProcess p;
+ TDEProcess p;
K3bProcessOutputCollector out( &p );
p << path + "movix-conf" << "--supported=" + type;
- if( p.start( KProcess::Block, KProcess::AllOutput ) )
+ if( p.start( TDEProcess::Block, TDEProcess::AllOutput ) )
return TQStringList::split( "\n", out.output() );
else
return TQStringList();
@@ -316,7 +316,7 @@ TQStringList K3bMovixBin::files( const TQString& kbd,
const TQString& lang,
const TQStringList& codecs ) const
{
- KProcess p;
+ TDEProcess p;
K3bProcessOutputCollector out( &p );
p << path + "movix-conf" << "--files";
@@ -332,7 +332,7 @@ TQStringList K3bMovixBin::files( const TQString& kbd,
if( !codecs.isEmpty() )
p << "--codecs" << codecs.join( "," );
- if( p.start( KProcess::Block, KProcess::AllOutput ) )
+ if( p.start( TDEProcess::Block, TDEProcess::AllOutput ) )
return TQStringList::split( "\n", out.output() );
else
return TQStringList();
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp
index 18c5678..fe62515 100644
--- a/libk3b/projects/videocd/k3bvcdjob.cpp
+++ b/libk3b/projects/videocd/k3bvcdjob.cpp
@@ -225,11 +225,11 @@ void K3bVcdJob::vcdxBuild()
*m_process << TQString( "%1" ).arg( TQFile::encodeName( m_xmlFile ).data() );
- connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
- this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) );
- connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
- this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) );
- connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ),
+ connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+ this, TQT_SLOT( slotParseVcdxBuildOutput( TDEProcess*, char*, int ) ) );
+ connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+ this, TQT_SLOT( slotParseVcdxBuildOutput( TDEProcess*, char*, int ) ) );
+ connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( slotVcdxBuildFinished() ) );
// vcdxbuild commandline parameters
@@ -243,7 +243,7 @@ void K3bVcdJob::vcdxBuild()
kdDebug() << s << flush << endl;
emit debuggingOutput( "vcdxbuild command:", s );
- if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
+ if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
kdDebug() << "(K3bVcdJob) could not start vcdxbuild" << endl;
emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxbuild" ), K3bJob::ERROR );
cancelAll();
@@ -251,7 +251,7 @@ void K3bVcdJob::vcdxBuild()
}
}
-void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len )
+void K3bVcdJob::slotParseVcdxBuildOutput( TDEProcess*, char* output, int len )
{
TQString buffer = TQString::fromLocal8Bit( output, len );
diff --git a/libk3b/projects/videocd/k3bvcdjob.h b/libk3b/projects/videocd/k3bvcdjob.h
index a96fe68..329646f 100644
--- a/libk3b/projects/videocd/k3bvcdjob.h
+++ b/libk3b/projects/videocd/k3bvcdjob.h
@@ -22,7 +22,7 @@ class K3bVcdDoc;
class K3bVcdTrack;
class TQString;
class K3bProcess;
-class KProcess;
+class TDEProcess;
class TQDataStream;
class K3bAbstractWriter;
class K3bDevice::Device;
@@ -56,7 +56,7 @@ class K3bVcdJob : public K3bBurnJob
protected slots:
void slotVcdxBuildFinished();
- void slotParseVcdxBuildOutput( KProcess*, char* output, int len );
+ void slotParseVcdxBuildOutput( TDEProcess*, char* output, int len );
void slotWriterJobPercent( int p );
void slotProcessedSize( int cs, int ts );
diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp
index 3319754..9d72448 100644
--- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp
+++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp
@@ -104,7 +104,7 @@ int K3bVideoDvdImager::writePathSpec()
//
// We do this here since K3bIsoImager::start calls cleanup which deletes the temp files
//
- TQDir dir( KGlobal::dirs()->resourceDirs( "tmp" ).first() );
+ TQDir dir( TDEGlobal::dirs()->resourceDirs( "tmp" ).first() );
d->tempPath = K3b::findUniqueFilePrefix( "k3bVideoDvd", dir.path() );
kdDebug() << "(K3bVideoDvdImager) creating temp dir: " << d->tempPath << endl;
if( !dir.mkdir( d->tempPath, true ) ) {
diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp
index 34615e3..929e1f1 100644
--- a/libk3b/tools/k3bbusywidget.cpp
+++ b/libk3b/tools/k3bbusywidget.cpp
@@ -96,7 +96,7 @@ void K3bBusyWidget::drawContents( TQPainter* p )
// p->eraseRect( rect );
if( m_bBusy )
- p->fillRect( pos, (rect.height() - squareSize)/2, squareSize, squareSize, KGlobalSettings::highlightColor() );
+ p->fillRect( pos, (rect.height() - squareSize)/2, squareSize, squareSize, TDEGlobalSettings::highlightColor() );
}
diff --git a/libk3b/tools/k3bdirsizejob.cpp b/libk3b/tools/k3bdirsizejob.cpp
index cddf0e7..eedca01 100644
--- a/libk3b/tools/k3bdirsizejob.cpp
+++ b/libk3b/tools/k3bdirsizejob.cpp
@@ -69,8 +69,8 @@ public:
}
bool countDir( const TQString& dir ) {
- const TQString& dot = KGlobal::staticQString( "." );
- const TQString& dotdot = KGlobal::staticQString( ".." );
+ const TQString& dot = TDEGlobal::staticQString( "." );
+ const TQString& dotdot = TDEGlobal::staticQString( ".." );
TQStringList l = TQDir(dir).entryList( TQDir::All|TQDir::Hidden|TQDir::System );
l.remove( dot );
l.remove( dotdot );
diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp
index 69c6ed5..7a01caf 100644
--- a/libk3b/tools/k3bpushbutton.cpp
+++ b/libk3b/tools/k3bpushbutton.cpp
@@ -105,7 +105,7 @@ bool K3bPushButton::eventFilter( TQObject* o, TQEvent* ev )
}
else if( ev->type() == TQEvent::MouseMove ) {
TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
- if( ( mev->pos() - d->mousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) {
+ if( ( mev->pos() - d->mousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) {
d->popupTimer->stop();
slotDelayedPopup();
return true;
diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp
index 1dee2b1..36c0a63 100644
--- a/libk3b/tools/k3brichtextlabel.cpp
+++ b/libk3b/tools/k3brichtextlabel.cpp
@@ -37,14 +37,14 @@ static TQString qrichtextify( const TQString& text )
K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
- m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+ m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5);
setAlignment( TQt::WordBreak );
setText(text);
}
K3bRichTextLabel::K3bRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
- m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+ m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5);
setAlignment( TQt::WordBreak );
}
diff --git a/libk3b/tools/k3btempfile.cpp b/libk3b/tools/k3btempfile.cpp
index 18ad803..0136f91 100644
--- a/libk3b/tools/k3btempfile.cpp
+++ b/libk3b/tools/k3btempfile.cpp
@@ -24,7 +24,7 @@ static inline TQString defaultTempDir()
// we need a world-readable temp dir
// FIXME: check if the default is world-readable
-// TQStringList dirs = KGlobal::dirs()->resourceDirs( "tmp" );
+// TQStringList dirs = TDEGlobal::dirs()->resourceDirs( "tmp" );
// for( TQStringList::const_iterator it = dirs.begin();
// it != dirs.end(); ++it ) {
// const TQString& dir = *it;
diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp
index 04d767c..b897ebd 100644
--- a/libk3b/tools/k3btoolbutton.cpp
+++ b/libk3b/tools/k3btoolbutton.cpp
@@ -97,7 +97,7 @@ bool K3bToolButton::eventFilter( TQObject* o, TQEvent* ev )
else if( ev->type() == TQEvent::MouseMove ) {
TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
if( !d->instantMenu &&
- ( mev->pos() - d->mousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) {
+ ( mev->pos() - d->mousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) {
openPopup();
return true;
}