From f78838f2f736acc2b235d8b680f3379a07a6d372 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:34 -0600 Subject: Remove additional unneeded tq method conversions --- kompare/kompare_shell.cpp | 4 +-- kompare/komparenavtreepart/komparenavtreepart.cpp | 2 +- kompare/komparepart/kompare_part.cpp | 30 +++++++++++------------ kompare/komparepart/kompareconnectwidget.cpp | 2 +- kompare/komparepart/komparelistview.cpp | 6 ++--- kompare/komparepart/komparesaveoptionsbase.ui | 2 +- kompare/komparepart/komparesplitter.cpp | 4 +-- kompare/libdialogpages/pagebase.cpp | 2 +- kompare/libdiff2/diffhunk.cpp | 8 +++--- kompare/libdiff2/diffmodel.cpp | 4 +-- kompare/libdiff2/komparemodellist.cpp | 12 ++++----- 11 files changed, 38 insertions(+), 38 deletions(-) (limited to 'kompare') diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index b62c423f..43814746 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -269,13 +269,13 @@ void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int TQString diffStr; if ( modelIndex >= 0 ) - fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).tqarg( modelIndex + 1 ); + fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).arg( modelIndex + 1 ); else fileStr = i18n( " %n file ", " %n files ", modelCount ); if ( differenceIndex >= 0 ) diffStr = i18n( " %1 of %n difference, %2 applied ", " %1 of %n differences, %2 applied ", differenceCount ) - .tqarg( differenceIndex + 1 ).tqarg( appliedCount ); + .arg( differenceIndex + 1 ).arg( appliedCount ); else diffStr = i18n( " %n difference ", " %n differences ", differenceCount ); diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index 1a402260..9f9d775e 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.cpp +++ b/kompare/komparenavtreepart/komparenavtreepart.cpp @@ -582,7 +582,7 @@ KDirLVI* KDirLVI::findChild( TQString dir ) // kdDebug(8105) << "KDirLVI::findChild called with dir = " << dir << endl; KDirLVI* child; if ( ( child = static_cast(this->firstChild()) ) != 0L ) - { // has tqchildren, check if dir already exists, if so addModel + { // has children, check if dir already exists, if so addModel do { if ( dir == child->dirName() ) return child; diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index 3c110857..a00a7cb8 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -266,7 +266,7 @@ const TQString KomparePart::fetchURL( const KURL& url ) { if ( ! KIO::NetAccess::download( url, tempFileName, widget() ) ) { - slotShowError( i18n( "The URL %1 cannot be downloaded." ).tqarg( url.prettyURL() ) ); + slotShowError( i18n( "The URL %1 cannot be downloaded." ).arg( url.prettyURL() ) ); tempFileName = ""; } return tempFileName; @@ -278,7 +278,7 @@ const TQString KomparePart::fetchURL( const KURL& url ) return url.path(); else { - slotShowError( i18n( "The URL %1 does not exist on your system." ).tqarg( url.prettyURL() ) ); + slotShowError( i18n( "The URL %1 does not exist on your system." ).arg( url.prettyURL() ) ); return tempFileName; } } @@ -543,26 +543,26 @@ void KomparePart::updateStatus() { case Kompare::ComparingFiles : text = i18n( "Comparing file %1 with file %2" ) - .tqarg( source ) - .tqarg( destination ); + .arg( source ) + .arg( destination ); break; case Kompare::ComparingDirs : text = i18n( "Comparing files in %1 with files in %2" ) - .tqarg( source ) - .tqarg( destination ); + .arg( source ) + .arg( destination ); break; case Kompare::ShowingDiff : - text = i18n( "Viewing diff output from %1" ).tqarg( source ); + text = i18n( "Viewing diff output from %1" ).arg( source ); break; case Kompare::BlendingFile : text = i18n( "Blending diff output from %1 into file %2" ) - .tqarg( source ) - .tqarg( destination ); + .arg( source ) + .arg( destination ); break; case Kompare::BlendingDir : text = i18n( "Blending diff output from %1 into folder %2" ) - .tqarg( m_info.source.prettyURL() ) - .tqarg( m_info.destination.prettyURL() ); + .arg( m_info.source.prettyURL() ) + .arg( 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") - .tqarg(oldFile).tqarg(newFile).tqarg(diffFormat) - .tqarg(noOfHunks).tqarg(noOfDiffs), + .arg(oldFile).arg(newFile).arg(diffFormat) + .arg(noOfHunks).arg(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") - .tqarg(filesInDiff).tqarg(diffFormat).tqarg(oldFile) - .tqarg(newFile).tqarg(noOfHunks).tqarg(noOfDiffs), + .arg(filesInDiff).arg(diffFormat).arg(oldFile) + .arg(newFile).arg(noOfHunks).arg(noOfDiffs), i18n("Diff Statistics"), TQString(), false ); } } diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp index aa35fc7f..2bccc48b 100644 --- a/kompare/komparepart/kompareconnectwidget.cpp +++ b/kompare/komparepart/kompareconnectwidget.cpp @@ -139,7 +139,7 @@ void KompareConnectWidget::slotSetSelection( const DiffModel* model, const Diffe void KompareConnectWidget::slotDelayedRepaint() { - TQTimer::singleShot( 0, this, TQT_SLOT( tqrepaint() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( repaint() ) ); } void KompareConnectWidget::slotSetSelection( const Difference* diff ) diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp index cc114859..30e65d87 100644 --- a/kompare/komparepart/komparelistview.cpp +++ b/kompare/komparepart/komparelistview.cpp @@ -390,7 +390,7 @@ void KompareListView::slotApplyAllDifferences( bool apply ) TQPtrDictIterator it ( m_itemDict ); for( ; it.current(); ++it ) it.current()->applyDifference( apply ); - tqrepaint(); + repaint(); } void KompareListView::slotApplyDifference( const Difference* diff, bool apply ) @@ -500,7 +500,7 @@ void KompareListViewDiffItem::applyDifference( bool apply ) kdDebug(8104) << "KompareListViewDiffItem::applyDifference( " << apply << " )" << endl; setVisibility(); setup(); - tqrepaint(); + repaint(); } int KompareListViewDiffItem::maxHeight() @@ -520,7 +520,7 @@ void KompareListViewDiffItem::setSelected( bool b ) m_sourceItem->firstChild() : m_destItem->firstChild(); while( item && item->isVisible() ) { - item->tqrepaint(); + item->repaint(); item = item->nextSibling(); } } diff --git a/kompare/komparepart/komparesaveoptionsbase.ui b/kompare/komparepart/komparesaveoptionsbase.ui index 7636a27f..47cfc893 100644 --- a/kompare/komparepart/komparesaveoptionsbase.ui +++ b/kompare/komparepart/komparesaveoptionsbase.ui @@ -83,7 +83,7 @@ Command Line - + AlignVCenter|AlignLeft diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp index 009156cd..f91ac6bc 100644 --- a/kompare/komparepart/komparesplitter.cpp +++ b/kompare/komparepart/komparesplitter.cpp @@ -212,7 +212,7 @@ static TQPoint bottomRight( TQWidget *w ) if ( isCollapsed(w) ) { return toggle( w, w->pos() ) - TQPoint( 1, 1 ); } else { - return w->tqgeometry().bottomRight(); + return w->geometry().bottomRight(); } } @@ -396,7 +396,7 @@ void KompareSplitter::repaintHandles() TQSplitterLayoutStruct *curr; for ( curr = d->list.first(); curr; curr = d->list.next() ) if ( curr->isHandle ) - ((KompareConnectWidgetFrame*)curr->wid)->wid()->tqrepaint(); + ((KompareConnectWidgetFrame*)curr->wid)->wid()->repaint(); } // Scrolling stuff diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp index a2061a2b..43d6e933 100644 --- a/kompare/libdialogpages/pagebase.cpp +++ b/kompare/libdialogpages/pagebase.cpp @@ -37,7 +37,7 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget ) { // // The size is computed by adding the sizeHint().height() of all - // widget tqchildren and taking the width of the widest child and adding + // widget children and taking the width of the widest child and adding // tqlayout()->margin() and tqlayout()->spacing() // diff --git a/kompare/libdiff2/diffhunk.cpp b/kompare/libdiff2/diffhunk.cpp index 3fbd082e..3b48d796 100644 --- a/kompare/libdiff2/diffhunk.cpp +++ b/kompare/libdiff2/diffhunk.cpp @@ -98,10 +98,10 @@ TQString DiffHunk::recreateHunk() const // recreate header hunk += TQString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" ) - .tqarg( m_sourceLine ) - .tqarg( m_destinationLine ) - .tqarg( slc ) - .tqarg( dlc ); + .arg( m_sourceLine ) + .arg( m_destinationLine ) + .arg( slc ) + .arg( dlc ); if ( !m_function.isEmpty() ) hunk += " " + m_function; diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp index c300755b..1b3822b0 100644 --- a/kompare/libdiff2/diffmodel.cpp +++ b/kompare/libdiff2/diffmodel.cpp @@ -154,11 +154,11 @@ TQString DiffModel::recreateDiff() const // recreate header TQString tab = TQString::fromLatin1( "\t" ); TQString nl = TQString::fromLatin1( "\n" ); - diff += TQString::fromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp ); + diff += TQString::fromLatin1( "--- %1\t%2" ).arg( m_source ).arg( m_sourceTimestamp ); if ( !m_sourceRevision.isEmpty() ) diff += tab + m_sourceRevision; diff += nl; - diff += TQString::fromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp ); + diff += TQString::fromLatin1( "+++ %1\t%2" ).arg( m_destination ).arg( m_destinationTimestamp ); if ( !m_destinationRevision.isEmpty() ) diff += tab + m_destinationRevision; diff += nl; diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index 89912eac..90aff45b 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -235,7 +235,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di if ( parseDiffOutput( readFile( diff ) ) != 0 ) { - emit error( i18n( "No models or no differences, this file: %1, is not a valid diff file." ).tqarg( diff ) ); + emit error( i18n( "No models or no differences, this file: %1, is not a valid diff file." ).arg( diff ) ); return false; } @@ -243,7 +243,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di if ( !blendOriginalIntoModelList( file ) ) { kdDebug(8101) << "Oops cant blend original file into modellist : " << file << endl; - emit( i18n( "There were problems applying the diff %1 to the file %2." ).tqarg( diff ).tqarg( file ) ); + emit( i18n( "There were problems applying the diff %1 to the file %2." ).arg( diff ).arg( file ) ); return false; } @@ -259,7 +259,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff if ( parseDiffOutput( readFile( diff ) ) != 0 ) { - emit error( i18n( "No models or no differences, this file: %1, is not a valid diff file." ).tqarg( diff ) ); + emit error( i18n( "No models or no differences, this file: %1, is not a valid diff file." ).arg( diff ) ); return false; } @@ -268,7 +268,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff { // Trouble blending the original into the model kdDebug(8101) << "Oops cant blend original dir into modellist : " << dir << endl; - emit error( i18n( "There were problems applying the diff %1 to the folder %2." ).tqarg( diff ).tqarg( dir ) ); + emit error( i18n( "There were problems applying the diff %1 to the folder %2." ).arg( diff ).arg( dir ) ); return false; } @@ -347,7 +347,7 @@ bool KompareModelList::saveDestination( DiffModel* model ) temp->close(); if( temp->status() != 0 ) { - emit error( i18n( "Could not write to the temporary file %1, deleting it." ).tqarg( temp->name() ) ); + emit error( i18n( "Could not write to the temporary file %1, deleting it." ).arg( temp->name() ) ); temp->unlink(); delete temp; return false; @@ -380,7 +380,7 @@ bool KompareModelList::saveDestination( DiffModel* model ) if ( !result ) { - emit error( i18n( "Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually copy it to the right place." ).tqarg( m_destination ).tqarg( temp->name() ) ); + emit error( i18n( "Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually copy it to the right place." ).arg( m_destination ).arg( temp->name() ) ); } else { -- cgit v1.2.1