diff options
Diffstat (limited to 'vcs/subversion/svn_kio.h')
| -rw-r--r-- | vcs/subversion/svn_kio.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/vcs/subversion/svn_kio.h b/vcs/subversion/svn_kio.h index 332a11a9..a66064d0 100644 --- a/vcs/subversion/svn_kio.h +++ b/vcs/subversion/svn_kio.h @@ -20,8 +20,8 @@ #ifndef _svn_H_ #define _svn_H_ -#include <qstring.h> -#include <qcstring.h> +#include <tqstring.h> +#include <tqcstring.h> #include <kurl.h> #include <kio/global.h> @@ -31,7 +31,7 @@ #include <subversion-1/svn_client.h> #include <subversion-1/svn_config.h> #include <sys/stat.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <subversion-1/svn_wc.h> #include "subversion_global.h" @@ -68,9 +68,9 @@ typedef struct notify_baton { class kio_svnProtocol : public KIO::SlaveBase { public: - kio_svnProtocol(const QCString &pool_socket, const QCString &app_socket); + kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket); virtual ~kio_svnProtocol(); - virtual void special( const QByteArray& data ); + virtual void special( const TQByteArray& data ); virtual void get(const KURL& url); virtual void listDir(const KURL& url); virtual void stat(const KURL& url); @@ -79,31 +79,31 @@ class kio_svnProtocol : public KIO::SlaveBase virtual void del( const KURL& url, bool isfile ); // virtual void copy(const KURL & src, const KURL& dest, int permissions, bool overwrite); virtual void rename(const KURL& src, const KURL& dest, bool overwrite); - void checkout( const KURL& repos, const KURL& wc, int revnumber, const QString& revkind ); + void checkout( const KURL& repos, const KURL& wc, int revnumber, const TQString& revkind ); void import( const KURL& repos, const KURL& wc ); - void svn_switch( const KURL& wc, const KURL& url, int revnumber, const QString& revkind, bool recurse); + void svn_switch( const KURL& wc, const KURL& url, int revnumber, const TQString& revkind, bool recurse); void svn_switch_relocate( const KURL &wc, const KURL &origUrl, const KURL &newUrl, bool recurse ); - void svn_diff( const KURL& url1, const KURL& url2, int rev1, int rev2, const QString& revkind1, const QString& revkind2, bool recurse, bool pegdiff); + void svn_diff( const KURL& url1, const KURL& url2, int rev1, int rev2, const TQString& revkind1, const TQString& revkind2, bool recurse, bool pegdiff); //TODO fix with svn 1.2 : support a KURL::List -> svn_client_update2() - void update( const KURL::List &list, int revnumber, const QString& revkind ); + void update( const KURL::List &list, int revnumber, const TQString& revkind ); void commit( const KURL::List& wc ); void commit2( bool recurse, bool keeplocks, const KURL::List& wc ); - void blame( KURL url, SvnGlobal::UrlMode mode, /*int pegRev, QString pegRevKind,*/ int startRev, QString startRevKind, int endRev, QString endRevKind ); + void blame( KURL url, SvnGlobal::UrlMode mode, /*int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind ); static svn_error_t* 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 ); - void svn_log( int revstart, const QString &revkindstart, int revend, const QString &revkindend, bool discorverChangedPath, bool strictNodeHistory, const KURL::List& targets ); + void svn_log( int revstart, const TQString &revkindstart, int revend, const TQString &revkindend, bool discorverChangedPath, bool strictNodeHistory, const KURL::List& targets ); static svn_error_t* receiveLogMessage(void *baton, apr_hash_t *changed_paths, svn_revnum_t revision, const char *author, const char *date, const char *message, apr_pool_t *pool ); void add( const KURL::List& wcList ); //these work using the working copy void wc_resolve( const KURL& wc, bool recurse = true ); void wc_delete( const KURL::List& wc ); void wc_revert( const KURL::List& wc ); - void wc_status(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, int revnumber=-1, const QString& revkind="HEAD"); - void wc_status2(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, bool noIgnore=false, int revnumber=-1, const QString& revkind="WORKING"); - void svn_info( KURL pathOrUrl, int pegRev, QString pegRevKind, int rev, QString revKind, bool recurse ); + void wc_status(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, int revnumber=-1, const TQString& revkind="HEAD"); + void wc_status2(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, bool noIgnore=false, int revnumber=-1, const TQString& revkind="WORKING"); + void svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, int rev, TQString revKind, bool recurse ); static svn_error_t* infoReceiver( void *baton, const char *path, const svn_info_t *info, apr_pool_t *pool); - void svn_copy( const KURL &srcUrl, int srcRev, const QString &srcRevKind, const KURL &destUrl ); - void svn_merge( const KURL &src1, int rev1, QString revKind1, const KURL &src2, int rev2, QString revKind2, + void svn_copy( const KURL &srcUrl, int srcRev, const TQString &srcRevKind, const KURL &destUrl ); + void svn_merge( const KURL &src1, int rev1, TQString revKind1, const KURL &src2, int rev2, TQString revKind2, const KURL &target_wc, bool recurse, bool ignore_ancestry, bool force, bool dry_run ); @@ -116,23 +116,23 @@ class kio_svnProtocol : public KIO::SlaveBase static void status(void *baton, const char *path, svn_wc_status_t *status); static void progressCallback( apr_off_t progress, apr_off_t total, void *baton, apr_pool_t *pool); - QString chooseProtocol ( const QString& kproto ) const; - QString makeSvnURL ( const KURL& url ) const; + TQString chooseProtocol ( const TQString& kproto ) const; + TQString makeSvnURL ( const KURL& url ) const; void initNotifier(bool is_checkout, bool is_export, bool suppress_final_line, apr_pool_t *spool); void recordCurrentURL(const KURL& url); - void popupMessage( const QString& message ); + void popupMessage( const TQString& message ); int counter() { return m_counter; } void incCounter() { m_counter++; } - svn_opt_revision_t createRevision( int revision, const QString& revkind, apr_pool_t *pool ); + svn_opt_revision_t createRevision( int revision, const TQString& revkind, apr_pool_t *pool ); KURL myURL; svn_client_ctx_t *ctx; KIO::AuthInfo info; enum SVN_METHOD { - SVN_CHECKOUT=1, //KURL repository, KURL workingcopy, int revnumber=-1, QString revkind(HEAD, ...) //revnumber==-1 => use of revkind - SVN_UPDATE=2, // KURL wc (svn:///tmp/test, int revnumber=-1, QString revkind(HEAD, ...) // revnumber==-1 => use of revkind + SVN_CHECKOUT=1, //KURL repository, KURL workingcopy, int revnumber=-1, TQString revkind(HEAD, ...) //revnumber==-1 => use of revkind + SVN_UPDATE=2, // KURL wc (svn:///tmp/test, int revnumber=-1, TQString revkind(HEAD, ...) // revnumber==-1 => use of revkind SVN_COMMIT=3, SVN_LOG=4, SVN_IMPORT=5, @@ -155,7 +155,7 @@ class kio_svnProtocol : public KIO::SlaveBase }; private: - bool createUDSEntry( const QString& filename, const QString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry); + bool createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry); apr_pool_t *pool; unsigned long int m_counter; }; |