TDE
/
soundkonverter
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/soundkonverter
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 546e1d8959
commit 6afce6c4bc
16 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File

4
src/cddb.cpp
Unescape View File

@ -377,7 +377,7 @@ CDDB::parse_read_resp(TQTextStream *stream, TQTextStream *write_stream)
for (int i = 0; i < m_tracks; i++) for (int i = 0; i < m_tracks; i++)
{ {
if (m_names[i].isEmpty()) if (m_names[i].isEmpty())
m_names[i] += i18n("Track %1").tqarg(i); m_names[i] += i18n("Track %1").arg(i);
//m_names[i].replace(TQRegExp("/"), "%2f"); //m_names[i].replace(TQRegExp("/"), "%2f");
si = m_names[i].find(" - "); si = m_names[i].find(" - ");
if (si < 0) if (si < 0)
@ -423,7 +423,7 @@ CDDB::searchLocal(unsigned int id, TQFile *ret_file)
{ {
TQDir dir; TQDir dir;
TQString filename; TQString filename;
filename = TQString("%1").tqarg(id, 0, 16).rightJustify(8, '0'); filename = TQString("%1").arg(id, 0, 16).rightJustify(8, '0');
TQStringList::ConstIterator it; TQStringList::ConstIterator it;
for (it = cddb_dirs.begin(); it != cddb_dirs.end(); ++it) for (it = cddb_dirs.begin(); it != cddb_dirs.end(); ++it)
{ {

6
src/configpluginspage.cpp
Unescape View File

@ -207,19 +207,19 @@ void ConfigPluginsPage::refreshPlugins()
TQValueList<ConvertPlugin*> converters = config->allConverters(); TQValueList<ConvertPlugin*> converters = config->allConverters();
for( TQValueList<ConvertPlugin*>::Iterator it = converters.begin(); it != converters.end(); ++it ) { for( TQValueList<ConvertPlugin*>::Iterator it = converters.begin(); it != converters.end(); ++it ) {
lPlugins->insertItem( (*it)->info.name + " v. " + TQString::number((*it)->info.version) ); lPlugins->insertItem( (*it)->info.name + " v. " + TQString::number((*it)->info.version) );
//lPlugins->insertItem( i18n("%1, Version: %2").tqarg((*it)->info.name).tqarg((*it)->info.version) ); //lPlugins->insertItem( i18n("%1, Version: %2").arg((*it)->info.name).arg((*it)->info.version) );
} }
TQValueList<ReplayGainPlugin*> replaygains = config->allReplayGains(); TQValueList<ReplayGainPlugin*> replaygains = config->allReplayGains();
for( TQValueList<ReplayGainPlugin*>::Iterator it = replaygains.begin(); it != replaygains.end(); ++it ) { for( TQValueList<ReplayGainPlugin*>::Iterator it = replaygains.begin(); it != replaygains.end(); ++it ) {
lPlugins->insertItem( (*it)->info.name + " v. " + TQString::number((*it)->info.version) ); lPlugins->insertItem( (*it)->info.name + " v. " + TQString::number((*it)->info.version) );
//lPlugins->insertItem( i18n("%1, Version: %2").tqarg((*it)->info.name).tqarg((*it)->info.version) ); //lPlugins->insertItem( i18n("%1, Version: %2").arg((*it)->info.name).arg((*it)->info.version) );
} }
TQValueList<RipperPlugin*> rippers = config->allRippers(); TQValueList<RipperPlugin*> rippers = config->allRippers();
for( TQValueList<RipperPlugin*>::Iterator it = rippers.begin(); it != rippers.end(); ++it ) { for( TQValueList<RipperPlugin*>::Iterator it = rippers.begin(); it != rippers.end(); ++it ) {
lPlugins->insertItem( (*it)->info.name + " v. " + TQString::number((*it)->info.version) ); lPlugins->insertItem( (*it)->info.name + " v. " + TQString::number((*it)->info.version) );
//lPlugins->insertItem( i18n("%1, Version: %2").tqarg((*it)->info.name).tqarg((*it)->info.version) ); //lPlugins->insertItem( i18n("%1, Version: %2").arg((*it)->info.name).arg((*it)->info.version) );
} }
} }

20
src/convert.cpp
Unescape View File

@ -161,12 +161,12 @@ void Convert::rip( ConvertItem* item )
TQString wavFile; TQString wavFile;
TQString args = job->device; TQString args = job->device;
if(!args.isEmpty()) if(!args.isEmpty())
args = TQString("?device=%1").tqarg(args); args = TQString("?device=%1").arg(args);
args = args+"&fileNameTemplate=Track %{number}"; args = args+"&fileNameTemplate=Track %{number}";
if(job->track < 10) if(job->track < 10)
wavFile = TQString("audiocd:/Wav/Track 0%1.wav%2").tqarg(job->track).tqarg(args); wavFile = TQString("audiocd:/Wav/Track 0%1.wav%2").arg(job->track).arg(args);
else else
wavFile = TQString("audiocd:/Wav/Track %1.wav%2").tqarg(job->track).tqarg(args); wavFile = TQString("audiocd:/Wav/Track %1.wav%2").arg(job->track).arg(args);
*/ */
RipperPlugin* plugin = config->getCurrentRipper(); RipperPlugin* plugin = config->getCurrentRipper();
@ -888,7 +888,7 @@ void Convert::moveFinished( KIO::Job* job )
} }
else if( (*item)->state == ConvertItem::put ) { else if( (*item)->state == ConvertItem::put ) {
if( job->error() != 0 ) { if( job->error() != 0 ) {
logger->log( (*item)->logID, i18n("Could not write to file: `%1'").tqarg(OutputDirectory::calcPath((*item)->fileListItem,config)) ); logger->log( (*item)->logID, i18n("Could not write to file: `%1'").arg(OutputDirectory::calcPath((*item)->fileListItem,config)) );
emit uncountTime( (*item)->getTime ); emit uncountTime( (*item)->getTime );
emit uncountTime( (*item)->getCorrectionTime ); emit uncountTime( (*item)->getCorrectionTime );
emit uncountTime( (*item)->ripTime ); emit uncountTime( (*item)->ripTime );
@ -1201,7 +1201,7 @@ void Convert::processExit( KProcess* proc )
} }
if( (*item)->state == ConvertItem::put ) { if( (*item)->state == ConvertItem::put ) {
if( proc->signalled() ) { if( proc->signalled() ) {
logger->log( (*item)->logID, i18n("Could not write to file: `%1'").tqarg(OutputDirectory::calcPath((*item)->fileListItem,config)) ); logger->log( (*item)->logID, i18n("Could not write to file: `%1'").arg(OutputDirectory::calcPath((*item)->fileListItem,config)) );
emit uncountTime( (*item)->getTime ); emit uncountTime( (*item)->getTime );
emit uncountTime( (*item)->getCorrectionTime ); emit uncountTime( (*item)->getCorrectionTime );
emit uncountTime( (*item)->ripTime ); emit uncountTime( (*item)->ripTime );
@ -1213,7 +1213,7 @@ void Convert::processExit( KProcess* proc )
return; return;
} }
if( !proc->normalExit() ) { if( !proc->normalExit() ) {
logger->log( (*item)->logID, i18n("Could not write to file: `%1'").tqarg(OutputDirectory::calcPath((*item)->fileListItem,config)) ); logger->log( (*item)->logID, i18n("Could not write to file: `%1'").arg(OutputDirectory::calcPath((*item)->fileListItem,config)) );
emit uncountTime( (*item)->getTime ); emit uncountTime( (*item)->getTime );
emit uncountTime( (*item)->getCorrectionTime ); emit uncountTime( (*item)->getCorrectionTime );
emit uncountTime( (*item)->ripTime ); emit uncountTime( (*item)->ripTime );
@ -1289,14 +1289,14 @@ void Convert::processExit( KProcess* proc )
void Convert::add( FileListItem* item ) void Convert::add( FileListItem* item )
{ {
logger->log( 1000, i18n("Adding new item to conversion list: `%1'").tqarg(item->options.filePathName) ); logger->log( 1000, i18n("Adding new item to conversion list: `%1'").arg(item->options.filePathName) );
// append the item to the item list and store the iterator // append the item to the item list and store the iterator
TQValueList<ConvertItem*>::Iterator newItem = items.append( new ConvertItem( item ) ); TQValueList<ConvertItem*>::Iterator newItem = items.append( new ConvertItem( item ) );
// register at the logger // register at the logger
(*newItem)->logID = logger->registerProcess( item->options.filePathName ); (*newItem)->logID = logger->registerProcess( item->options.filePathName );
logger->log( 1000, " " + i18n("Got log ID: %1").tqarg((*newItem)->logID) ); logger->log( 1000, " " + i18n("Got log ID: %1").arg((*newItem)->logID) );
logger->log( (*newItem)->logID, "Mime Type: " + (*newItem)->fileListItem->mimeType ); logger->log( (*newItem)->logID, "Mime Type: " + (*newItem)->fileListItem->mimeType );
if( (*newItem)->fileListItem->tags ) logger->log( (*newItem)->logID, i18n("Tags successfully read") ); if( (*newItem)->fileListItem->tags ) logger->log( (*newItem)->logID, i18n("Tags successfully read") );
@ -1465,14 +1465,14 @@ void Convert::remove( ConvertItem* item, int state )
//emit uncountTime( item->getTime + item->getCorrectionTime + item->ripTime + //emit uncountTime( item->getTime + item->getCorrectionTime + item->ripTime +
// item->decodeTime + item->encodeTime + item->replaygainTime ); // item->decodeTime + item->encodeTime + item->replaygainTime );
logger->log( item->logID, i18n("Removing file from conversion list. Exit code %1").tqarg(state) ); logger->log( item->logID, i18n("Removing file from conversion list. Exit code %1").arg(state) );
if( item->fileListItem->notify != "" ) { if( item->fileListItem->notify != "" ) {
TQString command = item->fileListItem->notify; TQString command = item->fileListItem->notify;
command.replace( "%u", item->fileListItem->url ); command.replace( "%u", item->fileListItem->url );
command.replace( "%i", item->fileListItem->options.filePathName.replace(" ","%20") ); command.replace( "%i", item->fileListItem->options.filePathName.replace(" ","%20") );
command.replace( "%o", item->outputFilePathName.replace(" ","%20") ); command.replace( "%o", item->outputFilePathName.replace(" ","%20") );
logger->log( item->logID, " "+i18n("Executing command: \"%1\"").tqarg(command) ); logger->log( item->logID, " "+i18n("Executing command: \"%1\"").arg(command) );
notify.clearArguments(); notify.clearArguments();
TQString paramSplinter; TQString paramSplinter;
// FIXME split correct (strings with spaces are splited by mistake) // FIXME split correct (strings with spaces are splited by mistake)

26
src/filelist.cpp
Unescape View File

@ -59,7 +59,7 @@ FileListItem::FileListItem( KListView* parent )
FileListItem::~FileListItem() FileListItem::~FileListItem()
{} {}
void FileListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) void FileListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
{ {
// NOTE speed up this function // NOTE speed up this function
// NOTE calculate the red color // NOTE calculate the red color
@ -72,14 +72,14 @@ void FileListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
int margin = listView()->itemMargin(); int margin = listView()->itemMargin();
int w = width - 2*margin; int w = width - 2*margin;
int h = height(); int h = height();
TQRect textRect = p->boundingRect( margin, 0, w, h, tqalignment, text(column) ); TQRect textRect = p->boundingRect( margin, 0, w, h, alignment, text(column) );
if( textRect.width() > w ) { if( textRect.width() > w ) {
tqalignment = TQt::AlignRight | TQt::SingleLine; alignment = TQt::AlignRight | TQt::SingleLine;
} }
/*if ( textRect.width() <= w ) { /*if ( textRect.width() <= w ) {
p->drawText( margin, 0, w, h, tqalignment | TQt::SingleLine | TQt::ExpandTabs, text(column), -1 ); p->drawText( margin, 0, w, h, alignment | TQt::SingleLine | TQt::ExpandTabs, text(column), -1 );
} }
else { else {
textRect = p->boundingRect( margin, 0, w, h, TQt::AlignLeft, "... " ); textRect = p->boundingRect( margin, 0, w, h, TQt::AlignLeft, "... " );
@ -90,21 +90,21 @@ void FileListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
if( isSelected() && converting ) { if( isSelected() && converting ) {
_cg.setColor( TQColorGroup::Highlight, TQColor( 215, 62, 62 ) ); _cg.setColor( TQColorGroup::Highlight, TQColor( 215, 62, 62 ) );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
else if( converting && column != listView()->sortColumn() ) { else if( converting && column != listView()->sortColumn() ) {
_cg.setColor( TQColorGroup::Base, TQColor( 255, 234, 234 ) ); _cg.setColor( TQColorGroup::Base, TQColor( 255, 234, 234 ) );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
else if( converting && column == listView()->sortColumn() ) { else if( converting && column == listView()->sortColumn() ) {
_cg.setColor( TQColorGroup::Base, TQColor( 247, 227, 227 ) ); _cg.setColor( TQColorGroup::Base, TQColor( 247, 227, 227 ) );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
KListViewItem::paintCell( p, _cg, column, width, tqalignment ); KListViewItem::paintCell( p, _cg, column, width, alignment );
} }
/*void FileListItem::updateOutputCell() /*void FileListItem::updateOutputCell()
@ -587,7 +587,7 @@ void FileList::addTracks( const TQString& device, TQValueList<int> trackList )
// if( newItem->options.outputOptions.mode != OutputDirectory::Specify ) newItem->options.outputOptions.mode = OutputDirectory::MetaData; // if( newItem->options.outputOptions.mode != OutputDirectory::Specify ) newItem->options.outputOptions.mode = OutputDirectory::MetaData;
newItem->notify = notify; newItem->notify = notify;
newItem->track = (*it); newItem->track = (*it);
newItem->fileName = i18n("Audio CD (%1)").tqarg(device) + ": " + i18n("Track") + TQString().sprintf(" %02i",newItem->track); newItem->fileName = i18n("Audio CD (%1)").arg(device) + ": " + i18n("Track") + TQString().sprintf(" %02i",newItem->track);
newItem->mimeType = "application/x-cda"; newItem->mimeType = "application/x-cda";
newItem->fileFormat = "cda"; newItem->fileFormat = "cda";
newItem->local = true; newItem->local = true;
@ -602,7 +602,7 @@ void FileList::addTracks( const TQString& device, TQValueList<int> trackList )
// logger->log( 1000, " " + i18n("Tags successfully read") ); // logger->log( 1000, " " + i18n("Tags successfully read") );
newItem->time = newItem->tags->length; newItem->time = newItem->tags->length;
newItem->options.filePathName = TQDir::homeDirPath() + "/" + TQString().sprintf("%02i - ",newItem->track) + newItem->tags->title + "." + newItem->fileFormat; newItem->options.filePathName = TQDir::homeDirPath() + "/" + TQString().sprintf("%02i - ",newItem->track) + newItem->tags->title + "." + newItem->fileFormat;
newItem->fileName = i18n("Audio CD (%1)").tqarg(device) + ": " + TQString().sprintf("%02i - ",newItem->track) + newItem->tags->title; newItem->fileName = i18n("Audio CD (%1)").arg(device) + ": " + TQString().sprintf("%02i - ",newItem->track) + newItem->tags->title;
} }
updateItem( newItem ); updateItem( newItem );
emit increaseTime( newItem->time ); emit increaseTime( newItem->time );
@ -612,13 +612,13 @@ void FileList::addTracks( const TQString& device, TQValueList<int> trackList )
void FileList::addDisc( const TQString& device ) void FileList::addDisc( const TQString& device )
{ {
// logger->log( 1000, i18n("Adding full audio CD (%1)").tqarg(device) ); // logger->log( 1000, i18n("Adding full audio CD (%1)").arg(device) );
FileListItem* newItem = new FileListItem( this, lastItem() ); FileListItem* newItem = new FileListItem( this, lastItem() );
newItem->options = options->getCurrentOptions(); newItem->options = options->getCurrentOptions();
// if( newItem->options.outputOptions.mode != OutputDirectory::Specify ) newItem->options.outputOptions.mode = OutputDirectory::MetaData; // if( newItem->options.outputOptions.mode != OutputDirectory::Specify ) newItem->options.outputOptions.mode = OutputDirectory::MetaData;
newItem->notify = notify; newItem->notify = notify;
newItem->track = 0; newItem->track = 0;
newItem->fileName = i18n("Full audio CD (%1)").tqarg(device); newItem->fileName = i18n("Full audio CD (%1)").arg(device);
newItem->mimeType = "application/x-cda"; newItem->mimeType = "application/x-cda";
newItem->fileFormat = "cda"; newItem->fileFormat = "cda";
newItem->local = true; newItem->local = true;
@ -633,7 +633,7 @@ void FileList::addDisc( const TQString& device )
// logger->log( 1000, " " + i18n("Tags successfully read") ); // logger->log( 1000, " " + i18n("Tags successfully read") );
newItem->time = newItem->tags->length; newItem->time = newItem->tags->length;
newItem->options.filePathName = TQDir::homeDirPath() + newItem->tags->title + "." + newItem->fileFormat; newItem->options.filePathName = TQDir::homeDirPath() + newItem->tags->title + "." + newItem->fileFormat;
newItem->fileName = i18n("Full audio CD (%1)").tqarg(device) + ": " + newItem->tags->title; newItem->fileName = i18n("Full audio CD (%1)").arg(device) + ": " + newItem->tags->title;
} }
updateItem( newItem ); updateItem( newItem );
emit increaseTime( newItem->time ); emit increaseTime( newItem->time );

2
src/filelist.h
Unescape View File

@ -50,7 +50,7 @@ public:
*/ */
virtual ~FileListItem(); virtual ~FileListItem();
virtual void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int tqalignment ); virtual void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int alignment );
//void updateOutputCell(); //void updateOutputCell();
//void updateOptionsCell(); //void updateOptionsCell();

4
src/logger.cpp
Unescape View File

@ -22,7 +22,7 @@ Logger::Logger()
(*item)->id = 1000; (*item)->id = 1000;
(*item)->completed = true; (*item)->completed = true;
(*item)->state = 1; (*item)->state = 1;
(*item)->file.setName( locateLocal("data",TQString("soundkonverter/log/%1.log").tqarg((*item)->id)) ); (*item)->file.setName( locateLocal("data",TQString("soundkonverter/log/%1.log").arg((*item)->id)) );
// TODO error handling // TODO error handling
(*item)->file.open( IO_WriteOnly ); (*item)->file.open( IO_WriteOnly );
(*item)->textStream.setDevice( TQT_TQIODEVICE(&((*item)->file)) ); (*item)->textStream.setDevice( TQT_TQIODEVICE(&((*item)->file)) );
@ -52,7 +52,7 @@ int Logger::registerProcess( const TQString& filename )
(*item)->filename = filename; (*item)->filename = filename;
(*item)->id = getNewID(); (*item)->id = getNewID();
(*item)->completed = false; (*item)->completed = false;
(*item)->file.setName( locateLocal("data",TQString("soundkonverter/log/%1.log").tqarg((*item)->id)) ); (*item)->file.setName( locateLocal("data",TQString("soundkonverter/log/%1.log").arg((*item)->id)) );
// TODO error handling // TODO error handling
(*item)->file.open( IO_WriteOnly ); (*item)->file.open( IO_WriteOnly );
(*item)->textStream.setDevice( TQT_TQIODEVICE(&((*item)->file)) ); (*item)->textStream.setDevice( TQT_TQIODEVICE(&((*item)->file)) );

10
src/logviewer.cpp
Unescape View File

@ -31,7 +31,7 @@ LogViewerItem::LogViewerItem( LogViewerItem* parent, LogViewerItem* after, TQStr
LogViewerItem::~LogViewerItem() LogViewerItem::~LogViewerItem()
{} {}
void LogViewerItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) void LogViewerItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
{ {
// NOTE calculate the red color // NOTE calculate the red color
@ -40,21 +40,21 @@ void LogViewerItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
if( isSelected() && converting ) { if( isSelected() && converting ) {
_cg.setColor( TQColorGroup::Highlight, TQColor( 215, 62, 62 ) ); _cg.setColor( TQColorGroup::Highlight, TQColor( 215, 62, 62 ) );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
else if( converting && column != listView()->sortColumn() ) { else if( converting && column != listView()->sortColumn() ) {
_cg.setColor( TQColorGroup::Base, TQColor( 255, 234, 234 ) ); _cg.setColor( TQColorGroup::Base, TQColor( 255, 234, 234 ) );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
else if( converting && column == listView()->sortColumn() ) { else if( converting && column == listView()->sortColumn() ) {
_cg.setColor( TQColorGroup::Base, TQColor( 247, 227, 227 ) ); _cg.setColor( TQColorGroup::Base, TQColor( 247, 227, 227 ) );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
KListViewItem::paintCell( p, _cg, column, width, tqalignment ); KListViewItem::paintCell( p, _cg, column, width, alignment );
} }

2
src/logviewer.h
Unescape View File

@ -39,7 +39,7 @@ public:
*/ */
virtual ~LogViewerItem(); virtual ~LogViewerItem();
virtual void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int tqalignment ); virtual void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int alignment );
LogViewerItem* nextSibling() const { return static_cast<LogViewerItem*>( KListViewItem::nextSibling() ); } LogViewerItem* nextSibling() const { return static_cast<LogViewerItem*>( KListViewItem::nextSibling() ); }
LogViewerItem* firstChild() const { return static_cast<LogViewerItem*>( KListViewItem::firstChild() ); } LogViewerItem* firstChild() const { return static_cast<LogViewerItem*>( KListViewItem::firstChild() ); }

2
src/metadata/m4a/mp4file.h
Unescape View File

@ -104,7 +104,7 @@ namespace TagLib {
/*! /*!
* This will remove all tags. * This will remove all tags.
* *
* \note This will also tqinvalidate pointers to the tags * \note This will also invalidate pointers to the tags
* as their memory will be freed. * as their memory will be freed.
* \note In order to make the removal permanent save() still needs to be called * \note In order to make the removal permanent save() still needs to be called
*/ */

2
src/metadata/trueaudio/ttafile.h
Unescape View File

@ -154,7 +154,7 @@ namespace TagLib {
* This will remove the tags that match the OR-ed together TagTypes from the * This will remove the tags that match the OR-ed together TagTypes from the
* file. By default it removes all tags. * file. By default it removes all tags.
* *
* \note This will also tqinvalidate pointers to the tags * \note This will also invalidate pointers to the tags
* as their memory will be freed. * as their memory will be freed.
* \note In order to make the removal permanent save() still needs to be called * \note In order to make the removal permanent save() still needs to be called
*/ */

2
src/metadata/wavpack/wvfile.h
Unescape View File

@ -136,7 +136,7 @@ namespace TagLib {
* This will remove the tags that match the OR-ed together TagTypes from the * This will remove the tags that match the OR-ed together TagTypes from the
* file. By default it removes all tags. * file. By default it removes all tags.
* *
* \note This will also tqinvalidate pointers to the tags * \note This will also invalidate pointers to the tags
* as their memory will be freed. * as their memory will be freed.
* \note In order to make the removal permanent save() still needs to be called * \note In order to make the removal permanent save() still needs to be called
*/ */

4
src/optionsdetailed.cpp
Unescape View File

@ -686,9 +686,9 @@ void OptionsDetailed::qualityChanged()
} }
} }
TQToolTip::add( iQuality, i18n("This is a relative quality between 0 and 100.\nThe higher this number the higher is the quality.\nsoundKonverter will convert it into the file format's quality format.\nSee the \"What's this?\" for more informations.\n\nCurrent parameter: \"%1\"").tqarg(quality) ); TQToolTip::add( iQuality, i18n("This is a relative quality between 0 and 100.\nThe higher this number the higher is the quality.\nsoundKonverter will convert it into the file format's quality format.\nSee the \"What's this?\" for more informations.\n\nCurrent parameter: \"%1\"").arg(quality) );
// TQToolTip toolTip( iQuality ); // TQToolTip toolTip( iQuality );
// toolTip.tip( i18n("Current parameter: \"%1\"").tqarg(quality) ); // toolTip.tip( i18n("Current parameter: \"%1\"").arg(quality) );
} }
} }

2
src/optionseditor.cpp
Unescape View File

@ -384,7 +384,7 @@ void OptionsEditor::itemsSelected( TQValueList<FileListItem*> items )
} }
} }
else { else {
setCaption( i18n("%1 Files").tqarg(items.count()) ); setCaption( i18n("%1 Files").arg(items.count()) );
TQValueList<FileListItem*>::Iterator it = items.begin(); TQValueList<FileListItem*>::Iterator it = items.begin();
ConversionOptions cOptions = (*it)->options; ConversionOptions cOptions = (*it)->options;
TQString title = ( (*it)->tags == 0 ) ? "" : (*it)->tags->title; TQString title = ( (*it)->tags == 0 ) ? "" : (*it)->tags->title;

2
src/optionssimple.cpp
Unescape View File

@ -202,7 +202,7 @@ void OptionsSimple::profileInfo()
void OptionsSimple::profileRemove() void OptionsSimple::profileRemove()
{ {
int ret = KMessageBox::questionYesNo( this, int ret = KMessageBox::questionYesNo( this,
i18n("Do you really want to remove the profile: %1").tqarg(cProfile->currentText()), i18n("Do you really want to remove the profile: %1").arg(cProfile->currentText()),
i18n("Remove profile?") ); i18n("Remove profile?") );
if( ret != KMessageBox::Yes ) return; if( ret != KMessageBox::Yes ) return;

68
src/replaygainfilelist.cpp
Unescape View File

@ -63,7 +63,7 @@ ReplayGainFileListItem::ReplayGainFileListItem( ReplayGainFileListItem* parent )
ReplayGainFileListItem::~ReplayGainFileListItem() ReplayGainFileListItem::~ReplayGainFileListItem()
{} {}
void ReplayGainFileListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) void ReplayGainFileListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
{ {
// NOTE speed up this function // NOTE speed up this function
// NOTE calculate the red color // NOTE calculate the red color
@ -76,46 +76,46 @@ void ReplayGainFileListItem::paintCell( TQPainter *p, const TQColorGroup &cg, in
int margin = listView()->itemMargin(); int margin = listView()->itemMargin();
int w = width - 2*margin; int w = width - 2*margin;
int h = height(); int h = height();
TQRect textRect = p->boundingRect( margin, 0, w, h, tqalignment, text(column) ); TQRect textRect = p->boundingRect( margin, 0, w, h, alignment, text(column) );
if( textRect.width() > w ) { if( textRect.width() > w ) {
tqalignment = TQt::AlignRight | TQt::SingleLine; alignment = TQt::AlignRight | TQt::SingleLine;
} }
} }
if( isSelected() && addingReplayGain ) { if( isSelected() && addingReplayGain ) {
_cg.setColor( TQColorGroup::Highlight, TQColor( 215, 62, 62 ) ); _cg.setColor( TQColorGroup::Highlight, TQColor( 215, 62, 62 ) );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
else if( addingReplayGain && column != listView()->sortColumn() ) { else if( addingReplayGain && column != listView()->sortColumn() ) {
_cg.setColor( TQColorGroup::Base, TQColor( 255, 234, 234 ) ); _cg.setColor( TQColorGroup::Base, TQColor( 255, 234, 234 ) );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
else if( addingReplayGain && column == listView()->sortColumn() ) { else if( addingReplayGain && column == listView()->sortColumn() ) {
_cg.setColor( TQColorGroup::Base, TQColor( 247, 227, 227 ) ); _cg.setColor( TQColorGroup::Base, TQColor( 247, 227, 227 ) );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
if( isSelected() && queued ) { if( isSelected() && queued ) {
_cg.setColor( TQColorGroup::Highlight, TQColor( 230, 232, 100 ) ); _cg.setColor( TQColorGroup::Highlight, TQColor( 230, 232, 100 ) );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
else if( queued && column != listView()->sortColumn() ) { else if( queued && column != listView()->sortColumn() ) {
_cg.setColor( TQColorGroup::Base, TQColor( 255, 255, 190 ) ); _cg.setColor( TQColorGroup::Base, TQColor( 255, 255, 190 ) );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
else if( queued && column == listView()->sortColumn() ) { else if( queued && column == listView()->sortColumn() ) {
_cg.setColor( TQColorGroup::Base, TQColor( 255, 243, 168 ) ); _cg.setColor( TQColorGroup::Base, TQColor( 255, 243, 168 ) );
TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); TQListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
KListViewItem::paintCell( p, _cg, column, width, tqalignment ); KListViewItem::paintCell( p, _cg, column, width, alignment );
} }
void ReplayGainFileListItem::setType( Type type ) void ReplayGainFileListItem::setType( Type type )
@ -836,18 +836,18 @@ void ReplayGainFileList::calcSelectedItemsGain()
if( item->type() == ReplayGainFileListItem::File ) { if( item->type() == ReplayGainFileListItem::File ) {
if( item->isSelected() ) { if( item->isSelected() ) {
item->queued = true; item->queued = true;
item->tqrepaint(); item->repaint();
item->mode = ReplayGainFileListItem::force; item->mode = ReplayGainFileListItem::force;
} }
} }
else { else {
if( item->isSelected() ) { if( item->isSelected() ) {
item->queued = true; item->queued = true;
item->tqrepaint(); item->repaint();
item->mode = ReplayGainFileListItem::force; item->mode = ReplayGainFileListItem::force;
for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) { for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
sub_item->queued = true; sub_item->queued = true;
sub_item->tqrepaint(); sub_item->repaint();
sub_item->mode = ReplayGainFileListItem::force; sub_item->mode = ReplayGainFileListItem::force;
} }
} }
@ -855,11 +855,11 @@ void ReplayGainFileList::calcSelectedItemsGain()
for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) { for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
if( sub_item->isSelected() ) { if( sub_item->isSelected() ) {
item->queued = true; item->queued = true;
item->tqrepaint(); item->repaint();
item->mode = ReplayGainFileListItem::force; item->mode = ReplayGainFileListItem::force;
for( ReplayGainFileListItem* sub_item2 = item->firstChild(); sub_item2 != 0; sub_item2 = sub_item2->nextSibling() ) { for( ReplayGainFileListItem* sub_item2 = item->firstChild(); sub_item2 != 0; sub_item2 = sub_item2->nextSibling() ) {
sub_item2->queued = true; sub_item2->queued = true;
sub_item2->tqrepaint(); sub_item2->repaint();
sub_item2->mode = ReplayGainFileListItem::force; sub_item2->mode = ReplayGainFileListItem::force;
} }
break; break;
@ -878,18 +878,18 @@ void ReplayGainFileList::removeSelectedItemsGain()
if( item->type() == ReplayGainFileListItem::File ) { if( item->type() == ReplayGainFileListItem::File ) {
if( item->isSelected() && !item->addingReplayGain ) { if( item->isSelected() && !item->addingReplayGain ) {
item->queued = true; item->queued = true;
item->tqrepaint(); item->repaint();
item->mode = ReplayGainFileListItem::remove; item->mode = ReplayGainFileListItem::remove;
} }
} }
else { else {
if( item->isSelected() && !item->addingReplayGain ) { if( item->isSelected() && !item->addingReplayGain ) {
item->queued = true; item->queued = true;
item->tqrepaint(); item->repaint();
item->mode = ReplayGainFileListItem::remove; item->mode = ReplayGainFileListItem::remove;
for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) { for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
sub_item->queued = true; sub_item->queued = true;
sub_item->tqrepaint(); sub_item->repaint();
sub_item->mode = ReplayGainFileListItem::remove; sub_item->mode = ReplayGainFileListItem::remove;
} }
} }
@ -897,7 +897,7 @@ void ReplayGainFileList::removeSelectedItemsGain()
for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) { for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
if( sub_item->isSelected() && !sub_item->addingReplayGain ) { if( sub_item->isSelected() && !sub_item->addingReplayGain ) {
sub_item->queued = true; sub_item->queued = true;
sub_item->tqrepaint(); sub_item->repaint();
sub_item->mode = ReplayGainFileListItem::remove; sub_item->mode = ReplayGainFileListItem::remove;
} }
} }
@ -926,12 +926,12 @@ void ReplayGainFileList::calcReplayGain( ReplayGainFileListItem* item )
if( item->type() == ReplayGainFileListItem::Album ) { if( item->type() == ReplayGainFileListItem::Album ) {
item->queued = false; item->queued = false;
item->addingReplayGain = true; item->addingReplayGain = true;
item->tqrepaint(); item->repaint();
for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) { for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
if( sub_item->queued && sub_item->mode & ReplayGainFileListItem::force ) force = true; // NOTE can this be replaced by checking item? if( sub_item->queued && sub_item->mode & ReplayGainFileListItem::force ) force = true; // NOTE can this be replaced by checking item?
sub_item->queued = false; sub_item->queued = false;
sub_item->addingReplayGain = true; sub_item->addingReplayGain = true;
sub_item->tqrepaint(); sub_item->repaint();
fileList += sub_item->filePathName; fileList += sub_item->filePathName;
files++; files++;
@ -953,10 +953,10 @@ void ReplayGainFileList::calcReplayGain( ReplayGainFileListItem* item )
else { else {
logger->processCompleted( logID, 0 ); logger->processCompleted( logID, 0 );
item->addingReplayGain = false; item->addingReplayGain = false;
item->tqrepaint(); item->repaint();
for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) { for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
sub_item->addingReplayGain = false; sub_item->addingReplayGain = false;
sub_item->tqrepaint(); sub_item->repaint();
} }
processNextFile(); processNextFile();
} }
@ -966,7 +966,7 @@ void ReplayGainFileList::calcReplayGain( ReplayGainFileListItem* item )
item->queued = false; item->queued = false;
item->addingReplayGain = true; item->addingReplayGain = true;
item->tqrepaint(); item->repaint();
files = 1; files = 1;
timeCount = item->time; timeCount = item->time;
@ -989,13 +989,13 @@ void ReplayGainFileList::removeReplayGain( ReplayGainFileListItem* item )
if( item->type() == ReplayGainFileListItem::File ) { if( item->type() == ReplayGainFileListItem::File ) {
item->queued = false; item->queued = false;
item->addingReplayGain = true; item->addingReplayGain = true;
item->tqrepaint(); item->repaint();
timeCount = item->time; timeCount = item->time;
replayGain->apply( item->filePathName, item->mimeType, process, logID, ReplayGain::remove ); replayGain->apply( item->filePathName, item->mimeType, process, logID, ReplayGain::remove );
} }
else { else {
item->queued = false; item->queued = false;
item->tqrepaint(); item->repaint();
processNextFile(); processNextFile();
} }
} }
@ -1201,43 +1201,43 @@ void ReplayGainFileList::processExit( KProcess* proc )
if( item->addingReplayGain ) { if( item->addingReplayGain ) {
processedTime += item->time; processedTime += item->time;
item->addingReplayGain = false; item->addingReplayGain = false;
item->tqrepaint(); item->repaint();
item->updateReplayGainCells( tagEngine->readTags(KURL::decode_string(item->filePathName)) ); item->updateReplayGainCells( tagEngine->readTags(KURL::decode_string(item->filePathName)) );
} }
if( item->queued && proc->signalled() ) { if( item->queued && proc->signalled() ) {
item->queued = false; item->queued = false;
item->tqrepaint(); item->repaint();
} }
} }
else { else {
if( item->addingReplayGain ) { if( item->addingReplayGain ) {
item->addingReplayGain = false; item->addingReplayGain = false;
item->tqrepaint(); item->repaint();
for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) { for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
processedTime += sub_item->time; processedTime += sub_item->time;
sub_item->addingReplayGain = false; sub_item->addingReplayGain = false;
sub_item->tqrepaint(); sub_item->repaint();
sub_item->updateReplayGainCells( tagEngine->readTags(KURL::decode_string(sub_item->filePathName)) ); sub_item->updateReplayGainCells( tagEngine->readTags(KURL::decode_string(sub_item->filePathName)) );
} }
} }
if( item->queued && proc->signalled() ) { if( item->queued && proc->signalled() ) {
item->queued = false; item->queued = false;
item->tqrepaint(); item->repaint();
for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) { for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
sub_item->queued = false; sub_item->queued = false;
sub_item->tqrepaint(); sub_item->repaint();
} }
} }
for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) { for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
if( sub_item->addingReplayGain ) { if( sub_item->addingReplayGain ) {
processedTime += sub_item->time; processedTime += sub_item->time;
sub_item->addingReplayGain = false; sub_item->addingReplayGain = false;
sub_item->tqrepaint(); sub_item->repaint();
sub_item->updateReplayGainCells( tagEngine->readTags(KURL::decode_string(sub_item->filePathName)) ); sub_item->updateReplayGainCells( tagEngine->readTags(KURL::decode_string(sub_item->filePathName)) );
} }
if( sub_item->queued && proc->signalled() ) { if( sub_item->queued && proc->signalled() ) {
sub_item->queued = false; sub_item->queued = false;
sub_item->tqrepaint(); sub_item->repaint();
} }
} }
} }

2
src/replaygainfilelist.h
Unescape View File

@ -66,7 +66,7 @@ public:
*/ */
virtual ~ReplayGainFileListItem(); virtual ~ReplayGainFileListItem();
virtual void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int tqalignment ); virtual void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int alignment );
int compare( TQListViewItem* item, int column, bool ascending ) const; int compare( TQListViewItem* item, int column, bool ascending ) const;

Write Preview
Loading…
Cancel
Save