From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 14 Jun 2011 16:45:05 +0000
Subject: 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
---
 vcs/perforce/perforcepart.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'vcs/perforce/perforcepart.cpp')

diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index cb3d7ba9..406de1f8 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -38,8 +38,8 @@ static const KDevPluginInfo data("kdevperforce");
 typedef KDevGenericFactory<PerforcePart> PerforceFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) )
 
-PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & )
-    : KDevVersionControl( &data, parent, name ? name : "PerforcePart" )
+PerforcePart::PerforcePart( TQObject *tqparent, const char *name, const TQStringList & )
+    : KDevVersionControl( &data, tqparent, name ? name : "PerforcePart" )
 {
     setInstance(PerforceFactory::instance());
     setupActions();
@@ -94,30 +94,30 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context)
 
         KPopupMenu *sub = new KPopupMenu(popup);
         TQString name = fi.fileName();
-        sub->insertTitle( i18n("Actions for %1").arg(name) );
+        sub->insertTitle( i18n("Actions for %1").tqarg(name) );
 
         int id = sub->insertItem( i18n("Edit"),
                            this, TQT_SLOT(slotEdit()) );
-        sub->setWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
+        sub->tqsetWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
         id = sub->insertItem( i18n("Revert"),
                            this, TQT_SLOT(slotRevert()) );
-        sub->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
+        sub->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
         id = sub->insertItem( i18n("Submit"),
                            this, TQT_SLOT(slotCommit()) );
-        sub->setWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
+        sub->tqsetWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
         id = sub->insertItem( i18n("Sync"),
                            this, TQT_SLOT(slotUpdate()) );
-        sub->setWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace."));
+        sub->tqsetWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace."));
         sub->insertSeparator();
         id = sub->insertItem( i18n("Diff Against Repository"),
                           this, TQT_SLOT(slotDiff()) );
-        sub->setWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot."));
+        sub->tqsetWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot."));
         id = sub->insertItem( i18n("Add to Repository"),
                            this, TQT_SLOT(slotAdd()) );
-        sub->setWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot."));
+        sub->tqsetWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot."));
         id = sub->insertItem( i18n("Remove From Repository"),
                            this, TQT_SLOT(slotRemove()) );
-        sub->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot."));
+        sub->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot."));
         id = popup->insertItem(i18n("Perforce"), sub);
     }
 }
@@ -153,7 +153,7 @@ void PerforcePart::revert( const TQString& filename )
 {
     if ( KMessageBox::questionYesNo( 0,
             i18n("Do you really want to revert "
-                 "the file %1 and lose all your changes?").arg( filename ), TQString::null, i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
+                 "the file %1 and lose all your changes?").tqarg( filename ), TQString(), i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
         execCommand( "revert", filename );
     }
 }
@@ -242,7 +242,7 @@ void PerforcePart::diff( const TQString& filename )
     args << "diff";
     args << "-du";
     args << name;
-    ExecCommand* cmv = new ExecCommand( "p4", args, TQString::null, TQStringList(), this );
+    ExecCommand* cmv = new ExecCommand( "p4", args, TQString(), TQStringList(), this );
     connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )),
              this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) );
 }
@@ -275,7 +275,7 @@ void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err )
     static TQRegExp rx( "(^|\\n)==== ([^ ]+) -.*====\\n" );
     rx.setMinimal( true );
     TQString strippedDiff = diff;
-    strippedDiff.replace( rx, "--- \\2\n+++ \\2\n" );
+    strippedDiff.tqreplace( rx, "--- \\2\n+++ \\2\n" );
 
     if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("KDevelop/DiffFrontend"))
         diffFrontend->showDiff( strippedDiff );
@@ -289,7 +289,7 @@ TQString PerforcePart::currentFile()
         if ( url.isLocalFile() )
             return url.path();
     }
-    return TQString::null;
+    return TQString();
 }
 
 void PerforcePart::slotActionCommit()
-- 
cgit v1.2.1