summaryrefslogtreecommitdiffstats
path: root/libk3b/projects/datacd
diff options
context:
space:
mode:
Diffstat (limited to 'libk3b/projects/datacd')
-rw-r--r--libk3b/projects/datacd/Makefile.am35
-rw-r--r--libk3b/projects/datacd/k3bdatadoc.cpp4
-rw-r--r--libk3b/projects/datacd/k3bdatadoc.h2
-rw-r--r--libk3b/projects/datacd/k3bdatajob.cpp76
-rw-r--r--libk3b/projects/datacd/k3bdatajob.h2
-rw-r--r--libk3b/projects/datacd/k3bdatapreparationjob.cpp2
-rw-r--r--libk3b/projects/datacd/k3bdatapreparationjob.h2
-rw-r--r--libk3b/projects/datacd/k3bfileitem.cpp2
-rw-r--r--libk3b/projects/datacd/k3bisoimager.cpp26
-rw-r--r--libk3b/projects/datacd/k3bisoimager.h2
-rw-r--r--libk3b/projects/datacd/k3bmsinfofetcher.cpp16
-rw-r--r--libk3b/projects/datacd/k3bmsinfofetcher.h2
12 files changed, 68 insertions, 103 deletions
diff --git a/libk3b/projects/datacd/Makefile.am b/libk3b/projects/datacd/Makefile.am
deleted file mode 100644
index dea5cb2..0000000
--- a/libk3b/projects/datacd/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-AM_CPPFLAGS= -I$(srcdir)/.. \
- -I$(srcdir)/../../core \
- -I$(srcdir)/../../plugin \
- -I$(srcdir)/../../../libk3bdevice \
- -I$(srcdir)/../../../src \
- -I$(srcdir)/../../tools \
- -I$(srcdir)/../../jobs \
- -I$(srcdir)/../.. \
- $(all_includes)
-
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES = libdata.la
-
-libdata_la_SOURCES = k3bdatajob.cpp \
- k3bdatadoc.cpp \
- k3bdataitem.cpp \
- k3bdiritem.cpp \
- k3bfileitem.cpp \
- k3bisoimager.cpp \
- k3bmsinfofetcher.cpp \
- k3bbootitem.cpp \
- k3bisooptions.cpp \
- k3bfilecompilationsizehandler.cpp \
- k3bsessionimportitem.cpp \
- k3bmkisofshandler.cpp \
- k3bdatapreparationjob.cpp
-
-include_HEADERS = k3bdatadoc.h \
- k3bdatajob.h \
- k3bdataitem.h \
- k3bdiritem.h \
- k3bfileitem.h \
- k3bbootitem.h \
- k3bisooptions.h
diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp
index d25e342..7f99ce6 100644
--- a/libk3b/projects/datacd/k3bdatadoc.cpp
+++ b/libk3b/projects/datacd/k3bdatadoc.cpp
@@ -1118,13 +1118,13 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir )
void K3bDataDoc::informAboutNotFoundFiles()
{
if( !m_notFoundFiles.isEmpty() ) {
- KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("Could not find the following files:"),
+ KMessageBox::informationList( tqApp->activeWindow(), i18n("Could not find the following files:"),
m_notFoundFiles, i18n("Not Found") );
m_notFoundFiles.clear();
}
if( !m_noPermissionFiles.isEmpty() ) {
- KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("No permission to read the following files:"),
+ KMessageBox::informationList( tqApp->activeWindow(), i18n("No permission to read the following files:"),
m_noPermissionFiles, i18n("No Read Permission") );
m_noPermissionFiles.clear();
diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h
index 4d9b58e..bdcb91c 100644
--- a/libk3b/projects/datacd/k3bdatadoc.h
+++ b/libk3b/projects/datacd/k3bdatadoc.h
@@ -60,7 +60,7 @@ namespace K3bDevice {
class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp
index 356ab17..dcb5224 100644
--- a/libk3b/projects/datacd/k3bdatajob.cpp
+++ b/libk3b/projects/datacd/k3bdatajob.cpp
@@ -95,10 +95,10 @@ K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent )
m_isoImager = 0;
m_msInfoFetcher = new K3bMsInfoFetcher( this, this );
- connect( m_msInfoFetcher, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMsInfoFetched(bool)) );
- connect( m_msInfoFetcher, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
- connect( m_msInfoFetcher, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
- this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+ connect( m_msInfoFetcher, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotMsInfoFetched(bool)) );
+ connect( m_msInfoFetcher, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_msInfoFetcher, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
d->imageFinished = true;
}
@@ -432,20 +432,20 @@ void K3bDataJob::slotWriterJobFinished( bool success )
if( d->doc->verifyData() ) {
if( !d->verificationJob ) {
d->verificationJob = new K3bVerificationJob( this, this );
- connect( d->verificationJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
- this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
- connect( d->verificationJob, TQT_SIGNAL(newTask(const TQString&)),
- this, TQT_SIGNAL(newSubTask(const TQString&)) );
- connect( d->verificationJob, TQT_SIGNAL(newSubTask(const TQString&)),
- this, TQT_SIGNAL(newSubTask(const TQString&)) );
- connect( d->verificationJob, TQT_SIGNAL(percent(int)),
- this, TQT_SLOT(slotVerificationProgress(int)) );
- connect( d->verificationJob, TQT_SIGNAL(percent(int)),
- this, TQT_SIGNAL(subPercent(int)) );
- connect( d->verificationJob, TQT_SIGNAL(finished(bool)),
- this, TQT_SLOT(slotVerificationFinished(bool)) );
- connect( d->verificationJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
- this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+ connect( d->verificationJob, TQ_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQ_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( d->verificationJob, TQ_SIGNAL(newTask(const TQString&)),
+ this, TQ_SIGNAL(newSubTask(const TQString&)) );
+ connect( d->verificationJob, TQ_SIGNAL(newSubTask(const TQString&)),
+ this, TQ_SIGNAL(newSubTask(const TQString&)) );
+ connect( d->verificationJob, TQ_SIGNAL(percent(int)),
+ this, TQ_SLOT(slotVerificationProgress(int)) );
+ connect( d->verificationJob, TQ_SIGNAL(percent(int)),
+ this, TQ_SIGNAL(subPercent(int)) );
+ connect( d->verificationJob, TQ_SIGNAL(finished(bool)),
+ this, TQ_SLOT(slotVerificationFinished(bool)) );
+ connect( d->verificationJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
d->verificationJob->clear();
@@ -541,19 +541,19 @@ void K3bDataJob::setWriterJob( K3bAbstractWriter* writer )
{
// FIXME: progressedsize for multiple copies
m_writerJob = writer;
- connect( m_writerJob, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
- connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterJobPercent(int)) );
- connect( m_writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
- connect( m_writerJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
- connect( m_writerJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
- connect( m_writerJob, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) );
- connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
- connect( m_writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
- connect( m_writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
- connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) );
- connect( m_writerJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
- connect( m_writerJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
- this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+ connect( m_writerJob, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_writerJob, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotWriterJobPercent(int)) );
+ connect( m_writerJob, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSize(int, int)) );
+ connect( m_writerJob, TQ_SIGNAL(subPercent(int)), this, TQ_SIGNAL(subPercent(int)) );
+ connect( m_writerJob, TQ_SIGNAL(processedSubSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) );
+ connect( m_writerJob, TQ_SIGNAL(nextTrack(int, int)), this, TQ_SLOT(slotWriterNextTrack(int, int)) );
+ connect( m_writerJob, TQ_SIGNAL(buffer(int)), this, TQ_SIGNAL(bufferStatus(int)) );
+ connect( m_writerJob, TQ_SIGNAL(deviceBuffer(int)), this, TQ_SIGNAL(deviceBuffer(int)) );
+ connect( m_writerJob, TQ_SIGNAL(writeSpeed(int, int)), this, TQ_SIGNAL(writeSpeed(int, int)) );
+ connect( m_writerJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotWriterJobFinished(bool)) );
+ connect( m_writerJob, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) );
+ connect( m_writerJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
@@ -572,11 +572,11 @@ void K3bDataJob::setImager( K3bIsoImager* imager )
void K3bDataJob::connectImager()
{
m_isoImager->disconnect( this );
- connect( m_isoImager, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
- connect( m_isoImager, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotIsoImagerPercent(int)) );
- connect( m_isoImager, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotIsoImagerFinished(bool)) );
- connect( m_isoImager, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
- this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+ connect( m_isoImager, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_isoImager, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotIsoImagerPercent(int)) );
+ connect( m_isoImager, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotIsoImagerFinished(bool)) );
+ connect( m_isoImager, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
@@ -790,9 +790,9 @@ void K3bDataJob::determineMultiSessionMode()
else {
// now we need to determine the media's size
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, d->doc->burner() ),
- TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- TQT_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) );
+ TQ_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) );
}
}
else {
diff --git a/libk3b/projects/datacd/k3bdatajob.h b/libk3b/projects/datacd/k3bdatajob.h
index c36713f..589ced3 100644
--- a/libk3b/projects/datacd/k3bdatajob.h
+++ b/libk3b/projects/datacd/k3bdatajob.h
@@ -39,7 +39,7 @@ namespace K3bDevice {
*/
class K3bDataJob : public K3bBurnJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp
index a6b9e88..1598c3e 100644
--- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp
+++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp
@@ -154,7 +154,7 @@ K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hd
{
d = new Private( doc );
d->threadJob = new K3bThreadJob( d, this, this );
- connectSubJob( d->threadJob, TQT_SLOT(slotWorkDone(bool)), K3bJob::DEFAULT_SIGNAL_CONNECTION );
+ connectSubJob( d->threadJob, TQ_SLOT(slotWorkDone(bool)), K3bJob::DEFAULT_SIGNAL_CONNECTION );
}
diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.h b/libk3b/projects/datacd/k3bdatapreparationjob.h
index c63a88e..d0b968c 100644
--- a/libk3b/projects/datacd/k3bdatapreparationjob.h
+++ b/libk3b/projects/datacd/k3bdatapreparationjob.h
@@ -28,7 +28,7 @@ class K3bJobHandler;
*/
class K3bDataPreparationJob : public K3bJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp
index 3e20982..8474aeb 100644
--- a/libk3b/projects/datacd/k3bfileitem.cpp
+++ b/libk3b/projects/datacd/k3bfileitem.cpp
@@ -68,7 +68,7 @@ K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem*
m_k3bName = k3bName;
// we determine the size here to avoid problems with removed or renamed files
- // we need to use lstat here since for symlinks both KDE and QT return the size of the file pointed to
+ // we need to use lstat here since for symlinks both TDE and TQt return the size of the file pointed to
// instead the size of the link.
k3b_struct_stat statBuf;
if( k3b_lstat( TQFile::encodeName(filePath), &statBuf ) ) {
diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp
index 2f750c5..f424e07 100644
--- a/libk3b/projects/datacd/k3bisoimager.cpp
+++ b/libk3b/projects/datacd/k3bisoimager.cpp
@@ -103,7 +103,7 @@ K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* paren
d = new Private();
d->dataPreparationJob = new K3bDataPreparationJob( doc, this, this );
connectSubJob( d->dataPreparationJob,
- TQT_SLOT(slotDataPreparationDone(bool)),
+ TQ_SLOT(slotDataPreparationDone(bool)),
DEFAULT_SIGNAL_CONNECTION );
}
@@ -340,16 +340,16 @@ void K3bIsoImager::startSizeCalculation()
// TODO: use K3bProcess::OutputCollector instead iof our own two slots.
- 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(TDEProcess*)),
- this, TQT_SLOT(slotMkisofsPrintSizeFinished()) );
+ connect( m_process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQ_SLOT(slotCollectMkisofsPrintSizeStderr(TDEProcess*, char*, int)) );
+ connect( m_process, TQ_SIGNAL(stdoutLine(const TQString&)),
+ this, TQ_SLOT(slotCollectMkisofsPrintSizeStdout(const TQString&)) );
+ connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)),
+ this, TQ_SLOT(slotMkisofsPrintSizeFinished()) );
// we also want error messages
- connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )),
- this, TQT_SLOT(slotReceivedStderr( const TQString& )) );
+ connect( m_process, TQ_SIGNAL(stderrLine( const TQString& )),
+ this, TQ_SLOT(slotReceivedStderr( const TQString& )) );
m_collectedMkisofsPrintSizeStdout = TQString();
m_collectedMkisofsPrintSizeStderr = TQString();
@@ -485,11 +485,11 @@ void K3bIsoImager::start()
return;
}
- connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)),
- this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
+ connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)),
+ this, TQ_SLOT(slotProcessExited(TDEProcess*)) );
- connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )),
- this, TQT_SLOT(slotReceivedStderr( const TQString& )) );
+ connect( m_process, TQ_SIGNAL(stderrLine( const TQString& )),
+ this, TQ_SLOT(slotReceivedStderr( const TQString& )) );
//
// Check the image file
diff --git a/libk3b/projects/datacd/k3bisoimager.h b/libk3b/projects/datacd/k3bisoimager.h
index 0c3535e..1cf21c0 100644
--- a/libk3b/projects/datacd/k3bisoimager.h
+++ b/libk3b/projects/datacd/k3bisoimager.h
@@ -37,7 +37,7 @@ class KTempFile;
class K3bIsoImager : public K3bJob, public K3bMkisofsHandler
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
index cfbe58b..ce4b756 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
@@ -70,9 +70,9 @@ void K3bMsInfoFetcher::start()
//
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, m_device ),
- TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- TQT_SLOT(slotMediaDetectionFinished(K3bDevice::DeviceHandler*)) );
+ TQ_SLOT(slotMediaDetectionFinished(K3bDevice::DeviceHandler*)) );
}
@@ -116,12 +116,12 @@ void K3bMsInfoFetcher::getMsInfo()
emit debuggingOutput( "msinfo command:", s );
- // 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()) );
+ // connect( m_process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ // this, TQ_SLOT(slotCollectOutput(TDEProcess*, char*, int)) );
+ connect( m_process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQ_SLOT(slotCollectOutput(TDEProcess*, char*, int)) );
+ connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)),
+ this, TQ_SLOT(slotProcessExited()) );
m_msInfo = TQString();
m_collectedOutput = TQString();
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.h b/libk3b/projects/datacd/k3bmsinfofetcher.h
index 88a174f..85be4ca 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.h
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.h
@@ -26,7 +26,7 @@ class TDEProcess;
class K3bMsInfoFetcher : public K3bJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 16:29:36 +0000