summaryrefslogtreecommitdiffstats
path: root/vcs/subversion
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:15:35 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:15:35 -0600
commitf78eb03afb8c9a380985d26286afc40b4c89b292 (patch)
tree3c087e2f119e645c902958c3bc3c802abf078ad0 /vcs/subversion
parentda1941ccadffe5ae70ee111c53f0ec2b3d990869 (diff)
downloadtdevelop-f78eb03afb8c9a380985d26286afc40b4c89b292.tar.gz
tdevelop-f78eb03afb8c9a380985d26286afc40b4c89b292.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'vcs/subversion')
-rw-r--r--vcs/subversion/subversion_part.cpp34
-rw-r--r--vcs/subversion/subversion_part.h2
2 files changed, 18 insertions, 18 deletions
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index 7c41c29b..2af899a1 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -98,64 +98,64 @@ subversionPart::~subversionPart() {
}
void subversionPart::setupActions() {
- actionCommit = new KAction( i18n("&Commit to Repository..."), 0, this, TQT_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" );
+ actionCommit = new TDEAction( i18n("&Commit to Repository..."), 0, this, TQT_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 KAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()),
+ /* actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()),
actionCollection(), "subversion_diff" );
actionDiff->setToolTip( i18n("Build difference") );
actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") );
*/
- actionAdd = new KAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), actionCollection(), "subversion_add" );
+ actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQT_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 KAction( i18n("Show logs..."), 0, this, TQT_SLOT(slotLog()), actionCollection(), "subversion_log" );
- actionBlame = new KAction( i18n("Blame..."), 0, this, TQT_SLOT(slotBlame()), actionCollection(), "subversion_blame");
+ 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");
- actionRemove = new KAction( i18n("&Remove From Repository"), 0, this, TQT_SLOT(slotActionDel()), actionCollection(), "subversion_remove" );
+ actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQT_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 KAction( i18n("&Update"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" );
+ actionUpdate = new TDEAction( i18n("&Update"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" );
actionUpdate->setToolTip( i18n("Update") );
actionUpdate->setWhatsThis( i18n("<b>Update</b><p>Updates file(s) from repository.") );
- actionDiffLocal = new KAction( i18n("&Diff to BASE"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" );
+ actionDiffLocal = new TDEAction( i18n("&Diff to BASE"), 0, this, TQT_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 KAction( i18n("&Diff to HEAD"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" );
+ actionDiffHead = new TDEAction( i18n("&Diff to HEAD"), 0, this, TQT_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 KAction( i18n("&Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" );
+ actionRevert = new TDEAction( i18n("&Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" );
actionRevert->setToolTip( i18n("Revert") );
actionRevert->setWhatsThis( i18n("<b>Revert</b><p>Undo local changes.") );
/*
- actionAddToIgnoreList = new KAction( i18n("&Ignore in Subversion Operations"), 0,
+ actionAddToIgnoreList = new TDEAction( i18n("&Ignore in Subversion Operations"), 0,
this, TQT_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 KAction( i18n("Do &Not Ignore in Subversion Operations"), 0,
+ actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in Subversion Operations"), 0,
this, TQT_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 KAction( i18n("Re&solve Conflicting State"), 0,
+ actionResolve = new TDEAction( i18n("Re&solve Conflicting State"), 0,
this, TQT_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 KAction( i18n("Switch this working copy to URL.."), 0,
+ actionSwitch = new TDEAction( i18n("Switch this working copy to URL.."), 0,
this, TQT_SLOT(slotSwitch()), actionCollection(), "subversion_switch" );
// warn slogCopy(), slotMerge only works on context menu. There is no main-menu action
- actionCopy = new KAction( i18n("Copy this working copy to URL.."), 0,
+ actionCopy = new TDEAction( i18n("Copy this working copy to URL.."), 0,
this, TQT_SLOT(slotCopy()), actionCollection(), "subversion_copy" );
- actionMerge = new KAction( i18n("Merge difference to working copy"), 0,
+ actionMerge = new TDEAction( i18n("Merge difference to working copy"), 0,
this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" );
}
@@ -209,7 +209,7 @@ if(!project())
if (m_urls.count() <= 0)
return;
- KPopupMenu *subMenu = new KPopupMenu( popup );
+ TDEPopupMenu *subMenu = new TDEPopupMenu( popup );
if (context->hasType( Context::FileContext ))
popup->insertSeparator();
diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h
index a5490251..1847567d 100644
--- a/vcs/subversion/subversion_part.h
+++ b/vcs/subversion/subversion_part.h
@@ -92,7 +92,7 @@ private:
TQGuardedPtr<subversionCore> m_impl;
KURL::List m_urls;
- KAction *actionCommit,
+ TDEAction *actionCommit,
*actionDiffHead,
*actionDiffLocal,
*actionAdd,