summaryrefslogtreecommitdiffstats
path: root/vcs/subversion/svn_kio.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'vcs/subversion/svn_kio.cpp')
-rw-r--r--vcs/subversion/svn_kio.cpp370
1 files changed, 185 insertions, 185 deletions
diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp
index 16eccd14..3a39d33c 100644
--- a/vcs/subversion/svn_kio.cpp
+++ b/vcs/subversion/svn_kio.cpp
@@ -17,10 +17,10 @@
Boston, MA 02110-1301, USA.
*/
-#include <qcstring.h>
-#include <qsocket.h>
-#include <qdatetime.h>
-#include <qbitarray.h>
+#include <tqcstring.h>
+#include <tqsocket.h>
+#include <tqdatetime.h>
+#include <tqbitarray.h>
#include <stdlib.h>
#include <math.h>
@@ -39,7 +39,7 @@
#include <kurl.h>
#include <ksock.h>
#include <dcopclient.h>
-#include <qcstring.h>
+#include <tqcstring.h>
#include <subversion-1/svn_sorts.h>
#include <subversion-1/svn_path.h>
@@ -49,7 +49,7 @@
#include <subversion-1/svn_cmdline.h>
#include <kmimetype.h>
-#include <qfile.h>
+#include <tqfile.h>
#include "svn_kio.h"
#include <apr_portable.h>
@@ -115,7 +115,7 @@ compare_items_as_paths (const svn_sort__item_t*a, const svn_sort__item_t*b) {
return svn_path_compare_paths ((const char *)a->key, (const char *)b->key);
}
-kio_svnProtocol::kio_svnProtocol(const QCString &pool_socket, const QCString &app_socket)
+kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("kio_svn", pool_socket, app_socket) {
kdDebug(9036) << "kio_svnProtocol::kio_svnProtocol()" << endl;
@@ -245,7 +245,7 @@ void kio_svnProtocol::recordCurrentURL(const KURL& url) {
void kio_svnProtocol::get(const KURL& url ){
kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ;
- QString remoteServer = url.host();
+ TQString remoteServer = url.host();
infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
apr_pool_t *subpool = svn_pool_create (pool);
@@ -254,7 +254,7 @@ void kio_svnProtocol::get(const KURL& url ){
bt->string_stream = svn_stream_create(bt,subpool);
svn_stream_set_write(bt->string_stream,write_to_string);
- QString target = makeSvnURL( url );
+ TQString target = makeSvnURL( url );
kdDebug(9036) << "SvnURL: " << target << endl;
recordCurrentURL( KURL( target ) );
@@ -263,7 +263,7 @@ void kio_svnProtocol::get(const KURL& url ){
svn_opt_revision_t endrev;
int idx = target.findRev( "?rev=" );
if ( idx != -1 ) {
- QString revstr = target.mid( idx+5 );
+ TQString revstr = target.mid( idx+5 );
#if 0
kdDebug(9036) << "revision string found " << revstr << endl;
if ( revstr == "HEAD" ) {
@@ -292,7 +292,7 @@ void kio_svnProtocol::get(const KURL& url ){
}
// Send the mimeType as soon as it is known
- QByteArray *cp = new QByteArray();
+ TQByteArray *cp = new TQByteArray();
cp->setRawData( bt->target_string->data, bt->target_string->len );
KMimeType::Ptr mt = KMimeType::findByContent(*cp);
kdDebug(9036) << "KMimeType returned : " << mt->name() << endl;
@@ -303,7 +303,7 @@ void kio_svnProtocol::get(const KURL& url ){
//send data
data(*cp);
- data(QByteArray()); // empty array means we're done sending the data
+ data(TQByteArray()); // empty array means we're done sending the data
finished();
svn_pool_destroy (subpool);
}
@@ -316,7 +316,7 @@ void kio_svnProtocol::stat(const KURL & url){
svn_node_kind_t kind;
apr_pool_t *subpool = svn_pool_create (pool);
- QString target = makeSvnURL( url);
+ TQString target = makeSvnURL( url);
kdDebug(9036) << "SvnURL: " << target << endl;
recordCurrentURL( KURL( target ) );
@@ -325,7 +325,7 @@ void kio_svnProtocol::stat(const KURL & url){
svn_opt_revision_t endrev;
int idx = target.findRev( "?rev=" );
if ( idx != -1 ) {
- QString revstr = target.mid( idx+5 );
+ TQString revstr = target.mid( idx+5 );
#if 0
kdDebug(9036) << "revision string found " << revstr << endl;
if ( revstr == "HEAD" ) {
@@ -421,7 +421,7 @@ void kio_svnProtocol::listDir(const KURL& url){
apr_pool_t *subpool = svn_pool_create (pool);
apr_hash_t *dirents;
- QString target = makeSvnURL( url);
+ TQString target = makeSvnURL( url);
kdDebug(9036) << "SvnURL: " << target << endl;
recordCurrentURL( KURL( target ) );
@@ -430,7 +430,7 @@ void kio_svnProtocol::listDir(const KURL& url){
svn_opt_revision_t endrev;
int idx = target.findRev( "?rev=" );
if ( idx != -1 ) {
- QString revstr = target.mid( idx+5 );
+ TQString revstr = target.mid( idx+5 );
svn_opt_parse_revision( &rev, &endrev, revstr.utf8(), subpool );
#if 0
kdDebug(9036) << "revision string found " << revstr << endl;
@@ -490,7 +490,7 @@ void kio_svnProtocol::listDir(const KURL& url){
if (dirent->last_author)
svn_utf_cstring_from_utf8 (&native_author, dirent->last_author, subpool);
- if ( createUDSEntry(QString( native_entryname ), QString( native_author ), dirent->size,
+ if ( createUDSEntry(TQString( native_entryname ), TQString( native_author ), dirent->size,
dirent->kind==svn_node_dir ? true : false, 0, entry) )
listEntry( entry, false );
}
@@ -500,7 +500,7 @@ void kio_svnProtocol::listDir(const KURL& url){
svn_pool_destroy (subpool);
}
-bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& user, long long int size, bool isdir, time_t mtime, UDSEntry& entry) {
+bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, UDSEntry& entry) {
kdDebug(9036) << "MTime : " << ( long )mtime << endl;
kdDebug(9036) << "UDS filename : " << filename << endl;
UDSAtom atom;
@@ -538,8 +538,8 @@ bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& us
// KURL ndest = dest;
// nsrc.setProtocol( chooseProtocol( src.protocol() ) );
// ndest.setProtocol( chooseProtocol( dest.protocol() ) );
-// QString srcsvn = nsrc.url();
-// QString destsvn = ndest.url();
+// TQString srcsvn = nsrc.url();
+// TQString destsvn = ndest.url();
//
// recordCurrentURL( nsrc );
//
@@ -547,7 +547,7 @@ bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& us
// svn_opt_revision_t rev;
// int idx = srcsvn.findRev( "?rev=" );
// if ( idx != -1 ) {
-// QString revstr = srcsvn.mid( idx+5 );
+// TQString revstr = srcsvn.mid( idx+5 );
// kdDebug(9036) << "revision string found " << revstr << endl;
// if ( revstr == "HEAD" ) {
// rev.kind = svn_opt_revision_head;
@@ -587,7 +587,7 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) {
KURL::List::const_iterator it = list.begin(), end = list.end();
for ( ; it != end; ++it ) {
- QString cur = makeSvnURL( *it );
+ TQString cur = makeSvnURL( *it );
kdDebug( 9036 ) << "kio_svnProtocol::mkdir raw url for subversion : " << cur << endl;
const char *_target = apr_pstrdup( subpool, svn_path_canonicalize( apr_pstrdup( subpool, cur.utf8() ), subpool ) );
(*(( const char ** )apr_array_push(( apr_array_header_t* )targets)) ) = _target;
@@ -596,7 +596,7 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) {
initNotifier(false, false, false, subpool);
svn_error_t *err = svn_client_mkdir(&commit_info,targets,ctx,subpool);
if ( err ) {
- error( KIO::ERR_COULD_NOT_MKDIR, QString::fromLocal8Bit(err->message) );
+ error( KIO::ERR_COULD_NOT_MKDIR, TQString::fromLocal8Bit(err->message) );
svn_pool_destroy (subpool);
return;
}
@@ -611,7 +611,7 @@ void kio_svnProtocol::mkdir( const KURL& url, int /*permissions*/ ) {
apr_pool_t *subpool = svn_pool_create (pool);
svn_client_commit_info_t *commit_info = NULL;
- QString target = makeSvnURL( url);
+ TQString target = makeSvnURL( url);
kdDebug(9036) << "SvnURL: " << target << endl;
recordCurrentURL( KURL( target ) );
@@ -636,7 +636,7 @@ void kio_svnProtocol::del( const KURL& url, bool /*isfile*/ ) {
apr_pool_t *subpool = svn_pool_create (pool);
svn_client_commit_info_t *commit_info = NULL;
- QString target = makeSvnURL(url);
+ TQString target = makeSvnURL(url);
kdDebug(9036) << "SvnURL: " << target << endl;
recordCurrentURL( KURL( target ) );
@@ -665,8 +665,8 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite
KURL ndest = dest;
nsrc.setProtocol( chooseProtocol( src.protocol() ) );
ndest.setProtocol( chooseProtocol( dest.protocol() ) );
- QString srcsvn = nsrc.url();
- QString destsvn = ndest.url();
+ TQString srcsvn = nsrc.url();
+ TQString destsvn = ndest.url();
recordCurrentURL( nsrc );
@@ -674,7 +674,7 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite
svn_opt_revision_t rev;
int idx = srcsvn.findRev( "?rev=" );
if ( idx != -1 ) {
- QString revstr = srcsvn.mid( idx+5 );
+ TQString revstr = srcsvn.mid( idx+5 );
kdDebug(9036) << "revision string found " << revstr << endl;
if ( revstr == "HEAD" ) {
rev.kind = svn_opt_revision_head;
@@ -703,10 +703,10 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite
svn_pool_destroy (subpool);
}
-void kio_svnProtocol::special( const QByteArray& data ) {
+void kio_svnProtocol::special( const TQByteArray& data ) {
// kdDebug(9036) << "kio_svnProtocol::special" << endl;
- QDataStream stream(data, IO_ReadOnly);
+ TQDataStream stream(data, IO_ReadOnly);
int tmp;
stream >> tmp;
@@ -717,7 +717,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
{
KURL repository, wc;
int revnumber;
- QString revkind;
+ TQString revkind;
stream >> repository;
stream >> wc;
stream >> revnumber;
@@ -730,7 +730,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
{
KURL::List list;
int revnumber;
- QString revkind;
+ TQString revkind;
stream >> list;
stream >> revnumber;
stream >> revkind;
@@ -769,7 +769,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
{
kdDebug(9036) << "kio_svnProtocol LOG" << endl;
int revstart, revend;
- QString revkindstart, revkindend;
+ TQString revkindstart, revkindend;
bool discorverChangedPath, strictNodeHistory;
KURL::List targets;
@@ -835,7 +835,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
case SVN_STATUS_2:
{
KURL wc;
- QString revkind;
+ TQString revkind;
int revnumber;
bool checkRepos, fullRecurse, getAll, noIgnore;
stream >> checkRepos;
@@ -871,7 +871,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
KURL wc,url;
bool recurse;
int revnumber;
- QString revkind;
+ TQString revkind;
stream >> wc;
stream >> url;
stream >> recurse;
@@ -897,7 +897,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
KURL url1,url2;
int rev1, rev2;
bool recurse, pegdiff;
- QString revkind1, revkind2;
+ TQString revkind1, revkind2;
stream >> url1;
stream >> url2;
stream >> rev1;
@@ -914,7 +914,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
KURL url;
int urlMode;
int pegRev, startRev, endRev;
- QString pegRevKind, startRevKind, endRevKind;
+ TQString pegRevKind, startRevKind, endRevKind;
stream >> url;
stream >> urlMode;
// stream >> pegRev;
@@ -931,7 +931,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
{
KURL pathOrUrl;
int pegRev, rev;
- QString pegRevKind, revKind;
+ TQString pegRevKind, revKind;
bool recurse = false;
stream >> pathOrUrl;
stream >> pegRev;
@@ -946,7 +946,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
{
KURL src, dest;
int srcRev;
- QString srcRevKind;
+ TQString srcRevKind;
stream >> src;
stream >> srcRev;
stream >> srcRevKind;
@@ -958,7 +958,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
{
KURL src1, src2, wc_target;
int rev1, rev2;
- QString revKind1, revKind2;
+ TQString revKind1, revKind2;
bool recurse, ignore_ancestry, force, dry_run;
stream >> src1 >> rev1 >> revKind1;
stream >> src2 >> rev2 >> revKind2;
@@ -978,16 +978,16 @@ void kio_svnProtocol::special( const QByteArray& data ) {
/**
* not used anywhere, anymore
*/
-void kio_svnProtocol::popupMessage( const QString& message ) {
-// QByteArray params;
-// QDataStream stream(params, IO_WriteOnly);
+void kio_svnProtocol::popupMessage( const TQString& message ) {
+// TQByteArray params;
+// TQDataStream stream(params, IO_WriteOnly);
// stream << message;
//
-// if ( !dcopClient()->send( "kded","ksvnd","popupMessage(QString)", params ) )
+// if ( !dcopClient()->send( "kded","ksvnd","popupMessage(TQString)", params ) )
// kdWarning() << "Communication with KDED:KSvnd failed" << endl;
}
-void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, QString pegRevKind,*/ int startRev, QString startRevKind, int endRev, QString endRevKind )
+void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind )
{
kdDebug(9036) << " __TIME__ " << __TIME__ << endl;
// kdDebug(9036) << " PegRev " << pegRev << pegRevKind << endl;
@@ -1005,7 +1005,7 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, QString p
svn_client_blame_receiver_t receiver = kio_svnProtocol::blameReceiver;
svn_error_t *err = svn_client_blame( path_or_url, &rev1, &rev2, receiver, (void*)this, ctx, subpool );
if ( err )
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
finished();
svn_pool_destroy (subpool);
@@ -1014,11 +1014,11 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, QString p
svn_error_t* kio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, svn_revnum_t rev, const char *author, const char *date, const char *line, apr_pool_t *pool )
{
kio_svnProtocol *p = (kio_svnProtocol*)baton;
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "LINE", QString::number(line_no) );
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", QString::number(rev) );
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "AUTHOR", author );
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "DATE", date );
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "CONTENT", QString::fromLocal8Bit(line) );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "LINE", TQString::number(line_no) );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", TQString::number(rev) );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "AUTHOR", author );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "DATE", date );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "CONTENT", TQString::fromLocal8Bit(line) );
p->incCounter();
return SVN_NO_ERROR;
@@ -1029,7 +1029,7 @@ svn_error_t* kio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, s
Thus retreiving URL from WC should be done here, using subversion native API.
Thus, svn_log should get another flag (bool repositHistory )specifying between file:/// or URL
*/
-void kio_svnProtocol::svn_log( int revstart, const QString& revkindstart, int revend, const QString& revkindend,
+void kio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int revend, const TQString& revkindend,
bool discorverChangedPaths, bool strictNodeHistory,
const KURL::List& urls )
{
@@ -1045,21 +1045,21 @@ void kio_svnProtocol::svn_log( int revstart, const QString& revkindstart, int re
m_counter = 0;
apr_array_header_t *targets = apr_array_make(subpool, 1+urls.count(), sizeof(const char *));
- for ( QValueListConstIterator<KURL> it = urls.begin(); it != urls.end() ; ++it ) {
+ for ( TQValueListConstIterator<KURL> it = urls.begin(); it != urls.end() ; ++it ) {
KURL nurl = *it;
const char *path =
apr_pstrdup( subpool, svn_path_canonicalize( nurl.pathOrURL().utf8(), subpool ) );
kdDebug(9036) << path << endl;
*(( const char ** )apr_array_push(( apr_array_header_t* )targets)) = path;
- setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "requrl", nurl.pathOrURL() );
+ setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "requrl", nurl.pathOrURL() );
incCounter();
}
svn_log_message_receiver_t receiver = kio_svnProtocol::receiveLogMessage;
svn_error_t *err = svn_client_log2(targets, &rev1, &rev2, 0, discorverChangedPaths, strictNodeHistory, receiver, this, ctx, subpool);
if ( err ){
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
svn_pool_destroy (subpool);
return;
}
@@ -1073,12 +1073,12 @@ svn_error_t* kio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed
const char *author, const char *date, const char *message, apr_pool_t *pool )
{
kio_svnProtocol *p = (kio_svnProtocol*)baton;
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", QString::number(revision) );
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "author", author );
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "date", date );
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "logmsg", QString::fromLocal8Bit(message) );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number(revision) );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "author", author );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "date", date );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "logmsg", TQString::fromLocal8Bit(message) );
if( changed_paths != NULL ){
- QString pathlist;
+ TQString pathlist;
void *onePath;
const char *pathkey;
apr_hash_index_t *hi;
@@ -1093,13 +1093,13 @@ svn_error_t* kio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed
pathlist += "\n";
}
kdDebug(9036) << "pathlist: " << pathlist <<endl;
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "pathlist", pathlist );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "pathlist", pathlist );
}
p->incCounter();
return SVN_NO_ERROR;
}
-svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const QString& revkind, apr_pool_t *pool ) {
+svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const TQString& revkind, apr_pool_t *pool ) {
svn_opt_revision_t result;//,endrev;
// TODO support svn_opt_revision_date
if ( revision != -1 ) {
@@ -1127,7 +1127,7 @@ svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const QString&
return result;
}
-void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int rev2,const QString& revkind1,const QString& revkind2,bool recurse, bool pegdiff )
+void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int rev2,const TQString& revkind1,const TQString& revkind2,bool recurse, bool pegdiff )
{
kdDebug(9036) << "kio_svn::diff : " << url1.path() << " at revision " << rev1 << " or " << revkind1 << " with "
<< url2.path() << " at revision " << rev2 << " or " << revkind2
@@ -1141,8 +1141,8 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int
// nurl1.setProtocol( chooseProtocol( url1.protocol() ) ); //svn+https -> https for eg
// nurl2.setProtocol( chooseProtocol( url2.protocol() ) );
// recordCurrentURL( nurl1 );
-// QString source = makeSvnURL( nurl1 );
-// QString target = makeSvnURL( nurl2 );
+// TQString source = makeSvnURL( nurl1 );
+// TQString target = makeSvnURL( nurl2 );
// const char *path1 = svn_path_canonicalize( apr_pstrdup( subpool, source.utf8() ), subpool );
// const char *path2 = svn_path_canonicalize( apr_pstrdup( subpool, target.utf8() ), subpool );
@@ -1183,25 +1183,25 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int
}
if ( err ){
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
svn_pool_destroy (subpool);
return;
}
//read the content of the outfile now
- QStringList tmp;
+ TQStringList tmp;
apr_file_close(outfile);
- QFile file(templ);
+ TQFile file(templ);
if ( file.open( IO_ReadOnly ) ) {
- QTextStream stream( &file );
- QString line;
+ TQTextStream stream( &file );
+ TQString line;
while ( !stream.atEnd() ) {
line = stream.readLine();
tmp << line;
}
file.close();
}
- for ( QStringList::Iterator itt = tmp.begin(); itt != tmp.end(); itt++ ) {
- setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "diffresult", ( *itt ) );
+ for ( TQStringList::Iterator itt = tmp.begin(); itt != tmp.end(); itt++ ) {
+ setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "diffresult", ( *itt ) );
m_counter++;
}
//delete temp file
@@ -1211,7 +1211,7 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int
svn_pool_destroy (subpool);
}
-void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumber, const QString& revkind, bool recurse) {
+void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumber, const TQString& revkind, bool recurse) {
kdDebug(9036) << "kio_svn::switch : " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ;
apr_pool_t *subpool = svn_pool_create (pool);
@@ -1221,8 +1221,8 @@ void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumb
nurl.setProtocol( chooseProtocol( repos.protocol() ) );
dest.setProtocol( "file" );
// recordCurrentURL( nurl );
-// QString source = dest.path();
-// QString target = makeSvnURL( repos );
+// TQString source = dest.path();
+// TQString target = makeSvnURL( repos );
const char *path = svn_path_canonicalize( apr_pstrdup( subpool, dest.path().utf8() ), subpool );
const char *url = svn_path_canonicalize( apr_pstrdup( subpool, nurl.url().utf8() ), subpool );
@@ -1233,7 +1233,7 @@ void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumb
initNotifier(false, false, false, subpool);
svn_error_t *err = svn_client_switch (NULL/*result revision*/, path, url, &rev, recurse, ctx, subpool);
if ( err ){
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit( err->message ) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) );
svn_pool_destroy (subpool);
return;
}
@@ -1255,18 +1255,18 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl,
svn_error_t *err = svn_client_relocate( wcPath, fromUrl, toUrl, recurse, ctx, pool );
if ( err ){
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit( err->message ) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) );
svn_pool_destroy (subpool);
return;
}
m_counter = 0L;
- setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string",
- QString("switched to %1").arg( toUrl ) );
+ setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
+ TQString("switched to %1").arg( toUrl ) );
finished();
svn_pool_destroy( subpool );
}
-void kio_svnProtocol::update( const KURL::List &list, int revnumber, const QString& revkind ) {
+void kio_svnProtocol::update( const KURL::List &list, int revnumber, const TQString& revkind ) {
kdDebug(9036) << "kio_svn::update : __TIME__" << __TIME__ << endl;
apr_pool_t *subpool = svn_pool_create (pool);
@@ -1274,7 +1274,7 @@ void kio_svnProtocol::update( const KURL::List &list, int revnumber, const QStri
apr_array_header_t *targets = apr_array_make(subpool, 1+list.count(), sizeof(const char *));
svn_opt_revision_t rev = createRevision( revnumber, revkind, subpool );
- for( QValueList<KURL>::ConstIterator it = list.begin(); it != list.end(); ++it ){
+ for( TQValueList<KURL>::ConstIterator it = list.begin(); it != list.end(); ++it ){
KURL nurl = *it;
*( const char ** )apr_array_push(targets) = svn_path_canonicalize( nurl.path().utf8(), subpool );
}
@@ -1284,7 +1284,7 @@ void kio_svnProtocol::update( const KURL::List &list, int revnumber, const QStri
true/*recurse*/, false/*ignore_external*/,
ctx, subpool);
if ( err ){
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
svn_pool_destroy (subpool);
return;
}
@@ -1310,7 +1310,7 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) {
svn_error_t *err = svn_client_import2(&commit_info, path, url, nonrecursive, false, ctx, subpool);
if ( err ){
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
svn_pool_destroy (subpool);
return;
}
@@ -1319,7 +1319,7 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) {
finished();
}
-void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber, const QString& revkind ) {
+void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber, const TQString& revkind ) {
kdDebug(9036) << "kio_svn::checkout : " << repos.url() << " into " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ;
apr_pool_t *subpool = svn_pool_create (pool);
@@ -1327,9 +1327,9 @@ void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber
KURL dest = wc;
nurl.setProtocol( chooseProtocol( repos.protocol() ) );
dest.setProtocol( "file" );
- QString target = makeSvnURL( repos );
+ TQString target = makeSvnURL( repos );
recordCurrentURL( nurl );
- QString dpath = dest.path();
+ TQString dpath = dest.path();
//find the requested revision
svn_opt_revision_t rev = createRevision( revnumber, revkind, subpool );
@@ -1358,7 +1358,7 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc
apr_array_header_t *targets = apr_array_make(subpool, 1+wc.count(), sizeof(const char *));
- for ( QValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) {
+ for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) {
KURL nurl = *it;
nurl.setProtocol( "file" );
recordCurrentURL( nurl );
@@ -1372,27 +1372,27 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc
if ( err ){
char errbuf[512];
svn_strerror(err->apr_err, errbuf, 512);
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) + "\n: " + QString::fromLocal8Bit(errbuf) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) + "\n: " + TQString::fromLocal8Bit(errbuf) );
svn_pool_destroy (subpool);
return;
}
if ( commit_info ) {
- for ( QValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) {
+ for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) {
KURL nurl = *it;
nurl.setProtocol( "file" );
- QString userstring = i18n ( "Nothing to commit." );
+ TQString userstring = i18n ( "Nothing to commit." );
if ( SVN_IS_VALID_REVNUM( commit_info->revision ) )
userstring = i18n( "Committed revision %1." ).arg(commit_info->revision);
- setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() );
- setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" );
- setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" );
- setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "mime_t", "" );
- setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "content", "0" );
- setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "prop", "0" );
- setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "rev" , QString::number( commit_info->revision ) );
- setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "string", userstring );
+ 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" );
+ setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "mime_t", "" );
+ setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "content", "0" );
+ setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "prop", "0" );
+ setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "rev" , TQString::number( commit_info->revision ) );
+ setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "string", userstring );
m_counter++;
}
}
@@ -1409,7 +1409,7 @@ void kio_svnProtocol::add(const KURL::List& list) {
initNotifier(false, false, false, subpool);
svn_error_t *err = NULL;
- for( QValueList<KURL>::ConstIterator it = list.begin(); it != list.end(); ++it ){
+ for( TQValueList<KURL>::ConstIterator it = list.begin(); it != list.end(); ++it ){
KURL nurl = (*it);
nurl.setProtocol( "file" );
@@ -1420,7 +1420,7 @@ void kio_svnProtocol::add(const KURL::List& list) {
if( err ) break;
}
if ( err ){
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
svn_pool_destroy (subpool);
return;
}
@@ -1438,7 +1438,7 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) {
apr_array_header_t *targets = apr_array_make(subpool, 1+wc.count(), sizeof(const char *));
- for ( QValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) {
+ for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) {
KURL nurl = *it;
nurl.setProtocol( "file" );
recordCurrentURL( nurl );
@@ -1449,7 +1449,7 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) {
svn_error_t *err = svn_client_delete(&commit_info,targets,force,ctx,subpool);
if ( err )
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
finished();
svn_pool_destroy (subpool);
@@ -1463,7 +1463,7 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) {
apr_array_header_t *targets = apr_array_make(subpool, 1 + wc.count(), sizeof(const char *));
- for ( QValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) {
+ for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) {
KURL nurl = *it;
nurl.setProtocol( "file" );
recordCurrentURL( nurl );
@@ -1473,7 +1473,7 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) {
initNotifier(false, false, false, subpool);
svn_error_t *err = svn_client_revert(targets,nonrecursive,ctx,subpool);
if ( err ){
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit( err->message ) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) );
svn_pool_destroy (subpool);
return;
}
@@ -1482,13 +1482,13 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) {
svn_pool_destroy (subpool);
}
-void kio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, int revnumber, const QString& revkind) {
+void kio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, int revnumber, const TQString& revkind) {
kdDebug(9036) << "kio_svnProtocol::wc_status() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << endl;
wc_status2( wc, checkRepos, fullRecurse, getAll, false, revnumber, revkind );
}
-void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore, int revnumber, const QString& revkind) {
+void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore, int revnumber, const TQString& revkind) {
kdDebug(9036) << "kio_svnProtocol::wc_status2() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << " noIgnore " << noIgnore << " revnumber " << revnumber << " revkind " << revkind << endl;
kdDebug(9036) << " __TIME__ " << __TIME__ << endl;
@@ -1506,7 +1506,7 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur
svn_error_t *err = svn_client_status(&result_rev, svn_path_canonicalize( nurl.path().utf8(), subpool ), &rev, kio_svnProtocol::status, this, fullRecurse, getAll, checkRepos, noIgnore, ctx, subpool);
if ( err ){
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
svn_pool_destroy (subpool);
return;
}
@@ -1515,7 +1515,7 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur
svn_pool_destroy (subpool);
}
-void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, QString pegRevKind, int rev, QString revKind, bool recurse )
+void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, int rev, TQString revKind, bool recurse )
{
kdDebug(9036) << " kio_svnProtocol::svn_info(): pegRev " << pegRev << " pegKind " << pegRevKind << " rev " << rev << " revKind " << revKind << " recurse " << recurse << endl;
@@ -1531,7 +1531,7 @@ void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, QString pegRevKind,
ctx, pool );
if ( err ){
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
svn_pool_destroy (subpool);
return;
}
@@ -1546,18 +1546,18 @@ svn_error_t* kio_svnProtocol::infoReceiver( void *baton, const char *path,
if( !p )
return SVN_NO_ERROR;
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "PATH", QString::fromUtf8( path ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "URL", QString( info->URL ) );
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", QString::number( info->rev ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "KIND", QString::number( info->kind ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_ROOT_URL", QString( info->repos_root_URL ) );
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_UUID", QString(info->repos_UUID) );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "PATH", TQString::fromUtf8( path ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "URL", TQString( info->URL ) );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", TQString::number( info->rev ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "KIND", TQString::number( info->kind ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_ROOT_URL", TQString( info->repos_root_URL ) );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_UUID", TQString(info->repos_UUID) );
p->incCounter();
return SVN_NO_ERROR;
}
-void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const QString &srcRevKind,
+void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &srcRevKind,
const KURL &destUrl )
{
kdDebug(9036) << " kio: svn_copy src: " << srcUrl << " Dest Url: " << destUrl << " revnum: " << srcRev << " revKind: " << srcRevKind << endl;
@@ -1577,16 +1577,16 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const QString &s
apr_status_t errcode = err->apr_err;
char buf[512];
svn_strerror(errcode, buf, 512);
- error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(buf) );
+ error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(buf) );
svn_pool_destroy (subpool);
return;
}
if( commit_info ){
- setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string",
+ setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
i18n("Copied Revision %1").arg( commit_info->revision) );
} else {
- setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string",
+ setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
i18n("Copied") );
}
@@ -1594,8 +1594,8 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const QString &s
svn_pool_destroy (subpool);
}
-void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, QString revKind1,
- const KURL &src2, int revNum2, QString revKind2,
+void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1,
+ const KURL &src2, int revNum2, TQString revKind2,
const KURL &target_wc,
bool recurse, bool ignore_ancestry, bool force, bool dry_run )
{
@@ -1616,7 +1616,7 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, QString revKind1,
char buf[512];
svn_strerror(errcode, buf, 512);
error( KIO::ERR_SLAVE_DEFINED,
- QString::fromLocal8Bit(err->message) + "\n "+ QString::fromLocal8Bit(buf) );
+ TQString::fromLocal8Bit(err->message) + "\n "+ TQString::fromLocal8Bit(buf) );
svn_pool_destroy (subpool);
return;
}
@@ -1627,11 +1627,11 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, QString revKind1,
//change the proto and remove trailing /
//remove double / also
-QString kio_svnProtocol::makeSvnURL ( const KURL& url ) const {
- QString kproto = url.protocol();
+TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const {
+ TQString kproto = url.protocol();
KURL tpURL = url;
tpURL.cleanPath( true );
- QString svnUrl;
+ TQString svnUrl;
if ( kproto == "kdevsvn+http" ) {
kdDebug(9036) << "http:/ " << url.url() << endl;
tpURL.setProtocol("http");
@@ -1668,12 +1668,12 @@ QString kio_svnProtocol::makeSvnURL ( const KURL& url ) const {
return tpURL.url(-1);
}
-QString kio_svnProtocol::chooseProtocol ( const QString& kproto ) const {
- if ( kproto == "svn+http" ) return QString( "http" );
- else if ( kproto == "svn+https" ) return QString( "https" );
- else if ( kproto == "svn+ssh" ) return QString( "svn+ssh" );
- else if ( kproto == "svn" ) return QString( "svn" );
- else if ( kproto == "svn+file" ) return QString( "file" );
+TQString kio_svnProtocol::chooseProtocol ( const TQString& kproto ) const {
+ if ( kproto == "svn+http" ) return TQString( "http" );
+ else if ( kproto == "svn+https" ) return TQString( "https" );
+ else if ( kproto == "svn+ssh" ) return TQString( "svn+ssh" );
+ else if ( kproto == "svn" ) return TQString( "svn" );
+ else if ( kproto == "svn+file" ) return TQString( "file" );
return kproto;
}
/** Certificate is not yet valid. */
@@ -1691,18 +1691,18 @@ svn_error_t *kio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t **
{
kio_svnProtocol *p = (kio_svnProtocol*)baton;
// prepare params.
- QByteArray params, replyData;
- QCString replyType;
- QDataStream arg(params, IO_WriteOnly);
+ TQByteArray params, replyData;
+ TQCString replyType;
+ TQDataStream arg(params, IO_WriteOnly);
arg << i18n( "The certificate from the server could not be trusted automatically. Do you want to trust this certificate? " );
- arg << QString::fromLocal8Bit(ci->hostname);
- arg << QString::fromLocal8Bit(ci->fingerprint);
- arg << QString::fromLocal8Bit(ci->valid_from) << QString::fromLocal8Bit(ci->valid_until);
- arg << QString::fromLocal8Bit(ci->issuer_dname) << QString::fromLocal8Bit(ci->ascii_cert) ;
+ arg << TQString::fromLocal8Bit(ci->hostname);
+ arg << TQString::fromLocal8Bit(ci->fingerprint);
+ arg << TQString::fromLocal8Bit(ci->valid_from) << TQString::fromLocal8Bit(ci->valid_until);
+ arg << TQString::fromLocal8Bit(ci->issuer_dname) << TQString::fromLocal8Bit(ci->ascii_cert) ;
// call dcop
int ret = p->dcopClient()->call( "kded", "kdevsvnd",
- "sslServerTrustPrompt(QString, QString, QString, QString, QString, QString, QString)",
+ "sslServerTrustPrompt(TQString, TQString, TQString, TQString, TQString, TQString, TQString)",
params, replyType, replyData );
if (!ret){
kdWarning() << " failed to prompt SSL_Server_Trust_Prompt " << endl;
@@ -1713,7 +1713,7 @@ svn_error_t *kio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t **
return SVN_NO_ERROR;
}
int resultCode;
- QDataStream replyStream( replyData, IO_ReadOnly );
+ TQDataStream replyStream( replyData, IO_ReadOnly );
replyStream >> resultCode;
if( resultCode == -1 ){
@@ -1742,21 +1742,21 @@ svn_error_t *kio_svnProtocol::clientCertSSLPrompt(
{
kdDebug(9036) << " clientCertSSLPrompt " << endl;
// kio_svnProtocol *p = (kio_svnProtocol*)baton;
-// QByteArray reply;
-// QByteArray params;
-// QCString replyType;
+// TQByteArray reply;
+// TQByteArray params;
+// TQCString replyType;
// call dcop
// if (!p->dcopClient()->call("kded","kdevsvnd", "sslCertFile()",params,replyType,reply)) {
// kdWarning()<<" Communication with dcop failed - fail to get certfile "<<endl;
// return SVN_NO_ERROR;
// }
-// if (replyType != "QString") {
+// if (replyType != "TQString") {
// kdWarning()<<" unexpected reply type "<<endl;
// return SVN_NO_ERROR;
// }
// save reply data
-// QString fileName;
-// QDataStream replyStream( reply, IO_ReadOnly );
+// TQString fileName;
+// TQDataStream replyStream( reply, IO_ReadOnly );
// replyStream >> fileName;
// allocate memory
// *cred_p = (svn_auth_cred_ssl_client_cert_t*) apr_palloc (pool, sizeof(svn_auth_cred_ssl_client_cert_t));
@@ -1773,23 +1773,23 @@ svn_error_t *kio_svnProtocol::clientCertPasswdPrompt(
kdDebug(9036) << " realm " << realm << " <--realm " << endl;
// kio_svnProtocol *p = ( kio_svnProtocol* )baton;
// // prepare dcop
-// QByteArray reply;
-// QByteArray params;
-// QCString replyType;
-// QDataStream arg( params, IO_WriteOnly );
-// arg << i18n( "Enter password for subversion repository access" ) + "\n" + QString(realm);
+// TQByteArray reply;
+// TQByteArray params;
+// TQCString replyType;
+// TQDataStream arg( params, IO_WriteOnly );
+// arg << i18n( "Enter password for subversion repository access" ) + "\n" + TQString(realm);
// // call dcop
-// if (!p->dcopClient()->call("kded","kdevsvnd", "sslPasswdDlg(QString)",params,replyType,reply)) {
+// if (!p->dcopClient()->call("kded","kdevsvnd", "sslPasswdDlg(TQString)",params,replyType,reply)) {
// kdWarning()<<" Communication with dcop failed - fail to show passwd dlg"<<endl;
// return SVN_NO_ERROR;
// }
-// if (replyType != "QCString") {
+// if (replyType != "TQCString") {
// kdWarning()<<" unexpected reply type "<<endl;
// return SVN_NO_ERROR;
// }
// // save reply data
-// QCString retstr, passwd;
-// QDataStream replyStream( reply, IO_ReadOnly );
+// TQCString retstr, passwd;
+// TQDataStream replyStream( reply, IO_ReadOnly );
// replyStream >> retstr;
//
// if( retstr.left(1) == "-1" ){
@@ -1813,16 +1813,16 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char
apr_array_header_t *commit_items, void *baton, apr_pool_t *pool )
{
*file = NULL; // if omitting this, it will segfault at import operation.
- QCString replyType;
- QByteArray params;
- QByteArray reply;
- QString result;// slist;
- QStringList slist;
+ TQCString replyType;
+ TQByteArray params;
+ TQByteArray reply;
+ TQString result;// slist;
+ TQStringList slist;
kio_svnProtocol *p = ( kio_svnProtocol* )baton;
svn_stringbuf_t *message = NULL;
for (int i = 0; i < commit_items->nelts; i++) {
- QString list;
+ TQString list;
svn_client_commit_item_t *item = ((svn_client_commit_item_t **) commit_items->elts)[i];
const char *path = item->path;
char text_mod = '_', prop_mod = ' ';
@@ -1856,25 +1856,25 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char
// slist += list;
}
- QDataStream stream(params, IO_WriteOnly);
+ TQDataStream stream(params, IO_WriteOnly);
stream << slist.join("\n");
kdDebug(9036) << " __TIME__ " << __TIME__ << endl;
- if ( !p->dcopClient()->call( "kded","kdevsvnd","commitDialog(QString)", params, replyType, reply ) ) {
+ if ( !p->dcopClient()->call( "kded","kdevsvnd","commitDialog(TQString)", params, replyType, reply ) ) {
kdWarning() << "Communication with KDED:KDevSvnd failed" << endl;
svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL,
apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP. If this is your first problem, try to restart KDE" ) );
return err;
}
- if ( replyType != "QString" ) {
+ if ( replyType != "TQString" ) {
kdWarning() << "Unexpected reply type" << endl;
svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL,
apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP." ) );
return err;
}
- QDataStream stream2 ( reply, IO_ReadOnly );
+ TQDataStream stream2 ( reply, IO_ReadOnly );
stream2 >> result;
if ( result.isNull() ) { //cancelled
@@ -1893,7 +1893,7 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char
void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action_t action, svn_node_kind_t kind, const char *mime_type, svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_revnum_t revision) {
kdDebug(9036) << "NOTIFY : " << path << " updated at revision " << revision << " action : " << action << ", kind : " << kind << " , content_state : " << content_state << ", prop_state : " << prop_state << endl;
- QString userstring;
+ TQString userstring;
struct notify_baton *nb = ( struct notify_baton* ) baton;
//// Convert notification to a user readable string
@@ -1970,7 +1970,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
|| content_state == svn_wc_notify_state_unknown)
&& (prop_state == svn_wc_notify_state_unchanged
|| prop_state == svn_wc_notify_state_unknown)))
- userstring += QString( " " ) + path;
+ userstring += TQString( " " ) + path;
}
break;
}
@@ -2071,14 +2071,14 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
kio_svnProtocol *p = ( kio_svnProtocol* )nb->master;
if (!p) kdDebug(9036) << " Null Pointer at Line " << __LINE__ << endl;
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "path" , QString::fromUtf8( path ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "action", QString::number( action ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "kind", QString::number( kind ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "mime_t", QString::fromUtf8( mime_type ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "content", QString::number( content_state ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", QString::number( prop_state ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", QString::number( revision ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "string", userstring );
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "path" , TQString::fromUtf8( path ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "action", TQString::number( action ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "kind", TQString::number( kind ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "mime_t", TQString::fromUtf8( mime_type ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "content", TQString::number( content_state ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", TQString::number( prop_state ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number( revision ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "string", userstring );
kdDebug(9036) << " kio_svnProtocol::notify() userstring " << userstring << endl;
p->incCounter();
}
@@ -2090,19 +2090,19 @@ void kio_svnProtocol::status(void *baton, const char *path, svn_wc_status_t *sta
<< ", repos prop status : " << status->repos_prop_status
<< endl;
- QByteArray params;
+ TQByteArray params;
kio_svnProtocol *p = ( kio_svnProtocol* )baton;
- QDataStream stream(params, IO_WriteOnly);
+ TQDataStream stream(params, IO_WriteOnly);
long int rev = status->entry ? status->entry->revision : 0;
- stream << QString::fromUtf8( path ) << status->text_status << status->prop_status << status->repos_text_status << status->repos_prop_status << rev;
-
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "path", QString::fromUtf8( path ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "text", QString::number( status->text_status ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", QString::number( status->prop_status ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "reptxt", QString::number( status->repos_text_status ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "repprop", QString::number( status->repos_prop_status ));
- p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", QString::number( rev ));
+ stream << TQString::fromUtf8( path ) << status->text_status << status->prop_status << status->repos_text_status << status->repos_prop_status << rev;
+
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "path", TQString::fromUtf8( path ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "text", TQString::number( status->text_status ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", TQString::number( status->prop_status ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "reptxt", TQString::number( status->repos_text_status ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "repprop", TQString::number( status->repos_prop_status ));
+ p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number( rev ));
p->incCounter();
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-13 07:15:51 +0000