From 6b45a7b7b2a804ccb2d522eb9ba6423fedb59b8f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:12 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit ca82971624269719d487c6f7980d7237f9420036. --- renamedlgplugins/audio/audio_plugin.cpp | 8 ++++---- renamedlgplugins/audio/audiopreview.cpp | 16 ++++++++-------- renamedlgplugins/images/image_plugin.cpp | 2 +- renamedlgplugins/images/imagevisualizer.cpp | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'renamedlgplugins') diff --git a/renamedlgplugins/audio/audio_plugin.cpp b/renamedlgplugins/audio/audio_plugin.cpp index f71eb7b..5aeeb49 100644 --- a/renamedlgplugins/audio/audio_plugin.cpp +++ b/renamedlgplugins/audio/audio_plugin.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include @@ -73,11 +73,11 @@ bool AudioPlugin::initialize( KIO::RenameDlg_Mode mode, const TQString &_src, co TQString sentence1; TQString dest = KURL::fromPathOrURL(_dest).pathOrURL(); if (mtimeDest < mtimeSrc) - sentence1 = i18n("An older file named '%1' already exists.\n").arg(dest); + sentence1 = i18n("An older file named '%1' already exists.\n").tqarg(dest); else if (mtimeDest == mtimeSrc) - sentence1 = i18n("A similar file named '%1' already exists.\n").arg(dest); + sentence1 = i18n("A similar file named '%1' already exists.\n").tqarg(dest); else - sentence1 = i18n("A newer file named '%1' already exists.\n").arg(dest); + sentence1 = i18n("A newer file named '%1' already exists.\n").tqarg(dest); label_head->setText(sentence1); label_src->setText(i18n("Source File")); label_dst->setText(i18n("Existing File")); diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp index 4f2936a..e0af544 100644 --- a/renamedlgplugins/audio/audiopreview.cpp +++ b/renamedlgplugins/audio/audiopreview.cpp @@ -89,27 +89,27 @@ void AudioPreview::initView( const TQString& mimeType ) KSqueezedTextLabel *sl; sl = new KSqueezedTextLabel(this); - sl->setText(i18n("Artist: %1\n").arg(info.item("Artist").value().toString())); + sl->setText(i18n("Artist: %1\n").tqarg(info.item("Artist").value().toString())); sl = new KSqueezedTextLabel(this); - sl->setText(i18n("Title: %1\n").arg(info.item("Title").value().toString())); + sl->setText(i18n("Title: %1\n").tqarg(info.item("Title").value().toString())); sl = new KSqueezedTextLabel(this); - sl->setText(i18n("Comment: %1\n").arg(info.item("Comment").value().toString())); + sl->setText(i18n("Comment: %1\n").tqarg(info.item("Comment").value().toString())); - desc.append(i18n("Biterate: 160 kbits/s", "Bitrate: %1 %2\n").arg( info.item("Bitrate").value().toString() ).arg( info.item("Bitrate").suffix() )); + desc.append(i18n("Biterate: 160 kbits/s", "Bitrate: %1 %2\n").tqarg( info.item("Bitrate").value().toString() ).tqarg( info.item("Bitrate").suffix() )); } - desc.append(i18n("Sample rate: %1 %2\n").arg( info.item("Sample Rate").value().toString() ).arg( info.item("Sample Rate").suffix() )); + desc.append(i18n("Sample rate: %1 %2\n").tqarg( info.item("Sample Rate").value().toString() ).tqarg( info.item("Sample Rate").suffix() )); desc.append(i18n("Length: ")); /* Calculate length in mm:ss format */ int length = info.item("Length").value().toInt(); if (length/60 < 10) desc.append("0"); - desc.append(TQString("%1:").arg(length/60, 0, 10)); + desc.append(TQString("%1:").tqarg(length/60, 0, 10)); if (length%60 < 10) desc.append("0"); - desc.append(TQString("%1\n").arg(length%60, 0, 10)); + desc.append(TQString("%1\n").tqarg(length%60, 0, 10)); } description = new TQLabel(this); @@ -125,7 +125,7 @@ void AudioPreview::initView( const TQString& mimeType ) void AudioPreview::downloadFile( const TQString& url ) { - if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), m_localFile , topLevelWidget()) ) + if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), m_localFile , tqtopLevelWidget()) ) { m_isTempFile = true; initView( KMimeType::findByPath( m_localFile )->name() ); diff --git a/renamedlgplugins/images/image_plugin.cpp b/renamedlgplugins/images/image_plugin.cpp index abab724..65023f7 100644 --- a/renamedlgplugins/images/image_plugin.cpp +++ b/renamedlgplugins/images/image_plugin.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include diff --git a/renamedlgplugins/images/imagevisualizer.cpp b/renamedlgplugins/images/imagevisualizer.cpp index 009eb8b..e347dc4 100644 --- a/renamedlgplugins/images/imagevisualizer.cpp +++ b/renamedlgplugins/images/imagevisualizer.cpp @@ -64,8 +64,8 @@ void ImageVisualizer::loadImage( const TQString& path ) pic->adjustSize(); TQString desc; - desc.append(i18n("The color depth of an image", "Depth: %1\n").arg( img.depth() )); - desc.append(i18n("The dimensions of an image", "Dimensions: %1x%1").arg(img.width()).arg(img.height() )); + desc.append(i18n("The color depth of an image", "Depth: %1\n").tqarg( img.depth() )); + desc.append(i18n("The dimensions of an image", "Dimensions: %1x%1").tqarg(img.width()).tqarg(img.height() )); description->setText(desc ); description->adjustSize(); } @@ -73,7 +73,7 @@ void ImageVisualizer::loadImage( const TQString& path ) void ImageVisualizer::downloadImage(const TQString& url) { TQString tmpFile; - if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), tmpFile , topLevelWidget()) ) + if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), tmpFile , tqtopLevelWidget()) ) { loadImage( tmpFile ); KIO::NetAccess::removeTempFile( tmpFile ); -- cgit v1.2.1