From b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:51:21 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- parts/diff/diffdlg.cpp | 6 +++--- parts/diff/diffpart.cpp | 2 +- parts/diff/diffwidget.cpp | 12 ++++++------ parts/diff/diffwidget.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'parts/diff') diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp index 16e84b9e..1965cebb 100644 --- a/parts/diff/diffdlg.cpp +++ b/parts/diff/diffdlg.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include +#include #include @@ -22,8 +22,8 @@ DiffDlg::DiffDlg( TQWidget *parent, const char *name ): diffWidget = new DiffWidget( this, "Main Diff Widget" ); setMainWidget( diffWidget ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 0, spacingHint() ); - tqlayout->addWidget( diffWidget ); + TQVBoxLayout* layout = new TQVBoxLayout( this, 0, spacingHint() ); + layout->addWidget( diffWidget ); } DiffDlg::~DiffDlg() diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index 133a29f3..647a5cc5 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -182,7 +182,7 @@ void DiffPart::processExited( KProcess* p ) else showDiff( resultBuffer ); } else { - KMessageBox::error( 0, i18n("Diff command failed (%1):\n").tqarg( p->exitStatus() ) + resultErr ); + KMessageBox::error( 0, i18n("Diff command failed (%1):\n").arg( p->exitStatus() ) + resultErr ); } resultBuffer = resultErr = TQString(); delete proc; diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index b2a14518..c8e2c171 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include -#include +#include +#include #include #include #include @@ -73,7 +73,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) int i = 0; for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) { - popup->insertItem( i18n( "Show in %1" ).tqarg( *it ), i + POPUP_BASE, i ); + popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i ); i++; } if ( !extPartsTranslated.isEmpty() ) @@ -192,8 +192,8 @@ DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFl // te->setMinimumSize( 300, 200 ); connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( te ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->addWidget( te ); } DiffWidget::~DiffWidget() @@ -233,7 +233,7 @@ void DiffWidget::loadExtPart( const TQString& partName ) if ( !extPart || !extPart->widget() ) return; - tqlayout()->add( extPart->widget() ); + layout()->add( extPart->widget() ); setExtPartVisible( true ); diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h index df4b296b..ec5904b0 100644 --- a/parts/diff/diffwidget.h +++ b/parts/diff/diffwidget.h @@ -13,7 +13,7 @@ #define _DIFFWIDGET_H_ #include -#include +#include #include #include -- cgit v1.2.1