diff options
Diffstat (limited to 'src/rip')
-rw-r--r-- | src/rip/k3bpatternparser.cpp | 4 | ||||
-rw-r--r-- | src/rip/k3bvideocdinfo.cpp | 14 | ||||
-rw-r--r-- | src/rip/k3bvideocdinfo.h | 6 | ||||
-rw-r--r-- | src/rip/k3bvideocdrip.cpp | 14 | ||||
-rw-r--r-- | src/rip/k3bvideocdrip.h | 6 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingdialog.cpp | 8 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingpreview.cpp | 10 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingpreview.h | 6 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp | 4 |
9 files changed, 36 insertions, 36 deletions
diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp index 0ab14d8..382c00d 100644 --- a/src/rip/k3bpatternparser.cpp +++ b/src/rip/k3bpatternparser.cpp @@ -171,7 +171,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, dir.append( s ); // I think it makes more sense to allow empty comments break; case DATE: - dir.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) ); + dir.append( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) ); break; default: dir.append( pattern.mid(i, len) ); @@ -247,7 +247,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, s = entry.cdExtInfo; break; case DATE: - s = KGlobal::locale()->formatDate( TQDate::currentDate() ); + s = TDEGlobal::locale()->formatDate( TQDate::currentDate() ); break; default: // we must never get here, break; // all choices should be covered diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp index ace8fb2..af29a37 100644 --- a/src/rip/k3bvideocdinfo.cpp +++ b/src/rip/k3bvideocdinfo.cpp @@ -67,21 +67,21 @@ void K3bVideoCdInfo::info( const TQString& device ) *m_process << "-q" << "--norip" << "-i" << device << "-o" << "-"; - connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), - this, TQT_SLOT( slotParseOutput( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, TQT_SLOT( slotParseOutput( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), + connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQT_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQT_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotInfoFinished() ) ); - if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { + if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { kdDebug() << "(K3bVideoCdInfo::info) could not start vcdxrip" << endl; cancelAll(); emit infoFinished( false ); } } -void K3bVideoCdInfo::slotParseOutput( KProcess*, char* output, int len ) +void K3bVideoCdInfo::slotParseOutput( TDEProcess*, char* output, int len ) { TQString buffer = TQString::fromLocal8Bit( output, len ); diff --git a/src/rip/k3bvideocdinfo.h b/src/rip/k3bvideocdinfo.h index 683a515..d6efd0a 100644 --- a/src/rip/k3bvideocdinfo.h +++ b/src/rip/k3bvideocdinfo.h @@ -24,7 +24,7 @@ #include <k3btoc.h> #include <k3bcore.h> -class KProcess; +class TDEProcess; class K3bVideoCdInfoResultEntry { @@ -90,7 +90,7 @@ class K3bVideoCdInfo : public TQObject private slots: void slotInfoFinished(); - void slotParseOutput( KProcess*, char* output, int len ); + void slotParseOutput( TDEProcess*, char* output, int len ); private: void cancelAll(); @@ -98,7 +98,7 @@ class K3bVideoCdInfo : public TQObject K3bVideoCdInfoResult m_Result; void parseXmlData(); - KProcess* m_process; + TDEProcess* m_process; TQString m_xmlData; bool m_isXml; diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp index be91fa9..7df8305 100644 --- a/src/rip/k3bvideocdrip.cpp +++ b/src/rip/k3bvideocdrip.cpp @@ -150,11 +150,11 @@ void K3bVideoCdRip::vcdxRip() *m_process << "-o" << "/dev/null"; - connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdXRipOutput( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdXRipOutput( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), + connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQT_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQT_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotVcdXRipFinished() ) ); m_process->setWorkingDirectory( TQUrl( m_videooptions ->getVideoCdDestination() ).dirPath() ); @@ -174,7 +174,7 @@ void K3bVideoCdRip::vcdxRip() emit infoMessage( i18n( "Start extracting." ), K3bJob::INFO ); emit infoMessage( i18n( "Extract files from %1 to %2." ).arg( m_videooptions ->getVideoCdSource() ).arg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO ); - if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { + if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { kdDebug() << "(K3bVideoCdRip) could not start vcdxrip" << endl; emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxrip" ), K3bJob::ERROR ); cancelAll(); @@ -182,7 +182,7 @@ void K3bVideoCdRip::vcdxRip() } } -void K3bVideoCdRip::slotParseVcdXRipOutput( KProcess*, char* output, int len ) +void K3bVideoCdRip::slotParseVcdXRipOutput( TDEProcess*, char* output, int len ) { TQString buffer = TQString::fromLocal8Bit( output, len ); diff --git a/src/rip/k3bvideocdrip.h b/src/rip/k3bvideocdrip.h index 21aade0..a6d4582 100644 --- a/src/rip/k3bvideocdrip.h +++ b/src/rip/k3bvideocdrip.h @@ -21,7 +21,7 @@ #include "k3bvideocdrippingoptions.h" class TQString; -class KProcess; +class TDEProcess; class TQDataStream; class K3bVideoCdRip : public K3bJob @@ -47,7 +47,7 @@ class K3bVideoCdRip : public K3bJob protected slots: void slotVcdXRipFinished(); - void slotParseVcdXRipOutput( KProcess*, char* output, int len ); + void slotParseVcdXRipOutput( TDEProcess*, char* output, int len ); private: void vcdxRip(); @@ -68,7 +68,7 @@ class K3bVideoCdRip : public K3bJob bool m_canceled; - KProcess* m_process; + TDEProcess* m_process; }; diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index 95093de..3ba01b4 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -212,7 +212,7 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles // ri.audioStream = 0; for( unsigned int i = 0; i < m_dvd[*it-1].numAudioStreams(); ++i ) { - if( m_dvd[*it-1].audioStream(i).langCode() == KGlobal::locale()->language() && + if( m_dvd[*it-1].audioStream(i).langCode() == TDEGlobal::locale()->language() && m_dvd[*it-1].audioStream(i).format() != K3bVideoDVD::AUDIO_FORMAT_DTS ) { ri.audioStream = i; break; @@ -226,7 +226,7 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles .arg( m_dvd[*it-1].audioStream(i).channels() ) .arg( m_dvd[*it-1].audioStream(i).langCode().isEmpty() ? i18n("unknown language") - : KGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) ) + : TDEGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) ) .arg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() ) : TQString() ); @@ -436,7 +436,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob:: break; case PATTERN_LANGUAGE_NAME: if( title.numAudioStreams() > 0 ) - f.append( KGlobal::locale()->twoAlphaToLanguageName( title.audioStream( info.audioStream ).langCode() ) ); + f.append( TDEGlobal::locale()->twoAlphaToLanguageName( title.audioStream( info.audioStream ).langCode() ) ); break; case PATTERN_AUDIO_FORMAT: // FIXME: what about MPEG audio streams? @@ -471,7 +471,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob:: f.append( "16:9" ); break; case PATTERN_CURRENT_DATE: - f.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) ); + f.append( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) ); break; default: f.append( pattern[i-1] ); diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp index 2081d32..2f2b38e 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp @@ -74,7 +74,7 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv m_tempDir = new KTempDir(); m_tempDir->setAutoDelete( true ); - m_process = new KProcess(); + m_process = new TDEProcess(); *m_process << bin->path; *m_process << "-i" << dvd.device()->blockDeviceName(); *m_process << "-T" << TQString("%1,%2").arg(title).arg(chapter); @@ -85,9 +85,9 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv *m_process << "-Z" << "x200"; *m_process << "-o" << m_tempDir->name(); - connect( m_process, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotTranscodeFinished(KProcess*)) ); - if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { // we use AllOutput to not pollute stdout + connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotTranscodeFinished(TDEProcess*)) ); + if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { // we use AllOutput to not pollute stdout // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bVideoDVDRippingPreview) Could not start transcode." << endl; @@ -109,7 +109,7 @@ void K3bVideoDVDRippingPreview::cancel() } -void K3bVideoDVDRippingPreview::slotTranscodeFinished( KProcess* ) +void K3bVideoDVDRippingPreview::slotTranscodeFinished( TDEProcess* ) { // read the image TQString filename = m_tempDir->name() + "000000.ppm";// + tempTQDir->entryList( TQDir::Files ).first(); diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.h b/src/rip/videodvd/k3bvideodvdrippingpreview.h index 7459ae8..92706dc 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.h +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.h @@ -23,7 +23,7 @@ class KTempDir; -class KProcess; +class TDEProcess; class K3bVideoDVDRippingPreview : public TQObject { @@ -51,12 +51,12 @@ class K3bVideoDVDRippingPreview : public TQObject void previewDone( bool ); private slots: - void slotTranscodeFinished( KProcess* ); + void slotTranscodeFinished( TDEProcess* ); private: TQImage m_preview; KTempDir* m_tempDir; - KProcess* m_process; + TDEProcess* m_process; int m_title; int m_chapter; K3bVideoDVD::VideoDVD m_dvd; diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp index d3f1e72..4d03c64 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp @@ -49,7 +49,7 @@ static TQString audioStreamString( const K3bVideoDVD::Title& title, unsigned int .arg( title.audioStream(i).channels() ) .arg( title.audioStream(i).langCode().isEmpty() ? i18n("unknown language") - : KGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) ) + : TDEGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) ) .arg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() ) : TQString() ); @@ -74,7 +74,7 @@ static TQString subpictureStreamString( const K3bVideoDVD::Title& title, unsigne : i18n("Extended") ) .arg( title.subPictureStream(i).langCode().isEmpty() ? i18n("unknown language") - : KGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) ) + : TDEGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) ) .arg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED ? TQString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() ) : TQString() ); |