summaryrefslogtreecommitdiffstats
path: root/vcs/subversion/subversion_part.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'vcs/subversion/subversion_part.cpp')
-rw-r--r--vcs/subversion/subversion_part.cpp86
1 files changed, 43 insertions, 43 deletions
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index 98b44848..be5f2b24 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -74,14 +74,14 @@ subversionPart::subversionPart(TQObject *parent, const char *name, const TQStrin
setupActions();
- connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) );
+ connect( m_impl, TQ_SIGNAL(checkoutFinished(TQString)), TQ_SIGNAL(finishedFetching(TQString)) );
// Context menu
- connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
- connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
- connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
- connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
- connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
+ connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
+ connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(projectConfigWidget(KDialogBase*)) );
+ connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) );
+ connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) );
+ connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) );
m_impl->processWidget()->setCaption(i18n( "Subversion Output" ));
mainWindow()->embedOutputView( (TQWidget*)m_impl->processWidget(), i18n( "Subversion" ), i18n( "Subversion messages" ) );
@@ -98,65 +98,65 @@ subversionPart::~subversionPart() {
}
void subversionPart::setupActions() {
- actionCommit = new TDEAction( i18n("&Commit to Repository..."), 0, this, TQT_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" );
+ actionCommit = new TDEAction( i18n("&Commit to Repository..."), 0, this, TQ_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" );
actionCommit->setToolTip( i18n("Commit file(s)") );
actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") );
- /* actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()),
+ /* actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQ_SLOT(slotActionDiff()),
actionCollection(), "subversion_diff" );
actionDiff->setToolTip( i18n("Build difference") );
actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") );
*/
- actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), actionCollection(), "subversion_add" );
+ actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "subversion_add" );
actionAdd->setToolTip( i18n("Add file to repository") );
actionAdd->setWhatsThis( i18n("<b>Add file to repository</b><p>Adds file to repository.") );
- actionLog = new TDEAction( i18n("Show logs..."), 0, this, TQT_SLOT(slotLog()), actionCollection(), "subversion_log" );
- actionBlame = new TDEAction( i18n("Blame..."), 0, this, TQT_SLOT(slotBlame()), actionCollection(), "subversion_blame");
+ actionLog = new TDEAction( i18n("Show logs..."), 0, this, TQ_SLOT(slotLog()), actionCollection(), "subversion_log" );
+ actionBlame = new TDEAction( i18n("Blame..."), 0, this, TQ_SLOT(slotBlame()), actionCollection(), "subversion_blame");
- actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQT_SLOT(slotActionDel()), actionCollection(), "subversion_remove" );
+ actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQ_SLOT(slotActionDel()), actionCollection(), "subversion_remove" );
actionRemove->setToolTip( i18n("Remove from repository") );
actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") );
- actionUpdate = new TDEAction( i18n("&Update"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" );
+ actionUpdate = new TDEAction( i18n("&Update"), 0, this, TQ_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" );
actionUpdate->setToolTip( i18n("Update") );
actionUpdate->setWhatsThis( i18n("<b>Update</b><p>Updates file(s) from repository.") );
- actionDiffLocal = new TDEAction( i18n("&Diff to BASE"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" );
+ actionDiffLocal = new TDEAction( i18n("&Diff to BASE"), 0, this, TQ_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" );
actionDiffLocal->setToolTip( i18n("Diff to BASE") );
actionDiffLocal->setWhatsThis( i18n("<b>Diff to disk</b><p>Diff current file to the BASE checked out copy.") );
- actionDiffHead = new TDEAction( i18n("&Diff to HEAD"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" );
+ actionDiffHead = new TDEAction( i18n("&Diff to HEAD"), 0, this, TQ_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" );
actionDiffHead->setToolTip( i18n("Diff to HEAD") );
actionDiffHead->setWhatsThis( i18n("<b>Diff HEAD</b><p>Diff the current file to HEAD in svn.") );
- actionRevert = new TDEAction( i18n("&Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" );
+ actionRevert = new TDEAction( i18n("&Revert"), 0, this, TQ_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" );
actionRevert->setToolTip( i18n("Revert") );
actionRevert->setWhatsThis( i18n("<b>Revert</b><p>Undo local changes.") );
/*
actionAddToIgnoreList = new TDEAction( i18n("&Ignore in Subversion Operations"), 0,
- this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" );
+ this, TQ_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" );
actionAddToIgnoreList->setToolTip( i18n("Ignore in Subversion operations") );
actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).") );
actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in Subversion Operations"), 0,
- this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" );
+ this, TQ_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" );
actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in Subversion operations") );
actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).") );
*/
actionResolve = new TDEAction( i18n("Re&solve Conflicting State"), 0,
- this, TQT_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" );
+ this, TQ_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" );
actionResolve->setToolTip( i18n("Resolve the conflicting state of a file after a merge") );
actionResolve->setWhatsThis( i18n("<b>Resolve the conflicting state</b><p>Remove the conflict state that can be set on a file after a merge failed.") );
actionSwitch = new TDEAction( i18n("Switch this working copy to URL.."), 0,
- this, TQT_SLOT(slotSwitch()), actionCollection(), "subversion_switch" );
+ this, TQ_SLOT(slotSwitch()), actionCollection(), "subversion_switch" );
// warn slogCopy(), slotMerge only works on context menu. There is no main-menu action
actionCopy = new TDEAction( i18n("Copy this working copy to URL.."), 0,
- this, TQT_SLOT(slotCopy()), actionCollection(), "subversion_copy" );
+ this, TQ_SLOT(slotCopy()), actionCollection(), "subversion_copy" );
actionMerge = new TDEAction( i18n("Merge difference to working copy"), 0,
- this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" );
+ this, TQ_SLOT(slotMerge()), actionCollection(), "subversion_merge" );
}
TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) {
@@ -213,48 +213,48 @@ if(!project())
if (context->hasType( Context::FileContext ))
popup->insertSeparator();
- int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) );
+ int id = subMenu->insertItem( actionCommit->text(), this, TQ_SLOT(slotCommit()) );
// CvsService let to do log and diff operations only on one file (or directory) at time
/* if (m_urls.count() == 1)
{
- subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) );
- subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
+ subMenu->insertItem( actionDiff->text(), this, TQ_SLOT(slotDiff()) );
+ subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) );
}*/
subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
- id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) );
+ id = subMenu->insertItem( actionAdd->text(), this, TQ_SLOT(slotAdd()) );
subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository."));
- id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) );
+ id = subMenu->insertItem( actionRemove->text(), this, TQ_SLOT(slotDel()) );
subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
- id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
+ id = subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) );
subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs"));
- id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) );
+ id = subMenu->insertItem( actionBlame->text(), this, TQ_SLOT(slotBlame()) );
subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate"));
subMenu->insertSeparator();
- id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) );
+ id = subMenu->insertItem( actionDiffLocal->text(), this, TQ_SLOT(slotDiffLocal()) );
subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk."));
- id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) );
+ id = subMenu->insertItem( actionDiffHead->text(), this, TQ_SLOT(slotDiffHead()) );
subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository."));
- id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) );
+ id = subMenu->insertItem( actionUpdate->text(), this, TQ_SLOT(slotUpdate()) );
subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository."));
- id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) );
+ id = subMenu->insertItem( actionRevert->text(), this, TQ_SLOT(slotRevert()) );
subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") );
- id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) );
+ id = subMenu->insertItem( actionResolve->text(), this, TQ_SLOT(slotResolve()) );
subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") );
- id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) );
+ id = subMenu->insertItem( actionSwitch->text(), this, TQ_SLOT(slotSwitch()) );
subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") );
- id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) );
+ id = subMenu->insertItem( actionCopy->text(), this, TQ_SLOT(slotCopy()) );
subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") );
- id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) );
+ id = subMenu->insertItem( actionMerge->text(), this, TQ_SLOT(slotMerge()) );
subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") );
/*
subMenu->insertSeparator();
- id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) );
+ id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQ_SLOT(slotAddToIgnoreList()) );
subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s)."));
- id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) );
+ id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQ_SLOT(slotRemoveFromIgnoreList()) );
subMenu->setWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s)."));
*/
// Now insert in parent menu
@@ -529,16 +529,16 @@ void subversionPart::slotProjectOpened() {
} */
//loadOptions();
/// \FIXME slots
- //connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) );
- //connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) );
+ //connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) );
+ //connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) );
}
void subversionPart::slotProjectClosed() {
kdDebug(9036) << "subversion :projectClosed" << endl;
//saveOptions();
/// \FIXME slots
- //disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) );
- //disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) );
+ //disconnect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) );
+ //disconnect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) );
}
void subversionPart::savePartialProjectSession(TQDomElement* dom) {