summaryrefslogtreecommitdiffstats
path: root/libk3b/projects/datadvd
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:19:29 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:19:29 -0600
commit2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (patch)
tree36de2281c8b4cf238a5e27a76b5c6e07f40151ab /libk3b/projects/datadvd
parent2a3289ab87c52551fd2f5655492988ca02c17892 (diff)
downloadk3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.tar.gz
k3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/projects/datadvd')
-rw-r--r--libk3b/projects/datadvd/k3bdvdbooktypejob.cpp6
-rw-r--r--libk3b/projects/datadvd/k3bdvdbooktypejob.h4
2 files changed, 5 insertions, 5 deletions
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* );