diff options
Diffstat (limited to 'libk3b/core')
| -rw-r--r-- | libk3b/core/k3b_export.h | 2 | ||||
| -rw-r--r-- | libk3b/core/k3bcore.cpp | 10 | ||||
| -rw-r--r-- | libk3b/core/k3bcore.h | 2 | ||||
| -rw-r--r-- | libk3b/core/k3bdefaultexternalprograms.cpp | 75 | ||||
| -rw-r--r-- | libk3b/core/k3bdefaultexternalprograms.h | 16 | ||||
| -rw-r--r-- | libk3b/core/k3bexternalbinmanager.cpp | 2 | ||||
| -rw-r--r-- | libk3b/core/k3bexternalbinmanager.h | 2 | ||||
| -rw-r--r-- | libk3b/core/k3bglobals.cpp | 12 | ||||
| -rw-r--r-- | libk3b/core/k3bjob.cpp | 62 | ||||
| -rw-r--r-- | libk3b/core/k3bjob.h | 4 | ||||
| -rw-r--r-- | libk3b/core/k3bprocess.cpp | 16 | ||||
| -rw-r--r-- | libk3b/core/k3bprocess.h | 6 | ||||
| -rw-r--r-- | libk3b/core/k3bsimplejobhandler.h | 2 | ||||
| -rw-r--r-- | libk3b/core/k3bthreadjob.h | 2 | 
14 files changed, 125 insertions, 88 deletions
| diff --git a/libk3b/core/k3b_export.h b/libk3b/core/k3b_export.h index b6272f1..ec02420 100644 --- a/libk3b/core/k3b_export.h +++ b/libk3b/core/k3b_export.h @@ -21,7 +21,7 @@  #include <config.h>  #endif -#ifdef __KDE_HAVE_GCC_VISIBILITY +#ifdef __TDE_HAVE_GCC_VISIBILITY  #define LIBK3B_NO_EXPORT __attribute__ ((visibility("hidden")))  #define LIBK3B_EXPORT __attribute__ ((visibility("default")))  #else diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp index 293d74f..533e1f9 100644 --- a/libk3b/core/k3bcore.cpp +++ b/libk3b/core/k3bcore.cpp @@ -32,7 +32,7 @@  #include <tdelocale.h>  #include <tdeconfig.h>  #include <tdeaboutdata.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h>  #include <tdeapplication.h>  #include <tqptrlist.h> @@ -202,10 +202,10 @@ void K3bCore::init()    externalBinManager()->search(); -  connect( K3bDevice::Connection::instance(), TQT_SIGNAL(deviceAdded(const TQString&)), -	   deviceManager(), TQT_SLOT(addDevice(const TQString&)) ); -  connect( K3bDevice::Connection::instance(), TQT_SIGNAL(deviceRemoved(const TQString&)), -	   deviceManager(), TQT_SLOT(removeDevice(const TQString&)) ); +  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(); 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/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp index 4b86055..7fbace6 100644 --- a/libk3b/core/k3bdefaultexternalprograms.cpp +++ b/libk3b/core/k3bdefaultexternalprograms.cpp @@ -49,13 +49,13 @@ void K3b::addDefaultPrograms( K3bExternalBinManager* m )  void K3b::addTranscodePrograms( K3bExternalBinManager* m )  {    static const char* transcodeTools[] =  { "transcode", -					   0, // K3b 1.0 only uses the transcode binary -					   "tcprobe", -					   "tccat", -					   "tcscan", -					   "tcextract", -					   "tcdecode", -					   0 }; +                                           0, // K3b 1.0 only uses the transcode binary +                                           "tcprobe", +                                           "tccat", +                                           "tcscan", +                                           "tcextract", +                                           "tcdecode", +                                           0 };    for( int i = 0; transcodeTools[i]; ++i )      m->addProgram( new K3bTranscodeProgram( transcodeTools[i] ) ); @@ -102,16 +102,16 @@ static TQString& debianWeirdnessHack( TQString& path )        f.open( IO_ReadOnly );        TQString s = TQTextStream( &f ).read();        if( s.contains( "cdrecord.mmap" ) && s.contains( "cdrecord.shm" ) ) { -	kdDebug() << "(K3bCdrecordProgram) Found Debian Wrapper script." << endl; -	TQString ext; -	if( K3b::kernelVersion().versionString().left(3) > "2.2" ) -	  ext = ".mmap"; -	else -	  ext = ".shm"; +        kdDebug() << "(K3bCdrecordProgram) Found Debian Wrapper script." << endl; +        TQString ext; +        if( K3b::kernelVersion().versionString().left(3) > "2.2" ) +          ext = ".mmap"; +        else +          ext = ".shm"; -	kdDebug() << "(K3bCdrecordProgram) Using cdrecord" << ext << endl; +        kdDebug() << "(K3bCdrecordProgram) Using cdrecord" << ext << endl; -	path += ext; +        path += ext;        }      }    } @@ -214,7 +214,7 @@ bool K3bCdrecordProgram::scan( const TQString& p )      if( out.output().contains( "-tao" ) )        bin->addFeature( "tao" );      if( out.output().contains( "cuefile=" ) && -	( wodim || bin->version > K3bVersion( 2, 1, -1, "a14") ) ) // cuefile handling was still buggy in a14 +        ( wodim || bin->version > K3bVersion( 2, 1, -1, "a14") ) ) // cuefile handling was still buggy in a14        bin->addFeature( "cuefile" );      // new mode 2 options since cdrecord 2.01a12 @@ -223,15 +223,15 @@ bool K3bCdrecordProgram::scan( const TQString& p )      // two checks)      // and the version check does not handle versions like 2.01-dvd properly      if( out.output().contains( "-xamix" ) || -	bin->version >= K3bVersion( 2, 1, -1, "a12" ) || -	wodim ) +        bin->version >= K3bVersion( 2, 1, -1, "a12" ) || +        wodim )        bin->addFeature( "xamix" );      // check if we run cdrecord as root      struct stat s;      if( !::stat( TQFile::encodeName(path), &s ) ) {        if( (s.st_mode & S_ISUID) && s.st_uid == 0 ) -	bin->addFeature( "suidroot" ); +        bin->addFeature( "suidroot" );      }    }    else { @@ -352,7 +352,7 @@ bool K3bMkisofsProgram::scan( const TQString& p )      struct stat s;      if( !::stat( TQFile::encodeName(path), &s ) ) {        if( (s.st_mode & S_ISUID) && s.st_uid == 0 ) -	bin->addFeature( "suidroot" ); +        bin->addFeature( "suidroot" );      }    }    else { @@ -458,7 +458,7 @@ bool K3bReadcdProgram::scan( const TQString& p )      struct stat s;      if( !::stat( TQFile::encodeName(path), &s ) ) {        if( (s.st_mode & S_ISUID) && s.st_uid == 0 ) -	bin->addFeature( "suidroot" ); +        bin->addFeature( "suidroot" );      }    }    else { @@ -551,7 +551,7 @@ bool K3bCdrdaoProgram::scan( const TQString& p )      struct stat s;      if( !::stat( TQFile::encodeName(path), &s ) ) {        if( (s.st_mode & S_ISUID) && s.st_uid == 0 ) -	bin->addFeature( "suidroot" ); +        bin->addFeature( "suidroot" );      }    }    else { @@ -712,20 +712,41 @@ K3bNormalizeProgram::K3bNormalizeProgram()  {  } +TQStringList K3bNormalizeProgram::binNames() const { +  TQStringList rv; +  rv << "normalize-audio" << "normalize"; +  return rv; +}  bool K3bNormalizeProgram::scan( const TQString& p )  {    if( p.isEmpty() )      return false; -  TQString path = p; -  TQFileInfo fi( path ); +  bool found = false; + +  TQFileInfo fi( p );    if( fi.isDir() ) { -    if( path[path.length()-1] != '/' ) -      path.append("/"); -    path.append("normalize-audio"); + +    for(const auto & name: binNames()) { +      TQString path = p; +      if( path[path.length()-1] != '/' ) +        path.append("/"); +      path.append(name); + +      if( verifyAddBin(path) ) +        found = true; +    } +  } else { +    if( verifyAddBin(p) ) +      found = true;    } +  return found; +} + + +bool K3bNormalizeProgram::verifyAddBin( const TQString& path ) {    if( !TQFile::exists( path ) )      return false; diff --git a/libk3b/core/k3bdefaultexternalprograms.h b/libk3b/core/k3bdefaultexternalprograms.h index bc4d41c..daca769 100644 --- a/libk3b/core/k3bdefaultexternalprograms.h +++ b/libk3b/core/k3bdefaultexternalprograms.h @@ -102,6 +102,22 @@ class LIBK3B_EXPORT K3bNormalizeProgram : public K3bExternalProgram    K3bNormalizeProgram();    bool scan( const TQString& ); + protected: +  /** +   * Returns list of names the executable of this program could be called +   */ +  TQStringList binNames() const; + +  /** +   * Verifies if binary on the given path suitable to be used by k3b and +   * addBin()s it if so +   */ +  bool verifyAddBin( const TQString& path ); + +  /** +   * @note: it would make sense to make binNames() and verifyBin() virtuals in +   * K3bExternalProgram and reimplement scan() in a more generic way. +   */  }; diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp index 902025d..f73a8e8 100644 --- a/libk3b/core/k3bexternalbinmanager.cpp +++ b/libk3b/core/k3bexternalbinmanager.cpp @@ -16,7 +16,7 @@  #include "k3bexternalbinmanager.h"  #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h>  #include <tdeconfig.h>  #include <tdeversion.h> 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 7793128..4bc0ff4 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -28,7 +28,7 @@  #include <tdeversion.h>  #include <tdeglobal.h>  #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h>  #include <tdeconfig.h>  #include <tdeapplication.h>  #include <kdebug.h> @@ -36,7 +36,7 @@  #include <tdeio/netaccess.h>  #include <kurl.h>  #include <dcopref.h> -#include <kprocess.h> +#include <tdeprocess.h>  #include <tqdatastream.h>  #include <tqdir.h> @@ -175,10 +175,10 @@ TQString K3b::findTempFile( const TQString& ending, const TQString& d )  TQString K3b::defaultTempPath()  { -  TQString oldGroup = kapp->config()->group(); -  kapp->config()->setGroup( "General Options" ); -  TQString url = kapp->config()->readPathEntry( "Temp Dir", TDEGlobal::dirs()->resourceDirs( "tmp" ).first() ); -  kapp->config()->setGroup( oldGroup ); +  TQString oldGroup = tdeApp->config()->group(); +  tdeApp->config()->setGroup( "General Options" ); +  TQString url = tdeApp->config()->readPathEntry( "Temp Dir", TDEGlobal::dirs()->resourceDirs( "tmp" ).first() ); +  tdeApp->config()->setGroup( oldGroup );    return prepareDir(url);  } diff --git a/libk3b/core/k3bjob.cpp b/libk3b/core/k3bjob.cpp index 0e169b1..67d0f39 100644 --- a/libk3b/core/k3bjob.cpp +++ b/libk3b/core/k3bjob.cpp @@ -19,7 +19,7 @@  #include <k3bcore.h>  #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h>  #include <tqstringlist.h>  #include <kdebug.h> @@ -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..642df4a 100644 --- a/libk3b/core/k3bprocess.h +++ b/libk3b/core/k3bprocess.h @@ -18,7 +18,7 @@  #define K3B_PROCESS_H -#include <kprocess.h> +#include <tdeprocess.h>  #include <tqstring.h>  #include "k3b_export.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: | 
