summaryrefslogtreecommitdiffstats
path: root/src/kiosvn
diff options
context:
space:
mode:
Diffstat (limited to 'src/kiosvn')
-rw-r--r--src/kiosvn/kiolistener.cpp42
-rw-r--r--src/kiosvn/kiosvn.cpp12
2 files changed, 27 insertions, 27 deletions
diff --git a/src/kiosvn/kiolistener.cpp b/src/kiosvn/kiolistener.cpp
index f08dc18..16ff6e4 100644
--- a/src/kiosvn/kiolistener.cpp
+++ b/src/kiosvn/kiolistener.cpp
@@ -116,9 +116,9 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action
case svn_wc_notify_add:
{
if (mime_type && (svn_mime_type_is_binary (mime_type)))
- userstring = i18n( "A (bin) %1" ).tqarg( path );
+ userstring = i18n( "A (bin) %1" ).arg( path );
else
- userstring = i18n( "A %1" ).tqarg( path );
+ userstring = i18n( "A %1" ).arg( path );
break;
}
break;
@@ -126,33 +126,33 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action
break;
case svn_wc_notify_delete: //delete
m_HasChanges = TRUE;
- userstring = i18n( "D %1" ).tqarg( path );
+ userstring = i18n( "D %1" ).arg( path );
break;
case svn_wc_notify_restore : //restore
- userstring=i18n( "Restored %1." ).tqarg( path );
+ userstring=i18n( "Restored %1." ).arg( path );
break;
case svn_wc_notify_revert : //revert
- userstring=i18n( "Reverted %1." ).tqarg( path );
+ userstring=i18n( "Reverted %1." ).arg( path );
break;
case svn_wc_notify_failed_revert: //failed revert
- userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path );
+ userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path );
break;
case svn_wc_notify_resolved: //resolved
- userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path );
+ userstring=i18n( "Resolved conflicted state of %1." ).arg( path );
break;
case svn_wc_notify_skip: //skip
if ( content_state == svn_wc_notify_state_missing )
- userstring=i18n("Skipped missing target %1.").tqarg( path );
+ userstring=i18n("Skipped missing target %1.").arg( path );
else
- userstring=i18n("Skipped %1.").tqarg( path );
+ userstring=i18n("Skipped %1.").arg( path );
break;
case svn_wc_notify_update_delete: //update_delete
m_HasChanges = TRUE;
- userstring=i18n( "D %1" ).tqarg( path );
+ userstring=i18n( "D %1" ).arg( path );
break;
case svn_wc_notify_update_add: //update_add
m_HasChanges = TRUE;
- userstring=i18n( "A %1" ).tqarg( path );
+ userstring=i18n( "A %1" ).arg( path );
break;
case svn_wc_notify_update_update: //update_update
{
@@ -195,13 +195,13 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action
{
if (!m_External) {
if (SVN_IS_VALID_REVNUM(revision)) {
- userstring = i18n("Finished at revision %1.").tqarg(revision);
+ userstring = i18n("Finished at revision %1.").arg(revision);
} else {
userstring = i18n("Finished.");
}
} else {
if (SVN_IS_VALID_REVNUM(revision)) {
- userstring = i18n("Finished external at revision %1.").tqarg(revision);
+ userstring = i18n("Finished external at revision %1.").arg(revision);
} else {
userstring = i18n("Finished external.");
}
@@ -212,30 +212,30 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action
break;
case svn_wc_notify_update_external: //update_external
m_External = TRUE;
- userstring = i18n("Fetching external item into %1." ).tqarg( path );
+ userstring = i18n("Fetching external item into %1." ).arg( path );
break;
case svn_wc_notify_status_completed: //status_completed
if (SVN_IS_VALID_REVNUM (revision))
- userstring = i18n( "Status against revision: %1.").tqarg( revision );
+ userstring = i18n( "Status against revision: %1.").arg( revision );
break;
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.").arg( path );
break;
case svn_wc_notify_commit_modified: //commit_modified
- userstring = i18n( "Sending %1.").tqarg( path );
+ userstring = i18n( "Sending %1.").arg( path );
break;
case svn_wc_notify_commit_added: //commit_added
if (mime_type && svn_mime_type_is_binary (mime_type)) {
- userstring = i18n( "Adding (bin) %1.").tqarg( path );
+ userstring = i18n( "Adding (bin) %1.").arg( path );
} else {
- userstring = i18n( "Adding %1.").tqarg( path );
+ userstring = i18n( "Adding %1.").arg( path );
}
break;
case svn_wc_notify_commit_deleted: //commit_deleted
- userstring = i18n( "Deleting %1.").tqarg( path );
+ userstring = i18n( "Deleting %1.").arg( path );
break;
case svn_wc_notify_commit_replaced: //commit_replaced
- userstring = i18n( "Replacing %1.").tqarg( path );
+ userstring = i18n( "Replacing %1.").arg( path );
break;
case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta
if (!m_FirstTxDelta) {
diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp
index 0773d6d..59c9434 100644
--- a/src/kiosvn/kiosvn.cpp
+++ b/src/kiosvn/kiosvn.cpp
@@ -53,7 +53,7 @@
#include <tqcstring.h>
#include <kmimetype.h>
#include <krun.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <stdlib.h>
#include <math.h>
@@ -671,13 +671,13 @@ void kio_svnProtocol::status(const KURL&wc,bool cR,bool rec)
}
//TQDataStream stream(params, IO_WriteOnly);
setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"path",dlist[j]->path());
- setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"text",TQString::number(dlist[j]->texttqStatus()));
+ setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"text",TQString::number(dlist[j]->textStatus()));
setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "prop",
- TQString::number(dlist[j]->proptqStatus()));
+ TQString::number(dlist[j]->propStatus()));
setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "reptxt",
- TQString::number(dlist[j]->reposTexttqStatus()));
+ TQString::number(dlist[j]->reposTextStatus()));
setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "repprop",
- TQString::number(dlist[j]->reposProptqStatus()));
+ TQString::number(dlist[j]->reposPropStatus()));
setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "rev",
TQString::number(dlist[j]->entry().cmtRev()));
m_pData->m_Listener.incCounter();
@@ -724,7 +724,7 @@ void kio_svnProtocol::commit(const KURL::List&url)
for (unsigned j=0;j<url.count();++j) {
TQString userstring;
if (nnum!=svn::Revision::UNDEFINED) {
- userstring = i18n( "Committed revision %1." ).tqarg(nnum.toString());
+ userstring = i18n( "Committed revision %1." ).arg(nnum.toString());
} else {
userstring = i18n ( "Nothing to commit." );
}