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

Fix a number of accidental tqStatus string conversions

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent f5c53fbef9
commit 9f3eff1ef5
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
src/kiosvn/kiolistener.cpp
Unescape View File

@ -216,7 +216,7 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action
break; break;
case svn_wc_notify_status_completed: //status_completed case svn_wc_notify_status_completed: //status_completed
if (SVN_IS_VALID_REVNUM (revision)) if (SVN_IS_VALID_REVNUM (revision))
userstring = i18n( "tqStatus against revision: %1.").tqarg( revision ); userstring = i18n( "Status against revision: %1.").tqarg( revision );
break; break;
case svn_wc_notify_status_external: //status_external case svn_wc_notify_status_external: //status_external
userstring = i18n("Performing status on external item at %1.").tqarg( path ); userstring = i18n("Performing status on external item at %1.").tqarg( path );

2
src/kiosvn/kiosvn.cpp
Unescape View File

@ -664,7 +664,7 @@ void kio_svnProtocol::status(const KURL&wc,bool cR,bool rec)
error(KIO::ERR_SLAVE_DEFINED,e.msg()); error(KIO::ERR_SLAVE_DEFINED,e.msg());
return; return;
} }
kdDebug()<<"tqStatus got " << dlist.count() << " entries." << endl; kdDebug()<<"Status got " << dlist.count() << " entries." << endl;
for (unsigned j=0;j<dlist.count();++j) { for (unsigned j=0;j<dlist.count();++j) {
if (!dlist[j]) { if (!dlist[j]) {
continue; continue;

2
src/svnfrontend/ccontextlistener.cpp
Unescape View File

@ -74,7 +74,7 @@ const TQString CContextListener::action_strings[]={
I18N_NOOP("Update complete"), I18N_NOOP("Update complete"),
I18N_NOOP("Update external module"), I18N_NOOP("Update external module"),
TQString(), // status completed - will not send is just noisy TQString(), // status completed - will not send is just noisy
I18N_NOOP("tqStatus on external"), //svn_wc_notify_status_external I18N_NOOP("Status on external"), //svn_wc_notify_status_external
I18N_NOOP("Commit Modified"), I18N_NOOP("Commit Modified"),
I18N_NOOP("Commit Added"), I18N_NOOP("Commit Added"),
I18N_NOOP("Commit Deleted"), I18N_NOOP("Commit Deleted"),

2
src/svnfrontend/kdesvnfilelist.cpp
Unescape View File

@ -208,7 +208,7 @@ kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,TQWidget *parent, cons
setAllColumnsShowFocus (true); setAllColumnsShowFocus (true);
setRootIsDecorated(true); setRootIsDecorated(true);
addColumn(i18n("Name")); addColumn(i18n("Name"));
addColumn(i18n("tqStatus")); addColumn(i18n("Status"));
addColumn(i18n("Last changed Revision")); addColumn(i18n("Last changed Revision"));
addColumn(i18n("Last author")); addColumn(i18n("Last author"));
addColumn(i18n("Last change date")); addColumn(i18n("Last change date"));

4
src/svnfrontend/svnactions.cpp
Unescape View File

@ -963,7 +963,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets)
for (unsigned j = 0; j < targets.size(); ++j) { for (unsigned j = 0; j < targets.size(); ++j) {
svn::Revision where = svn::Revision::HEAD; svn::Revision where = svn::Revision::HEAD;
try { try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("tqStatus / 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"));
_Cache = m_Data->m_Svnclient->status(targets.target(j).path(),svn::DepthInfinity,false,false,false,where); _Cache = m_Data->m_Svnclient->status(targets.target(j).path(),svn::DepthInfinity,false,false,false,where);
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
emit clientException(e.msg()); emit clientException(e.msg());
@ -2309,7 +2309,7 @@ bool SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn
TQString ex; TQString ex;
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("tqStatus / 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,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_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);

Write Preview
Loading…
Cancel
Save