diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 10:00:09 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 10:00:09 -0600 |
| commit | 3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b (patch) | |
| tree | 4405f233f4b0eee7f4ad3d265a5584c9ce681011 /kompare/komparepart/kompare_part.cpp | |
| parent | d6331f1b56eb6dca7a1950658b2932f208015da0 (diff) | |
| download | tdesdk-3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b.tar.gz tdesdk-3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.
Diffstat (limited to 'kompare/komparepart/kompare_part.cpp')
| -rw-r--r-- | kompare/komparepart/kompare_part.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index c11bbe8e..3c110857 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -21,7 +21,7 @@ #include "kompare_qsplitter.h" // make sure we get there first -#include <layout.h> +#include <tqlayout.h> #include <tqwidget.h> #include <kaction.h> @@ -266,7 +266,7 @@ const TQString KomparePart::fetchURL( const KURL& url ) { if ( ! KIO::NetAccess::download( url, tempFileName, widget() ) ) { - slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).arg( url.prettyURL() ) ); + slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).tqarg( url.prettyURL() ) ); tempFileName = ""; } return tempFileName; @@ -278,7 +278,7 @@ const TQString KomparePart::fetchURL( const KURL& url ) return url.path(); else { - slotShowError( i18n( "<qt>The URL <b>%1</b> does not exist on your system.</qt>" ).arg( url.prettyURL() ) ); + slotShowError( i18n( "<qt>The URL <b>%1</b> does not exist on your system.</qt>" ).tqarg( url.prettyURL() ) ); return tempFileName; } } @@ -543,26 +543,26 @@ void KomparePart::updateStatus() { case Kompare::ComparingFiles : text = i18n( "Comparing file %1 with file %2" ) - .arg( source ) - .arg( destination ); + .tqarg( source ) + .tqarg( destination ); break; case Kompare::ComparingDirs : text = i18n( "Comparing files in %1 with files in %2" ) - .arg( source ) - .arg( destination ); + .tqarg( source ) + .tqarg( destination ); break; case Kompare::ShowingDiff : - text = i18n( "Viewing diff output from %1" ).arg( source ); + text = i18n( "Viewing diff output from %1" ).tqarg( source ); break; case Kompare::BlendingFile : text = i18n( "Blending diff output from %1 into file %2" ) - .arg( source ) - .arg( destination ); + .tqarg( source ) + .tqarg( destination ); break; case Kompare::BlendingDir : text = i18n( "Blending diff output from %1 into folder %2" ) - .arg( m_info.source.prettyURL() ) - .arg( m_info.destination.prettyURL() ); + .tqarg( m_info.source.prettyURL() ) + .tqarg( m_info.destination.prettyURL() ); break; default: break; @@ -678,8 +678,8 @@ void KomparePart::slotShowDiffstats( void ) "Format: %3\n" "Number of hunks: %4\n" "Number of differences: %5") - .arg(oldFile).arg(newFile).arg(diffFormat) - .arg(noOfHunks).arg(noOfDiffs), + .tqarg(oldFile).tqarg(newFile).tqarg(diffFormat) + .tqarg(noOfHunks).tqarg(noOfDiffs), i18n("Diff Statistics"), TQString(), false ); } else { // more than 1 file in diff, or 2 directories compared KMessageBox::information( 0L, i18n( @@ -693,8 +693,8 @@ void KomparePart::slotShowDiffstats( void ) "\n" "Number of hunks: %5\n" "Number of differences: %6") - .arg(filesInDiff).arg(diffFormat).arg(oldFile) - .arg(newFile).arg(noOfHunks).arg(noOfDiffs), + .tqarg(filesInDiff).tqarg(diffFormat).tqarg(oldFile) + .tqarg(newFile).tqarg(noOfHunks).tqarg(noOfDiffs), i18n("Diff Statistics"), TQString(), false ); } } |