Port kdesvn to TQt4

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1230412 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 14 insertions, 18 deletions

diff --git a/src/svnqt/repositorydata.cpp b/src/svnqt/repositorydata.cpp
index 2ab9c5d..532c80a 100644
--- a/src/svnqt/repositorydata.cpp
+++ b/src/svnqt/repositorydata.cpp
@@ -53,7 +53,7 @@ RepoOutStream::RepoOutStream(RepositoryData*aBack)
 long RepoOutStream::write(const char*data,const unsigned long max)
 {
     if (m_Back) {
-        QString msg = QString::FROMUTF8(data,max);
+        TQString msg = TQString::FROMUTF8(data,max);
         m_Back->reposFsWarning(msg);
     }
     return max;
@@ -75,13 +75,13 @@ void RepositoryData::warning_func(void *baton, svn_error_t *err)
     RepositoryData*_r = (RepositoryData*)baton;
 
     if (_r) {
-        QString msg = svn::Exception::error2msg(err);
+        TQString msg = svn::Exception::error2msg(err);
         svn_error_clear(err);
         _r->reposFsWarning(msg);
     }
 }
 
-void RepositoryData::reposFsWarning(const QString&msg)
+void RepositoryData::reposFsWarning(const TQString&msg)
 {
     if (m_Listener) {
         m_Listener->sendWarning(msg);
@@ -92,7 +92,7 @@ svn_error_t*RepositoryData::cancel_func(void*baton)
 {
     RepositoryListener*m_L = (RepositoryListener*)baton;
     if (m_L && m_L->isCanceld()) {
-        return svn_error_create (SVN_ERR_CANCELLED, 0, QString::FROMUTF8("Cancelled by user.").TOUTF8());
+        return svn_error_create (SVN_ERR_CANCELLED, 0, TQString::FROMUTF8("Cancelled by user.").TOUTF8());
     }
     return SVN_NO_ERROR;
 }
@@ -108,9 +108,9 @@ void RepositoryData::Close()
 
 
 /*!
-    \fn svn::RepositoryData::Open(const QString&)
+    \fn svn::RepositoryData::Open(const TQString&)
  */
-svn_error_t * RepositoryData::Open(const QString&path)
+svn_error_t * RepositoryData::Open(const TQString&path)
 {
     Close();
     svn_error_t * error = svn_repos_open(&m_Repository,path.TOUTF8(),m_Pool);
@@ -124,20 +124,16 @@ svn_error_t * RepositoryData::Open(const QString&path)
 
 
 /*!
-    \fn svn::RepositoryData::CreateOpen(const QString&path, const QString&fstype, bool _bdbnosync = false, bool _bdbautologremove = true, bool nosvn1diff=false)
+    \fn svn::RepositoryData::CreateOpen(const TQString&path, const TQString&fstype, bool _bdbnosync = false, bool _bdbautologremove = true, bool nosvn1diff=false)
  */
-svn_error_t * RepositoryData::CreateOpen(const QString&path, const QString&fstype, bool _bdbnosync,
+svn_error_t * RepositoryData::CreateOpen(const TQString&path, const TQString&fstype, bool _bdbnosync,
                                           bool _bdbautologremove,
                                           bool _pre_1_4_compat,
                                           bool _pre_1_5_compat)
 {
     Close();
     const char* _type;
-#if QT_VERSION < 0x040000
     if (fstype.lower()=="bdb") {
-#else
-    if (fstype.toLower()=="bdb") {
-#endif
         _type="bdb";
     } else {
         _type="fsfs";
@@ -194,9 +190,9 @@ svn_error_t * RepositoryData::CreateOpen(const QString&path, const QString&fstyp
 
 
 /*!
-    \fn svn::RepositoryData::dump(const QString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas)
+    \fn svn::RepositoryData::dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas)
  */
-svn_error_t* RepositoryData::dump(const QString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas)
+svn_error_t* RepositoryData::dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas)
 {
     if (!m_Repository) {
         return svn_error_create(SVN_ERR_CANCELLED,0,"No repository selected.");
@@ -213,7 +209,7 @@ svn_error_t* RepositoryData::dump(const QString&output,const svn::Revision&start
     return SVN_NO_ERROR;
 }
 
-svn_error_t* RepositoryData::loaddump(const QString&dump,svn_repos_load_uuid uuida, const QString&parentFolder, bool usePre, bool usePost)
+svn_error_t* RepositoryData::loaddump(const TQString&dump,svn_repos_load_uuid uuida, const TQString&tqparentFolder, bool usePre, bool usePost)
 {
     if (!m_Repository) {
         return svn_error_create(SVN_ERR_CANCELLED,0,"No repository selected.");
@@ -223,10 +219,10 @@ svn_error_t* RepositoryData::loaddump(const QString&dump,svn_repos_load_uuid uui
     Pool pool;
     const char*src_path = apr_pstrdup (pool,dump.TOUTF8());
     const char*dest_path;
-    if (parentFolder.isEmpty()) {
+    if (tqparentFolder.isEmpty()) {
         dest_path=0;
     } else {
-        dest_path=apr_pstrdup (pool,parentFolder.TOUTF8());
+        dest_path=apr_pstrdup (pool,tqparentFolder.TOUTF8());
     }
 
     src_path = svn_path_internal_style(src_path, pool);
@@ -234,7 +230,7 @@ svn_error_t* RepositoryData::loaddump(const QString&dump,svn_repos_load_uuid uui
     return SVN_NO_ERROR;
 }
 
-svn_error_t* RepositoryData::hotcopy(const QString&src,const QString&dest,bool cleanlogs)
+svn_error_t* RepositoryData::hotcopy(const TQString&src,const TQString&dest,bool cleanlogs)
 {
     Pool pool;
     const char*src_path = apr_pstrdup (pool,src.TOUTF8());