From bece9aa3ad05fe774bf89d9a840235ee8adfd4da Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:26:51 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/convert.cpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/convert.cpp') diff --git a/src/convert.cpp b/src/convert.cpp index 5b9b2b5..43e8c29 100755 --- a/src/convert.cpp +++ b/src/convert.cpp @@ -98,7 +98,7 @@ void Convert::get( ConvertItem* item ) logger->log( item->logID, "cp \"" + source.path() + "\" \"" + destination.path() + "\"" ); item->convertProcess->setPriority( config->data.general.priority ); - item->convertProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + item->convertProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); } else { item->moveJob = new KIO::FileCopyJob( source, destination, -1, false, true, false, false ); @@ -139,7 +139,7 @@ void Convert::getCorrection( ConvertItem* item ) logger->log( item->logID, "cp \"" + source.path() + "\" \"" + destination.path() + "\"" ); item->convertProcess->setPriority( config->data.general.priority ); - item->convertProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + item->convertProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); } else { item->moveJob = new KIO::FileCopyJob( source, destination, -1, false, true, false, false ); @@ -261,7 +261,7 @@ void Convert::rip( ConvertItem* item ) item->fileListItem->ripping = true; item->convertProcess->setPriority( config->data.general.priority ); - item->convertProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + item->convertProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); } } @@ -314,7 +314,7 @@ void Convert::decode( ConvertItem* item ) item->fileListItem->setText( fileList->columnByName(i18n("State")), i18n("Decoding")+"... 00 %" ); item->convertProcess->setPriority( config->data.general.priority ); - item->convertProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + item->convertProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); } void Convert::encode( ConvertItem* item ) @@ -420,7 +420,7 @@ void Convert::encode( ConvertItem* item ) //t_int -= t_int%plugin->enc.quality.step; sQuality = TQString::number( t_int ); } - if( plugin->enc.bin == "oggenc" ) sQuality.replace(TQChar('.'),KGlobal::locale()->decimalSymbol()); // HACK make oggenc usable with all langauges + if( plugin->enc.bin == "oggenc" ) sQuality.replace(TQChar('.'),TDEGlobal::locale()->decimalSymbol()); // HACK make oggenc usable with all langauges else if( plugin->enc.lossy.quality.separator != '.' ) sQuality.replace(TQChar('.'),plugin->enc.lossy.quality.separator); } else { @@ -555,7 +555,7 @@ void Convert::encode( ConvertItem* item ) item->fileListItem->setText( fileList->columnByName(i18n("State")), i18n("Encoding")+"... 00 %" ); item->convertProcess->setPriority( config->data.general.priority ); - item->convertProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + item->convertProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); } void Convert::replaygain( ConvertItem* item ) @@ -631,7 +631,7 @@ void Convert::put( ConvertItem* item ) logger->log( item->logID, "cp \"" + source.path() + "\" \"" + destination.path() + "\"" ); item->convertProcess->setPriority( config->data.general.priority ); - item->convertProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + item->convertProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); } else { item->moveJob = new KIO::FileCopyJob( source, destination, -1, false, false, false, false ); @@ -670,7 +670,7 @@ void Convert::putCorrection( ConvertItem* item ) logger->log( item->logID, "cp \"" + source.path() + "\" \"" + destination.path() + "\"" ); item->convertProcess->setPriority( config->data.general.priority ); - item->convertProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + item->convertProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); } else { item->moveJob = new KIO::FileCopyJob( source, destination, -1, false, false, false, false ); @@ -705,7 +705,7 @@ void Convert::executeUserScript( ConvertItem* item ) logger->log( item->logID, userscript + " \"" + source.path() + "\" \"" + destination.path() + "\"" ); item->convertProcess->setPriority( config->data.general.priority ); - item->convertProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + item->convertProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); } void Convert::executeNextStep( ConvertItem* item ) @@ -924,7 +924,7 @@ void Convert::moveFinished( KIO::Job* job ) } } -void Convert::processOutput( KProcess* proc, char* data, int ) +void Convert::processOutput( TDEProcess* proc, char* data, int ) { int iPercent = 0, iTime = 0, iPos = 0, iNum = 0; @@ -1083,7 +1083,7 @@ void Convert::processOutput( KProcess* proc, char* data, int ) } } -void Convert::processExit( KProcess* proc ) +void Convert::processExit( TDEProcess* proc ) { // search the item list for our item for( TQValueList::Iterator item = items.begin(); item != items.end(); item++ ) { @@ -1316,15 +1316,15 @@ void Convert::add( FileListItem* item ) (*newItem)->correctionOutputExtension = TQString()();*/ // connect convertProcess of our new item with the slots of Convert - (*newItem)->convertProcess = new KProcess(); - connect( (*newItem)->convertProcess, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this, TQT_SLOT(processOutput(KProcess*,char*,int)) + (*newItem)->convertProcess = new TDEProcess(); + connect( (*newItem)->convertProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQT_SLOT(processOutput(TDEProcess*,char*,int)) ); - connect( (*newItem)->convertProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(processOutput(KProcess*,char*,int)) + connect( (*newItem)->convertProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQT_SLOT(processOutput(TDEProcess*,char*,int)) ); - connect( (*newItem)->convertProcess, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(processExit(KProcess*)) + connect( (*newItem)->convertProcess, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(processExit(TDEProcess*)) ); // NOTE the tempInFile is also created if the file is a audio cd track @@ -1486,7 +1486,7 @@ void Convert::remove( ConvertItem* item, int state ) paramSplinter.replace( "%o", item->outputFilePathName ); notify << paramSplinter; } - notify.start( KProcess::DontCare ); + notify.start( TDEProcess::DontCare ); } item->fileListItem->converting = false; @@ -1592,7 +1592,7 @@ void Convert::updateProgressIndicator() // void Convert::priorityChanged( int priority ) // { // FIXME setting a higher priority does not work -// KProcess pChangePriority; +// TDEProcess pChangePriority; // // for( TQValueList::Iterator it = items.begin(); it != items.end(); it++ ) { // if( (*it)->convertProcess->isRunning() ) { @@ -1607,7 +1607,7 @@ void Convert::updateProgressIndicator() // pChangePriority << pid; // //TQString cmd; // //cmd.sprintf( "renice %i %i", ); -// pChangePriority.start( KProcess::Block ); +// pChangePriority.start( TDEProcess::Block ); // } // } // } -- cgit v1.2.1