summaryrefslogtreecommitdiffstats
path: root/libk3b/core
diff options
context:
space:
mode:
Diffstat (limited to 'libk3b/core')
-rw-r--r--libk3b/core/Makefile.am19
-rw-r--r--libk3b/core/k3bcore.cpp12
-rw-r--r--libk3b/core/k3bcore.h2
-rw-r--r--libk3b/core/k3bexternalbinmanager.h2
-rw-r--r--libk3b/core/k3bglobals.cpp8
-rw-r--r--libk3b/core/k3bglobals.h4
-rw-r--r--libk3b/core/k3bjob.cpp60
-rw-r--r--libk3b/core/k3bjob.h4
-rw-r--r--libk3b/core/k3bprocess.cpp16
-rw-r--r--libk3b/core/k3bprocess.h4
-rw-r--r--libk3b/core/k3bsimplejobhandler.h2
-rw-r--r--libk3b/core/k3bthreadjob.h2
12 files changed, 58 insertions, 77 deletions
diff --git a/libk3b/core/Makefile.am b/libk3b/core/Makefile.am
deleted file mode 100644
index 06e474c..0000000
--- a/libk3b/core/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-AM_CPPFLAGS = -I$(srcdir)/../../libk3bdevice -I$(srcdir)/../plugin -I$(srcdir)/../tools $(all_includes)
-
-noinst_LTLIBRARIES = libk3bcore.la
-
-libk3bcore_la_LIBADD = $(LIB_TDEIO) $(ARTSC_LIB)
-
-libk3bcore_la_LDFLAGS = $(all_libraries)
-
-libk3bcore_la_SOURCES = k3bcore.cpp k3bglobals.cpp k3bdefaultexternalprograms.cpp \
- k3bexternalbinmanager.cpp k3bversion.cpp k3bprocess.cpp k3bjob.cpp \
- k3bthread.cpp k3bthreadjob.cpp k3bglobalsettings.cpp k3bsimplejobhandler.cpp
-
-include_HEADERS = k3bcore.h k3bdefaultexternalprograms.h k3bexternalbinmanager.h \
- k3bprocess.h k3bversion.h k3bglobals.h k3bjob.h k3bthread.h \
- k3bthreadjob.h k3bglobalsettings.h k3bjobhandler.h \
- k3b_export.h k3bsimplejobhandler.h
-
-METASOURCES = AUTO
-
diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp
index 9fecb79..a17225c 100644
--- a/libk3b/core/k3bcore.cpp
+++ b/libk3b/core/k3bcore.cpp
@@ -19,7 +19,7 @@
#include "k3bjob.h"
#include <k3bdevicemanager.h>
-#include <k3bhalconnection.h>
+#include <k3bconnection.h>
#include <k3bexternalbinmanager.h>
#include <k3bdefaultexternalprograms.h>
#include <k3bglobals.h>
@@ -202,11 +202,11 @@ void K3bCore::init()
externalBinManager()->search();
- connect( K3bDevice::HalConnection::instance(), TQT_SIGNAL(deviceAdded(const TQString&)),
- deviceManager(), TQT_SLOT(addDevice(const TQString&)) );
- connect( K3bDevice::HalConnection::instance(), TQT_SIGNAL(deviceRemoved(const TQString&)),
- deviceManager(), TQT_SLOT(removeDevice(const TQString&)) );
- TQStringList devList = K3bDevice::HalConnection::instance()->devices();
+ connect( K3bDevice::Connection::instance(), TQ_SIGNAL(deviceAdded(const TQString&)),
+ deviceManager(), TQ_SLOT(addDevice(const TQString&)) );
+ connect( K3bDevice::Connection::instance(), TQ_SIGNAL(deviceRemoved(const TQString&)),
+ deviceManager(), TQ_SLOT(removeDevice(const TQString&)) );
+ TQStringList devList = K3bDevice::Connection::instance()->devices();
if( devList.isEmpty() )
deviceManager()->scanBus();
else
diff --git a/libk3b/core/k3bcore.h b/libk3b/core/k3bcore.h
index 8e40adc..3b8fce7 100644
--- a/libk3b/core/k3bcore.h
+++ b/libk3b/core/k3bcore.h
@@ -54,7 +54,7 @@ namespace K3bDevice {
*/
class LIBK3B_EXPORT K3bCore : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/core/k3bexternalbinmanager.h b/libk3b/core/k3bexternalbinmanager.h
index 18b601b..06f7791 100644
--- a/libk3b/core/k3bexternalbinmanager.h
+++ b/libk3b/core/k3bexternalbinmanager.h
@@ -113,7 +113,7 @@ class LIBK3B_EXPORT K3bExternalProgram
class LIBK3B_EXPORT K3bExternalBinManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index 2e542e3..7793128 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -23,7 +23,7 @@
#include <k3bdeviceglobals.h>
#include <k3bexternalbinmanager.h>
#include <k3bcore.h>
-#include <k3bhalconnection.h>
+#include <k3bconnection.h>
#include <tdeversion.h>
#include <tdeglobal.h>
@@ -580,7 +580,7 @@ bool K3b::unmount( K3bDevice::Device* dev )
return !p.exitStatus();
}
else {
- return !K3bDevice::HalConnection::instance()->unmount( dev );
+ return !K3bDevice::Connection::instance()->unmount( dev );
}
}
@@ -598,7 +598,7 @@ bool K3b::mount( K3bDevice::Device* dev )
return true;
#endif
- if( !K3bDevice::HalConnection::instance()->mount( dev ) )
+ if( !K3bDevice::Connection::instance()->mount( dev ) )
return true;
// now try pmount
@@ -616,7 +616,7 @@ bool K3b::mount( K3bDevice::Device* dev )
bool K3b::eject( K3bDevice::Device* dev )
{
- if( !K3bDevice::HalConnection::instance()->eject( dev ) )
+ if( !K3bDevice::Connection::instance()->eject( dev ) )
return true;
if( K3b::isMounted( dev ) )
diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h
index c6d2111..17cc149 100644
--- a/libk3b/core/k3bglobals.h
+++ b/libk3b/core/k3bglobals.h
@@ -242,14 +242,14 @@ namespace K3b
/**
* Tries to mount the medium. Since K3b does not gather any information
- * about mount points the only methods used are pmount and HAL::mount
+ * about mount points the only methods used are pmount and tdehw lib mount
*/
LIBK3B_EXPORT bool mount( K3bDevice::Device* );
/**
* Ejects the medium in the device or simply opens the tray.
* This method improves over K3bDevice::Device::eject in that it
- * unmounts before ejecting and introduces HAL support.
+ * unmounts before ejecting.
*/
LIBK3B_EXPORT bool eject( K3bDevice::Device* );
}
diff --git a/libk3b/core/k3bjob.cpp b/libk3b/core/k3bjob.cpp
index 0e169b1..1f6bbaa 100644
--- a/libk3b/core/k3bjob.cpp
+++ b/libk3b/core/k3bjob.cpp
@@ -40,8 +40,8 @@ K3bJob::K3bJob( K3bJobHandler* handler, TQObject* parent, const char* name )
m_canceled(false),
m_active(false)
{
- connect( this, TQT_SIGNAL(canceled()),
- this, TQT_SLOT(slotCanceled()) );
+ connect( this, TQ_SIGNAL(canceled()),
+ this, TQ_SLOT(slotCanceled()) );
}
K3bJob::~K3bJob()
@@ -128,23 +128,23 @@ void K3bJob::connectSubJob( K3bJob* subJob,
const char* processedSizeSlot,
const char* processedSubSizeSlot )
{
- connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
- connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) );
- connect( subJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
- this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
- connect( subJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
- this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
- connect( subJob, TQT_SIGNAL(finished(bool)), this, finishedSlot );
+ connect( subJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) );
+ connect( subJob, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SLOT(slotNewSubTask(const TQString&)) );
+ connect( subJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+ connect( subJob, TQ_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQ_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( subJob, TQ_SIGNAL(finished(bool)), this, finishedSlot );
if( connectProgress ) {
- connect( subJob, TQT_SIGNAL(percent(int)),
- this, progressSlot != 0 ? progressSlot : TQT_SIGNAL(subPercent(int)) );
+ connect( subJob, TQ_SIGNAL(percent(int)),
+ this, progressSlot != 0 ? progressSlot : TQ_SIGNAL(subPercent(int)) );
if( subProgressSlot )
- connect( subJob, TQT_SIGNAL(subPercent(int)), this, subProgressSlot );
- connect( subJob, TQT_SIGNAL(processedSize(int, int)),
- this, processedSizeSlot != 0 ? processedSizeSlot : TQT_SIGNAL(processedSubSize(int, int)) );
+ connect( subJob, TQ_SIGNAL(subPercent(int)), this, subProgressSlot );
+ connect( subJob, TQ_SIGNAL(processedSize(int, int)),
+ this, processedSizeSlot != 0 ? processedSizeSlot : TQ_SIGNAL(processedSubSize(int, int)) );
if( processedSubSizeSlot )
- connect( subJob, TQT_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot );
+ connect( subJob, TQ_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot );
}
}
@@ -159,42 +159,42 @@ void K3bJob::connectSubJob( K3bJob* subJob,
const char* processedSubSizeSlot )
{
// standard connections
- connect( subJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
- this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
- connect( subJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
- this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( subJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+ connect( subJob, TQ_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQ_SIGNAL(infoMessage(const TQString&, int)) );
// task connections
if( newTaskSlot == DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( subJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) );
else if( newTaskSlot )
- connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, newTaskSlot );
+ connect( subJob, TQ_SIGNAL(newTask(const TQString&)), this, newTaskSlot );
if( newSubTaskSlot == DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) );
+ connect( subJob, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SLOT(slotNewSubTask(const TQString&)) );
else if( newSubTaskSlot )
- connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, newSubTaskSlot );
+ connect( subJob, TQ_SIGNAL(newSubTask(const TQString&)), this, newSubTaskSlot );
if( finishedSlot && finishedSlot != DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, TQT_SIGNAL(finished(bool)), this, finishedSlot );
+ connect( subJob, TQ_SIGNAL(finished(bool)), this, finishedSlot );
// progress
if( progressSlot == DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) );
+ connect( subJob, TQ_SIGNAL(percent(int)), this, TQ_SIGNAL(subPercent(int)) );
else if( progressSlot )
- connect( subJob, TQT_SIGNAL(percent(int)), this, progressSlot );
+ connect( subJob, TQ_SIGNAL(percent(int)), this, progressSlot );
if( subProgressSlot && subProgressSlot != DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, TQT_SIGNAL(subPercent(int)), this, subProgressSlot );
+ connect( subJob, TQ_SIGNAL(subPercent(int)), this, subProgressSlot );
// processed size
if( processedSizeSlot == DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
+ connect( subJob, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) );
else if( processedSizeSlot )
- connect( subJob, TQT_SIGNAL(processedSize(int, int)), this, processedSizeSlot );
+ connect( subJob, TQ_SIGNAL(processedSize(int, int)), this, processedSizeSlot );
if( processedSubSizeSlot && processedSubSizeSlot != DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, TQT_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot );
+ connect( subJob, TQ_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot );
}
diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h
index a4a7564..95af192 100644
--- a/libk3b/core/k3bjob.h
+++ b/libk3b/core/k3bjob.h
@@ -42,7 +42,7 @@ namespace K3bDevice {
*/
class LIBK3B_EXPORT K3bJob : public TQObject, public K3bJobHandler
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -256,7 +256,7 @@ class LIBK3B_EXPORT K3bJob : public TQObject, public K3bJobHandler
*/
class LIBK3B_EXPORT K3bBurnJob : public K3bJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/core/k3bprocess.cpp b/libk3b/core/k3bprocess.cpp
index 304c0f5..31ca4ae 100644
--- a/libk3b/core/k3bprocess.cpp
+++ b/libk3b/core/k3bprocess.cpp
@@ -104,12 +104,12 @@ K3bProcess& K3bProcess::operator<<( const TQStringList& args )
bool K3bProcess::start( RunMode run, Communication com )
{
if( com & Stderr ) {
- connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
- this, TQT_SLOT(slotSplitStderr(TDEProcess*, char*, int)) );
+ connect( this, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQ_SLOT(slotSplitStderr(TDEProcess*, char*, int)) );
}
if( com & Stdout ) {
- connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
- this, TQT_SLOT(slotSplitStdout(TDEProcess*, char*, int)) );
+ connect( this, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQ_SLOT(slotSplitStdout(TDEProcess*, char*, int)) );
}
return TDEProcess::start( run, com );
@@ -425,10 +425,10 @@ void K3bProcessOutputCollector::setProcess( TDEProcess* p )
m_process = p;
if( p ) {
- 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)) );
+ connect( p, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this, TQ_SLOT(slotGatherStdout(TDEProcess*, char*, int)) );
+ connect( p, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQ_SLOT(slotGatherStderr(TDEProcess*, char*, int)) );
}
m_gatheredOutput.truncate( 0 );
diff --git a/libk3b/core/k3bprocess.h b/libk3b/core/k3bprocess.h
index 19fb024..1cc99ed 100644
--- a/libk3b/core/k3bprocess.h
+++ b/libk3b/core/k3bprocess.h
@@ -37,7 +37,7 @@ class K3bExternalBin;
*/
class LIBK3B_EXPORT K3bProcess : public TDEProcess
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -180,7 +180,7 @@ class LIBK3B_EXPORT K3bProcess : public TDEProcess
class LIBK3B_EXPORT K3bProcessOutputCollector: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/core/k3bsimplejobhandler.h b/libk3b/core/k3bsimplejobhandler.h
index 37582d0..4c1c839 100644
--- a/libk3b/core/k3bsimplejobhandler.h
+++ b/libk3b/core/k3bsimplejobhandler.h
@@ -30,7 +30,7 @@
*/
class LIBK3B_EXPORT K3bSimpleJobHandler : public TQObject, public K3bJobHandler
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/core/k3bthreadjob.h b/libk3b/core/k3bthreadjob.h
index 4ef88bf..7f6b037 100644
--- a/libk3b/core/k3bthreadjob.h
+++ b/libk3b/core/k3bthreadjob.h
@@ -39,7 +39,7 @@ class K3bThread;
*/
class LIBK3B_EXPORT K3bThreadJob : public K3bJob
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 09:24:32 +0000