diff options
Diffstat (limited to 'libk3b/projects/videocd')
-rw-r--r-- | libk3b/projects/videocd/Makefile.am | 20 | ||||
-rw-r--r-- | libk3b/projects/videocd/cdi/Makefile.am | 5 | ||||
-rw-r--r-- | libk3b/projects/videocd/extra/Makefile.am | 5 | ||||
-rw-r--r-- | libk3b/projects/videocd/k3bvcddoc.cpp | 22 | ||||
-rw-r--r-- | libk3b/projects/videocd/k3bvcddoc.h | 4 | ||||
-rw-r--r-- | libk3b/projects/videocd/k3bvcdjob.cpp | 40 | ||||
-rw-r--r-- | libk3b/projects/videocd/k3bvcdjob.h | 2 | ||||
-rw-r--r-- | libk3b/projects/videocd/k3bvcdoptions.cpp | 4 | ||||
-rw-r--r-- | libk3b/projects/videocd/k3bvcdtrack.h | 2 | ||||
-rw-r--r-- | libk3b/projects/videocd/k3bvcdxmlview.cpp | 2 | ||||
-rw-r--r-- | libk3b/projects/videocd/mpeginfo/Makefile.am | 5 |
11 files changed, 38 insertions, 73 deletions
diff --git a/libk3b/projects/videocd/Makefile.am b/libk3b/projects/videocd/Makefile.am deleted file mode 100644 index 1e18d02..0000000 --- a/libk3b/projects/videocd/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -AM_CPPFLAGS= -I$(srcdir)/../../core \ - -I$(srcdir)/../../../src \ - -I$(srcdir)/../../../libk3bdevice \ - -I$(srcdir)/../../tools \ - -I$(srcdir)/.. \ - $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = libvcd.la - -libvcd_la_SOURCES = k3bvcddoc.cpp k3bvcdtrack.cpp k3bvcdjob.cpp k3bvcdoptions.cpp k3bvcdxmlview.cpp - -libvcd_la_LIBADD = mpeginfo/libmpeginfo.la - -SUBDIRS = cdi extra mpeginfo - -include_HEADERS = k3bvcdjob.h \ - k3bvcddoc.h \ - k3bvcdoptions.h diff --git a/libk3b/projects/videocd/cdi/Makefile.am b/libk3b/projects/videocd/cdi/Makefile.am deleted file mode 100644 index e487acc..0000000 --- a/libk3b/projects/videocd/cdi/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -cdidir = $(kde_datadir)/k3b/cdi -cdi_DATA = cdi_imag.rtf cdi_text.fnt cdi_vcd.app cdi_vcd.cfg vcd_on_cdi_41.pdf icdia.htm - -EXTRA_DIST = $(cdi_DATA) diff --git a/libk3b/projects/videocd/extra/Makefile.am b/libk3b/projects/videocd/extra/Makefile.am deleted file mode 100644 index 717fa99..0000000 --- a/libk3b/projects/videocd/extra/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -extradir = $(kde_datadir)/k3b/extra -extra_DATA = k3bphotovcd.mpg k3bphotosvcd.mpg - -EXTRA_DIST = $(extra_DATA) diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index eb40f16..2b2b0b3 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -13,7 +13,7 @@ * See the file "COPYING" for the exact licensing terms. */ -// QT-includes +// TQt includes #include <tqstring.h> #include <tqstringlist.h> #include <tqfile.h> @@ -24,13 +24,13 @@ #include <tqtextstream.h> // KDE-includes -#include <kprocess.h> +#include <tdeprocess.h> #include <kurl.h> #include <tdeapplication.h> #include <tdemessagebox.h> #include <tdeconfig.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/global.h> #include <kdebug.h> #include <kstdguiitem.h> @@ -59,11 +59,11 @@ K3bVcdDoc::K3bVcdDoc( TQObject* parent ) m_vcdType = NONE; m_urlAddingTimer = new TQTimer( this ); - connect( m_urlAddingTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotWorkUrlQueue() ) ); + connect( m_urlAddingTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotWorkUrlQueue() ) ); // FIXME: remove the newTracks() signal and replace it with the changed signal - connect( this, TQT_SIGNAL( newTracks() ), this, TQT_SIGNAL( changed() ) ); - connect( this, TQT_SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, TQT_SIGNAL( changed() ) ); + connect( this, TQ_SIGNAL( newTracks() ), this, TQ_SIGNAL( changed() ) ); + connect( this, TQ_SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, TQ_SIGNAL( changed() ) ); } K3bVcdDoc::~K3bVcdDoc() @@ -207,7 +207,7 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) m_urlAddingTimer->stop(); setVcdType( vcdTypes( mpegVersion ) ); vcdOptions() ->setMpegVersion( mpegVersion ); - KMessageBox::information( kapp->mainWidget(), + KMessageBox::information( tdeApp->mainWidget(), i18n( "K3b will create a %1 image from the given MPEG " "files, but these files must already be in %2 " "format. K3b does not yet resample MPEG files." ) @@ -219,7 +219,7 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) m_urlAddingTimer->stop(); vcdOptions() ->setMpegVersion( mpegVersion ); bool force = false; - force = ( KMessageBox::questionYesNo( kapp->mainWidget(), + force = ( KMessageBox::questionYesNo( tdeApp->mainWidget(), i18n( "K3b will create a %1 image from the given MPEG " "files, but these files must already be in %2 " "format. K3b does not yet resample MPEG files." ) @@ -242,7 +242,7 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) if ( numOfTracks() > 0 && vcdOptions() ->mpegVersion() != mpegVersion ) { - KMessageBox::error( kapp->mainWidget(), "(" + url.path() + ")\n" + + KMessageBox::error( tdeApp->mainWidget(), "(" + url.path() + ")\n" + i18n( "You cannot mix MPEG1 and MPEG2 video files.\nPlease start a new Project for this filetype.\nResample not implemented in K3b yet." ), i18n( "Wrong File Type for This Project" ) ); @@ -254,7 +254,7 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) *( newTrack->mpeg_info ) = *( Mpeg->mpeg_info ); if ( newTrack->isSegment() && !vcdOptions()->PbcEnabled() ) { - KMessageBox::information( kapp->mainWidget(), + KMessageBox::information( tdeApp->mainWidget(), i18n( "PBC (Playback control) enabled.\n" "Videoplayers can not reach Segments (Mpeg Still Pictures) without Playback control ." ) , i18n( "Information" ) ); @@ -286,7 +286,7 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) } // error (unsupported files) - KMessageBox::error( kapp->mainWidget(), "(" + url.path() + ")\n" + + KMessageBox::error( tdeApp->mainWidget(), "(" + url.path() + ")\n" + i18n( "Only MPEG1 and MPEG2 video files are supported.\n" ) + error_string , i18n( "Wrong File Format" ) ); diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h index e752a98..335b084 100644 --- a/libk3b/projects/videocd/k3bvcddoc.h +++ b/libk3b/projects/videocd/k3bvcddoc.h @@ -16,7 +16,7 @@ #ifndef K3BVCDDOC_H #define K3BVCDDOC_H -// TQt Includes +// TQt includes #include <tqptrqueue.h> #include <tqfile.h> #include <tqstring.h> @@ -47,7 +47,7 @@ class TDEConfig; class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp index d16e7e0..0edcdad 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -15,7 +15,7 @@ #include <tdelocale.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <tdetempfile.h> #include <tdeio/global.h> @@ -225,12 +225,12 @@ void K3bVcdJob::vcdxBuild() *m_process << TQString( "%1" ).arg( TQFile::encodeName( m_xmlFile ).data() ); - connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdxBuildOutput( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdxBuildOutput( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotVcdxBuildFinished() ) ); + connect( m_process, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQ_SLOT( slotParseVcdxBuildOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQ_SLOT( slotParseVcdxBuildOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotVcdxBuildFinished() ) ); // vcdxbuild commandline parameters kdDebug() << "***** vcdxbuild parameters:" << endl; @@ -432,19 +432,19 @@ bool K3bVcdJob::prepareWriterJob() } - 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_SLOT( slotProcessedSize( 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( newTask( const TQString& ) ), this, TQT_SIGNAL( newTask( const TQString& ) ) ); - 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_SLOT( slotProcessedSize( 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( newTask( const TQString& ) ), this, TQ_SIGNAL( newTask( const TQString& ) ) ); + 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& ) ) ); return true; } diff --git a/libk3b/projects/videocd/k3bvcdjob.h b/libk3b/projects/videocd/k3bvcdjob.h index 9eca0ed..af22869 100644 --- a/libk3b/projects/videocd/k3bvcdjob.h +++ b/libk3b/projects/videocd/k3bvcdjob.h @@ -32,7 +32,7 @@ namespace K3bDevice { class K3bVcdJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp index b0d60cf..a9d2bbf 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.cpp +++ b/libk3b/projects/videocd/k3bvcdoptions.cpp @@ -18,9 +18,9 @@ #include <tdeconfig.h> #include <k3bcore.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> -// TQt Includes +// TQt includes #include <tqstring.h> #include <tqfile.h> diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h index f529275..ff4b48d 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.h +++ b/libk3b/projects/videocd/k3bvcdtrack.h @@ -16,7 +16,7 @@ #ifndef K3BVCDTRACK_H #define K3BVCDTRACK_H -// TQt Includes +// TQt includes #include <tqstring.h> #include <tqfileinfo.h> #include <tqfile.h> diff --git a/libk3b/projects/videocd/k3bvcdxmlview.cpp b/libk3b/projects/videocd/k3bvcdxmlview.cpp index 6881946..f00e740 100644 --- a/libk3b/projects/videocd/k3bvcdxmlview.cpp +++ b/libk3b/projects/videocd/k3bvcdxmlview.cpp @@ -16,7 +16,7 @@ #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> diff --git a/libk3b/projects/videocd/mpeginfo/Makefile.am b/libk3b/projects/videocd/mpeginfo/Makefile.am deleted file mode 100644 index af1b06b..0000000 --- a/libk3b/projects/videocd/mpeginfo/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -INCLUDES = $(all_includes) -noinst_LTLIBRARIES = libmpeginfo.la - -libmpeginfo_la_SOURCES = k3bmpeginfo.cpp - |