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, 8 insertions, 8 deletions

diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index fab596ad..f6495932 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -41,8 +41,8 @@ static const KDevPluginInfo data("kdevdiff");
 typedef KDevGenericFactory<DiffPart> DiffFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) )
 
-DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
+DiffPart::DiffPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevDiffFrontend(&data, tqparent, name ? name : "DiffPart"), proc(0)
 {
   setInstance(DiffFactory::instance());
   setXMLFile("kdevdiff.rc");
@@ -122,7 +122,7 @@ void DiffPart::contextMenu( TQPopupMenu* popup, const Context* context )
 	{
 		int id = popup->insertItem( i18n( "Difference to Disk File" ),
 							this, TQT_SLOT(localDiff()) );
-		popup->setWhatsThis(id, i18n("<b>Difference to disk file</b><p>Shows the difference between "
+		popup->TQMenuData::setWhatsThis(id, i18n("<b>Difference to disk file</b><p>Shows the difference between "
 			"the file contents in this editor and the file contents on disk."));
 	}
 }
@@ -146,7 +146,7 @@ void DiffPart::localDiff()
   if ( !editIface )
     return;
   buffer = editIface->text().local8Bit();
-  resultBuffer = resultErr = TQString::null;
+  resultBuffer = resultErr = TQString();
 
   delete proc;
   proc = new KProcess();
@@ -182,9 +182,9 @@ 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::null;
+  resultBuffer = resultErr = TQString();
   delete proc;
   proc = 0;
 }
@@ -196,7 +196,7 @@ void DiffPart::receivedStdout( KProcess* /* p */, char* buf, int buflen )
 
 void DiffPart::receivedStderr( KProcess* /* p */, char* buf, int buflen )
 {
-  kdDebug(9033) << "received Stderr: " << TQString::fromLocal8Bit( buf, buflen ) << endl;
+  kdDebug(9033) << "received Stderr: " << TQString::fromLocal8Bit( buf, buflen ).data() << endl;
   resultErr += TQString::fromLocal8Bit( buf, buflen );
 }
 
@@ -237,7 +237,7 @@ void DiffPart::showDiff( const TQString& diff )
 
 void DiffPart::slotExecDiff()
 {
-  KURL url = KFileDialog::getOpenURL( TQString::null, TQString::null, 0, i18n("Please Select Patch File") );
+  KURL url = KFileDialog::getOpenURL( TQString(), TQString(), 0, i18n("Please Select Patch File") );
 
   if ( url.isEmpty() )
     return;