summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
commit9f3eff1ef54cdff75caf77237b7884c5ff6b1352 (patch)
treefde3b6ad551a6262f68b92b9b1f487879764519d
parentf5c53fbef9f5d07c57420d5246cf839416517318 (diff)
downloadtdesvn-9f3eff1e.tar.gz
tdesvn-9f3eff1e.zip
Fix a number of accidental tqStatus string conversions
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--src/kiosvn/kiolistener.cpp2
-rw-r--r--src/kiosvn/kiosvn.cpp2
-rw-r--r--src/svnfrontend/ccontextlistener.cpp2
-rw-r--r--src/svnfrontend/kdesvnfilelist.cpp2
-rw-r--r--src/svnfrontend/svnactions.cpp4
5 files changed, 6 insertions, 6 deletions
diff --git a/src/kiosvn/kiolistener.cpp b/src/kiosvn/kiolistener.cpp
index 28536d7..5904639 100644
--- a/src/kiosvn/kiolistener.cpp
+++ b/src/kiosvn/kiolistener.cpp
@@ -216,7 +216,7 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action
break;
case svn_wc_notify_status_completed: //status_completed
if (SVN_IS_VALID_REVNUM (revision))
- userstring = i18n( "tqStatus against revision: %1.").tqarg( revision );
+ userstring = i18n( "Status against revision: %1.").tqarg( revision );
break;
case svn_wc_notify_status_external: //status_external
userstring = i18n("Performing status on external item at %1.").tqarg( path );
diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp
index 2036f5e..796c3d9 100644
--- a/src/kiosvn/kiosvn.cpp
+++ b/src/kiosvn/kiosvn.cpp
@@ -664,7 +664,7 @@ void kio_svnProtocol::status(const KURL&wc,bool cR,bool rec)
error(KIO::ERR_SLAVE_DEFINED,e.msg());
return;
}
- kdDebug()<<"tqStatus got " << dlist.count() << " entries." << endl;
+ kdDebug()<<"Status got " << dlist.count() << " entries." << endl;
for (unsigned j=0;j<dlist.count();++j) {
if (!dlist[j]) {
continue;
diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp
index 4526edc..143118b 100644
--- a/src/svnfrontend/ccontextlistener.cpp
+++ b/src/svnfrontend/ccontextlistener.cpp
@@ -74,7 +74,7 @@ const TQString CContextListener::action_strings[]={
I18N_NOOP("Update complete"),
I18N_NOOP("Update external module"),
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 Added"),
I18N_NOOP("Commit Deleted"),
diff --git a/src/svnfrontend/kdesvnfilelist.cpp b/src/svnfrontend/kdesvnfilelist.cpp
index f089782..30c3a5c 100644
--- a/src/svnfrontend/kdesvnfilelist.cpp
+++ b/src/svnfrontend/kdesvnfilelist.cpp
@@ -208,7 +208,7 @@ kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,TQWidget *parent, cons
setAllColumnsShowFocus (true);
setRootIsDecorated(true);
addColumn(i18n("Name"));
- addColumn(i18n("tqStatus"));
+ addColumn(i18n("Status"));
addColumn(i18n("Last changed Revision"));
addColumn(i18n("Last author"));
addColumn(i18n("Last change date"));
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 222d6f1..0d1fd1c 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -963,7 +963,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets)
for (unsigned j = 0; j < targets.size(); ++j) {
svn::Revision where = svn::Revision::HEAD;
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);
} catch (const svn::Exception&e) {
emit clientException(e.msg());
@@ -2309,7 +2309,7 @@ bool SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn
TQString ex;
svn::Depth _d=rec?svn::DepthInfinity:svn::DepthImmediates;
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&)));
// rec all up noign
dlist = m_Data->m_Svnclient->status(what,_d,all,updates,display_ignores,where,disp_remote_details,false);