summaryrefslogtreecommitdiffstats
path: root/vcs/perforce
diff options
context:
space:
mode:
Diffstat (limited to 'vcs/perforce')
-rw-r--r--vcs/perforce/commitdlg.cpp8
-rw-r--r--vcs/perforce/commitdlg.h2
-rw-r--r--vcs/perforce/integrator/perforceintegrator.h2
-rw-r--r--vcs/perforce/integrator/pfintegratordlg.h2
-rw-r--r--vcs/perforce/perforcepart.cpp44
-rw-r--r--vcs/perforce/perforcepart.h2
6 files changed, 30 insertions, 30 deletions
diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp
index c5706903..daa882d4 100644
--- a/vcs/perforce/commitdlg.cpp
+++ b/vcs/perforce/commitdlg.cpp
@@ -17,7 +17,7 @@
#include <tqtextedit.h>
#include <tqpushbutton.h>
#include <tqregexp.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeapplication.h>
#include <tdelocale.h>
#include <klineedit.h>
@@ -103,9 +103,9 @@ void CommitDialog::setDepotFiles( const TQStringList& lst )
args << (*it);
}
- ExecCommand* cmd = new ExecCommand( "p4", args, TQString(), TQStringList(), TQT_TQOBJECT(this) );
- connect( cmd, TQT_SIGNAL(finished( const TQString&, const TQString& )),
- this, TQT_SLOT(getFilesFinished( const TQString&, const TQString& )) );
+ ExecCommand* cmd = new ExecCommand( "p4", args, TQString(), TQStringList(), this );
+ connect( cmd, TQ_SIGNAL(finished( const TQString&, const TQString& )),
+ this, TQ_SLOT(getFilesFinished( const TQString&, const TQString& )) );
}
void CommitDialog::getFilesFinished( const TQString& out, const TQString& /* err */ )
diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h
index 7fa70404..a2dbf2fd 100644
--- a/vcs/perforce/commitdlg.h
+++ b/vcs/perforce/commitdlg.h
@@ -23,7 +23,7 @@ class TDEProcess;
class CommitDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
CommitDialog( TQWidget *parent = 0, const char *name = 0 );
diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h
index 2b82046f..4384d583 100644
--- a/vcs/perforce/integrator/perforceintegrator.h
+++ b/vcs/perforce/integrator/perforceintegrator.h
@@ -26,7 +26,7 @@
class PerforceIntegrator : public KDevVCSIntegrator
{
-Q_OBJECT
+TQ_OBJECT
public:
PerforceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h
index 3e7bf4de..71a48b11 100644
--- a/vcs/perforce/integrator/pfintegratordlg.h
+++ b/vcs/perforce/integrator/pfintegratordlg.h
@@ -24,7 +24,7 @@
#include <kdevvcsintegrator.h>
class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog {
-Q_OBJECT
+TQ_OBJECT
public:
PFIntegratorDlg(TQWidget *parent = 0, const char *name = 0);
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index f92666b6..e3229fb6 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -18,7 +18,7 @@
#include <tdepopupmenu.h>
#include <kdebug.h>
#include <kdevgenericfactory.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <tdeaction.h>
@@ -33,19 +33,19 @@
#include "commitdlg.h"
#include "execcommand.h"
-static const KDevPluginInfo data("kdevperforce");
+static const KDevPluginInfo pluginData("kdevperforce");
typedef KDevGenericFactory<PerforcePart> PerforceFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( pluginData ) )
PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & )
- : KDevVersionControl( &data, parent, name ? name : "PerforcePart" )
+ : KDevVersionControl( &pluginData, parent, name ? name : "PerforcePart" )
{
setInstance(PerforceFactory::instance());
setupActions();
- connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
- this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
+ connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+ this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
}
@@ -54,31 +54,31 @@ PerforcePart::~PerforcePart()
void PerforcePart::setupActions()
{
- actionEdit = new TDEAction( i18n("Edit"), 0, this, TQT_SLOT(slotActionEdit()),
+ actionEdit = new TDEAction( i18n("Edit"), 0, this, TQ_SLOT(slotActionEdit()),
actionCollection(), "perforce_edit" );
actionEdit->setToolTip(i18n("Edit"));
actionEdit->setWhatsThis(i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
- actionRevert = new TDEAction( i18n("Revert"), 0, this, TQT_SLOT(slotActionRevert()),
+ actionRevert = new TDEAction( i18n("Revert"), 0, this, TQ_SLOT(slotActionRevert()),
actionCollection(), "perforce_revert" );
actionRevert->setToolTip(i18n("Revert"));
actionRevert->setWhatsThis(i18n("<b>Revert</b><p>Discards changes made to open files."));
- actionSubmit = new TDEAction( i18n("Submit"), 0, this, TQT_SLOT(slotActionCommit()),
+ actionSubmit = new TDEAction( i18n("Submit"), 0, this, TQ_SLOT(slotActionCommit()),
actionCollection(), "perforce_submit" );
actionSubmit->setToolTip(i18n("Submit"));
actionSubmit->setWhatsThis(i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
- actionSync = new TDEAction( i18n("Sync"), 0, this, TQT_SLOT(slotActionUpdate()),
+ actionSync = new TDEAction( i18n("Sync"), 0, this, TQ_SLOT(slotActionUpdate()),
actionCollection(), "perforce_sync" );
actionSync->setToolTip(i18n("Sync"));
actionSync->setWhatsThis(i18n("<b>Sync</b><p>Copies files from the depot into the workspace."));
- actionDiff = new TDEAction( i18n("Diff Against Repository"), 0, this, TQT_SLOT(slotActionDiff()),
+ actionDiff = new TDEAction( i18n("Diff Against Repository"), 0, this, TQ_SLOT(slotActionDiff()),
actionCollection(), "perforce_diff" );
actionDiff->setToolTip(i18n("Diff against repository"));
actionDiff->setWhatsThis(i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot."));
- actionAdd = new TDEAction( i18n("Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()),
+ actionAdd = new TDEAction( i18n("Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()),
actionCollection(), "perforce_add" );
actionAdd->setToolTip(i18n("Add to repository"));
actionAdd->setWhatsThis(i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot."));
- actionRemove = new TDEAction( i18n("Remove From Repository"), 0, this, TQT_SLOT(slotActionRemove()),
+ actionRemove = new TDEAction( i18n("Remove From Repository"), 0, this, TQ_SLOT(slotActionRemove()),
actionCollection(), "perforce_remove" );
actionRemove->setToolTip(i18n("Remove from repository"));
actionRemove->setWhatsThis(i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot."));
@@ -97,26 +97,26 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context)
sub->insertTitle( i18n("Actions for %1").arg(name) );
int id = sub->insertItem( i18n("Edit"),
- this, TQT_SLOT(slotEdit()) );
+ this, TQ_SLOT(slotEdit()) );
sub->setWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
id = sub->insertItem( i18n("Revert"),
- this, TQT_SLOT(slotRevert()) );
+ this, TQ_SLOT(slotRevert()) );
sub->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
id = sub->insertItem( i18n("Submit"),
- this, TQT_SLOT(slotCommit()) );
+ this, TQ_SLOT(slotCommit()) );
sub->setWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
id = sub->insertItem( i18n("Sync"),
- this, TQT_SLOT(slotUpdate()) );
+ this, TQ_SLOT(slotUpdate()) );
sub->setWhatsThis(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()) );
+ this, TQ_SLOT(slotDiff()) );
sub->setWhatsThis(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()) );
+ this, TQ_SLOT(slotAdd()) );
sub->setWhatsThis(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()) );
+ this, TQ_SLOT(slotRemove()) );
sub->setWhatsThis(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);
}
@@ -243,8 +243,8 @@ void PerforcePart::diff( const TQString& filename )
args << "-du";
args << name;
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& )) );
+ connect( cmv, TQ_SIGNAL(finished( const TQString&, const TQString& )),
+ this, TQ_SLOT(slotDiffFinished( const TQString&, const TQString& )) );
}
void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err )
diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h
index 7c034424..6980eaab 100644
--- a/vcs/perforce/perforcepart.h
+++ b/vcs/perforce/perforcepart.h
@@ -22,7 +22,7 @@ class TDEAction;
class PerforcePart : public KDevVersionControl
{
- Q_OBJECT
+ TQ_OBJECT
public: