6 files changed, 11 insertions, 32 deletions
diff --git a/libk3b/projects/datadvd/Makefile.am b/libk3b/projects/datadvd/Makefile.am
deleted file mode 100644
index 99ae10c..0000000
--- a/libk3b/projects/datadvd/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-# we need the ../datacd for the uic generated header files
-AM_CPPFLAGS= 	-I$(srcdir)/../../core \
-		-I$(srcdir)/../../../libk3bdevice \
-		-I$(srcdir)/../../../src \
-		-I$(srcdir)/../../tools \
-		-I$(srcdir)/../../jobs \
-		-I$(srcdir)/../datacd \
-		-I$(srcdir)/.. \
-		-I../datacd \
-		$(all_includes)
-
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES = libdvd.la
-
-libdvd_la_SOURCES = 	k3bdvddoc.cpp \
-			k3bdvdjob.cpp \
-			k3bdvdbooktypejob.cpp
-
-include_HEADERS = 	k3bdvddoc.h \
-			k3bdvdjob.h
diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
index 058e195..eb0631a 100644
--- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
+++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
@@ -129,9 +129,9 @@ void K3bDvdBooktypeJob::start()
     emit newTask( i18n("Checking media") );
 
     connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, d->device ), 
-	     TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
+	     TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)),
 	     this, 
-	     TQT_SLOT(slotDeviceHandlerFinished(K3bDevice::DeviceHandler*)) );
+	     TQ_SLOT(slotDeviceHandlerFinished(K3bDevice::DeviceHandler*)) );
   }
   else {
     // change writer defaults
@@ -216,9 +216,9 @@ void K3bDvdBooktypeJob::slotProcessFinished( TDEProcess* p )
     else {
       emit infoMessage( i18n("Ejecting DVD..."), INFO );
       connect( K3bDevice::eject( d->device ), 
-	       TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
+	       TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)),
 	       this, 
-	       TQT_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) );
+	       TQ_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) );
     }
   }
   else {
@@ -280,8 +280,8 @@ void K3bDvdBooktypeJob::startBooktypeChange()
   d->process = new K3bProcess();
   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(TDEProcess*)), this, TQT_SLOT(slotProcessFinished(TDEProcess*)) );
+  connect( d->process, TQ_SIGNAL(stderrLine(const TQString&)), this, TQ_SLOT(slotStderrLine(const TQString&)) );
+  connect( d->process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessFinished(TDEProcess*)) );
 
   d->dvdBooktypeBin = k3bcore->externalBinManager()->binObject( "dvd+rw-booktype" );
   if( !d->dvdBooktypeBin ) {
diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.h b/libk3b/projects/datadvd/k3bdvdbooktypejob.h
index 165c29b..e3ea1e7 100644
--- a/libk3b/projects/datadvd/k3bdvdbooktypejob.h
+++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.h
@@ -33,7 +33,7 @@ namespace K3bDevice {
  */
 class K3bDvdBooktypeJob : public K3bJob
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp
index c8cec08..38cdbe3 100644
--- a/libk3b/projects/datadvd/k3bdvdjob.cpp
+++ b/libk3b/projects/datadvd/k3bdvdjob.cpp
@@ -105,9 +105,9 @@ void K3bDvdJob::determineMultiSessionMode()
   }
   else {
      connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, m_doc->burner() ),
-	     TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
+	     TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)),
 	     this,
-	     TQT_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) );
+	     TQ_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) );
   }
 }
 
diff --git a/libk3b/projects/datadvd/k3bdvdjob.h b/libk3b/projects/datadvd/k3bdvdjob.h
index 85aed2a..043f91b 100644
--- a/libk3b/projects/datadvd/k3bdvdjob.h
+++ b/libk3b/projects/datadvd/k3bdvdjob.h
@@ -27,7 +27,7 @@ class K3bGrowisofsWriter;
 
 class K3bDvdJob : public K3bDataJob
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
diff --git a/libk3b/projects/datadvd/k3bdvdview.h b/libk3b/projects/datadvd/k3bdvdview.h
index 8e5804c..9fb5c6f 100644
--- a/libk3b/projects/datadvd/k3bdvdview.h
+++ b/libk3b/projects/datadvd/k3bdvdview.h
@@ -24,7 +24,7 @@ class K3bDvdDoc;
 
 class K3bDvdView : public K3bDataView
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public: