TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 9 deletions

diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 7d403e46..21e7709f 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -42,7 +42,7 @@ static const int POPUP_BASE = 130977;
 TQStringList KDiffTextEdit::extParts;
 TQStringList KDiffTextEdit::extPartsTranslated;
 
-KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name )
+KDiffTextEdit::KDiffTextEdit( TQWidget* tqparent, const char* name ): TQTextEdit( tqparent, name )
 {
   KConfig* config = kapp->config();
   config->setGroup( "Diff" );
@@ -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() )
@@ -90,7 +90,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p )
   popup->insertSeparator( 3 );
 
   popup->insertSeparator();
-  popup->insertItem( i18n("Hide view"), parent(), TQT_SLOT(hideView()) );
+  popup->insertItem( i18n("Hide view"), tqparent(), TQT_SLOT(hideView()) );
 
   return popup;
 }
@@ -180,8 +180,8 @@ void KDiffTextEdit::popupActivated( int id )
   emit externalPartRequested( extParts[ id ] );
 }
 
-DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFlags f ):
-    TQWidget( parent, name, f ), m_part( part ), tempFile( 0 )
+DiffWidget::DiffWidget( DiffPart * part, TQWidget *tqparent, const char *name, WFlags f ):
+    TQWidget( tqparent, name, f ), m_part( part ), tempFile( 0 )
 {
   job = 0;
   extPart = 0;
@@ -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()
@@ -229,11 +229,11 @@ void DiffWidget::loadExtPart( const TQString& partName )
   if ( !extService )
     return;
 
-  extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, this, 0 );
+  extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, TQT_TQOBJECT(this), 0 );
   if ( !extPart || !extPart->widget() )
     return;
 
-  layout()->add( extPart->widget() );
+  tqlayout()->add( extPart->widget() );
 
   setExtPartVisible( true );