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 ++++++++++++++++---------------- src/convert.h | 10 ++++---- src/filelist.cpp | 2 +- src/options.cpp | 4 +-- src/optionsdetailed.cpp | 2 +- src/outputdirectory.cpp | 2 +- src/outputdirectory.h | 2 +- src/pluginloader/convertpluginloader.cpp | 2 +- src/pluginloader/formatinfoloader.cpp | 2 +- src/replaygain.cpp | 4 +-- src/replaygain.h | 6 ++--- src/replaygainfilelist.cpp | 20 +++++++-------- src/replaygainfilelist.h | 8 +++--- src/soundkonverter.cpp | 4 +-- 14 files changed, 55 insertions(+), 55 deletions(-) (limited to 'src') 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 ); // } // } // } diff --git a/src/convert.h b/src/convert.h index b880ab2..013b160 100755 --- a/src/convert.h +++ b/src/convert.h @@ -18,7 +18,7 @@ class FileListItem; class ReplayGain; class Logger; class KTempFile; -//class KProcess; +//class TDEProcess; /** * @short The items for the conversion (for every active file) @@ -67,7 +67,7 @@ public: ReplayGain* replayGain; /** if we need to encode, decode, etc. here we have our processes */ - KProcess* convertProcess; + TDEProcess* convertProcess; /** for moving the file to the temporary or output directory */ KIO::Job* moveJob; @@ -206,7 +206,7 @@ private: FileList* fileList; Logger* logger; TQTimer* tUpdateProgressIndicator; - KProcess notify; + TDEProcess notify; private slots: /** @@ -227,13 +227,13 @@ private slots: * @p data The output data * @p length The length of the data */ - void processOutput( KProcess *proc, char *data, int length ); + void processOutput( TDEProcess *proc, char *data, int length ); /** * The process has exited * @p proc The pinter to the progess */ - void processExit( KProcess *proc ); + void processExit( TDEProcess *proc ); /** * Updates the progress indicator diff --git a/src/filelist.cpp b/src/filelist.cpp index 60ddcbc..b4faa99 100755 --- a/src/filelist.cpp +++ b/src/filelist.cpp @@ -1369,7 +1369,7 @@ TQString FileList::debug_params( ConversionOptions conversionOptions, FormatItem //t_int -= t_int%plugin->enc.quality.step; sQuality = TQString::number( t_int ); } - if( plugin->enc.bin == "oggenc" ) sQuality.replace(TQChar('.'),KGlobal::locale()->decimalSymbol()); + if( plugin->enc.bin == "oggenc" ) sQuality.replace(TQChar('.'),TDEGlobal::locale()->decimalSymbol()); else if( plugin->enc.lossy.quality.separator != '.' ) sQuality.replace(TQChar('.'),plugin->enc.lossy.quality.separator); } else { diff --git a/src/options.cpp b/src/options.cpp index 4f9e881..726d1fd 100755 --- a/src/options.cpp +++ b/src/options.cpp @@ -113,7 +113,7 @@ Options::Options( Config* _config, const TQString &text, TQWidget *parent, const optionsBox->addStretch(); // pPluginsNotify = new KPushButton( "", this, "pPluginsNotify"); -// pPluginsNotify->setPixmap( KGlobal::iconLoader()->loadIcon("connect_creating",KIcon::Toolbar) ); +// pPluginsNotify->setPixmap( TDEGlobal::iconLoader()->loadIcon("connect_creating",KIcon::Toolbar) ); // TQToolTip::add( pPluginsNotify, i18n("There are new plugin updates available.\nClick on this button in order to open the configuration dialog.") ); // pPluginsNotify->hide(); // pPluginsNotify->setPaletteBackgroundColor( TQColor(255,220,247) ); @@ -123,7 +123,7 @@ Options::Options( Config* _config, const TQString &text, TQWidget *parent, const // ); pBackendsNotify = new KPushButton( "", this, "pBackendsNotify"); - pBackendsNotify->setPixmap( KGlobal::iconLoader()->loadIcon("kcmsystem",KIcon::Toolbar) ); + pBackendsNotify->setPixmap( TDEGlobal::iconLoader()->loadIcon("kcmsystem",KIcon::Toolbar) ); TQToolTip::add( pBackendsNotify, i18n("soundKonverter either found new backends or misses some.\nClick on this button in order to open the configuration dialog.") ); pBackendsNotify->setShown( config->backendsChanged ); config->backendsChanged = false; diff --git a/src/optionsdetailed.cpp b/src/optionsdetailed.cpp index f959600..efb5af9 100755 --- a/src/optionsdetailed.cpp +++ b/src/optionsdetailed.cpp @@ -675,7 +675,7 @@ void OptionsDetailed::qualityChanged() // t_int = ( (100 - item->fileListItem->options.encodingOptions.iQuality) * (int)( plugin->enc.lossy.quality.range_min - plugin->enc.lossy.quality.range_max ) / 100) + (int)plugin->enc.lossy.quality.range_max; quality.replace( "%q", TQString::number( ( (100 - qualityLevel) * (int)( plugin->enc.lossy.quality.range_min - plugin->enc.lossy.quality.range_max ) / 100) + (int)plugin->enc.lossy.quality.range_max ) ); } - if( plugin->enc.bin == "oggenc" ) quality.replace(TQChar('.'),KGlobal::locale()->decimalSymbol()); // HACK make oggenc usable with all langauges + if( plugin->enc.bin == "oggenc" ) quality.replace(TQChar('.'),TDEGlobal::locale()->decimalSymbol()); // HACK make oggenc usable with all langauges else if( plugin->enc.lossy.quality.separator != '.' ) { quality.replace( TQChar('.'), plugin->enc.lossy.quality.separator ); } diff --git a/src/outputdirectory.cpp b/src/outputdirectory.cpp index 8c5479e..3119849 100755 --- a/src/outputdirectory.cpp +++ b/src/outputdirectory.cpp @@ -419,7 +419,7 @@ void OutputDirectory::gotoDir() kfm << "kfmclient"; kfm << "openURL"; kfm << startDir; - kfm.start( KProcess::DontCare ); + kfm.start( TDEProcess::DontCare ); } void OutputDirectory::modeChangedSlot( int mode ) diff --git a/src/outputdirectory.h b/src/outputdirectory.h index 9c25d59..dfe391b 100755 --- a/src/outputdirectory.h +++ b/src/outputdirectory.h @@ -77,7 +77,7 @@ private: bool modeJustChanged; - KProcess kfm; + TDEProcess kfm; Config* config; diff --git a/src/pluginloader/convertpluginloader.cpp b/src/pluginloader/convertpluginloader.cpp index 0631c19..0b4bd65 100755 --- a/src/pluginloader/convertpluginloader.cpp +++ b/src/pluginloader/convertpluginloader.cpp @@ -66,7 +66,7 @@ ConvertPlugin* ConvertPluginLoader::loadFile( TQString fileName ) } opmlFile.close(); - TQString language = KGlobal::locale()->languagesTwoAlpha().first(); + TQString language = TDEGlobal::locale()->languagesTwoAlpha().first(); TQDomElement root = domTree.documentElement(); if( root.attribute("type") != "converter" ) return plugin; diff --git a/src/pluginloader/formatinfoloader.cpp b/src/pluginloader/formatinfoloader.cpp index 8a559bb..c056037 100755 --- a/src/pluginloader/formatinfoloader.cpp +++ b/src/pluginloader/formatinfoloader.cpp @@ -54,7 +54,7 @@ FormatInfo* FormatInfoLoader::loadFile( TQString fileName ) } opmlFile.close(); - TQString language = KGlobal::locale()->languagesTwoAlpha().first(); + TQString language = TDEGlobal::locale()->languagesTwoAlpha().first(); TQDomElement root = domTree.documentElement(); if( root.attribute("type") != "format_info" ) return plugin; diff --git a/src/replaygain.cpp b/src/replaygain.cpp index 64ca44d..2f897dc 100755 --- a/src/replaygain.cpp +++ b/src/replaygain.cpp @@ -19,7 +19,7 @@ ReplayGain::ReplayGain( Config* _config, Logger* _logger ) ReplayGain::~ReplayGain() {} -bool ReplayGain::apply( TQStringList files, const TQString& format, KProcess* proc, int logID, Mode mode ) +bool ReplayGain::apply( TQStringList files, const TQString& format, TDEProcess* proc, int logID, Mode mode ) { TQStringList params; TQString param, paramSplinter; @@ -88,7 +88,7 @@ bool ReplayGain::apply( TQStringList files, const TQString& format, KProcess* pr logger->log( logID, " " + i18n("Executing") + ": `" + param + "'" ); proc->setPriority( config->data.general.priority ); - proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); return true; } diff --git a/src/replaygain.h b/src/replaygain.h index d844ae7..53fd6e8 100755 --- a/src/replaygain.h +++ b/src/replaygain.h @@ -8,7 +8,7 @@ class Config; class Logger; -class KProcess; +class TDEProcess; /** * @short Starts a process to add/remove Replay Gain tags to/from a given file @@ -41,10 +41,10 @@ public: * Add/remove Replay Gain * @param files a list of files (of the same format) * @param format the format of the file/files (extension or mime type) - * @param prc a pointer to a KProcess + * @param prc a pointer to a TDEProcess * @param remove if true the Replay Gain tags are being removed, if false (default) the tags are calculated and added */ - bool apply( TQStringList files, const TQString& format, KProcess* proc, int logID, Mode mode = Mode(calc_track|calc_album) ); // NOTE const TQStringList& ? + bool apply( TQStringList files, const TQString& format, TDEProcess* proc, int logID, Mode mode = Mode(calc_track|calc_album) ); // NOTE const TQStringList& ? /* * Returns the track and the album gain (in this order) of the @p file diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp index 7d573d3..145591a 100755 --- a/src/replaygainfilelist.cpp +++ b/src/replaygainfilelist.cpp @@ -126,7 +126,7 @@ void ReplayGainFileListItem::setType( Type type ) if( type == Album ) { setOpen( true ); - setPixmap( 0, KGlobal::iconLoader()->loadIcon("cdrom_unmount",KIcon::Small) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon("cdrom_unmount",KIcon::Small) ); } } @@ -236,15 +236,15 @@ ReplayGainFileList::ReplayGainFileList( TagEngine* _tagEngine, Config* _config, TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ) ); - process = new KProcess(); - connect( process, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - TQT_TQOBJECT(this), TQT_SLOT(processOutput(KProcess*,char*,int)) + process = new TDEProcess(); + connect( process, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQT_TQOBJECT(this), TQT_SLOT(processOutput(TDEProcess*,char*,int)) ); - connect( process, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - TQT_TQOBJECT(this), TQT_SLOT(processOutput(KProcess*,char*,int)) + connect( process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQT_TQOBJECT(this), TQT_SLOT(processOutput(TDEProcess*,char*,int)) ); - connect( process, TQT_SIGNAL(processExited(KProcess*)), - TQT_TQOBJECT(this), TQT_SLOT(processExit(KProcess*)) + connect( process, TQT_SIGNAL(processExited(TDEProcess*)), + TQT_TQOBJECT(this), TQT_SLOT(processExit(TDEProcess*)) ); tUpdateProgress = new TQTimer( this, "tUpdateProgress" ); @@ -1129,7 +1129,7 @@ void ReplayGainFileList::processNextFile() emit processStopped(); } -void ReplayGainFileList::processOutput( KProcess* proc, char* data, int ) +void ReplayGainFileList::processOutput( TDEProcess* proc, char* data, int ) { int iPercent = 0, iTime = 0, iPos = 0, iNum = 0; @@ -1192,7 +1192,7 @@ void ReplayGainFileList::processOutput( KProcess* proc, char* data, int ) } } -void ReplayGainFileList::processExit( KProcess* proc ) +void ReplayGainFileList::processExit( TDEProcess* proc ) { logger->processCompleted( logID, ( proc->signalled() ) ? -1 : 0 ); diff --git a/src/replaygainfilelist.h b/src/replaygainfilelist.h index d09873d..0813663 100755 --- a/src/replaygainfilelist.h +++ b/src/replaygainfilelist.h @@ -20,7 +20,7 @@ class KProgress; class KPopupMenu; class KAction; class KActionCollection; -class KProcess; +class TDEProcess; // FIXME differ diffrent sampling rates, too! @@ -155,7 +155,7 @@ private: Config* config; Logger* logger; - KProcess* process; + TDEProcess* process; ReplayGain* replayGain; int logID; @@ -226,8 +226,8 @@ private slots: void slotDropped( TQDropEvent*, TQListViewItem*, TQListViewItem* ); // NOTE rename? - void processOutput( KProcess*, char*, int ); - void processExit( KProcess* ); + void processOutput( TDEProcess*, char*, int ); + void processExit( TDEProcess* ); signals: //void calcGain(); diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp index 61e3561..ca54232 100755 --- a/src/soundkonverter.cpp +++ b/src/soundkonverter.cpp @@ -86,9 +86,9 @@ soundKonverter::soundKonverter() // if( ret == KMessageBox::Yes ) { // config->write(); // // TODO parameters are lost -// KProcess restart; +// TDEProcess restart; // restart << "soundkonverter"; -// restart.start( KProcess::DontCare ); +// restart.start( TDEProcess::DontCare ); // kapp->quit(); // return; // } -- cgit v1.2.3