diff options
Diffstat (limited to 'parts/diff/diffwidget.cpp')
-rw-r--r-- | parts/diff/diffwidget.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index c8e2c171..b2a14518 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <layout.h> -#include <textedit.h> +#include <tqlayout.h> +#include <tqtextedit.h> #include <tqpopupmenu.h> #include <tqcursor.h> #include <tqfile.h> @@ -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" ).arg( *it ), i + POPUP_BASE, i ); + popup->insertItem( i18n( "Show in %1" ).tqarg( *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* layout = new TQVBoxLayout( this ); - layout->addWidget( te ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->addWidget( te ); } DiffWidget::~DiffWidget() @@ -233,7 +233,7 @@ void DiffWidget::loadExtPart( const TQString& partName ) if ( !extPart || !extPart->widget() ) return; - layout()->add( extPart->widget() ); + tqlayout()->add( extPart->widget() ); setExtPartVisible( true ); |