diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 14:24:33 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-21 23:12:29 +0900 |
commit | 0b6a83b773c37ee6949d73346c4a669aa1fc98b8 (patch) | |
tree | 03606cf5d79c9c08b77909997c4301fb34bc783c /vcs/subversion | |
parent | 19ccb502fc61ce7dfa1d030d833d2b1f898051f4 (diff) | |
download | tdevelop-0b6a83b773c37ee6949d73346c4a669aa1fc98b8.tar.gz tdevelop-0b6a83b773c37ee6949d73346c4a669aa1fc98b8.zip |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 35fbd60457d1e51e6a0df5d181d1a0f00ad75a2c)
Diffstat (limited to 'vcs/subversion')
-rw-r--r-- | vcs/subversion/kdevsvnd_widgets.cpp | 6 | ||||
-rw-r--r-- | vcs/subversion/subversion_core.cpp | 38 | ||||
-rw-r--r-- | vcs/subversion/subversion_fileinfo.cpp | 2 | ||||
-rw-r--r-- | vcs/subversion/subversion_part.cpp | 86 | ||||
-rw-r--r-- | vcs/subversion/subversion_widget.cpp | 2 | ||||
-rw-r--r-- | vcs/subversion/svn_blamewidget.cpp | 4 | ||||
-rw-r--r-- | vcs/subversion/svn_copywidget.cpp | 8 | ||||
-rw-r--r-- | vcs/subversion/svn_logviewwidget.cpp | 18 | ||||
-rw-r--r-- | vcs/subversion/svn_mergewidget.cpp | 8 | ||||
-rw-r--r-- | vcs/subversion/svn_switchwidget.cpp | 4 |
10 files changed, 88 insertions, 88 deletions
diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp index 0fd2c20b..9f3eb3f9 100644 --- a/vcs/subversion/kdevsvnd_widgets.cpp +++ b/vcs/subversion/kdevsvnd_widgets.cpp @@ -27,9 +27,9 @@ SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool m btnPermanent->setText(i18n("Accept Permanently")); btnTemporary->setText(i18n("Accept Temporarily")); btnReject->setText(i18n("Reject")); - connect( btnPermanent, TQT_SIGNAL(clicked()), this, TQT_SLOT(setPermanent()) ); - connect( btnTemporary, TQT_SIGNAL(clicked()), this, TQT_SLOT(setTemporary()) ); - connect( btnReject, TQT_SIGNAL(clicked()), this, TQT_SLOT(setRejected ()) ); + connect( btnPermanent, TQ_SIGNAL(clicked()), this, TQ_SLOT(setPermanent()) ); + connect( btnTemporary, TQ_SIGNAL(clicked()), this, TQ_SLOT(setTemporary()) ); + connect( btnReject, TQ_SIGNAL(clicked()), this, TQ_SLOT(setRejected ()) ); } SvnSSLTrustPrompt::~SvnSSLTrustPrompt() {} diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index e9c89ece..c0a97129 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -127,7 +127,7 @@ void subversionCore::resolve( const KURL::List& list ) { s << cmd << *it << recurse; SimpleJob * job = TDEIO::special(servURL, parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } } @@ -142,7 +142,7 @@ void subversionCore::update( const KURL::List& list ) { s << cmd << list << rev << TQString( "HEAD" ); SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") ); } @@ -160,7 +160,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){ TQString revkind2 = "WORKING"; s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); if ( diffresult.count() > 0 ) { //check kompare is available @@ -241,7 +241,7 @@ void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, s << cmd << pathOrUrl1 << pathOrUrl2 << rev1 << revKind1 << rev2 << revKind2 << recurse; s << pegdiff; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDiffResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotDiffResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() ); } @@ -261,7 +261,7 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock s << *it; } SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if( list.count() == 1 ) initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") ); else if( list.count() > 1 ) @@ -295,7 +295,7 @@ void subversionCore::svnLog( const KURL::List& list, s << *it; } SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotLogResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotLogResult( TDEIO::Job * ) ) ); // progress info. LogView is allowed and meaninful only for one url in KDev3.4 initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") ); } @@ -316,7 +316,7 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQStrin s << revstart << revKindStart << revend << revKindEnd ; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotBlameResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotBlameResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") ); } @@ -332,7 +332,7 @@ void subversionCore::add( const KURL::List& list ) { // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::del( const KURL::List& list ) { @@ -346,7 +346,7 @@ void subversionCore::del( const KURL::List& list ) { // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::revert( const KURL::List& list ) { @@ -359,7 +359,7 @@ void subversionCore::revert( const KURL::List& list ) { s << cmd << list; SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::checkout() { @@ -377,7 +377,7 @@ void subversionCore::checkout() { servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" SimpleJob * job = TDEIO::special(servURL,parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotEndCheckout( TDEIO::Job * ) ) ); } } @@ -393,7 +393,7 @@ void subversionCore::switchTree( const KURL &path, const KURL &repositUrl, s << recurse << revNum << revKind; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() ); } @@ -408,7 +408,7 @@ void subversionCore::switchRelocate( const KURL &path, s << cmd << path << currentUrl << newUrl << recurse; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); // this doesn't contact repository } @@ -423,7 +423,7 @@ void subversionCore::svnCopy( const KURL &src, int srcRev, const TQString &srcRe s << cmd << src << srcRev << srcRevKind << dest; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, src.prettyURL(), dest.prettyURL() ); } @@ -440,7 +440,7 @@ void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1, s << recurse << ignore_ancestry << force << dry_run; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() , wc_path.prettyURL() ); } @@ -722,10 +722,10 @@ void subversionCore::initProcessDlg( TDEIO::Job *job, const TQString &src, const progress->setSourceUrl( src ); progress->setDestUrl( dest ); progress->setJob( job ); - connect( job, TQT_SIGNAL( totalSize(TDEIO::Job*, TDEIO::filesize_t) ), - progress, TQT_SLOT( slotTotalSize (TDEIO::Job*, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( processedSize(TDEIO::Job*, TDEIO::filesize_t) ), - progress, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( totalSize(TDEIO::Job*, TDEIO::filesize_t) ), + progress, TQ_SLOT( slotTotalSize (TDEIO::Job*, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( processedSize(TDEIO::Job*, TDEIO::filesize_t) ), + progress, TQ_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t) ) ); } void subversionCore::createNewProject( const TQString& // dirName diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index 45d44d1e..f845c035 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -155,7 +155,7 @@ bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerDa s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << checkRepos << recursive; KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/"; job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if( checkRepos ) m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory Status") ); return true; 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) { diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index 95b31f6b..8cedf78f 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -39,7 +39,7 @@ subversionWidget::subversionWidget( subversionPart *part, TQWidget *parent, cons m_closeButton = new TQPushButton( tab() ); m_closeButton->setText( i18n("Close") ); tab()->setCornerWidget(m_closeButton); - connect( m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentTab()) ); + connect( m_closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeCurrentTab()) ); } subversionWidget::~subversionWidget() diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp index 87647525..78f09102 100644 --- a/vcs/subversion/svn_blamewidget.cpp +++ b/vcs/subversion/svn_blamewidget.cpp @@ -99,8 +99,8 @@ SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *parent ) m_layout->addWidget( m_okBtn, 1, 0 ); m_layout->addWidget( m_cancelBtn, 1, 1 ); - connect( m_okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( m_cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( m_okBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( m_cancelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); } SvnBlameFileSelectDlg::~SvnBlameFileSelectDlg() {} diff --git a/vcs/subversion/svn_copywidget.cpp b/vcs/subversion/svn_copywidget.cpp index 30b25fd7..094b9684 100644 --- a/vcs/subversion/svn_copywidget.cpp +++ b/vcs/subversion/svn_copywidget.cpp @@ -13,10 +13,10 @@ SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder { reqEdit->setText( reqPath ); - connect( urlRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsUrl()) ); - connect( pathRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsLocalPath()) ); - connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revnumInput, TQT_SLOT(setEnabled(bool)) ); - connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revkindCombo, TQT_SLOT(setDisabled(bool)) ); + connect( urlRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(setSourceAsUrl()) ); + connect( pathRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(setSourceAsLocalPath()) ); + connect( revnumRadio, TQ_SIGNAL(toggled(bool)), revnumInput, TQ_SLOT(setEnabled(bool)) ); + connect( revnumRadio, TQ_SIGNAL(toggled(bool)), revkindCombo, TQ_SLOT(setDisabled(bool)) ); // In many cases, users copy from reository to repository. This is for making tag/branche. // The case where copying from local path to repository may be lesser than the above one. diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index ebf5f438..ac9b982b 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -73,9 +73,9 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) resize( TQSize(692, 343).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); - connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) ); - connect( listView1, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)) ); + connect( listView1, TQ_SIGNAL(clicked( TQListViewItem *)), this, TQ_SLOT(slotClicked(TQListViewItem*)) ); + connect( listView1, TQ_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)) ); } SvnLogViewWidget::~SvnLogViewWidget() { @@ -128,8 +128,8 @@ void SvnLogViewWidget::contextMenuRequested( TQListViewItem *item, const TQPoint if( !m_ctxLogItem ) return; TQPopupMenu *menu = new TQPopupMenu(this); - menu->insertItem( i18n("Blame this revision"), this, TQT_SLOT(blameThis()) ); - menu->insertItem( i18n("Difference to previous revision"), this, TQT_SLOT(diffToPrevious()) ); + menu->insertItem( i18n("Blame this revision"), this, TQ_SLOT(blameThis()) ); + menu->insertItem( i18n("Difference to previous revision"), this, TQ_SLOT(diffToPrevious()) ); menu->exec( pos ); } void SvnLogViewWidget::blameThis() @@ -195,10 +195,10 @@ SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *parent, const char* name, bo radio4->setChecked(true); //start revistion by revision keyword radio5->setChecked(true); //end revision by revision number reinstallRevisionSpecifiers(); - connect( intInput1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartRevnumRadio()) ); - connect( comboBox1, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setStartRevkindRadio()) ); - connect( intInput2, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndRevnumRadio()) ); - connect( comboBox2, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setEndRevkindRadio()) ); + connect( intInput1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartRevnumRadio()) ); + connect( comboBox1, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(setStartRevkindRadio()) ); + connect( intInput2, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndRevnumRadio()) ); + connect( comboBox2, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(setEndRevkindRadio()) ); } SvnLogViewOptionDlg::~SvnLogViewOptionDlg() {} diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp index 50731690..5885e6b7 100644 --- a/vcs/subversion/svn_mergewidget.cpp +++ b/vcs/subversion/svn_mergewidget.cpp @@ -33,10 +33,10 @@ SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent ) { dest->setURL( wcTarget.prettyURL() ); - connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revnum1, TQT_SLOT(setEnabled(bool)) ); - connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revkind1, TQT_SLOT(setDisabled(bool)) ); - connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revnum2, TQT_SLOT(setEnabled(bool)) ); - connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revkind2, TQT_SLOT(setDisabled(bool)) ); + connect( revnumbtn1, TQ_SIGNAL(toggled(bool)), revnum1, TQ_SLOT(setEnabled(bool)) ); + connect( revnumbtn1, TQ_SIGNAL(toggled(bool)), revkind1, TQ_SLOT(setDisabled(bool)) ); + connect( revnumbtn2, TQ_SIGNAL(toggled(bool)), revnum2, TQ_SLOT(setEnabled(bool)) ); + connect( revnumbtn2, TQ_SIGNAL(toggled(bool)), revkind2, TQ_SLOT(setDisabled(bool)) ); revkind1->setDisabled(true); revnum2->setDisabled(true); } diff --git a/vcs/subversion/svn_switchwidget.cpp b/vcs/subversion/svn_switchwidget.cpp index 7149cce2..490d20b7 100644 --- a/vcs/subversion/svn_switchwidget.cpp +++ b/vcs/subversion/svn_switchwidget.cpp @@ -11,8 +11,8 @@ SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, : SvnSwitchDlgBase( parent ) , m_info( holder ) { - connect( switchOnlyRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); - connect( relocationRadio , TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( switchOnlyRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( relocationRadio , TQ_SIGNAL(clicked()), this, TQ_SLOT(resetCurrentRepositoryUrlEdit()) ); // set switch only switchOnlyRadio->setChecked( true ); wcUrlEdit->setText( wcPath ); |