From 4be907152dfb5461311d9db1d63120c28a0bad0a Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/svnqt/client.hpp | 4 ++-- src/svnqt/client_impl.hpp | 4 ++-- src/svnqt/client_modify.cpp | 6 +++--- src/svnqt/repository.cpp | 4 ++-- src/svnqt/repository.hpp | 4 ++-- src/svnqt/repositorydata.cpp | 6 +++--- src/svnqt/repositorydata.hpp | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/svnqt') diff --git a/src/svnqt/client.hpp b/src/svnqt/client.hpp index 93dcff6..95b7461 100644 --- a/src/svnqt/client.hpp +++ b/src/svnqt/client.hpp @@ -218,11 +218,11 @@ namespace svn * @param depth if @a path is a folder add items recursive depending on value if it. * @param force if true, do not error on already-versioned items. * @param no_ignore if false don't add files or directories that match ignore patterns. When build against svn 1.2 always false - * @param add_tqparents if true, go up to the next versioned folder and add all between path and this folder. + * @param add_parents if true, go up to the next versioned folder and add all between path and this folder. * @exception ClientException */ virtual void - add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_tqparents = true) throw (ClientException)=0; + add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true) throw (ClientException)=0; /** * Updates the file or directory. diff --git a/src/svnqt/client_impl.hpp b/src/svnqt/client_impl.hpp index 9afc062..bd6a599 100644 --- a/src/svnqt/client_impl.hpp +++ b/src/svnqt/client_impl.hpp @@ -189,11 +189,11 @@ namespace svn * @param depth if @a path is a folder add items recursive depending on value if it. Pre-subversion 1.5 DepthInfinity is mapped to recursive, all other to not-recursive. * @param force if true, do not error on already-versioned items. * @param no_ignore if false don't add files or directories that match ignore patterns. - * @param add_tqparents if true, go up to the next versioned folder and add all between path and this folder. Used only with subversion 1.5 or newer + * @param add_parents if true, go up to the next versioned folder and add all between path and this folder. Used only with subversion 1.5 or newer * @exception ClientException * @sa svn::Depth */ - virtual void add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_tqparents = true) throw (ClientException); + virtual void add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true) throw (ClientException); /** * Updates the file or directory. diff --git a/src/svnqt/client_modify.cpp b/src/svnqt/client_modify.cpp index c3b7c19..cd250ee 100644 --- a/src/svnqt/client_modify.cpp +++ b/src/svnqt/client_modify.cpp @@ -169,7 +169,7 @@ namespace svn void Client_impl::add (const Path & path, - svn::Depth depth,bool force, bool no_ignore, bool add_tqparents) throw (ClientException) + svn::Depth depth,bool force, bool no_ignore, bool add_parents) throw (ClientException) { Pool pool; #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) @@ -178,11 +178,11 @@ namespace svn internal::DepthToSvn(depth), force, no_ignore, - add_tqparents, + add_parents, *m_context, pool); #else - Q_UNUSED(add_tqparents); + Q_UNUSED(add_parents); svn_error_t * error = svn_client_add3 (path.cstr (), depth==DepthInfinity, diff --git a/src/svnqt/repository.cpp b/src/svnqt/repository.cpp index 15530ff..327340b 100644 --- a/src/svnqt/repository.cpp +++ b/src/svnqt/repository.cpp @@ -67,7 +67,7 @@ void Repository::dump(const TQString&output,const svn::Revision&start,const svn: } } -void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&tqparentFolder, bool usePre, bool usePost)throw (ClientException) +void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&parentFolder, bool usePre, bool usePost)throw (ClientException) { svn_repos_load_uuid uuid_action; switch (uuida) { @@ -82,7 +82,7 @@ void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&tq uuid_action=svn_repos_load_uuid_default; break; } - svn_error_t * error = m_Data->loaddump(dump,uuid_action,tqparentFolder,usePre,usePost); + svn_error_t * error = m_Data->loaddump(dump,uuid_action,parentFolder,usePre,usePost); if (error!=0) { throw ClientException (error); } diff --git a/src/svnqt/repository.hpp b/src/svnqt/repository.hpp index ff8e730..7f79f52 100644 --- a/src/svnqt/repository.hpp +++ b/src/svnqt/repository.hpp @@ -93,12 +93,12 @@ public: The repository must opened before. Progress message go trough the assigned svn::repository::RepositoryListener object. \param dump Dumpfile to load \param uuida what to do with UUIDs - \param tqparentFolder put content of dumpstream within folder in repository, if empty put into root-folder. + \param parentFolder put content of dumpstream within folder in repository, if empty put into root-folder. \param usePre use pre-commit-hook \param usePost use post-commit-hook \exception ClientException will be thrown in case of an error */ - void loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&tqparentFolder, bool usePre, bool usePost)throw (ClientException); + void loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&parentFolder, bool usePre, bool usePost)throw (ClientException); //! copy a repository to a new location /*! \param src the repository path to copy diff --git a/src/svnqt/repositorydata.cpp b/src/svnqt/repositorydata.cpp index 532c80a..5625f70 100644 --- a/src/svnqt/repositorydata.cpp +++ b/src/svnqt/repositorydata.cpp @@ -209,7 +209,7 @@ svn_error_t* RepositoryData::dump(const TQString&output,const svn::Revision&star return SVN_NO_ERROR; } -svn_error_t* RepositoryData::loaddump(const TQString&dump,svn_repos_load_uuid uuida, const TQString&tqparentFolder, bool usePre, bool usePost) +svn_error_t* RepositoryData::loaddump(const TQString&dump,svn_repos_load_uuid uuida, const TQString&parentFolder, bool usePre, bool usePost) { if (!m_Repository) { return svn_error_create(SVN_ERR_CANCELLED,0,"No repository selected."); @@ -219,10 +219,10 @@ svn_error_t* RepositoryData::loaddump(const TQString&dump,svn_repos_load_uuid uu Pool pool; const char*src_path = apr_pstrdup (pool,dump.TOUTF8()); const char*dest_path; - if (tqparentFolder.isEmpty()) { + if (parentFolder.isEmpty()) { dest_path=0; } else { - dest_path=apr_pstrdup (pool,tqparentFolder.TOUTF8()); + dest_path=apr_pstrdup (pool,parentFolder.TOUTF8()); } src_path = svn_path_internal_style(src_path, pool); diff --git a/src/svnqt/repositorydata.hpp b/src/svnqt/repositorydata.hpp index 8e2e8d1..5abe2ca 100644 --- a/src/svnqt/repositorydata.hpp +++ b/src/svnqt/repositorydata.hpp @@ -53,7 +53,7 @@ public: void reposFsWarning(const TQString&msg); svn_error_t* dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas); - svn_error_t* loaddump(const TQString&dump,svn_repos_load_uuid uuida, const TQString&tqparentFolder, bool usePre, bool usePost); + svn_error_t* loaddump(const TQString&dump,svn_repos_load_uuid uuida, const TQString&parentFolder, bool usePre, bool usePost); static svn_error_t* hotcopy(const TQString&src,const TQString&dest,bool cleanlogs); protected: -- cgit v1.2.1