4 files changed, 11 insertions, 11 deletions
diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp
index 1965cebb..16e84b9e 100644
--- a/parts/diff/diffdlg.cpp
+++ b/parts/diff/diffdlg.cpp
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
  
@@ -22,8 +22,8 @@ DiffDlg::DiffDlg( TQWidget *parent, const char *name ):
   diffWidget = new DiffWidget( this, "Main Diff Widget" );
   setMainWidget( diffWidget );
 
-  TQVBoxLayout* layout = new TQVBoxLayout( this, 0, spacingHint() );
-  layout->addWidget( diffWidget );
+  TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 0, spacingHint() );
+  tqlayout->addWidget( diffWidget );
 }
 
 DiffDlg::~DiffDlg()
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 647a5cc5..133a29f3 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").arg( p->exitStatus() ) + resultErr );
+    KMessageBox::error( 0, i18n("Diff command failed (%1):\n").tqarg( p->exitStatus() ) + resultErr );
   }
   resultBuffer = resultErr = TQString();
   delete proc;
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 );
 
diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h
index ec5904b0..df4b296b 100644
--- a/parts/diff/diffwidget.h
+++ b/parts/diff/diffwidget.h
@@ -13,7 +13,7 @@
 #define _DIFFWIDGET_H_
 
 #include <tqwidget.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqstringlist.h>
 
 #include <kurl.h>