TDE
/
tdesvn
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesvn
0
0
Fork 0
Code Issues Releases Wiki Activity

Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/21/head
Michele Calgaro 11 months ago
parent 70a9b1f3fb
commit 9ebb061777
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
21 changed files with 274 additions and 274 deletions
Show Stats Download Patch File Download Diff File

20
src/helpers/sshagent.cpp
Unescape View File

@ -134,10 +134,10 @@ bool SshAgent::addSshIdentities(bool force)
proc << "ssh-add"; proc << "ssh-add";
connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), connect(&proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), connect(&proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
proc.start(TDEProcess::DontCare, TDEProcess::AllOutput); proc.start(TDEProcess::DontCare, TDEProcess::AllOutput);
@ -238,12 +238,12 @@ bool SshAgent::startSshAgent()
proc << "ssh-agent"; proc << "ssh-agent";
connect(&proc, TQT_SIGNAL(processExited(TDEProcess*)), connect(&proc, TQ_SIGNAL(processExited(TDEProcess*)),
TQT_SLOT(slotProcessExited(TDEProcess*))); TQ_SLOT(slotProcessExited(TDEProcess*)));
connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), connect(&proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), connect(&proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) ); TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) );
proc.start(TDEProcess::NotifyOnExit, TDEProcess::All); proc.start(TDEProcess::NotifyOnExit, TDEProcess::All);

4
src/ksvnwidgets/diffbrowser.cpp
Unescape View File

@ -131,8 +131,8 @@ void DiffBrowser::startSearch()
{ {
if( !m_Data->srchdialog ) { if( !m_Data->srchdialog ) {
m_Data->srchdialog = new KEdFind( this, "searchdialog", false); m_Data->srchdialog = new KEdFind( this, "searchdialog", false);
connect(m_Data->srchdialog,TQT_SIGNAL(search()),this,TQT_SLOT(search_slot())); connect(m_Data->srchdialog,TQ_SIGNAL(search()),this,TQ_SLOT(search_slot()));
connect(m_Data->srchdialog,TQT_SIGNAL(done()),this,TQT_SLOT(searchdone_slot())); connect(m_Data->srchdialog,TQ_SIGNAL(done()),this,TQ_SLOT(searchdone_slot()));
} }
TQString _st = m_Data->srchdialog->getText(); TQString _st = m_Data->srchdialog->getText();
m_Data->srchdialog->setText(_st.isEmpty() ? m_Data->pattern : _st); m_Data->srchdialog->setText(_st.isEmpty() ? m_Data->pattern : _st);

4
src/ksvnwidgets/logmsg_impl.cpp
Unescape View File

@ -422,8 +422,8 @@ TQString Logmsg_impl::getLogmessage(const logActionEntries&_on,
ptr->initHistory(); ptr->initHistory();
if (callback) if (callback)
{ {
connect(ptr,TQT_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), connect(ptr,TQ_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
callback,TQT_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))); callback,TQ_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)));
} }
dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),groupName)); dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),groupName));
if (dlg.exec()!=TQDialog::Accepted) { if (dlg.exec()!=TQDialog::Accepted) {

12
src/svnfrontend/blamedisplay_impl.cpp
Unescape View File

@ -247,14 +247,14 @@ BlameDisplay_impl::BlameDisplay_impl(TQWidget*parent,const char*name)
: BlameDisplay(parent,name) : BlameDisplay(parent,name)
{ {
m_Data = new BlameDisplayData(); m_Data = new BlameDisplayData();
connect(m_BlameList,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); connect(m_BlameList,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotSelectionChanged()));
} }
BlameDisplay_impl::BlameDisplay_impl(const TQString&what,const svn::AnnotatedFile&blame,TQWidget*parent,const char*name) BlameDisplay_impl::BlameDisplay_impl(const TQString&what,const svn::AnnotatedFile&blame,TQWidget*parent,const char*name)
: BlameDisplay(parent,name) : BlameDisplay(parent,name)
{ {
m_Data = new BlameDisplayData(); m_Data = new BlameDisplayData();
connect(m_BlameList,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); connect(m_BlameList,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotSelectionChanged()));
setContent(what,blame); setContent(what,blame);
} }
@ -268,8 +268,8 @@ void BlameDisplay_impl::setContent(const TQString&what,const svn::AnnotatedFile&
m_Data->m_File = what; m_Data->m_File = what;
m_SearchWidget = new TDEListViewSearchLineWidget(m_BlameList,this); m_SearchWidget = new TDEListViewSearchLineWidget(m_BlameList,this);
EncodingSelector_impl*m_Ls = new EncodingSelector_impl(Kdesvnsettings::locale_for_blame(),this); EncodingSelector_impl*m_Ls = new EncodingSelector_impl(Kdesvnsettings::locale_for_blame(),this);
connect(m_Ls,TQT_SIGNAL(TextCodecChanged(const TQString&)), connect(m_Ls,TQ_SIGNAL(TextCodecChanged(const TQString&)),
this,TQT_SLOT(slotTextCodecChanged(const TQString&))); this,TQ_SLOT(slotTextCodecChanged(const TQString&)));
BlameDisplayLayout->remove(m_BlameList); BlameDisplayLayout->remove(m_BlameList);
BlameDisplayLayout->addWidget(m_Ls); BlameDisplayLayout->addWidget(m_Ls);
@ -457,8 +457,8 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s
ptr->setCb(_cb); ptr->setCb(_cb);
ptr->m_Data->m_dlg = dlg; ptr->m_Data->m_dlg = dlg;
dlg->enableButton(KDialogBase::User2,false); dlg->enableButton(KDialogBase::User2,false);
connect(dlg,TQT_SIGNAL(user1Clicked()),ptr,TQT_SLOT(slotGoLine())); connect(dlg,TQ_SIGNAL(user1Clicked()),ptr,TQ_SLOT(slotGoLine()));
connect(dlg,TQT_SIGNAL(user2Clicked()),ptr,TQT_SLOT(slotShowCurrentCommit())); connect(dlg,TQ_SIGNAL(user2Clicked()),ptr,TQ_SLOT(slotShowCurrentCommit()));
Dialog1Layout->adjustSize(); Dialog1Layout->adjustSize();
dlg->exec(); dlg->exec();

54
src/svnfrontend/commandexec.cpp
Unescape View File

@ -99,8 +99,8 @@ CommandExec::CommandExec(TQObject*parent, const char *name,TDECmdLineArgs *args)
SshAgent ag; SshAgent ag;
ag.querySshAgent(); ag.querySshAgent();
connect(m_pCPart->m_SvnWrapper,TQT_SIGNAL(clientException(const TQString&)),this,TQT_SLOT(clientException(const TQString&))); connect(m_pCPart->m_SvnWrapper,TQ_SIGNAL(clientException(const TQString&)),this,TQ_SLOT(clientException(const TQString&)));
connect(m_pCPart->m_SvnWrapper,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&))); connect(m_pCPart->m_SvnWrapper,TQ_SIGNAL(sendNotify(const TQString&)),this,TQ_SLOT(slotNotifyMessage(const TQString&)));
m_pCPart->m_SvnWrapper->reInitClient(); m_pCPart->m_SvnWrapper->reInitClient();
} }
@ -130,86 +130,86 @@ int CommandExec::exec()
} }
TQString slotCmd; TQString slotCmd;
if (!TQString::compare(m_pCPart->cmd,"log")) { if (!TQString::compare(m_pCPart->cmd,"log")) {
slotCmd=TQT_SLOT(slotCmd_log()); slotCmd=TQ_SLOT(slotCmd_log());
} else if (!TQString::compare(m_pCPart->cmd,"cat")) { } else if (!TQString::compare(m_pCPart->cmd,"cat")) {
slotCmd=TQT_SLOT(slotCmd_cat()); slotCmd=TQ_SLOT(slotCmd_cat());
m_pCPart->single_revision=true; m_pCPart->single_revision=true;
} else if (!TQString::compare(m_pCPart->cmd,"get")) { } else if (!TQString::compare(m_pCPart->cmd,"get")) {
slotCmd=TQT_SLOT(slotCmd_get()); slotCmd=TQ_SLOT(slotCmd_get());
m_pCPart->single_revision=true; m_pCPart->single_revision=true;
} else if (!TQString::compare(m_pCPart->cmd,"help")) { } else if (!TQString::compare(m_pCPart->cmd,"help")) {
slotCmd=TQT_SLOT(slotCmd_help()); slotCmd=TQ_SLOT(slotCmd_help());
} else if (!TQString::compare(m_pCPart->cmd,"blame")|| } else if (!TQString::compare(m_pCPart->cmd,"blame")||
!TQString::compare(m_pCPart->cmd,"annotate")) { !TQString::compare(m_pCPart->cmd,"annotate")) {
slotCmd=TQT_SLOT(slotCmd_blame()); slotCmd=TQ_SLOT(slotCmd_blame());
} else if (!TQString::compare(m_pCPart->cmd,"update")) { } else if (!TQString::compare(m_pCPart->cmd,"update")) {
slotCmd=TQT_SLOT(slotCmd_update()); slotCmd=TQ_SLOT(slotCmd_update());
m_pCPart->single_revision=true; m_pCPart->single_revision=true;
} else if (!TQString::compare(m_pCPart->cmd,"diff")) { } else if (!TQString::compare(m_pCPart->cmd,"diff")) {
m_pCPart->start = svn::Revision::WORKING; m_pCPart->start = svn::Revision::WORKING;
slotCmd=TQT_SLOT(slotCmd_diff()); slotCmd=TQ_SLOT(slotCmd_diff());
} else if (!TQString::compare(m_pCPart->cmd,"info")) { } else if (!TQString::compare(m_pCPart->cmd,"info")) {
slotCmd=TQT_SLOT(slotCmd_info()); slotCmd=TQ_SLOT(slotCmd_info());
m_pCPart->single_revision=true; m_pCPart->single_revision=true;
} else if (!TQString::compare(m_pCPart->cmd,"commit")|| } else if (!TQString::compare(m_pCPart->cmd,"commit")||
!TQString::compare(m_pCPart->cmd,"ci")) { !TQString::compare(m_pCPart->cmd,"ci")) {
slotCmd=TQT_SLOT(slotCmd_commit()); slotCmd=TQ_SLOT(slotCmd_commit());
} else if (!TQString::compare(m_pCPart->cmd,"list")|| } else if (!TQString::compare(m_pCPart->cmd,"list")||
!TQString::compare(m_pCPart->cmd,"ls")) { !TQString::compare(m_pCPart->cmd,"ls")) {
slotCmd=TQT_SLOT(slotCmd_list()); slotCmd=TQ_SLOT(slotCmd_list());
} else if (!TQString::compare(m_pCPart->cmd,"copy")|| } else if (!TQString::compare(m_pCPart->cmd,"copy")||
!TQString::compare(m_pCPart->cmd,"cp")) { !TQString::compare(m_pCPart->cmd,"cp")) {
slotCmd=TQT_SLOT(slotCmd_copy()); slotCmd=TQ_SLOT(slotCmd_copy());
dont_check_second = true; dont_check_second = true;
} else if (!TQString::compare(m_pCPart->cmd,"move")|| } else if (!TQString::compare(m_pCPart->cmd,"move")||
!TQString::compare(m_pCPart->cmd,"rename")|| !TQString::compare(m_pCPart->cmd,"rename")||
!TQString::compare(m_pCPart->cmd,"mv")) { !TQString::compare(m_pCPart->cmd,"mv")) {
slotCmd=TQT_SLOT(slotCmd_move()); slotCmd=TQ_SLOT(slotCmd_move());
dont_check_second = true; dont_check_second = true;
} else if (!TQString::compare(m_pCPart->cmd,"checkout")|| } else if (!TQString::compare(m_pCPart->cmd,"checkout")||
!TQString::compare(m_pCPart->cmd,"co")) { !TQString::compare(m_pCPart->cmd,"co")) {
slotCmd=TQT_SLOT(slotCmd_checkout()); slotCmd=TQ_SLOT(slotCmd_checkout());
dont_check_second = true; dont_check_second = true;
} else if (!TQString::compare(m_pCPart->cmd,"checkoutto")|| } else if (!TQString::compare(m_pCPart->cmd,"checkoutto")||
!TQString::compare(m_pCPart->cmd,"coto")) { !TQString::compare(m_pCPart->cmd,"coto")) {
slotCmd=TQT_SLOT(slotCmd_checkoutto()); slotCmd=TQ_SLOT(slotCmd_checkoutto());
dont_check_second = true; dont_check_second = true;
} else if (!TQString::compare(m_pCPart->cmd,"export")) { } else if (!TQString::compare(m_pCPart->cmd,"export")) {
slotCmd=TQT_SLOT(slotCmd_export()); slotCmd=TQ_SLOT(slotCmd_export());
dont_check_second = true; dont_check_second = true;
} else if (!TQString::compare(m_pCPart->cmd,"exportto")) { } else if (!TQString::compare(m_pCPart->cmd,"exportto")) {
slotCmd=TQT_SLOT(slotCmd_exportto()); slotCmd=TQ_SLOT(slotCmd_exportto());
dont_check_second = true; dont_check_second = true;
} else if (!TQString::compare(m_pCPart->cmd,"delete")|| } else if (!TQString::compare(m_pCPart->cmd,"delete")||
!TQString::compare(m_pCPart->cmd,"del")|| !TQString::compare(m_pCPart->cmd,"del")||
!TQString::compare(m_pCPart->cmd,"rm")|| !TQString::compare(m_pCPart->cmd,"rm")||
!TQString::compare(m_pCPart->cmd,"remove")) { !TQString::compare(m_pCPart->cmd,"remove")) {
slotCmd=TQT_SLOT(slotCmd_delete()); slotCmd=TQ_SLOT(slotCmd_delete());
} else if (!TQString::compare(m_pCPart->cmd,"add")) { } else if (!TQString::compare(m_pCPart->cmd,"add")) {
slotCmd=TQT_SLOT(slotCmd_add()); slotCmd=TQ_SLOT(slotCmd_add());
dont_check_all = true; dont_check_all = true;
path_only=true; path_only=true;
} else if (!TQString::compare(m_pCPart->cmd,"undo")|| } else if (!TQString::compare(m_pCPart->cmd,"undo")||
!TQString::compare(m_pCPart->cmd,"revert")) { !TQString::compare(m_pCPart->cmd,"revert")) {
slotCmd=TQT_SLOT(slotCmd_revert()); slotCmd=TQ_SLOT(slotCmd_revert());
} else if (!TQString::compare(m_pCPart->cmd,"checknew")|| } else if (!TQString::compare(m_pCPart->cmd,"checknew")||
!TQString::compare(m_pCPart->cmd,"addnew")) { !TQString::compare(m_pCPart->cmd,"addnew")) {
slotCmd=TQT_SLOT(slotCmd_addnew()); slotCmd=TQ_SLOT(slotCmd_addnew());
} else if (!TQString::compare(m_pCPart->cmd,"switch")) { } else if (!TQString::compare(m_pCPart->cmd,"switch")) {
slotCmd=TQT_SLOT(slotCmd_switch()); slotCmd=TQ_SLOT(slotCmd_switch());
} else if (!TQString::compare(m_pCPart->cmd,"tree")) { } else if (!TQString::compare(m_pCPart->cmd,"tree")) {
slotCmd=TQT_SLOT(slotCmd_tree()); slotCmd=TQ_SLOT(slotCmd_tree());
} else if (!TQString::compare(m_pCPart->cmd,"lock")) { } else if (!TQString::compare(m_pCPart->cmd,"lock")) {
slotCmd=TQT_SLOT(slotCmd_lock()); slotCmd=TQ_SLOT(slotCmd_lock());
no_revision = true; no_revision = true;
check_force=true; check_force=true;
} else if (!TQString::compare(m_pCPart->cmd,"unlock")) { } else if (!TQString::compare(m_pCPart->cmd,"unlock")) {
slotCmd=TQT_SLOT(slotCmd_unlock()); slotCmd=TQ_SLOT(slotCmd_unlock());
no_revision=true; no_revision=true;
check_force=true; check_force=true;
} }
bool found = connect(this,TQT_SIGNAL(executeMe()),this,slotCmd.ascii()); bool found = connect(this,TQ_SIGNAL(executeMe()),this,slotCmd.ascii());
if (!found) { if (!found) {
slotCmd=i18n("Command \"%1\" not implemented or known").arg(m_pCPart->cmd); slotCmd=i18n("Command \"%1\" not implemented or known").arg(m_pCPart->cmd);
KMessageBox::sorry(0,slotCmd,i18n("SVN Error")); KMessageBox::sorry(0,slotCmd,i18n("SVN Error"));

2
src/svnfrontend/editproperty_impl.cpp
Unescape View File

@ -123,7 +123,7 @@ EditProperty_impl::EditProperty_impl(TQWidget *parent, const char *name)
isDir = false; isDir = false;
TQToolTip::add(m_NameEdit, "Select or enter new property"); TQToolTip::add(m_NameEdit, "Select or enter new property");
connect(m_NameEdit, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateToolTip(const TQString &))); connect(m_NameEdit, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(updateToolTip(const TQString &)));
} }

2
src/svnfrontend/fillcachethread.cpp
Unescape View File

@ -37,7 +37,7 @@ FillCacheThread::FillCacheThread(TQObject*_parent,const TQString&reposRoot)
m_CurrentContext = new svn::Context(); m_CurrentContext = new svn::Context();
m_SvnContextListener = new ThreadContextListener(m_Parent); m_SvnContextListener = new ThreadContextListener(m_Parent);
TQObject::connect(m_SvnContextListener,TQT_SIGNAL(sendNotify(const TQString&)),m_Parent,TQT_SLOT(slotNotifyMessage(const TQString&))); TQObject::connect(m_SvnContextListener,TQ_SIGNAL(sendNotify(const TQString&)),m_Parent,TQ_SLOT(slotNotifyMessage(const TQString&)));
m_CurrentContext->setListener(m_SvnContextListener); m_CurrentContext->setListener(m_SvnContextListener);
m_what = reposRoot; m_what = reposRoot;

10
src/svnfrontend/fronthelpers/propertylist.cpp
Unescape View File

@ -35,10 +35,10 @@ Propertylist::Propertylist(TQWidget *parent, const char *name)
setRootIsDecorated(false); setRootIsDecorated(false);
setSortColumn(0); setSortColumn(0);
setAcceptDrops(false); setAcceptDrops(false);
connect(this,TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)),this,TQT_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int))); connect(this,TQ_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)),this,TQ_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int)));
connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this, connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this,
TQT_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int))); TQ_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int)));
//setFullWidth( TRUE ); //setFullWidth( TRUE );
} }
@ -150,8 +150,8 @@ bool Propertylist::checkExisting(const TQString&aName,TQListViewItem*it)
void Propertylist::addCallback(TQObject*ob) void Propertylist::addCallback(TQObject*ob)
{ {
if (ob) { if (ob) {
connect(this,TQT_SIGNAL(sigSetProperty(const svn::PropertiesMap&,const TQValueList<TQString>&,const TQString&)), connect(this,TQ_SIGNAL(sigSetProperty(const svn::PropertiesMap&,const TQValueList<TQString>&,const TQString&)),
ob,TQT_SLOT(slotChangeProperties(const svn::PropertiesMap&,const TQValueList<TQString>&,const TQString&))); ob,TQ_SLOT(slotChangeProperties(const svn::PropertiesMap&,const TQValueList<TQString>&,const TQString&)));
} }
} }

18
src/svnfrontend/graphtree/revgraphview.cpp
Unescape View File

@ -92,12 +92,12 @@ RevGraphView::RevGraphView(TQObject*aListener,svn::Client*_client,TQWidget * par
m_CompleteView->setHScrollBarMode(TQScrollView::AlwaysOff); m_CompleteView->setHScrollBarMode(TQScrollView::AlwaysOff);
m_CompleteView->raise(); m_CompleteView->raise();
m_CompleteView->hide(); m_CompleteView->hide();
connect(this, TQT_SIGNAL(contentsMoving(int,int)), connect(this, TQ_SIGNAL(contentsMoving(int,int)),
this, TQT_SLOT(contentsMovingSlot(int,int))); this, TQ_SLOT(contentsMovingSlot(int,int)));
connect(m_CompleteView, TQT_SIGNAL(zoomRectMoved(int,int)), connect(m_CompleteView, TQ_SIGNAL(zoomRectMoved(int,int)),
this, TQT_SLOT(zoomRectMoved(int,int))); this, TQ_SLOT(zoomRectMoved(int,int)));
connect(m_CompleteView, TQT_SIGNAL(zoomRectMoveFinished()), connect(m_CompleteView, TQ_SIGNAL(zoomRectMoveFinished()),
this, TQT_SLOT(zoomRectMoveFinished())); this, TQ_SLOT(zoomRectMoveFinished()));
m_LastAutoPosition = TopLeft; m_LastAutoPosition = TopLeft;
_isMoving = false; _isMoving = false;
_noUpdateZoomerPos = false; _noUpdateZoomerPos = false;
@ -495,9 +495,9 @@ void RevGraphView::dumpRevtree()
renderProcess->setEnvironment("LANG","C"); renderProcess->setEnvironment("LANG","C");
*renderProcess << "dot"; *renderProcess << "dot";
*renderProcess << dotTmpFile->name() << "-Tplain"; *renderProcess << dotTmpFile->name() << "-Tplain";
connect(renderProcess,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(dotExit(TDEProcess*))); connect(renderProcess,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(dotExit(TDEProcess*)));
connect(renderProcess,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), connect(renderProcess,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
this,TQT_SLOT(readDotOutput(TDEProcess*,char*,int)) ); this,TQ_SLOT(readDotOutput(TDEProcess*,char*,int)) );
if (!renderProcess->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) { if (!renderProcess->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) {
TQString arguments; TQString arguments;
for (unsigned c=0;c<renderProcess->args().count();++c) { for (unsigned c=0;c<renderProcess->args().count();++c) {

14
src/svnfrontend/graphtree/revtreewidget.cpp
Unescape View File

@ -45,21 +45,21 @@ RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* parent, const
m_RevGraphView = new RevGraphView(lt,cl, m_Splitter, "m_RevGraphView" ); m_RevGraphView = new RevGraphView(lt,cl, m_Splitter, "m_RevGraphView" );
m_RevGraphView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) ); m_RevGraphView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) );
connect(m_RevGraphView,TQT_SIGNAL(dispDetails(const TQString&)),this,TQT_SLOT(setDetailText(const TQString&))); connect(m_RevGraphView,TQ_SIGNAL(dispDetails(const TQString&)),this,TQ_SLOT(setDetailText(const TQString&)));
connect(m_RevGraphView, connect(m_RevGraphView,
TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), TQ_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
this, this,
TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) TQ_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))
); );
connect(m_RevGraphView, connect(m_RevGraphView,
TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), TQ_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
this, this,
TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) TQ_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))
); );
connect(m_RevGraphView, connect(m_RevGraphView,
TQT_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)), TQ_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)),
this, this,
TQT_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)) TQ_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*))
); );
m_Detailstext = new KTextBrowser( m_Splitter, "m_Detailstext" ); m_Detailstext = new KTextBrowser( m_Splitter, "m_Detailstext" );

2
src/svnfrontend/modifiedthread.cpp
Unescape View File

@ -33,7 +33,7 @@ CheckModifiedThread::CheckModifiedThread(TQObject*_parent,const TQString&what,bo
m_Parent = _parent; m_Parent = _parent;
m_CurrentContext = new svn::Context(); m_CurrentContext = new svn::Context();
m_ContextListener = new ThreadContextListener(m_Parent); m_ContextListener = new ThreadContextListener(m_Parent);
TQObject::connect(m_ContextListener,TQT_SIGNAL(sendNotify(const TQString&)),m_Parent,TQT_SLOT(slotNotifyMessage(const TQString&))); TQObject::connect(m_ContextListener,TQ_SIGNAL(sendNotify(const TQString&)),m_Parent,TQ_SLOT(slotNotifyMessage(const TQString&)));
m_CurrentContext->setListener(m_ContextListener); m_CurrentContext->setListener(m_ContextListener);
m_what = what; m_what = what;

4
src/svnfrontend/opencontextmenu.cpp
Unescape View File

@ -47,7 +47,7 @@ void OpenContextmenu::setup()
TQString actionName( (*it)->name().replace("&", "&&") ); TQString actionName( (*it)->name().replace("&", "&&") );
act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0, act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0,
this, TQT_SLOT( slotRunService() ), this, nam.prepend( "appservice_" ) ); this, TQ_SLOT( slotRunService() ), this, nam.prepend( "appservice_" ) );
act->plug(this); act->plug(this);
m_mapPopup[ id++ ] = *it; m_mapPopup[ id++ ] = *it;
} }
@ -55,7 +55,7 @@ void OpenContextmenu::setup()
insertSeparator( ); insertSeparator( );
} }
act = new TDEAction(i18n("Other..."),0, 0, act = new TDEAction(i18n("Other..."),0, 0,
this, TQT_SLOT( slotOpenWith() ),this,"openwith"); this, TQ_SLOT( slotOpenWith() ),this,"openwith");
act->plug(this); act->plug(this);
} }

12
src/svnfrontend/propertiesdlg.cpp
Unescape View File

@ -85,12 +85,12 @@ PropertiesDlg::PropertiesDlg(SvnItem*which, svn::Client*aClient, const svn::Revi
clearWState( WState_Polished ); clearWState( WState_Polished );
// signals and slots connections // signals and slots connections
connect( m_AddButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd())); connect( m_AddButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAdd()));
connect( m_ModifyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotModify())); connect( m_ModifyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotModify()));
connect( m_DeleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelete())); connect( m_DeleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelete()));
connect(this,TQT_SIGNAL(helpClicked()),TQT_SLOT(slotHelp())); connect(this,TQ_SIGNAL(helpClicked()),TQ_SLOT(slotHelp()));
connect(m_PropertiesListview,TQT_SIGNAL(selectionChanged(TQListViewItem*)),this,TQT_SLOT(slotSelectionChanged(TQListViewItem*))); connect(m_PropertiesListview,TQ_SIGNAL(selectionChanged(TQListViewItem*)),this,TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
// connect(m_PropertiesListview,TQT_SIGNAL(executed(TQListViewItem*)),this,TQT_SLOT(slotSelectionExecuted(TQListViewItem*))); // connect(m_PropertiesListview,TQ_SIGNAL(executed(TQListViewItem*)),this,TQ_SLOT(slotSelectionExecuted(TQListViewItem*)));
if (!m_Client) { if (!m_Client) {
m_PropertiesListview->setEnabled(false); m_PropertiesListview->setEnabled(false);

14
src/svnfrontend/stopdlg.cpp
Unescape View File

@ -62,13 +62,13 @@ StopDlg::StopDlg(TQObject*listener,TQWidget *parent, const char *name,const TQSt
mWait = false; mWait = false;
m_LogWindow = 0; m_LogWindow = 0;
connect(mShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoShow())); connect(mShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoShow()));
if (m_Context) { if (m_Context) {
connect(m_Context,TQT_SIGNAL(tickProgress()),this,TQT_SLOT(slotTick())); connect(m_Context,TQ_SIGNAL(tickProgress()),this,TQ_SLOT(slotTick()));
connect(m_Context,TQT_SIGNAL(waitShow(bool)),this,TQT_SLOT(slotWait(bool))); connect(m_Context,TQ_SIGNAL(waitShow(bool)),this,TQ_SLOT(slotWait(bool)));
connect(m_Context,TQT_SIGNAL(netProgress(long long int, long long int)), connect(m_Context,TQ_SIGNAL(netProgress(long long int, long long int)),
this,TQT_SLOT(slotNetProgres(long long int, long long int))); this,TQ_SLOT(slotNetProgres(long long int, long long int)));
connect(this,TQT_SIGNAL(sigCancel(bool)),m_Context,TQT_SLOT(setCanceled(bool))); connect(this,TQ_SIGNAL(sigCancel(bool)),m_Context,TQ_SLOT(setCanceled(bool)));
} }
mShowTimer->start(m_MinDuration, true); mShowTimer->start(m_MinDuration, true);
setMinimumSize(280,160); setMinimumSize(280,160);
@ -200,7 +200,7 @@ void StopDlg::slotNetProgres(long long int current, long long int max)
StopSimpleDlg::StopSimpleDlg(TQWidget *parent, const char *name,const TQString&caption,const TQString&text) StopSimpleDlg::StopSimpleDlg(TQWidget *parent, const char *name,const TQString&caption,const TQString&text)
: StopDlg(0,parent,name,caption,text),cancelld(false) : StopDlg(0,parent,name,caption,text),cancelld(false)
{ {
connect(this,TQT_SIGNAL(sigCancel(bool)),this,TQT_SLOT(slotSimpleCancel(bool))); connect(this,TQ_SIGNAL(sigCancel(bool)),this,TQ_SLOT(slotSimpleCancel(bool)));
} }
void StopSimpleDlg::slotSimpleCancel(bool how) void StopSimpleDlg::slotSimpleCancel(bool how)

102
src/svnfrontend/svnactions.cpp
Unescape View File

@ -209,9 +209,9 @@ SvnActions::SvnActions(ItemDisplay *parent, const char *name,bool processes_bloc
m_Data->m_ParentList = parent; m_Data->m_ParentList = parent;
m_Data->m_SvnContextListener = new CContextListener(this); m_Data->m_SvnContextListener = new CContextListener(this);
m_Data->runblocked = processes_blocked; m_Data->runblocked = processes_blocked;
connect(m_Data->m_SvnContextListener,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&))); connect(m_Data->m_SvnContextListener,TQ_SIGNAL(sendNotify(const TQString&)),this,TQ_SLOT(slotNotifyMessage(const TQString&)));
connect(&(m_Data->m_ThreadCheckTimer),TQT_SIGNAL(timeout()),this,TQT_SLOT(checkModthread())); connect(&(m_Data->m_ThreadCheckTimer),TQ_SIGNAL(timeout()),this,TQ_SLOT(checkModthread()));
connect(&(m_Data->m_UpdateCheckTimer),TQT_SIGNAL(timeout()),this,TQT_SLOT(checkUpdateThread())); connect(&(m_Data->m_UpdateCheckTimer),TQ_SIGNAL(timeout()),this,TQ_SLOT(checkUpdateThread()));
} }
svn::Client* SvnActions::svnclient() svn::Client* SvnActions::svnclient()
@ -291,7 +291,7 @@ svn::SharedPointer<svn::LogEntriesMap> SvnActions::getLog(const svn::Revision&st
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,(parent?parent:m_Data->m_ParentList->realWidget()),0,"Logs", StopDlg sdlg(m_Data->m_SvnContextListener,(parent?parent:m_Data->m_ParentList->realWidget()),0,"Logs",
i18n("Getting logs - hit cancel for abort")); i18n("Getting logs - hit cancel for abort"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
if (doNetworking()) { if (doNetworking()) {
m_Data->m_Svnclient->log(which,start,end,*logs,peg,list_files,!follow,limit); m_Data->m_Svnclient->log(which,start,end,*logs,peg,list_files,!follow,limit);
} else { } else {
@ -454,15 +454,15 @@ void SvnActions::makeTree(const TQString&what,const svn::Revision&_rev,const svn
disp = rt.getView(); disp = rt.getView();
if (disp) { if (disp) {
connect( connect(
disp,TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), disp,TQ_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
this,TQT_SLOT(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) this,TQ_SLOT(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))
); );
connect( connect(
disp,TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), disp,TQ_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
this,TQT_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) this,TQ_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))
); );
connect(disp,TQT_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)), connect(disp,TQ_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)),
this,TQT_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*))); this,TQ_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)));
dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),"revisiontree_dlg")); dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),"revisiontree_dlg"));
dlg.exec(); dlg.exec();
dlg.saveDialogSize(*(Kdesvnsettings::self()->config()),"revisiontree_dlg",false); dlg.saveDialogSize(*(Kdesvnsettings::self()->config()),"revisiontree_dlg",false);
@ -486,10 +486,10 @@ void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const
bool need_modal = m_Data->runblocked||TDEApplication::activeModalWidget()!=0; bool need_modal = m_Data->runblocked||TDEApplication::activeModalWidget()!=0;
if (need_modal||!m_Data->m_LogDialog) { if (need_modal||!m_Data->m_LogDialog) {
m_Data->m_LogDialog=new SvnLogDlgImp(this,0,"logdialog",need_modal); m_Data->m_LogDialog=new SvnLogDlgImp(this,0,"logdialog",need_modal);
connect(m_Data->m_LogDialog,TQT_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), connect(m_Data->m_LogDialog,TQ_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
this,TQT_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))); this,TQ_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)));
connect(m_Data->m_LogDialog,TQT_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)), connect(m_Data->m_LogDialog,TQ_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)),
this,TQT_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*))); this,TQ_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)));
} }
if (m_Data->m_LogDialog) { if (m_Data->m_LogDialog) {
@ -528,7 +528,7 @@ void SvnActions::makeBlame(const svn::Revision&start, const svn::Revision&end,co
try { try {
CursorStack a(TQt::BusyCursor); CursorStack a(TQt::BusyCursor);
StopDlg sdlg(m_Data->m_SvnContextListener,_parent,0,"Annotate",i18n("Annotate lines - hit cancel for abort")); StopDlg sdlg(m_Data->m_SvnContextListener,_parent,0,"Annotate",i18n("Annotate lines - hit cancel for abort"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->annotate(blame,p,start,end,peg); m_Data->m_Svnclient->annotate(blame,p,start,end,peg);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
emit clientException(e.msg()); emit clientException(e.msg());
@ -554,7 +554,7 @@ bool SvnActions::makeGet(const svn::Revision&start, const TQString&what, const T
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,dlgp, StopDlg sdlg(m_Data->m_SvnContextListener,dlgp,
0,"Content get",i18n("Getting content - hit cancel for abort")); 0,"Content get",i18n("Getting content - hit cancel for abort"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->get(p,target,start,peg); m_Data->m_Svnclient->get(p,target,start,peg);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
emit clientException(e.msg()); emit clientException(e.msg());
@ -673,7 +673,7 @@ TQString SvnActions::getInfo(const TQString& _what,const svn::Revision&rev,const
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Details", StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Details",
i18n("Retrieving infos - hit cancel for abort")); i18n("Retrieving infos - hit cancel for abort"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
svn::InfoEntries e; svn::InfoEntries e;
entries = (m_Data->m_Svnclient->info(_what+ entries = (m_Data->m_Svnclient->info(_what+
(_what.find("@")>-1&&!svn::Url::isValid(_what)?"@BASE":""),recursive?svn::DepthInfinity:svn::DepthEmpty,rev,peg)); (_what.find("@")>-1&&!svn::Url::isValid(_what)?"@BASE":""),recursive?svn::DepthInfinity:svn::DepthEmpty,rev,peg));
@ -865,7 +865,7 @@ void SvnActions::slotProperties()
if (!k) return; if (!k) return;
PropertiesDlg dlg(k,svnclient(), PropertiesDlg dlg(k,svnclient(),
m_Data->m_ParentList->isWorkingCopy()?svn::Revision::WORKING:svn::Revision::HEAD); m_Data->m_ParentList->isWorkingCopy()?svn::Revision::WORKING:svn::Revision::HEAD);
connect(&dlg,TQT_SIGNAL(clientException(const TQString&)),m_Data->m_ParentList->realWidget(),TQT_SLOT(slotClientException(const TQString&))); connect(&dlg,TQ_SIGNAL(clientException(const TQString&)),m_Data->m_ParentList->realWidget(),TQ_SLOT(slotClientException(const TQString&)));
dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()), "properties_dlg")); dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()), "properties_dlg"));
if (dlg.exec()!=TQDialog::Accepted) { if (dlg.exec()!=TQDialog::Accepted) {
return; return;
@ -884,7 +884,7 @@ bool SvnActions::changeProperties(const svn::PropertiesMap&setList,const TQValue
{ {
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Applying properties","<center>Applying<br>hit cancel for abort</center>"); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Applying properties","<center>Applying<br>hit cancel for abort</center>");
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
unsigned int pos; unsigned int pos;
for (pos = 0; pos<delList.size();++pos) { for (pos = 0; pos<delList.size();++pos) {
m_Data->m_Svnclient->propdel(delList[pos],svn::Path(path)); m_Data->m_Svnclient->propdel(delList[pos],svn::Path(path));
@ -1024,7 +1024,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets)
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Commiting"), StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Commiting"),
i18n("Commiting - hit cancel for abort")); i18n("Commiting - hit cancel for abort"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
nnum = m_Data->m_Svnclient->commit(_targets,msg,depth,keeplocks); nnum = m_Data->m_Svnclient->commit(_targets,msg,depth,keeplocks);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
emit clientException(e.msg()); emit clientException(e.msg());
@ -1085,7 +1085,7 @@ bool SvnActions::get(const TQString&what,const TQString& to,const svn::Revision&
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,p?p:m_Data->m_ParentList->realWidget(),0,"Downloading", StopDlg sdlg(m_Data->m_SvnContextListener,p?p:m_Data->m_ParentList->realWidget(),0,"Downloading",
i18n("Download - hit cancel for abort")); i18n("Download - hit cancel for abort"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->get(svn::Path(what), m_Data->m_Svnclient->get(svn::Path(what),
to,rev,_peg); to,rev,_peg);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
@ -1193,9 +1193,9 @@ void SvnActions::makeDiffExternal(const TQString&p1,const svn::Revision&start,co
*proc << *it; *proc << *it;
} }
} }
connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*))); connect(proc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(procClosed(TDEProcess*)));
connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) { if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) {
if (!m_Data->runblocked) { if (!m_Data->runblocked) {
if (!isDir) { if (!isDir) {
@ -1249,7 +1249,7 @@ void SvnActions::makeDiffinternal(const TQString&p1,const svn::Revision&r1,const
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,parent,0,"Diffing", StopDlg sdlg(m_Data->m_SvnContextListener,parent,0,"Diffing",
i18n("Diffing - hit cancel for abort")); i18n("Diffing - hit cancel for abort"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
if (p1==p2 && (r1.isRemote()||r2.isRemote())) { if (p1==p2 && (r1.isRemote()||r2.isRemote())) {
kdDebug()<<"Pegged diff"<<endl; kdDebug()<<"Pegged diff"<<endl;
ex = m_Data->m_Svnclient->diff_peg(svn::Path(tn), ex = m_Data->m_Svnclient->diff_peg(svn::Path(tn),
@ -1300,7 +1300,7 @@ void SvnActions::makeNorecDiff(const TQString&p1,const svn::Revision&r1,const TQ
bool ignore_content = Kdesvnsettings::diff_ignore_content(); bool ignore_content = Kdesvnsettings::diff_ignore_content();
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,"Diffing","Diffing - hit cancel for abort"); StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,"Diffing","Diffing - hit cancel for abort");
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
ex = m_Data->m_Svnclient->diff(svn::Path(tn), ex = m_Data->m_Svnclient->diff(svn::Path(tn),
svn::Path(p1),svn::Path(p2),svn::Path(), svn::Path(p1),svn::Path(p2),svn::Path(),
r1, r2, r1, r2,
@ -1342,10 +1342,10 @@ void SvnActions::dispDiff(const TQByteArray&ex)
} }
} }
connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*))); connect(proc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(procClosed(TDEProcess*)));
connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
if (!fname_used) { if (!fname_used) {
connect(proc,TQT_SIGNAL(wroteStdin(TDEProcess*)),this,TQT_SLOT(wroteStdin(TDEProcess*))); connect(proc,TQ_SIGNAL(wroteStdin(TDEProcess*)),this,TQ_SLOT(wroteStdin(TDEProcess*)));
} }
if (proc->start(TDEProcess::NotifyOnExit,fname_used?TDEProcess::Stderr:(TDEProcess::Communication)r)) { if (proc->start(TDEProcess::NotifyOnExit,fname_used?TDEProcess::Stderr:(TDEProcess::Communication)r)) {
if (!fname_used) proc->writeStdin(ex,ex.size()); if (!fname_used) proc->writeStdin(ex,ex.size());
@ -1370,10 +1370,10 @@ void SvnActions::dispDiff(const TQByteArray&ex)
TQWidget*wd = dlg->mainWidget(); TQWidget*wd = dlg->mainWidget();
if (wd) { if (wd) {
EncodingSelector_impl * ls = new EncodingSelector_impl("",wd); EncodingSelector_impl * ls = new EncodingSelector_impl("",wd);
TQObject::connect(ls,TQT_SIGNAL(TextCodecChanged(const TQString&)), TQObject::connect(ls,TQ_SIGNAL(TextCodecChanged(const TQString&)),
ptr,TQT_SLOT(slotTextCodecChanged(const TQString&))); ptr,TQ_SLOT(slotTextCodecChanged(const TQString&)));
} }
TQObject::connect(dlg,TQT_SIGNAL(user1Clicked()),ptr,TQT_SLOT(saveDiff())); TQObject::connect(dlg,TQ_SIGNAL(user1Clicked()),ptr,TQ_SLOT(saveDiff()));
ptr->setText(ex); ptr->setText(ex);
if (need_modal) { if (need_modal) {
ptr->setFocus(); ptr->setFocus();
@ -1409,7 +1409,7 @@ void SvnActions::makeUpdate(const TQStringList&what,const svn::Revision&rev,bool
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Making update", StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Making update",
i18n("Making update - hit cancel for abort")); i18n("Making update - hit cancel for abort"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
svn::Targets pathes(what); svn::Targets pathes(what);
ret = m_Data->m_Svnclient->update(pathes,rev, recurse?svn::DepthInfinity:svn::DepthFiles,false,false,true); ret = m_Data->m_Svnclient->update(pathes,rev, recurse?svn::DepthInfinity:svn::DepthFiles,false,false,true);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
@ -1689,7 +1689,7 @@ bool SvnActions::makeCheckout(const TQString&rUrl,const TQString&tPath,const svn
if (!_exp||!m_Data->m_CurrentContext) reInitClient(); if (!_exp||!m_Data->m_CurrentContext) reInitClient();
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,_exp?i18n("Export"):i18n("Checkout"),_exp?i18n("Exporting"):i18n("Checking out")); StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,_exp?i18n("Export"):i18n("Checkout"),_exp?i18n("Exporting"):i18n("Checking out"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
if (_exp) { if (_exp) {
/// @todo setup parameter for export operation /// @todo setup parameter for export operation
m_Data->m_Svnclient->doExport(svn::Path(fUrl),p,r,peg,overwrite,TQString(),ignoreExternal,depth); m_Data->m_Svnclient->doExport(svn::Path(fUrl),p,r,peg,overwrite,TQString(),ignoreExternal,depth);
@ -1762,7 +1762,7 @@ void SvnActions::slotRevertItems(const TQStringList&displist)
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Revert"),i18n("Reverting items")); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Revert"),i18n("Reverting items"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
svn::Targets target(items); svn::Targets target(items);
m_Data->m_Svnclient->revert(target,depth); m_Data->m_Svnclient->revert(target,depth);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
@ -1788,7 +1788,7 @@ bool SvnActions::makeSwitch(const TQString&rUrl,const TQString&tPath,const svn::
svn::Path p(tPath); svn::Path p(tPath);
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Switch url"),i18n("Switching url")); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Switch url"),i18n("Switching url"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->doSwitch(p,fUrl,r,depth,peg,stickydepth,ignore_externals,allow_unversioned); m_Data->m_Svnclient->doSwitch(p,fUrl,r,depth,peg,stickydepth,ignore_externals,allow_unversioned);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
emit clientException(e.msg()); emit clientException(e.msg());
@ -1813,7 +1813,7 @@ bool SvnActions::makeRelocate(const TQString&fUrl,const TQString&tUrl,const TQSt
svn::Path p(path); svn::Path p(path);
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Relocate url"),i18n("Relocate repository to new URL")); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Relocate url"),i18n("Relocate repository to new URL"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->relocate(p,_f,_t,rec); m_Data->m_Svnclient->relocate(p,_f,_t,rec);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
emit clientException(e.msg()); emit clientException(e.msg());
@ -1875,7 +1875,7 @@ bool SvnActions::makeCleanup(const TQString&path)
if (!m_Data->m_CurrentContext) return false; if (!m_Data->m_CurrentContext) return false;
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Cleanup"),i18n("Cleaning up folder")); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Cleanup"),i18n("Cleaning up folder"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->cleanup(svn::Path(path)); m_Data->m_Svnclient->cleanup(svn::Path(path));
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
emit clientException(e.msg()); emit clientException(e.msg());
@ -1889,7 +1889,7 @@ void SvnActions::slotResolved(const TQString&path)
if (!m_Data->m_CurrentContext) return; if (!m_Data->m_CurrentContext) return;
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Resolve"),i18n("Marking resolved")); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Resolve"),i18n("Marking resolved"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->resolve(svn::Path(path),svn::DepthEmpty); m_Data->m_Svnclient->resolve(svn::Path(path),svn::DepthEmpty);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
emit clientException(e.msg()); emit clientException(e.msg());
@ -1938,9 +1938,9 @@ void SvnActions::slotResolve(const TQString&p)
*proc << *it; *proc << *it;
} }
} }
connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*))); connect(proc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(procClosed(TDEProcess*)));
connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) { if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) {
return; return;
} else { } else {
@ -1956,7 +1956,7 @@ void SvnActions::slotImport(const TQString&path,const TQString&target,const TQSt
if (!m_Data->m_CurrentContext) return; if (!m_Data->m_CurrentContext) return;
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Import"),i18n("Importing items")); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Import"),i18n("Importing items"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->import(svn::Path(path),target,message,depth,noIgnore,noUnknown); m_Data->m_Svnclient->import(svn::Path(path),target,message,depth,noIgnore,noUnknown);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
emit clientException(e.msg()); emit clientException(e.msg());
@ -2088,8 +2088,8 @@ void SvnActions::slotMergeExternal(const TQString&_src1,const TQString&_src2, co
*proc << *it; *proc << *it;
} }
} }
connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*))); connect(proc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(procClosed(TDEProcess*)));
connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::Stderr)) { if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::Stderr)) {
if (!m_Data->runblocked) { if (!m_Data->runblocked) {
tdir1.setAutoDelete(false); tdir1.setAutoDelete(false);
@ -2147,7 +2147,7 @@ void SvnActions::slotMerge(const TQString&src1,const TQString&src2, const TQStri
} }
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Merge"),i18n("Merging items")); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Merge"),i18n("Merging items"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
if (pegged_merge) { if (pegged_merge) {
m_Data->m_Svnclient->merge_peg(p1,ranges,svn::Revision::HEAD,svn::Path(target),rec?svn::DepthUnknown:svn::DepthFiles, m_Data->m_Svnclient->merge_peg(p1,ranges,svn::Revision::HEAD,svn::Path(target),rec?svn::DepthUnknown:svn::DepthFiles,
ancestry,dry,forceIt,false); ancestry,dry,forceIt,false);
@ -2171,7 +2171,7 @@ bool SvnActions::makeMove(const TQString&Old,const TQString&New,bool force)
svn::Revision nnum; svn::Revision nnum;
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Move"),i18n("Moving/Rename item ")); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Move"),i18n("Moving/Rename item "));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
nnum = m_Data->m_Svnclient->move(svn::Path(Old),svn::Path(New),force); nnum = m_Data->m_Svnclient->move(svn::Path(Old),svn::Path(New),force);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
emit clientException(e.msg()); emit clientException(e.msg());
@ -2189,7 +2189,7 @@ bool SvnActions::makeMove(const KURL::List&Old,const TQString&New,bool force)
svn::Revision nnum; svn::Revision nnum;
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Move"),i18n("Moving entries")); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Move"),i18n("Moving entries"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
KURL::List::ConstIterator it = Old.begin(); KURL::List::ConstIterator it = Old.begin();
bool local = false; bool local = false;
@ -2216,7 +2216,7 @@ bool SvnActions::makeCopy(const TQString&Old,const TQString&New,const svn::Revis
if (!m_Data->m_CurrentContext) return false; if (!m_Data->m_CurrentContext) return false;
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Copy / Move"),i18n("Copy or Moving entries")); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Copy / Move"),i18n("Copy or Moving entries"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->copy(svn::Path(Old),rev,svn::Path(New)); m_Data->m_Svnclient->copy(svn::Path(Old),rev,svn::Path(New));
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
emit clientException(e.msg()); emit clientException(e.msg());
@ -2241,7 +2241,7 @@ bool SvnActions::makeCopy(const KURL::List&Old,const TQString&New,const svn::Rev
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Copy / Move"),i18n("Copy or Moving entries")); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Copy / Move"),i18n("Copy or Moving entries"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
KURL::List::ConstIterator it = Old.begin(); KURL::List::ConstIterator it = Old.begin();
m_Data->m_Svnclient->copy(t,rev,rev,svn::Path(New),true); m_Data->m_Svnclient->copy(t,rev,rev,svn::Path(New),true);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
@ -2310,7 +2310,7 @@ bool SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::
svn::Depth _d=rec?svn::DepthInfinity:svn::DepthImmediates; svn::Depth _d=rec?svn::DepthInfinity:svn::DepthImmediates;
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Status / List"),i18n("Creating list / check status")); StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Status / List"),i18n("Creating list / check status"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
// rec all up noign // rec all up noign
dlist = m_Data->m_Svnclient->status(what,_d,all,updates,display_ignores,where,disp_remote_details,false); dlist = m_Data->m_Svnclient->status(what,_d,all,updates,display_ignores,where,disp_remote_details,false);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {

14
src/svnfrontend/svnfiletip.cpp
Unescape View File

@ -113,7 +113,7 @@ void SvnFileTip::setItem(SvnItem*item, const TQRect &rect, const TQPixmap *pixma
// Don't start immediately, because the user could move the mouse over another item // Don't start immediately, because the user could move the mouse over another item
// This avoids a quick sequence of started preview-jobs // This avoids a quick sequence of started preview-jobs
m_timer->disconnect( this ); m_timer->disconnect( this );
connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(startDelayed())); connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(startDelayed()));
m_timer->start( 300, true ); m_timer->start( 300, true );
} else { } else {
m_timer->stop(); m_timer->stop();
@ -239,7 +239,7 @@ void SvnFileTip::showTip()
if ( text.isEmpty() ) return; if ( text.isEmpty() ) return;
m_timer->disconnect( this ); m_timer->disconnect( this );
connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideTip())); connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideTip()));
m_timer->start( 15000, true ); m_timer->start( 15000, true );
m_textLabel->setText( text ); m_textLabel->setText( text );
@ -269,14 +269,14 @@ void SvnFileTip::startDelayed()
oneItem.append( m_svnitem->fileItem() ); oneItem.append( m_svnitem->fileItem() );
m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0); m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0);
connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), connect( m_previewJob, TQ_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) ); this, TQ_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) );
connect( m_previewJob, TQT_SIGNAL( result( TDEIO::Job * ) ), connect( m_previewJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
this, TQT_SLOT( gotPreviewResult() ) ); this, TQ_SLOT( gotPreviewResult() ) );
} }
m_timer->disconnect( this ); m_timer->disconnect( this );
connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showTip())); connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showTip()));
m_timer->start( 400, true ); m_timer->start( 400, true );
} }

162
src/svnfrontend/tdesvnfilelist.cpp
Unescape View File

@ -127,7 +127,7 @@ public:
void connectDirTimer(TQObject*ob) void connectDirTimer(TQObject*ob)
{ {
TQObject::connect(&dirwatch_timer,TQT_SIGNAL(timeout()),ob,TQT_SLOT(_dirwatchTimeout())); TQObject::connect(&dirwatch_timer,TQ_SIGNAL(timeout()),ob,TQ_SLOT(_dirwatchTimeout()));
} }
void stopScan() void stopScan()
{ {
@ -151,7 +151,7 @@ public:
} }
void connectPropTimer(TQObject*ob) void connectPropTimer(TQObject*ob)
{ {
TQObject::connect(&propTimer,TQT_SIGNAL(timeout()),ob,TQT_SLOT(_propListTimeout())); TQObject::connect(&propTimer,TQ_SIGNAL(timeout()),ob,TQ_SLOT(_propListTimeout()));
} }
private: private:
@ -216,27 +216,27 @@ tdesvnfilelist::tdesvnfilelist(TDEActionCollection*aCollect,TQWidget *parent, co
setSortColumn(FileListViewItem::COL_NAME); setSortColumn(FileListViewItem::COL_NAME);
setupActions(); setupActions();
connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this, connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this,
TQT_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int))); TQ_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int)));
/* not via executed 'cause click may used for selection - single click execution /* not via executed 'cause click may used for selection - single click execution
just confuses in an application */ just confuses in an application */
connect(this,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); connect(this,TQ_SIGNAL(doubleClicked(TQListViewItem*)),this,TQ_SLOT(slotItemDoubleClicked(TQListViewItem*)));
connect(this,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); connect(this,TQ_SIGNAL(returnPressed(TQListViewItem*)),this,TQ_SLOT(slotItemDoubleClicked(TQListViewItem*)));
connect(this,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); connect(this,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotSelectionChanged()));
connect(m_SvnWrapper,TQT_SIGNAL(clientException(const TQString&)),this,TQT_SLOT(slotClientException(const TQString&))); connect(m_SvnWrapper,TQ_SIGNAL(clientException(const TQString&)),this,TQ_SLOT(slotClientException(const TQString&)));
connect(m_SvnWrapper,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&))); connect(m_SvnWrapper,TQ_SIGNAL(sendNotify(const TQString&)),this,TQ_SLOT(slotNotifyMessage(const TQString&)));
connect(m_SvnWrapper,TQT_SIGNAL(reinitItem(SvnItem*)),this,TQT_SLOT(slotReinitItem(SvnItem*))); connect(m_SvnWrapper,TQ_SIGNAL(reinitItem(SvnItem*)),this,TQ_SLOT(slotReinitItem(SvnItem*)));
connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshAll()),this,TQT_SLOT(refreshCurrentTree())); connect(m_SvnWrapper,TQ_SIGNAL(sigRefreshAll()),this,TQ_SLOT(refreshCurrentTree()));
connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshCurrent(SvnItem*)),this,TQT_SLOT(refreshCurrent(SvnItem*))); connect(m_SvnWrapper,TQ_SIGNAL(sigRefreshCurrent(SvnItem*)),this,TQ_SLOT(refreshCurrent(SvnItem*)));
connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshIcons(bool)),this,TQT_SLOT(slotRescanIcons(bool))); connect(m_SvnWrapper,TQ_SIGNAL(sigRefreshIcons(bool)),this,TQ_SLOT(slotRescanIcons(bool)));
connect(this,TQT_SIGNAL(dropped (TQDropEvent*,TQListViewItem*)), connect(this,TQ_SIGNAL(dropped (TQDropEvent*,TQListViewItem*)),
this,TQT_SLOT(slotDropped(TQDropEvent*,TQListViewItem*))); this,TQ_SLOT(slotDropped(TQDropEvent*,TQListViewItem*)));
connect(m_SvnWrapper,TQT_SIGNAL(sigGotourl(const TQString&)),this,TQT_SLOT(_openURL(const TQString&))); connect(m_SvnWrapper,TQ_SIGNAL(sigGotourl(const TQString&)),this,TQ_SLOT(_openURL(const TQString&)));
connect(m_SvnWrapper,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG))); connect(m_SvnWrapper,TQ_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQ_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)));
connect(m_SvnWrapper,TQT_SIGNAL(sigThreadsChanged()),this,TQT_SLOT(enableActions())); connect(m_SvnWrapper,TQ_SIGNAL(sigThreadsChanged()),this,TQ_SLOT(enableActions()));
m_pList->connectDirTimer(this); m_pList->connectDirTimer(this);
m_pList->connectPropTimer(this); m_pList->connectPropTimer(this);
@ -259,152 +259,152 @@ void tdesvnfilelist::setupActions()
TDEAction*tmp_action; TDEAction*tmp_action;
/* local and remote actions */ /* local and remote actions */
/* 1. actions on dirs AND files */ /* 1. actions on dirs AND files */
//new TDEAction(i18n("Log..."),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_L),this,TQT_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log"); //new TDEAction(i18n("Log..."),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_L),this,TQ_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log");
new TDEAction(i18n("Full Log"),"tdesvnlog",TDEShortcut(CTRL+Key_L),this,TQT_SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full"); new TDEAction(i18n("Full Log"),"tdesvnlog",TDEShortcut(CTRL+Key_L),this,TQ_SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full");
new TDEAction(i18n("Full revision tree"),"tdesvnlog",TDEShortcut(CTRL+Key_T),this,TQT_SLOT(slotMakeTree()),m_filesAction,"make_svn_tree"); new TDEAction(i18n("Full revision tree"),"tdesvnlog",TDEShortcut(CTRL+Key_T),this,TQ_SLOT(slotMakeTree()),m_filesAction,"make_svn_tree");
new TDEAction(i18n("Partial revision tree"),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_T), new TDEAction(i18n("Partial revision tree"),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_T),
this,TQT_SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree"); this,TQ_SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree");
new TDEAction(i18n("Properties"),"edit", new TDEAction(i18n("Properties"),"edit",
TDEShortcut(CTRL+Key_P),m_SvnWrapper,TQT_SLOT(slotProperties()),m_filesAction,"make_svn_property"); TDEShortcut(CTRL+Key_P),m_SvnWrapper,TQ_SLOT(slotProperties()),m_filesAction,"make_svn_property");
new TDEAction(i18n("Display Properties"),"edit", new TDEAction(i18n("Display Properties"),"edit",
TDEShortcut(SHIFT+CTRL+Key_P),this,TQT_SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property"); TDEShortcut(SHIFT+CTRL+Key_P),this,TQ_SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property");
tmp_action = new TDEAction(i18n("Display last changes"),"tdesvndiff", tmp_action = new TDEAction(i18n("Display last changes"),"tdesvndiff",
TDEShortcut(),this,TQT_SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change"); TDEShortcut(),this,TQ_SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change");
tmp_action->setToolTip(i18n("Display last changes as difference to previous commit.")); tmp_action->setToolTip(i18n("Display last changes as difference to previous commit."));
m_InfoAction = new TDEAction(i18n("Details"),"tdesvninfo", m_InfoAction = new TDEAction(i18n("Details"),"tdesvninfo",
TDEShortcut(CTRL+Key_I),this,TQT_SLOT(slotInfo()),m_filesAction,"make_svn_info"); TDEShortcut(CTRL+Key_I),this,TQ_SLOT(slotInfo()),m_filesAction,"make_svn_info");
m_RenameAction = new TDEAction(i18n("Move"),"move", m_RenameAction = new TDEAction(i18n("Move"),"move",
TDEShortcut(Key_F2),this,TQT_SLOT(slotRename()),m_filesAction,"make_svn_rename"); TDEShortcut(Key_F2),this,TQ_SLOT(slotRename()),m_filesAction,"make_svn_rename");
m_CopyAction = new TDEAction(i18n("Copy"),"tdesvncopy", m_CopyAction = new TDEAction(i18n("Copy"),"tdesvncopy",
TDEShortcut(CTRL+Key_C),this,TQT_SLOT(slotCopy()),m_filesAction,"make_svn_copy"); TDEShortcut(CTRL+Key_C),this,TQ_SLOT(slotCopy()),m_filesAction,"make_svn_copy");
tmp_action = new TDEAction(i18n("Check for updates"),"tdesvncheckupdates",TDEShortcut(),this,TQT_SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates"); tmp_action = new TDEAction(i18n("Check for updates"),"tdesvncheckupdates",TDEShortcut(),this,TQ_SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates");
tmp_action->setToolTip(i18n("Check if current working copy has items with newer version in repository")); tmp_action->setToolTip(i18n("Check if current working copy has items with newer version in repository"));
/* 2. actions only on files */ /* 2. actions only on files */
m_BlameAction = new TDEAction(i18n("Blame"),"tdesvnblame", m_BlameAction = new TDEAction(i18n("Blame"),"tdesvnblame",
TDEShortcut(),this,TQT_SLOT(slotBlame()),m_filesAction,"make_svn_blame"); TDEShortcut(),this,TQ_SLOT(slotBlame()),m_filesAction,"make_svn_blame");
m_BlameAction->setToolTip(i18n("Output the content of specified files or URLs with revision and author information in-line.")); m_BlameAction->setToolTip(i18n("Output the content of specified files or URLs with revision and author information in-line."));
m_BlameRangeAction = new TDEAction(i18n("Blame range"),"tdesvnblame", m_BlameRangeAction = new TDEAction(i18n("Blame range"),"tdesvnblame",
TDEShortcut(),this,TQT_SLOT(slotRangeBlame()),m_filesAction,"make_svn_range_blame"); TDEShortcut(),this,TQ_SLOT(slotRangeBlame()),m_filesAction,"make_svn_range_blame");
m_BlameRangeAction->setToolTip(i18n("Output the content of specified files or URLs with revision and author information in-line.")); m_BlameRangeAction->setToolTip(i18n("Output the content of specified files or URLs with revision and author information in-line."));
m_CatAction = new TDEAction(i18n("Cat head"), "tdesvncat", m_CatAction = new TDEAction(i18n("Cat head"), "tdesvncat",
TDEShortcut(),this,TQT_SLOT(slotCat()),m_filesAction,"make_svn_cat"); TDEShortcut(),this,TQ_SLOT(slotCat()),m_filesAction,"make_svn_cat");
m_CatAction->setToolTip(i18n("Output the content of specified files or URLs.")); m_CatAction->setToolTip(i18n("Output the content of specified files or URLs."));
tmp_action = new TDEAction(i18n("Cat revision..."),"tdesvncat", tmp_action = new TDEAction(i18n("Cat revision..."),"tdesvncat",
TDEShortcut(),this,TQT_SLOT(slotRevisionCat()),m_filesAction,"make_revisions_cat"); TDEShortcut(),this,TQ_SLOT(slotRevisionCat()),m_filesAction,"make_revisions_cat");
tmp_action->setToolTip(i18n("Output the content of specified files or URLs at specific revision.")); tmp_action->setToolTip(i18n("Output the content of specified files or URLs at specific revision."));
m_LockAction = new TDEAction(i18n("Lock current items"),"tdesvnlock", m_LockAction = new TDEAction(i18n("Lock current items"),"tdesvnlock",
TDEShortcut(),this,TQT_SLOT(slotLock()),m_filesAction,"make_svn_lock"); TDEShortcut(),this,TQ_SLOT(slotLock()),m_filesAction,"make_svn_lock");
m_UnlockAction = new TDEAction(i18n("Unlock current items"),"tdesvnunlock", m_UnlockAction = new TDEAction(i18n("Unlock current items"),"tdesvnunlock",
TDEShortcut(),this,TQT_SLOT(slotUnlock()),m_filesAction,"make_svn_unlock"); TDEShortcut(),this,TQ_SLOT(slotUnlock()),m_filesAction,"make_svn_unlock");
/* 3. actions only on dirs */ /* 3. actions only on dirs */
m_MkdirAction = new TDEAction(i18n("New folder"),"folder-new", m_MkdirAction = new TDEAction(i18n("New folder"),"folder-new",
TDEShortcut(),this,TQT_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir"); TDEShortcut(),this,TQ_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir");
m_switchRepository = new TDEAction(i18n("Switch repository"),"tdesvnswitch", m_switchRepository = new TDEAction(i18n("Switch repository"),"tdesvnswitch",
TDEShortcut(), m_SvnWrapper,TQT_SLOT(slotSwitch()),m_filesAction,"make_svn_switch"); TDEShortcut(), m_SvnWrapper,TQ_SLOT(slotSwitch()),m_filesAction,"make_svn_switch");
m_switchRepository->setToolTip(i18n("Switch repository path of current working copy path (\"svn switch\")")); m_switchRepository->setToolTip(i18n("Switch repository path of current working copy path (\"svn switch\")"));
tmp_action = new TDEAction(i18n("Relocate current working copy url"),"tdesvnrelocate",TDEShortcut(), tmp_action = new TDEAction(i18n("Relocate current working copy url"),"tdesvnrelocate",TDEShortcut(),
this,TQT_SLOT(slotRelocate()),m_filesAction,"make_svn_relocate"); this,TQ_SLOT(slotRelocate()),m_filesAction,"make_svn_relocate");
tmp_action->setToolTip(i18n("Relocate url of current working copy path to other url")); tmp_action->setToolTip(i18n("Relocate url of current working copy path to other url"));
tmp_action = new TDEAction(i18n("Check for unversioned items"),"tdesvnaddrecursive",TDEShortcut(), tmp_action = new TDEAction(i18n("Check for unversioned items"),"tdesvnaddrecursive",TDEShortcut(),
this,TQT_SLOT(slotCheckNewItems()),m_filesAction,"make_check_unversioned"); this,TQ_SLOT(slotCheckNewItems()),m_filesAction,"make_check_unversioned");
tmp_action->setToolTip(i18n("Browse folder for unversioned items and add them if wanted.")); tmp_action->setToolTip(i18n("Browse folder for unversioned items and add them if wanted."));
m_changeToRepository = new TDEAction(i18n("Open repository of working copy"),"go-home",TDEShortcut(), m_changeToRepository = new TDEAction(i18n("Open repository of working copy"),"go-home",TDEShortcut(),
this,TQT_SLOT(slotChangeToRepository()),m_filesAction,"make_switch_to_repo"); this,TQ_SLOT(slotChangeToRepository()),m_filesAction,"make_switch_to_repo");
m_changeToRepository->setToolTip(i18n("Opens the repository the current working copy was checked out from")); m_changeToRepository->setToolTip(i18n("Opens the repository the current working copy was checked out from"));
m_CleanupAction = new TDEAction(i18n("Cleanup"),"tdesvncleanup", m_CleanupAction = new TDEAction(i18n("Cleanup"),"tdesvncleanup",
TDEShortcut(),this,TQT_SLOT(slotCleanupAction()),m_filesAction,"make_cleanup"); TDEShortcut(),this,TQ_SLOT(slotCleanupAction()),m_filesAction,"make_cleanup");
m_CleanupAction->setToolTip(i18n("Recursively clean up the working copy, removing locks, resuming unfinished operations, etc.")); m_CleanupAction->setToolTip(i18n("Recursively clean up the working copy, removing locks, resuming unfinished operations, etc."));
m_ImportDirsIntoCurrent = new TDEAction(i18n("Import folders into current"),"fileimport",TDEShortcut(), m_ImportDirsIntoCurrent = new TDEAction(i18n("Import folders into current"),"fileimport",TDEShortcut(),
this,TQT_SLOT(slotImportDirsIntoCurrent()),m_filesAction,"make_import_dirs_into_current"); this,TQ_SLOT(slotImportDirsIntoCurrent()),m_filesAction,"make_import_dirs_into_current");
m_ImportDirsIntoCurrent->setToolTip(i18n("Import folder content into current url")); m_ImportDirsIntoCurrent->setToolTip(i18n("Import folder content into current url"));
/* local only actions */ /* local only actions */
/* 1. actions on files AND dirs*/ /* 1. actions on files AND dirs*/
m_AddCurrent = new TDEAction(i18n("Add selected files/dirs"), m_AddCurrent = new TDEAction(i18n("Add selected files/dirs"),
"tdesvnadd",TDEShortcut(Key_Insert),m_SvnWrapper,TQT_SLOT(slotAdd()),m_filesAction,"make_svn_add"); "tdesvnadd",TDEShortcut(Key_Insert),m_SvnWrapper,TQ_SLOT(slotAdd()),m_filesAction,"make_svn_add");
m_AddCurrent->setToolTip(i18n("Adding selected files and/or directories to repository")); m_AddCurrent->setToolTip(i18n("Adding selected files and/or directories to repository"));
tmp_action = new TDEAction("Add selected files/dirs recursive", tmp_action = new TDEAction("Add selected files/dirs recursive",
"tdesvnaddrecursive",TDEShortcut(CTRL+Key_Insert),m_SvnWrapper,TQT_SLOT(slotAddRec()),m_filesAction,"make_svn_addrec"); "tdesvnaddrecursive",TDEShortcut(CTRL+Key_Insert),m_SvnWrapper,TQ_SLOT(slotAddRec()),m_filesAction,"make_svn_addrec");
tmp_action->setToolTip(i18n("Adding selected files and/or directories to repository and all subitems of folders")); tmp_action->setToolTip(i18n("Adding selected files and/or directories to repository and all subitems of folders"));
m_DelCurrent = new TDEAction(i18n("Delete selected files/dirs"),"tdesvndelete", m_DelCurrent = new TDEAction(i18n("Delete selected files/dirs"),"tdesvndelete",
TDEShortcut(Key_Delete),this,TQT_SLOT(slotDelete()),m_filesAction,"make_svn_remove"); TDEShortcut(Key_Delete),this,TQ_SLOT(slotDelete()),m_filesAction,"make_svn_remove");
m_DelCurrent->setToolTip(i18n("Deleting selected files and/or directories from repository")); m_DelCurrent->setToolTip(i18n("Deleting selected files and/or directories from repository"));
m_RevertAction = new TDEAction(i18n("Revert current changes"),"document-revert", m_RevertAction = new TDEAction(i18n("Revert current changes"),"document-revert",
TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotRevert()),m_filesAction,"make_svn_revert"); TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotRevert()),m_filesAction,"make_svn_revert");
m_ResolvedAction = new TDEAction(i18n("Mark resolved"),TDEShortcut(), m_ResolvedAction = new TDEAction(i18n("Mark resolved"),TDEShortcut(),
this,TQT_SLOT(slotResolved()),m_filesAction,"make_resolved"); this,TQ_SLOT(slotResolved()),m_filesAction,"make_resolved");
m_ResolvedAction->setToolTip(i18n("Marking files or dirs resolved")); m_ResolvedAction->setToolTip(i18n("Marking files or dirs resolved"));
tmp_action = new TDEAction(i18n("Resolve conflicts"),TDEShortcut(), tmp_action = new TDEAction(i18n("Resolve conflicts"),TDEShortcut(),
this,TQT_SLOT(slotTryResolve()),m_filesAction,"make_try_resolve"); this,TQ_SLOT(slotTryResolve()),m_filesAction,"make_try_resolve");
m_IgnoreAction = new TDEAction(i18n("Ignore/Unignore current item"),TDEShortcut(),this,TQT_SLOT(slotIgnore()),m_filesAction,"make_svn_ignore"); m_IgnoreAction = new TDEAction(i18n("Ignore/Unignore current item"),TDEShortcut(),this,TQ_SLOT(slotIgnore()),m_filesAction,"make_svn_ignore");
m_UpdateHead = new TDEAction(i18n("Update to head"),"tdesvnupdate", m_UpdateHead = new TDEAction(i18n("Update to head"),"tdesvnupdate",
TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate"); TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate");
m_UpdateRev = new TDEAction(i18n("Update to revision..."),"tdesvnupdate", m_UpdateRev = new TDEAction(i18n("Update to revision..."),"tdesvnupdate",
TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate"); TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate");
m_commitAction = new TDEAction(i18n("Commit"),"tdesvncommit", m_commitAction = new TDEAction(i18n("Commit"),"tdesvncommit",
TDEShortcut("CTRL+#"),m_SvnWrapper,TQT_SLOT(slotCommit()),m_filesAction,"make_svn_commit"); TDEShortcut("CTRL+#"),m_SvnWrapper,TQ_SLOT(slotCommit()),m_filesAction,"make_svn_commit");
tmp_action = new TDEAction(i18n("Diff local changes"),"tdesvndiff", tmp_action = new TDEAction(i18n("Diff local changes"),"tdesvndiff",
TDEShortcut(CTRL+Key_D),this,TQT_SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff"); TDEShortcut(CTRL+Key_D),this,TQ_SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff");
tmp_action->setToolTip(i18n("Diff working copy against BASE (last checked out version) - doesn't require access to repository")); tmp_action->setToolTip(i18n("Diff working copy against BASE (last checked out version) - doesn't require access to repository"));
tmp_action = new TDEAction(i18n("Diff against HEAD"),"tdesvndiff", tmp_action = new TDEAction(i18n("Diff against HEAD"),"tdesvndiff",
TDEShortcut(CTRL+Key_H),this,TQT_SLOT(slotSimpleHeadDiff()),m_filesAction,"make_svn_headdiff"); TDEShortcut(CTRL+Key_H),this,TQ_SLOT(slotSimpleHeadDiff()),m_filesAction,"make_svn_headdiff");
tmp_action->setToolTip(i18n("Diff working copy against HEAD (last checked in version)- requires access to repository")); tmp_action->setToolTip(i18n("Diff working copy against HEAD (last checked in version)- requires access to repository"));
tmp_action = new TDEAction(i18n("Diff items"),"tdesvndiff", tmp_action = new TDEAction(i18n("Diff items"),"tdesvndiff",
TDEShortcut(),this,TQT_SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff"); TDEShortcut(),this,TQ_SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff");
tmp_action->setToolTip(i18n("Diff two items")); tmp_action->setToolTip(i18n("Diff two items"));
m_MergeRevisionAction = new TDEAction(i18n("Merge two revisions"),"tdesvnmerge", m_MergeRevisionAction = new TDEAction(i18n("Merge two revisions"),"tdesvnmerge",
TDEShortcut(),this,TQT_SLOT(slotMergeRevisions()),m_filesAction,"make_svn_merge_revisions"); TDEShortcut(),this,TQ_SLOT(slotMergeRevisions()),m_filesAction,"make_svn_merge_revisions");
m_MergeRevisionAction->setToolTip(i18n("Merge two revisions of this entry into itself")); m_MergeRevisionAction->setToolTip(i18n("Merge two revisions of this entry into itself"));
tmp_action=new TDEAction(i18n("Merge..."),"tdesvnmerge", tmp_action=new TDEAction(i18n("Merge..."),"tdesvnmerge",
TDEShortcut(),this,TQT_SLOT(slotMerge()),m_filesAction,"make_svn_merge"); TDEShortcut(),this,TQ_SLOT(slotMerge()),m_filesAction,"make_svn_merge");
tmp_action->setToolTip("Merge repository path into current worky copy path or current repository path into a target"); tmp_action->setToolTip("Merge repository path into current worky copy path or current repository path into a target");
tmp_action=new TDEAction( i18n( "Open With..." ), 0, this, TQT_SLOT( slotOpenWith() ), m_filesAction, "openwith" ); tmp_action=new TDEAction( i18n( "Open With..." ), 0, this, TQ_SLOT( slotOpenWith() ), m_filesAction, "openwith" );
/* remote actions only */ /* remote actions only */
m_CheckoutCurrentAction = new TDEAction(i18n("Checkout current repository path"),"tdesvncheckout",TDEShortcut(), m_CheckoutCurrentAction = new TDEAction(i18n("Checkout current repository path"),"tdesvncheckout",TDEShortcut(),
m_SvnWrapper,TQT_SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current"); m_SvnWrapper,TQ_SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current");
m_ExportCurrentAction = new TDEAction(i18n("Export current repository path"),"tdesvnexport",TDEShortcut(), m_ExportCurrentAction = new TDEAction(i18n("Export current repository path"),"tdesvnexport",TDEShortcut(),
m_SvnWrapper,TQT_SLOT(slotExportCurrent()),m_filesAction,"make_svn_export_current"); m_SvnWrapper,TQ_SLOT(slotExportCurrent()),m_filesAction,"make_svn_export_current");
new TDEAction(i18n("Select browse revision"),TDEShortcut(),this,TQT_SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision"); new TDEAction(i18n("Select browse revision"),TDEShortcut(),this,TQ_SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision");
/* independe actions */ /* independe actions */
m_CheckoutAction = new TDEAction(i18n("Checkout a repository"),"tdesvncheckout", m_CheckoutAction = new TDEAction(i18n("Checkout a repository"),"tdesvncheckout",
TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotCheckout()),m_filesAction,"make_svn_checkout"); TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotCheckout()),m_filesAction,"make_svn_checkout");
m_ExportAction = new TDEAction(i18n("Export a repository"),"tdesvnexport", m_ExportAction = new TDEAction(i18n("Export a repository"),"tdesvnexport",
TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotExport()),m_filesAction,"make_svn_export"); TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotExport()),m_filesAction,"make_svn_export");
m_RefreshViewAction = new TDEAction(i18n("Refresh view"),"reload",TDEShortcut(Key_F5),this,TQT_SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh"); m_RefreshViewAction = new TDEAction(i18n("Refresh view"),"reload",TDEShortcut(Key_F5),this,TQ_SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh");
new TDEAction(i18n("Diff revisions"),"tdesvndiff",TDEShortcut(),this,TQT_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff"); new TDEAction(i18n("Diff revisions"),"tdesvndiff",TDEShortcut(),this,TQ_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff");
/* folding options */ /* folding options */
tmp_action = new TDEAction( i18n("Unfold File Tree"), 0, this , TQT_SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" ); tmp_action = new TDEAction( i18n("Unfold File Tree"), 0, this , TQ_SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" );
tmp_action->setToolTip(i18n("Opens all branches of the file tree")); tmp_action->setToolTip(i18n("Opens all branches of the file tree"));
tmp_action = new TDEAction( i18n("Fold File Tree"), 0, this, TQT_SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" ); tmp_action = new TDEAction( i18n("Fold File Tree"), 0, this, TQ_SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" );
tmp_action->setToolTip(i18n("Closes all branches of the file tree")); tmp_action->setToolTip(i18n("Closes all branches of the file tree"));
/* caching */ /* caching */
tmp_action = new TDEAction( i18n("Update log cache"),0,this,TQT_SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" ); tmp_action = new TDEAction( i18n("Update log cache"),0,this,TQ_SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" );
tmp_action->setToolTip(i18n("Update the log cache for current repository")); tmp_action->setToolTip(i18n("Update the log cache for current repository"));
/* tmp_action = new TDEAction( i18n("Stop update log cache"),0,this,TQT_SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" ); /* tmp_action = new TDEAction( i18n("Stop update log cache"),0,this,TQ_SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" );
tmp_action->setToolTip(i18n("Stop the update of the log cache")); tmp_action->setToolTip(i18n("Stop the update of the log cache"));
*/ */
@ -586,9 +586,9 @@ bool tdesvnfilelist::openURL( const KURL &url,bool noReinit )
m_SvnWrapper->clearUpdateCache(); m_SvnWrapper->clearUpdateCache();
if (isWorkingCopy()) { if (isWorkingCopy()) {
m_pList->m_DirWatch=new KDirWatch(this); m_pList->m_DirWatch=new KDirWatch(this);
connect(m_pList->m_DirWatch,TQT_SIGNAL(dirty(const TQString&)),this,TQT_SLOT(slotDirItemDirty(const TQString&))); connect(m_pList->m_DirWatch,TQ_SIGNAL(dirty(const TQString&)),this,TQ_SLOT(slotDirItemDirty(const TQString&)));
connect(m_pList->m_DirWatch,TQT_SIGNAL(created(const TQString&)),this,TQT_SLOT(slotDirItemCreated(const TQString&))); connect(m_pList->m_DirWatch,TQ_SIGNAL(created(const TQString&)),this,TQ_SLOT(slotDirItemCreated(const TQString&)));
connect(m_pList->m_DirWatch,TQT_SIGNAL(deleted(const TQString&)),this,TQT_SLOT(slotDirItemDeleted(const TQString&))); connect(m_pList->m_DirWatch,TQ_SIGNAL(deleted(const TQString&)),this,TQ_SLOT(slotDirItemDeleted(const TQString&)));
/* seems that recursive does not work */ /* seems that recursive does not work */
if (m_pList->m_DirWatch) { if (m_pList->m_DirWatch) {
m_pList->m_DirWatch->addDir(baseUri()+"/",false,false); m_pList->m_DirWatch->addDir(baseUri()+"/",false,false);
@ -620,7 +620,7 @@ bool tdesvnfilelist::openURL( const KURL &url,bool noReinit )
} }
emit changeCaption(baseUri()); emit changeCaption(baseUri());
emit sigUrlOpend(result); emit sigUrlOpend(result);
TQTimer::singleShot(1,this,TQT_SLOT(readSupportData())); TQTimer::singleShot(1,this,TQ_SLOT(readSupportData()));
enableActions(); enableActions();
return result; return result;
} }
@ -1287,7 +1287,7 @@ void tdesvnfilelist::refreshCurrentTree()
kdDebug()<<"Refresh time: "<<t.elapsed()<<" ms"<<endl; kdDebug()<<"Refresh time: "<<t.elapsed()<<" ms"<<endl;
setUpdatesEnabled(true); setUpdatesEnabled(true);
viewport()->repaint(); viewport()->repaint();
TQTimer::singleShot(1,this,TQT_SLOT(readSupportData())); TQTimer::singleShot(1,this,TQ_SLOT(readSupportData()));
//m_pList->startScan(); //m_pList->startScan();
} }
@ -1815,7 +1815,7 @@ void tdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item)
//m_pList->stopScan(); //m_pList->stopScan();
TDEIO::Job * job = 0L; TDEIO::Job * job = 0L;
job = TDEIO::copy(urlList,tdir); job = TDEIO::copy(urlList,tdir);
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),TQ_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
dispDummy(); dispDummy();
event->acceptAction(); event->acceptAction();
return; return;
@ -1860,7 +1860,7 @@ void tdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item)
m_pList->intern_drop_target=tdir; m_pList->intern_drop_target=tdir;
m_pList->intern_drop_action=action; m_pList->intern_drop_action=action;
m_pList->intern_drop_pos=TQCursor::pos(); m_pList->intern_drop_pos=TQCursor::pos();
TQTimer::singleShot(0,this,TQT_SLOT(slotInternalDrop())); TQTimer::singleShot(0,this,TQ_SLOT(slotInternalDrop()));
// internalDrop(action,urlList,tdir); // internalDrop(action,urlList,tdir);
} }
@ -2005,7 +2005,7 @@ void tdesvnfilelist::slotDelete()
} }
if (tdeioList.count()>0) { if (tdeioList.count()>0) {
TDEIO::Job*aJob = TDEIO::del(tdeioList); TDEIO::Job*aJob = TDEIO::del(tdeioList);
connect(aJob,TQT_SIGNAL(result (TDEIO::Job *)),this,TQT_SLOT(slotDeleteFinished(TDEIO::Job*))); connect(aJob,TQ_SIGNAL(result (TDEIO::Job *)),this,TQ_SLOT(slotDeleteFinished(TDEIO::Job*)));
dispDummy(); dispDummy();
} }
if (m_deletePerfect && items.size()>0) { if (m_deletePerfect && items.size()>0) {
@ -3059,8 +3059,8 @@ void tdesvnfilelist::slotUnfoldTree()
{ {
StopSimpleDlg sdlg(0,0,i18n("Unfold tree"),i18n("Unfold all folder")); StopSimpleDlg sdlg(0,0,i18n("Unfold tree"),i18n("Unfold all folder"));
connect(this,TQT_SIGNAL(sigListError()), connect(this,TQ_SIGNAL(sigListError()),
&sdlg,TQT_SLOT(makeCancel())); &sdlg,TQ_SLOT(makeCancel()));
TQListViewItemIterator it(this); TQListViewItemIterator it(this);
TQTime t;t.start(); TQTime t;t.start();

42
src/tdesvn.cpp
Unescape View File

@ -123,22 +123,22 @@ tdesvn::tdesvn()
TDEAction*tmpAction; TDEAction*tmpAction;
tmpAction = new TDEAction(i18n("Create and open new repository"),"document-new", tmpAction = new TDEAction(i18n("Create and open new repository"),"document-new",
TDEShortcut(),m_part->widget(),TQT_SLOT(slotCreateRepo()),actionCollection(),"subversion_create_repo"); TDEShortcut(),m_part->widget(),TQ_SLOT(slotCreateRepo()),actionCollection(),"subversion_create_repo");
tmpAction->setToolTip(i18n("Create and opens a new local subversion repository")); tmpAction->setToolTip(i18n("Create and opens a new local subversion repository"));
tmpAction = new TDEAction(i18n("Dump repository to file"),"document-new", tmpAction = new TDEAction(i18n("Dump repository to file"),"document-new",
TDEShortcut(),m_part->widget(),TQT_SLOT(slotDumpRepo()),actionCollection(),"subversion_dump_repo"); TDEShortcut(),m_part->widget(),TQ_SLOT(slotDumpRepo()),actionCollection(),"subversion_dump_repo");
tmpAction->setToolTip(i18n("Dump a subversion repository to a file")); tmpAction->setToolTip(i18n("Dump a subversion repository to a file"));
tmpAction = new TDEAction(i18n("Hotcopy a repository"),"document-new", tmpAction = new TDEAction(i18n("Hotcopy a repository"),"document-new",
TDEShortcut(),m_part->widget(),TQT_SLOT(slotHotcopy()),actionCollection(),"subversion_hotcopy_repo"); TDEShortcut(),m_part->widget(),TQ_SLOT(slotHotcopy()),actionCollection(),"subversion_hotcopy_repo");
tmpAction->setToolTip(i18n("Hotcopy a subversion repository to a new folder")); tmpAction->setToolTip(i18n("Hotcopy a subversion repository to a new folder"));
tmpAction = new TDEAction(i18n("Load dump into repository"),"document-new", tmpAction = new TDEAction(i18n("Load dump into repository"),"document-new",
TDEShortcut(),m_part->widget(),TQT_SLOT(slotLoaddump()),actionCollection(),"subversion_load_repo"); TDEShortcut(),m_part->widget(),TQ_SLOT(slotLoaddump()),actionCollection(),"subversion_load_repo");
tmpAction->setToolTip(i18n("Load a dump file into a repository.")); tmpAction->setToolTip(i18n("Load a dump file into a repository."));
tmpAction = new TDEAction(i18n("Add ssh identities to ssh-agent"),"password", tmpAction = new TDEAction(i18n("Add ssh identities to ssh-agent"),"password",
TDEShortcut(),m_part,TQT_SLOT(slotSshAdd()),actionCollection(),"tdesvn_ssh_add"); TDEShortcut(),m_part,TQ_SLOT(slotSshAdd()),actionCollection(),"tdesvn_ssh_add");
tmpAction->setToolTip(i18n("Force add ssh-identities to ssh-agent for future use.")); tmpAction->setToolTip(i18n("Force add ssh-identities to ssh-agent for future use."));
tmpAction = new TDEAction(i18n("Info about tdesvn part"), "tdesvn", tmpAction = new TDEAction(i18n("Info about tdesvn part"), "tdesvn",
TDEShortcut(), m_part, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart"); TDEShortcut(), m_part, TQ_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart");
tmpAction->setToolTip(i18n("Shows info about the tdesvn plugin not the standalone app.")); tmpAction->setToolTip(i18n("Shows info about the tdesvn plugin not the standalone app."));
/* enable tooltips in statusbar for menu */ /* enable tooltips in statusbar for menu */
@ -169,10 +169,10 @@ tdesvn::tdesvn()
void tdesvn::connectActionCollection( TDEActionCollection *coll ) void tdesvn::connectActionCollection( TDEActionCollection *coll )
{ {
if (!coll)return; if (!coll)return;
connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ),
this, TQT_SLOT( changeStatusbar( const TQString & ) ) ); this, TQ_SLOT( changeStatusbar( const TQString & ) ) );
connect( coll, TQT_SIGNAL( clearStatusText() ), connect( coll, TQ_SIGNAL( clearStatusText() ),
this, TQT_SLOT( resetStatusBar() ) ); this, TQ_SLOT( resetStatusBar() ) );
} }
void tdesvn::disconnectActionCollection( TDEActionCollection *coll ) void tdesvn::disconnectActionCollection( TDEActionCollection *coll )
@ -220,13 +220,13 @@ void tdesvn::load(const KURL& url,bool addRescent)
void tdesvn::setupActions() void tdesvn::setupActions()
{ {
TDEAction*ac; TDEAction*ac;
KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
KStdAction::openNew(this,TQT_SLOT(fileNew()),actionCollection()); KStdAction::openNew(this,TQ_SLOT(fileNew()),actionCollection());
ac = KStdAction::close(this,TQT_SLOT(fileClose()),actionCollection()); ac = KStdAction::close(this,TQ_SLOT(fileClose()),actionCollection());
ac->setEnabled(getMemberList()->count()>1); ac->setEnabled(getMemberList()->count()>1);
KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
TDERecentFilesAction*rac = KStdAction::openRecent(this,TQT_SLOT(loadRescent(const KURL&)),actionCollection()); TDERecentFilesAction*rac = KStdAction::openRecent(this,TQ_SLOT(loadRescent(const KURL&)),actionCollection());
if (rac) if (rac)
{ {
rac->setMaxItems(8); rac->setMaxItems(8);
@ -234,10 +234,10 @@ void tdesvn::setupActions()
rac->setText(i18n("Recent opened URLs")); rac->setText(i18n("Recent opened URLs"));
} }
KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
TDEToggleAction *toggletemp; TDEToggleAction *toggletemp;
toggletemp = new TDEToggleAction(i18n("Load last opened URL on start"),TDEShortcut(), toggletemp = new TDEToggleAction(i18n("Load last opened URL on start"),TDEShortcut(),
@ -245,7 +245,7 @@ void tdesvn::setupActions()
toggletemp->setToolTip(i18n("Reload last opened url if no one is given on commandline")); toggletemp->setToolTip(i18n("Reload last opened url if no one is given on commandline"));
TDEConfigGroup cs(TDEGlobal::config(),"startup"); TDEConfigGroup cs(TDEGlobal::config(),"startup");
toggletemp->setChecked(cs.readBoolEntry("load_last_on_start",false)); toggletemp->setChecked(cs.readBoolEntry("load_last_on_start",false));
connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotLoadLast(bool))); connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotLoadLast(bool)));
} }
void tdesvn::optionsShowStatusbar() void tdesvn::optionsShowStatusbar()
@ -371,8 +371,8 @@ void tdesvn::optionsConfigureToolbars()
// use the standard toolbar editor // use the standard toolbar editor
KEditToolbar dlg(factory()); KEditToolbar dlg(factory());
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), connect(&dlg, TQ_SIGNAL(newToolbarConfig()),
this, TQT_SLOT(applyNewToolbarConfig())); this, TQ_SLOT(applyNewToolbarConfig()));
dlg.exec(); dlg.exec();
} }

32
src/tdesvn_part.cpp
Unescape View File

@ -95,12 +95,12 @@ void tdesvnPart::init( TQWidget *parentWidget, const char *widgetName,bool full)
#else #else
setXMLFile("tdesvn_part.rc"); setXMLFile("tdesvn_part.rc");
#endif #endif
connect(m_view,TQT_SIGNAL(sigShowPopup(const TQString&,TQWidget**)),this,TQT_SLOT(slotDispPopup(const TQString&,TQWidget**))); connect(m_view,TQ_SIGNAL(sigShowPopup(const TQString&,TQWidget**)),this,TQ_SLOT(slotDispPopup(const TQString&,TQWidget**)));
connect(m_view,TQT_SIGNAL(sigSwitchUrl(const KURL&)),this,TQT_SLOT(openURL(const KURL&))); connect(m_view,TQ_SIGNAL(sigSwitchUrl(const KURL&)),this,TQ_SLOT(openURL(const KURL&)));
connect(this,TQT_SIGNAL(refreshTree()),m_view,TQT_SLOT(refreshCurrentTree())); connect(this,TQ_SIGNAL(refreshTree()),m_view,TQ_SLOT(refreshCurrentTree()));
connect(m_view,TQT_SIGNAL(setWindowCaption(const TQString&)),this,TQT_SIGNAL(setWindowCaption(const TQString&))); connect(m_view,TQ_SIGNAL(setWindowCaption(const TQString&)),this,TQ_SIGNAL(setWindowCaption(const TQString&)));
connect(m_view,TQT_SIGNAL(sigUrlChanged( const TQString&)),this,TQT_SLOT(slotUrlChanged(const TQString&))); connect(m_view,TQ_SIGNAL(sigUrlChanged( const TQString&)),this,TQ_SLOT(slotUrlChanged(const TQString&)));
connect(this,TQT_SIGNAL(settingsChanged()),widget(),TQT_SLOT(slotSettingsChanged())); connect(this,TQ_SIGNAL(settingsChanged()),widget(),TQ_SLOT(slotSettingsChanged()));
m_browserExt->setPropertiesActionEnabled(false); m_browserExt->setPropertiesActionEnabled(false);
} }
@ -181,37 +181,37 @@ void tdesvnPart::setupActions()
toggletemp = new TDEToggleAction(i18n("Logs follow node changes"),TDEShortcut(), toggletemp = new TDEToggleAction(i18n("Logs follow node changes"),TDEShortcut(),
actionCollection(),"toggle_log_follows"); actionCollection(),"toggle_log_follows");
toggletemp->setChecked(Kdesvnsettings::log_follows_nodes()); toggletemp->setChecked(Kdesvnsettings::log_follows_nodes());
connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotLogFollowNodes(bool))); connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotLogFollowNodes(bool)));
toggletemp = new TDEToggleAction(i18n("Display ignored files"),TDEShortcut(), toggletemp = new TDEToggleAction(i18n("Display ignored files"),TDEShortcut(),
actionCollection(),"toggle_ignored_files"); actionCollection(),"toggle_ignored_files");
toggletemp->setChecked(Kdesvnsettings::display_ignored_files()); toggletemp->setChecked(Kdesvnsettings::display_ignored_files());
connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotDisplayIgnored(bool))); connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotDisplayIgnored(bool)));
toggletemp = new TDEToggleAction(i18n("Display unknown files"),TDEShortcut(), toggletemp = new TDEToggleAction(i18n("Display unknown files"),TDEShortcut(),
actionCollection(),"toggle_unknown_files"); actionCollection(),"toggle_unknown_files");
toggletemp->setChecked(Kdesvnsettings::display_unknown_files()); toggletemp->setChecked(Kdesvnsettings::display_unknown_files());
connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotDisplayUnkown(bool))); connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotDisplayUnkown(bool)));
toggletemp = new TDEToggleAction(i18n("Hide unchanged files"),TDEShortcut(), toggletemp = new TDEToggleAction(i18n("Hide unchanged files"),TDEShortcut(),
actionCollection(),"toggle_hide_unchanged_files"); actionCollection(),"toggle_hide_unchanged_files");
toggletemp->setChecked(Kdesvnsettings::hide_unchanged_files()); toggletemp->setChecked(Kdesvnsettings::hide_unchanged_files());
connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotHideUnchanged(bool))); connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotHideUnchanged(bool)));
toggletemp = new TDEToggleAction(i18n("Work online"),TDEShortcut(), toggletemp = new TDEToggleAction(i18n("Work online"),TDEShortcut(),
actionCollection(),"toggle_network"); actionCollection(),"toggle_network");
toggletemp->setChecked(Kdesvnsettings::network_on()); toggletemp->setChecked(Kdesvnsettings::network_on());
connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableNetwork(bool))); connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableNetwork(bool)));
kdDebug()<<"Appname = " << (TQString)kapp->instanceName() << endl; kdDebug()<<"Appname = " << (TQString)kapp->instanceName() << endl;
TDEAction * t = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection(),"tdesvnpart_pref"); TDEAction * t = KStdAction::preferences(this, TQ_SLOT(slotShowSettings()), actionCollection(),"tdesvnpart_pref");
t->setText(i18n("&Configure %1...").arg("Kdesvn")); t->setText(i18n("&Configure %1...").arg("Kdesvn"));
if (TQString(kapp->instanceName())!=TQString("tdesvn")) { if (TQString(kapp->instanceName())!=TQString("tdesvn")) {
(void)new TDEAction(i18n("&About tdesvn part"), "tdesvn", 0, this, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart"); (void)new TDEAction(i18n("&About tdesvn part"), "tdesvn", 0, this, TQ_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart");
(void)new TDEAction(i18n("Tdesvn &Handbook"), "help", 0, this, TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdesvn"); (void)new TDEAction(i18n("Tdesvn &Handbook"), "help", 0, this, TQ_SLOT(appHelpActivated()), actionCollection(), "help_tdesvn");
(void)new TDEAction(i18n("Send Bugreport for tdesvn"), 0, 0, this, TQT_SLOT(reportBug()), actionCollection(), "report_bug"); (void)new TDEAction(i18n("Send Bugreport for tdesvn"), 0, 0, this, TQ_SLOT(reportBug()), actionCollection(), "report_bug");
} }
actionCollection()->setHighlightingEnabled(true); actionCollection()->setHighlightingEnabled(true);
} }
@ -364,7 +364,7 @@ void tdesvnPart::slotShowSettings()
dialog->addPage(new CmdExecSettings_impl(0,"cmdexec_items"), dialog->addPage(new CmdExecSettings_impl(0,"cmdexec_items"),
"TDEIO/"+i18n("Commandline"),"terminal",i18n("Settings for commandline and TDEIO execution"),true); "TDEIO/"+i18n("Commandline"),"terminal",i18n("Settings for commandline and TDEIO execution"),true);
connect(dialog,TQT_SIGNAL(settingsChanged()),this,TQT_SLOT(slotSettingsChanged())); connect(dialog,TQ_SIGNAL(settingsChanged()),this,TQ_SLOT(slotSettingsChanged()));
dialog->show(); dialog->show();
} }

20
src/tdesvnview.cpp
Unescape View File

@ -80,20 +80,20 @@ tdesvnView::tdesvnView(TDEActionCollection*aCollection,TQWidget *parent,const ch
Propertylist*pl = new Propertylist(m_infoSplitter); Propertylist*pl = new Propertylist(m_infoSplitter);
pl->setCommitchanges(true); pl->setCommitchanges(true);
pl->addCallback(m_flist); pl->addCallback(m_flist);
connect(m_flist,TQT_SIGNAL(sigProplist(const svn::PathPropertiesMapListPtr&,bool,const TQString&)), connect(m_flist,TQ_SIGNAL(sigProplist(const svn::PathPropertiesMapListPtr&,bool,const TQString&)),
pl,TQT_SLOT(displayList(const svn::PathPropertiesMapListPtr&,bool,const TQString&))); pl,TQ_SLOT(displayList(const svn::PathPropertiesMapListPtr&,bool,const TQString&)));
m_flist->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, m_flist->sizePolicy().hasHeightForWidth() ) ); m_flist->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, m_flist->sizePolicy().hasHeightForWidth() ) );
m_topLayout->addWidget(m_Splitter); m_topLayout->addWidget(m_Splitter);
connect(m_flist,TQT_SIGNAL(sigLogMessage(const TQString&)),this,TQT_SLOT(slotAppendLog(const TQString&))); connect(m_flist,TQ_SIGNAL(sigLogMessage(const TQString&)),this,TQ_SLOT(slotAppendLog(const TQString&)));
connect(m_flist,TQT_SIGNAL(changeCaption(const TQString&)),this,TQT_SLOT(slotSetTitle(const TQString&))); connect(m_flist,TQ_SIGNAL(changeCaption(const TQString&)),this,TQ_SLOT(slotSetTitle(const TQString&)));
connect(m_flist,TQT_SIGNAL(sigShowPopup(const TQString&,TQWidget**)),this,TQT_SLOT(slotDispPopup(const TQString&,TQWidget**))); connect(m_flist,TQ_SIGNAL(sigShowPopup(const TQString&,TQWidget**)),this,TQ_SLOT(slotDispPopup(const TQString&,TQWidget**)));
connect(m_flist,TQT_SIGNAL(sigUrlOpend(bool)),parent,TQT_SLOT(slotUrlOpened(bool))); connect(m_flist,TQ_SIGNAL(sigUrlOpend(bool)),parent,TQ_SLOT(slotUrlOpened(bool)));
connect(m_flist,TQT_SIGNAL(sigSwitchUrl(const KURL&)),this,TQT_SIGNAL(sigSwitchUrl(const KURL&))); connect(m_flist,TQ_SIGNAL(sigSwitchUrl(const KURL&)),this,TQ_SIGNAL(sigSwitchUrl(const KURL&)));
connect(m_flist,TQT_SIGNAL(sigUrlChanged( const TQString& )),this,TQT_SLOT(slotUrlChanged(const TQString&))); connect(m_flist,TQ_SIGNAL(sigUrlChanged( const TQString& )),this,TQ_SLOT(slotUrlChanged(const TQString&)));
connect(m_flist,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SLOT(fillCacheStatus(TQ_LONG,TQ_LONG))); connect(m_flist,TQ_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQ_SLOT(fillCacheStatus(TQ_LONG,TQ_LONG)));
connect(this,TQT_SIGNAL(sigMakeBaseDirs()),m_flist,TQT_SLOT(slotMkBaseDirs())); connect(this,TQ_SIGNAL(sigMakeBaseDirs()),m_flist,TQ_SLOT(slotMkBaseDirs()));
TDEConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-mainlayout"); TDEConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-mainlayout");
TQString t1 = cs.readEntry("split1",TQString()); TQString t1 = cs.readEntry("split1",TQString());
if (!t1.isEmpty()) { if (!t1.isEmpty()) {

4
src/urldlg.cpp
Unescape View File

@ -71,10 +71,10 @@ void UrlDlg::init_dlg()
urlRequester_->setFocus(); urlRequester_->setFocus();
KFile::Mode mode = static_cast<KFile::Mode>(KFile::ExistingOnly|KFile::Directory); KFile::Mode mode = static_cast<KFile::Mode>(KFile::ExistingOnly|KFile::Directory);
urlRequester_->setMode(mode); urlRequester_->setMode(mode);
connect(urlRequester_->comboBox(),TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotTextChanged(const TQString&))); connect(urlRequester_->comboBox(),TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotTextChanged(const TQString&)));
enableButtonOK( false ); enableButtonOK( false );
enableButton( KDialogBase::User1, false ); enableButton( KDialogBase::User1, false );
connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotClear())); connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotClear()));
urlRequester_->adjustSize(); urlRequester_->adjustSize();
resize(TQSize(400,sizeHint().height())); resize(TQSize(400,sizeHint().height()));
} }

Write Preview
Loading…
Cancel
Save