diff options
Diffstat (limited to 'vcs/subversion/subversion_core.h')
| -rw-r--r-- | vcs/subversion/subversion_core.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h index 7cf86a28..1c9611c8 100644 --- a/vcs/subversion/subversion_core.h +++ b/vcs/subversion/subversion_core.h @@ -21,8 +21,8 @@ #ifndef __SUBVERSION_CORE_H__ #define __SUBVERSION_CORE_H__ -#include <qobject.h> -#include <qwidget.h> +#include <tqobject.h> +#include <tqwidget.h> #include <kio/job.h> #include <kurl.h> #include <ktempdir.h> @@ -37,8 +37,8 @@ class SvnBlameHolder; class SvnLogHolder; class SvnLogViewWidget; -// class subversionCore : public QObject, public DCOPObject -class subversionCore : public QObject { +// class subversionCore : public TQObject, public DCOPObject +class subversionCore : public TQObject { Q_OBJECT // K_DCOP @@ -51,35 +51,35 @@ public: void update( const KURL::List&); void commit( const KURL::List&, bool recurse, bool keeplocks ); void svnLog( const KURL::List& list, - int revstart, QString revKindStart, int revend, QString revKindEnd, + int revstart, TQString revKindStart, int revend, TQString revKindEnd, bool discorverChangedPath, bool strictNodeHistory ); - void blame( const KURL &url, SvnGlobal::UrlMode mode, int revstart, QString revKindStart, int revend, QString revKindEnd ); + void blame( const KURL &url, SvnGlobal::UrlMode mode, int revstart, TQString revKindStart, int revend, TQString revKindEnd ); void add( const KURL::List&); void del( const KURL::List&); - void diff( const KURL::List&, const QString& where); + void diff( const KURL::List&, const TQString& where); void diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, - int rev1, QString revKind1, int rev2, QString revKind2, + int rev1, TQString revKind1, int rev2, TQString revKind2, bool recurse, bool pegdiff = false ); void revert( const KURL::List&); void resolve( const KURL::List&); void checkout(); void switchTree( const KURL &path, const KURL &repositUrl, - int revNum, const QString &revKind, bool recurse ); + int revNum, const TQString &revKind, bool recurse ); void switchRelocate( const KURL &path, const KURL ¤tUrl, const KURL &newUrl, bool recurse ); - void svnCopy( const KURL &src, int srcRev, const QString &srcRevKind, const KURL &dest ); - void merge( const KURL &src1, int rev1, QString revKind1, const KURL &src2, int rev2, QString revKind2, const KURL &wc_path, + void svnCopy( const KURL &src, int srcRev, const TQString &srcRevKind, const KURL &dest ); + void merge( const KURL &src1, int rev1, TQString revKind1, const KURL &src2, int rev2, TQString revKind2, const KURL &wc_path, bool recurse, bool ignore_ancestry, bool force, bool dry_run ); // This is blocking function. But the GUI is not blocked. // Information will be pulled solely from the working copy.Thus no network connections will be made. // Parameter holderMap is the map to be filled out by this method. Callers should preallocate this object. // Return true on success. Otherwise return false. - bool clientInfo( KURL path_or_url, bool recurse, QMap< KURL, SvnGlobal::SvnInfoHolder> &holderMap ); - void createNewProject( const QString& dirName, const KURL& importURL, bool init ); + bool clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, SvnGlobal::SvnInfoHolder> &holderMap ); + void createNewProject( const TQString& dirName, const KURL& importURL, bool init ); KDevVCSFileInfoProvider *fileInfoProvider() const; - void initProcessDlg( KIO::Job *job, const QString &src, const QString &dest ); + void initProcessDlg( KIO::Job *job, const TQString &src, const TQString &dest ); // k_dcop: -// void notification( const QString&, int,int, const QString&, int,int ,long int, const QString& ); +// void notification( const TQString&, int,int, const TQString&, int,int ,long int, const TQString& ); private slots: void slotEndCheckout( KIO::Job * job ); @@ -89,14 +89,14 @@ private slots: void slotDiffResult( KIO::Job * job ); signals: - void checkoutFinished( QString dir ); + void checkoutFinished( TQString dir ); private: - QGuardedPtr<subversionWidget> m_widget; + TQGuardedPtr<subversionWidget> m_widget; subversionPart *m_part; - QString wcPath; + TQString wcPath; SVNFileInfoProvider *m_fileInfoProvider; - QStringList diffresult; //for diff commands ;) + TQStringList diffresult; //for diff commands ;) // be nice about tmp diff files: delete all of them when exiting. KTempDir* diffTmpDir; |