From 96842585886a67c6ab4e2cf83bc69e6156ee2c11 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:34:02 -0600 Subject: Rename additional global TQt functions --- arts/builder/qttableview.cpp | 12 ++++++------ juk/cache.cpp | 8 ++++---- juk/tag.cpp | 4 ++-- kaudiocreator/encoder.cpp | 10 +++++----- kaudiocreator/ripper.cpp | 2 +- kaudiocreator/tracksimp.cpp | 4 ++-- kioslave/audiocd/audiocd.cpp | 8 ++++---- kioslave/audiocd/plugins/flac/encoderflac.cpp | 2 +- kioslave/audiocd/plugins/vorbis/encodervorbis.cpp | 4 ++-- kmix/ksmallslider.cpp | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp index c738b5ee..c8f8d9d3 100644 --- a/arts/builder/qttableview.cpp +++ b/arts/builder/qttableview.cpp @@ -274,7 +274,7 @@ void QtTableView::setNumRows( int rows ) { if ( rows < 0 ) { #if defined(TQT_CHECK_RANGE) - qWarning( "QtTableView::setNumRows: (%s) Negative argument %d.", + tqWarning( "QtTableView::setNumRows: (%s) Negative argument %d.", name( "unnamed" ), rows ); #endif return; @@ -316,7 +316,7 @@ void QtTableView::setNumCols( int cols ) { if ( cols < 0 ) { #if defined(TQT_CHECK_RANGE) - qWarning( "QtTableView::setNumCols: (%s) Negative argument %d.", + tqWarning( "QtTableView::setNumCols: (%s) Negative argument %d.", name( "unnamed" ), cols ); #endif return; @@ -582,7 +582,7 @@ void QtTableView::setCellWidth( int cellWidth ) return; #if defined(TQT_CHECK_RANGE) if ( cellWidth < 0 || cellWidth > SHRT_MAX ) { - qWarning( "QtTableView::setCellWidth: (%s) Argument out of range (%d)", + tqWarning( "QtTableView::setCellWidth: (%s) Argument out of range (%d)", name( "unnamed" ), cellWidth ); return; } @@ -636,7 +636,7 @@ void QtTableView::setCellHeight( int cellHeight ) return; #if defined(TQT_CHECK_RANGE) if ( cellHeight < 0 || cellHeight > SHRT_MAX ) { - qWarning( "QtTableView::setCellHeight: (%s) Argument out of range (%d)", + tqWarning( "QtTableView::setCellHeight: (%s) Argument out of range (%d)", name( "unnamed" ), cellHeight ); return; } @@ -1580,7 +1580,7 @@ int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY, if ( goOutsideView || yPos >= minViewY() && yPos <= maxViewY() ) { if ( yPos < minViewY() ) { #if defined(TQT_CHECK_RANGE) - qWarning( "QtTableView::findRawRow: (%s) internal error: " + tqWarning( "QtTableView::findRawRow: (%s) internal error: " "yPos < minViewY() && goOutsideView " "not supported. (%d,%d)", name( "unnamed" ), yPos, yOffs ); @@ -1627,7 +1627,7 @@ int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX , if ( goOutsideView || xPos >= minViewX() && xPos <= maxViewX() ) { if ( xPos < minViewX() ) { #if defined(TQT_CHECK_RANGE) - qWarning( "QtTableView::findRawCol: (%s) internal error: " + tqWarning( "QtTableView::findRawCol: (%s) internal error: " "xPos < minViewX() && goOutsideView " "not supported. (%d,%d)", name( "unnamed" ), xPos, xOffs ); diff --git a/juk/cache.cpp b/juk/cache.cpp index 6cfed63f..34d59b46 100644 --- a/juk/cache.cpp +++ b/juk/cache.cpp @@ -84,7 +84,7 @@ void Cache::save() TQDataStream fs(&f); - TQ_INT32 checksum = qChecksum(data.data(), data.size()); + TQ_INT32 checksum = tqChecksum(data.data(), data.size()); fs << TQ_INT32(m_currentVersion) << checksum @@ -120,7 +120,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static TQ_UINT16 checksum; fs >> checksum >> data; - if(checksum != qChecksum(data.data(), data.size())) + if(checksum != tqChecksum(data.data(), data.size())) return; // Create a new stream just based on the data. @@ -244,7 +244,7 @@ void Cache::savePlaylists(const PlaylistList &playlists) TQDataStream fs(&f); fs << TQ_INT32(playlistCacheVersion); - fs << qChecksum(data.data(), data.size()); + fs << tqChecksum(data.data(), data.size()); fs << data; f.close(); @@ -297,7 +297,7 @@ void Cache::load() buffer.open(IO_ReadOnly); s.setDevice(&buffer); - if(checksum != qChecksum(data.data(), data.size())) { + if(checksum != tqChecksum(data.data(), data.size())) { KMessageBox::sorry(0, i18n("The music data cache has been corrupted. JuK " "needs to rescan it now. This may take some time.")); return; diff --git a/juk/tag.cpp b/juk/tag.cpp index 27f0a91c..08a717ea 100644 --- a/juk/tag.cpp +++ b/juk/tag.cpp @@ -54,9 +54,9 @@ Tag::Tag(const TQString &fileName) : m_bitrate(0), m_isValid(false) { - // using qDebug here since we want this to show up in non-debug builds as well + // using tqDebug here since we want this to show up in non-debug builds as well - qDebug("Reading tag for %s", fileName.local8Bit().data()); + tqDebug("Reading tag for %s", fileName.local8Bit().data()); if(MediaFiles::isMP3(fileName)) { TagLib::MPEG::File file(TQFile::encodeName(fileName).data()); diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp index 1d5e533d..cd4b93ea 100644 --- a/kaudiocreator/encoder.cpp +++ b/kaudiocreator/encoder.cpp @@ -252,12 +252,12 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length ) reportCount++; return; } - //qDebug(TQString("Pre cropped: %1").arg(output).latin1()); + //tqDebug(TQString("Pre cropped: %1").arg(output).latin1()); output = output.mid(output.find('%')-loadEncoder(job->encoder)->percentLength(),2); - //qDebug(TQString("Post cropped: %1").arg(output).latin1()); + //tqDebug(TQString("Post cropped: %1").arg(output).latin1()); bool conversionSuccessfull = false; int percent = output.toInt(&conversionSuccessfull); - //qDebug(TQString("number: %1").arg(percent).latin1()); + //tqDebug(TQString("number: %1").arg(percent).latin1()); if ( percent >= 0 && percent < 100 && conversionSuccessfull ) { emit(updateProgress(job->id, percent)); } @@ -276,7 +276,7 @@ void Encoder::jobDone(KProcess *process ) { if ( !process) return; - //qDebug("Process exited with status: %d", process->exitStatus()); + //tqDebug("Process exited with status: %d", process->exitStatus()); Job *job = jobs[(KShellProcess*)process]; threads.remove((KShellProcess*)process); @@ -296,7 +296,7 @@ void Encoder::jobDone(KProcess *process ) { } } else{ - //qDebug("Must be done: %d", (process->exitStatus())); + //tqDebug("Must be done: %d", (process->exitStatus())); emit(updateProgress(job->id, 100)); KNotifyClient::event("track encoded"); if ( job->lastSongInAlbum) diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index cb9c012b..f68c1001 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -120,7 +120,7 @@ void Ripper::removeJob(int id){ pendingJobs.remove(job); delete job; } - //qDebug(TQString("Done removing Job:%1").arg(id).latin1()); + //tqDebug(TQString("Done removing Job:%1").arg(id).latin1()); tendToNewJobs(); } diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index 36419871..c9296547 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -183,13 +183,13 @@ void TracksImp::changeDevice(const TQString &file ) { TQString newDevice = KCompactDisc::urlToDevice(file); if( newDevice == cd->device() ) { - //qDebug("Device names match, returning"); + //tqDebug("Device names match, returning"); return; } TQFileInfo fileInfo(newDevice); if( !fileInfo.exists() || fileInfo.isDir()) { - //qDebug("Device file !exist or isDir or !file"); + //tqDebug("Device file !exist or isDir or !file"); return; } diff --git a/kioslave/audiocd/audiocd.cpp b/kioslave/audiocd/audiocd.cpp index c41a6543..bd65d49d 100644 --- a/kioslave/audiocd/audiocd.cpp +++ b/kioslave/audiocd/audiocd.cpp @@ -885,13 +885,13 @@ void AudioCDProtocol::paranoiaRead( diff = (diff*(unsigned long)((100/(float)end)*(end-cur)))/2; // Need 1% of data calculated as initial buffer, use %2 to be safe if( percentDone < .02 ){ - //qDebug("val: %f, diff: %ld", ((float)cur/(float)end), diff); + //tqDebug("val: %f, diff: %ld", ((float)cur/(float)end), diff); diff = 0; } // We are growing larger, increase total. if(lastSize < estSize){ - //qDebug("lastGuess: %ld, guess: %ld diff: %ld", lastSize, estSize, diff); + //tqDebug("lastGuess: %ld, guess: %ld diff: %ld", lastSize, estSize, diff); totalSize(estSize+diff); lastSize = estSize+diff; } @@ -902,7 +902,7 @@ void AudioCDProtocol::paranoiaRead( margin = 7; unsigned long low = lastSize - lastSize/margin; if(estSize < low){ - //qDebug("low: %ld, estSize: %ld, num: %i", low, estSize, margin); + //tqDebug("low: %ld, estSize: %ld, num: %i", low, estSize, margin); totalSize( estSize ); lastSize = estSize; } @@ -911,7 +911,7 @@ void AudioCDProtocol::paranoiaRead( /** * End estimation. */ - //qDebug("processed: %ld, totalSize: %ld", processed, estSize); + //tqDebug("processed: %ld, totalSize: %ld", processed, estSize); processedSize(processed); } diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/kioslave/audiocd/plugins/flac/encoderflac.cpp index dfb4f7ba..c208e659 100644 --- a/kioslave/audiocd/plugins/flac/encoderflac.cpp +++ b/kioslave/audiocd/plugins/flac/encoderflac.cpp @@ -199,7 +199,7 @@ void EncoderFLAC::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c if (!comments[i].second.toString().isEmpty()) { field = comments[i].first+"="+comments[i].second.toString(); cfield = field.utf8(); - entry.entry = (FLAC__byte*)qstrdup(cfield); + entry.entry = (FLAC__byte*)tqstrdup(cfield); entry.length = cfield.length(); // Insert in vorbiscomment and assign ownership of pointers to FLAC FLAC__metadata_object_vorbiscomment_insert_comment(d->metadata[0], num_comments, entry, false); diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp index 2caab8e5..5c88f844 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp +++ b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp @@ -321,8 +321,8 @@ void EncoderVorbis::fillSongInfo( KCDDB::CDInfo info, int track, const TQString // if the value is not empty if(!(*it).second.toString().isEmpty()) { - char *key = qstrdup((*it).first); - char *value = qstrdup((*it).second.toString().utf8().data()); + char *key = tqstrdup((*it).first); + char *value = tqstrdup((*it).second.toString().utf8().data()); vorbis_comment_add_tag(&d->vc, key, value); diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp index 8a69676f..93f18d65 100644 --- a/kmix/ksmallslider.cpp +++ b/kmix/ksmallslider.cpp @@ -364,7 +364,7 @@ void KSmallSlider::resetState() break; default: - qWarning("KSmallSlider: (%s) in wrong state", name( "unnamed" ) ); + tqWarning("KSmallSlider: (%s) in wrong state", name( "unnamed" ) ); } state = Idle; } -- cgit v1.2.1