diff options
Diffstat (limited to 'kioslave/svn/svn.cpp')
-rw-r--r-- | kioslave/svn/svn.cpp | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/kioslave/svn/svn.cpp b/kioslave/svn/svn.cpp index b7341df0..871b2ba0 100644 --- a/kioslave/svn/svn.cpp +++ b/kioslave/svn/svn.cpp @@ -232,7 +232,7 @@ void kio_svnProtocol::get(const KURL& url ){ kdDebug(7128) << "kio_svn::get(const KURL& url)" << endl ; TQString remoteServer = url.host(); - infoMessage(i18n("Looking for %1...").arg( remoteServer ) ); + infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) ); apr_pool_t *subpool = svn_pool_create (pool); kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt)); @@ -247,7 +247,7 @@ void kio_svnProtocol::get(const KURL& url ){ //find the requested revision svn_opt_revision_t rev; svn_opt_revision_t endrev; - int idx = target.findRev( "?rev=" ); + int idx = target.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = target.mid( idx+5 ); #if 0 @@ -309,7 +309,7 @@ void kio_svnProtocol::stat(const KURL & url){ //find the requested revision svn_opt_revision_t rev; svn_opt_revision_t endrev; - int idx = target.findRev( "?rev=" ); + int idx = target.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = target.mid( idx+5 ); #if 0 @@ -414,7 +414,7 @@ void kio_svnProtocol::listDir(const KURL& url){ //find the requested revision svn_opt_revision_t rev; svn_opt_revision_t endrev; - int idx = target.findRev( "?rev=" ); + int idx = target.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = target.mid( idx+5 ); svn_opt_parse_revision( &rev, &endrev, revstr.utf8(), subpool ); @@ -530,7 +530,7 @@ void kio_svnProtocol::copy(const KURL & src, const KURL& dest, int /*permissions //find the requested revision svn_opt_revision_t rev; - int idx = srcsvn.findRev( "?rev=" ); + int idx = srcsvn.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = srcsvn.mid( idx+5 ); kdDebug(7128) << "revision string found " << revstr << endl; @@ -650,7 +650,7 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite //find the requested revision svn_opt_revision_t rev; - int idx = srcsvn.findRev( "?rev=" ); + int idx = srcsvn.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = srcsvn.mid( idx+5 ); kdDebug(7128) << "revision string found " << revstr << endl; @@ -1087,7 +1087,7 @@ void kio_svnProtocol::commit(const KURL::List& wc) { TQString userstring = i18n ( "Nothing to commit." ); if ( SVN_IS_VALID_REVNUM( commit_info->revision ) ) - userstring = i18n( "Committed revision %1." ).arg(commit_info->revision); + userstring = i18n( "Committed revision %1." ).tqarg(commit_info->revision); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() ); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" ); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" ); @@ -1234,7 +1234,7 @@ TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const { tpURL.setProtocol("file"); svnUrl = tpURL.url(-1); //hack : add one more / after file:/ - int idx = svnUrl.find("/"); + int idx = svnUrl.tqfind("/"); svnUrl.insert( idx, "//" ); return svnUrl; } @@ -1320,7 +1320,7 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char return SVN_NO_ERROR; } - if ( replyType != "TQString" ) { + if ( replyType != TQSTRING_OBJECT_NAME_STRING ) { kdWarning() << "Unexpected reply type" << endl; return SVN_NO_ERROR; } @@ -1349,41 +1349,41 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action switch ( action ) { case svn_wc_notify_add : //add if (mime_type && (svn_mime_type_is_binary (mime_type))) - userstring = i18n( "A (bin) %1" ).arg( path ); + userstring = i18n( "A (bin) %1" ).tqarg( path ); else - userstring = i18n( "A %1" ).arg( path ); + userstring = i18n( "A %1" ).tqarg( path ); break; case svn_wc_notify_copy: //copy break; case svn_wc_notify_delete: //delete nb->received_some_change = TRUE; - userstring = i18n( "D %1" ).arg( path ); + userstring = i18n( "D %1" ).tqarg( path ); break; case svn_wc_notify_restore : //restore - userstring=i18n( "Restored %1." ).arg( path ); + userstring=i18n( "Restored %1." ).tqarg( path ); break; case svn_wc_notify_revert : //revert - userstring=i18n( "Reverted %1." ).arg( path ); + userstring=i18n( "Reverted %1." ).tqarg( path ); break; case svn_wc_notify_failed_revert: //failed revert - userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path ); + userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path ); break; case svn_wc_notify_resolved: //resolved - userstring=i18n( "Resolved conflicted state of %1." ).arg( path ); + userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path ); break; case svn_wc_notify_skip: //skip if ( content_state == svn_wc_notify_state_missing ) - userstring=i18n("Skipped missing target %1.").arg( path ); + userstring=i18n("Skipped missing target %1.").tqarg( path ); else - userstring=i18n("Skipped %1.").arg( path ); + userstring=i18n("Skipped %1.").tqarg( path ); break; case svn_wc_notify_update_delete: //update_delete nb->received_some_change = TRUE; - userstring=i18n( "D %1" ).arg( path ); + userstring=i18n( "D %1" ).tqarg( path ); break; case svn_wc_notify_update_add: //update_add nb->received_some_change = TRUE; - userstring=i18n( "A %1" ).arg( path ); + userstring=i18n( "A %1" ).tqarg( path ); break; case svn_wc_notify_update_update: //update_update { @@ -1428,25 +1428,25 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action if (SVN_IS_VALID_REVNUM (revision)) { if (nb->is_export) { if ( nb->in_external ) - userstring = i18n("Exported external at revision %1.").arg( revision ); + userstring = i18n("Exported external at revision %1.").tqarg( revision ); else - userstring = i18n("Exported revision %1.").arg( revision ); + userstring = i18n("Exported revision %1.").tqarg( revision ); } else if (nb->is_checkout) { if ( nb->in_external ) - userstring = i18n("Checked out external at revision %1.").arg( revision ); + userstring = i18n("Checked out external at revision %1.").tqarg( revision ); else - userstring = i18n("Checked out revision %1.").arg( revision); + userstring = i18n("Checked out revision %1.").tqarg( revision); } else { if (nb->received_some_change) { if ( nb->in_external ) - userstring=i18n("Updated external to revision %1.").arg( revision ); + userstring=i18n("Updated external to revision %1.").tqarg( revision ); else - userstring = i18n("Updated to revision %1.").arg( revision); + userstring = i18n("Updated to revision %1.").tqarg( revision); } else { if ( nb->in_external ) - userstring = i18n("External at revision %1.").arg( revision ); + userstring = i18n("External at revision %1.").tqarg( revision ); else - userstring = i18n("At revision %1.").arg( revision); + userstring = i18n("At revision %1.").tqarg( revision); } } } else /* no revision */ { @@ -1474,30 +1474,30 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action break; case svn_wc_notify_update_external: //update_external nb->in_external = TRUE; - userstring = i18n("Fetching external item into %1." ).arg( path ); + userstring = i18n("Fetching external item into %1." ).tqarg( path ); break; case svn_wc_notify_status_completed: //status_completed if (SVN_IS_VALID_REVNUM (revision)) - userstring = i18n( "Status against revision: %1.").arg( revision ); + userstring = i18n( "tqStatus against revision: %1.").tqarg( revision ); break; case svn_wc_notify_status_external: //status_external - userstring = i18n("Performing status on external item at %1.").arg( path ); + userstring = i18n("Performing status on external item at %1.").tqarg( path ); break; case svn_wc_notify_commit_modified: //commit_modified - userstring = i18n( "Sending %1").arg( path ); + userstring = i18n( "Sending %1").tqarg( 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.").arg( path ); + userstring = i18n( "Adding (bin) %1.").tqarg( path ); } else { - userstring = i18n( "Adding %1.").arg( path ); + userstring = i18n( "Adding %1.").tqarg( path ); } break; case svn_wc_notify_commit_deleted: //commit_deleted - userstring = i18n( "Deleting %1.").arg( path ); + userstring = i18n( "Deleting %1.").tqarg( path ); break; case svn_wc_notify_commit_replaced: //commit_replaced - userstring = i18n( "Replacing %1.").arg( path ); + userstring = i18n( "Replacing %1.").tqarg( path ); break; case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta if (! nb->sent_first_txdelta) { |