diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:15:16 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:15:16 -0600 |
commit | d6609da6b8c963fc19b622ab37f38e65df4e0a29 (patch) | |
tree | 66b2ac7b12897c16ac5226da82c451c04994f9cd /src/svnqt | |
parent | 548395e018d377eaa8fede0fba271da8b6c49fc9 (diff) | |
download | tdesvn-d6609da6b8c963fc19b622ab37f38e65df4e0a29.tar.gz tdesvn-d6609da6b8c963fc19b622ab37f38e65df4e0a29.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'src/svnqt')
-rw-r--r-- | src/svnqt/cache/sqlite3/qsql_sqlite3.cpp | 10 | ||||
-rw-r--r-- | src/svnqt/client.hpp | 6 | ||||
-rw-r--r-- | src/svnqt/client_impl.hpp | 6 | ||||
-rw-r--r-- | src/svnqt/client_status.cpp | 36 | ||||
-rw-r--r-- | src/svnqt/dirent.cpp | 2 | ||||
-rw-r--r-- | src/svnqt/log_entry.cpp | 8 | ||||
-rw-r--r-- | src/svnqt/path.cpp | 2 | ||||
-rw-r--r-- | src/svnqt/status.cpp | 54 | ||||
-rw-r--r-- | src/svnqt/status.hpp | 30 | ||||
-rw-r--r-- | src/svnqt/svnqttypes.hpp | 4 | ||||
-rw-r--r-- | src/svnqt/url.cpp | 8 | ||||
-rw-r--r-- | src/svnqt/wc.cpp | 2 |
12 files changed, 84 insertions, 84 deletions
diff --git a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp index 46e165f..d104e66 100644 --- a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp +++ b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp @@ -81,7 +81,7 @@ public: sqlite3_stmt *stmt; - uint skippedtqStatus: 1; // the status of the fetchNext() that's skipped + uint skippedStatus: 1; // the status of the fetchNext() that's skipped uint skipRow: 1; // skip the next fetchNext()? uint utf8: 1; TQSqlRecord rInf; @@ -90,7 +90,7 @@ public: static const uint initial_cache_size = 128; TQSQLite3ResultPrivate::TQSQLite3ResultPrivate(TQSQLite3Result* res) : q(res), access(0), - stmt(0), skippedtqStatus(false), skipRow(false), utf8(false) + stmt(0), skippedStatus(false), skipRow(false), utf8(false) { } @@ -98,7 +98,7 @@ void TQSQLite3ResultPrivate::cleanup() { finalize(); rInf.clear(); - skippedtqStatus = false; + skippedStatus = false; skipRow = false; q->setAt(TQSql::BeforeFirst); q->setActive(false); @@ -143,7 +143,7 @@ bool TQSQLite3ResultPrivate::fetchNext(TQSqlCachedResult::ValueCache &values, in // already fetched Q_ASSERT(!initialFetch); skipRow = false; - return skippedtqStatus; + return skippedStatus; } skipRow = initialFetch; @@ -226,7 +226,7 @@ bool TQSQLite3Result::reset (const TQString &query) return false; } - d->skippedtqStatus = d->fetchNext(cache(), 0, true); + d->skippedStatus = d->fetchNext(cache(), 0, true); setSelect(!d->rInf.isEmpty()); setActive(true); diff --git a/src/svnqt/client.hpp b/src/svnqt/client.hpp index 4fb6015..70195ac 100644 --- a/src/svnqt/client.hpp +++ b/src/svnqt/client.hpp @@ -125,7 +125,7 @@ namespace svn * @param revision list specific revision when browsing remote, on working copies parameter will ignored * @param detailed_remote if on remote listing detailed item info should get if possible * that may slow so should configureable in frontends! - * @return vector with tqStatus entries. + * @return vector with Status entries. */ virtual StatusEntries status (const Path& path, @@ -146,10 +146,10 @@ namespace svn * @param path File to gather status. * @param update if check against repository if new updates are there (for WC only) * @param revision list specific revision when browsing remote, on working copies parameter will ignored - * @return a tqStatus with Statis.isVersioned = FALSE + * @return a Status with Statis.isVersioned = FALSE */ virtual StatusPtr - singletqStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0; + singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0; /** * Executes a revision checkout. diff --git a/src/svnqt/client_impl.hpp b/src/svnqt/client_impl.hpp index 25d5b62..361603b 100644 --- a/src/svnqt/client_impl.hpp +++ b/src/svnqt/client_impl.hpp @@ -96,7 +96,7 @@ namespace svn * @param revision list specific revision when browsing remote, on working copies parameter will ignored * @param detailed_remote if on remote listing detailed item info should get if possible * that may slow so should configureable in frontends! - * @return vector with tqStatus entries. + * @return vector with Status entries. */ virtual StatusEntries status (const Path& path, @@ -117,10 +117,10 @@ namespace svn * @param path File to gather status. * @param update if check against repository if new updates are there (for WC only) * @param revision list specific revision when browsing remote, on working copies parameter will ignored - * @return a tqStatus with Statis.isVersioned = FALSE + * @return a Status with Statis.isVersioned = FALSE */ virtual StatusPtr - singletqStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException); + singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException); /** * Executes a revision checkout. diff --git a/src/svnqt/client_status.cpp b/src/svnqt/client_status.cpp index 4468b0d..1c58610 100644 --- a/src/svnqt/client_status.cpp +++ b/src/svnqt/client_status.cpp @@ -269,7 +269,7 @@ namespace svn } static StatusEntries - localtqStatus (const Path& path, + localStatus (const Path& path, Depth depth, const bool get_all, const bool update, @@ -342,28 +342,28 @@ namespace svn status = (svn_wc_status2_t *) item->value; filePath = (const char *) item->key; - entries.push_back (StatusPtr(new tqStatus(filePath, status))); + entries.push_back (StatusPtr(new Status(filePath, status))); } return entries; } static StatusPtr - dirEntryTotqStatus (const Path& path, DirEntryPtr dirEntry) + dirEntryToStatus (const Path& path, DirEntryPtr dirEntry) { TQString url = path.path(); url += TQString::FROMUTF8("/"); url += dirEntry->name(); - return StatusPtr(new tqStatus (url, dirEntry)); + return StatusPtr(new Status (url, dirEntry)); } static StatusPtr - infoEntryTotqStatus(const Path&,const InfoEntry&infoEntry) + infoEntryToStatus(const Path&,const InfoEntry&infoEntry) { - return StatusPtr(new tqStatus(infoEntry.url(),infoEntry)); + return StatusPtr(new Status(infoEntry.url(),infoEntry)); } static StatusEntries - remotetqStatus (Client * client, + remoteStatus (Client * client, const Path& path, Depth depth, const bool , @@ -385,7 +385,7 @@ namespace svn DirEntryPtr dirEntry = *it; if (dirEntry->name().isEmpty()) continue; - entries.push_back(dirEntryTotqStatus (path, dirEntry)); + entries.push_back(dirEntryToStatus (path, dirEntry)); } return entries; } @@ -402,16 +402,16 @@ namespace svn const StringArray & changelists) throw (ClientException) { if (Url::isValid (path.path())) { - return remotetqStatus (this, path, depth, get_all, update, + return remoteStatus (this, path, depth, get_all, update, no_ignore,revision,m_context,detailed_remote); } else { - return localtqStatus (path, depth, get_all, update, + return localStatus (path, depth, get_all, update, no_ignore, hide_externals,changelists, m_context); } } static StatusPtr - localSingletqStatus (const Path& path, Context * context,bool update=false) + localSingleStatus (const Path& path, Context * context,bool update=false) { svn_error_t *error; apr_hash_t *status_hash; @@ -470,26 +470,26 @@ namespace svn status = (svn_wc_status2_t *) item->value; filePath = (const char *) item->key; - return StatusPtr(new tqStatus (filePath, status)); + return StatusPtr(new Status (filePath, status)); }; static StatusPtr - remoteSingletqStatus (Client * client, const Path& path,const Revision revision, Context * ) + remoteSingleStatus (Client * client, const Path& path,const Revision revision, Context * ) { InfoEntries infoEntries = client->info(path,DepthEmpty,revision,Revision(Revision::UNDEFINED)); if (infoEntries.size () == 0) - return StatusPtr(new tqStatus()); + return StatusPtr(new Status()); else - return infoEntryTotqStatus (path, infoEntries [0]); + return infoEntryToStatus (path, infoEntries [0]); } StatusPtr - Client_impl::singletqStatus (const Path& path,bool update,const Revision revision) throw (ClientException) + Client_impl::singleStatus (const Path& path,bool update,const Revision revision) throw (ClientException) { if (Url::isValid (path.path())) - return remoteSingletqStatus (this, path,revision, m_context); + return remoteSingleStatus (this, path,revision, m_context); else - return localSingletqStatus (path, m_context,update); + return localSingleStatus (path, m_context,update); } bool diff --git a/src/svnqt/dirent.cpp b/src/svnqt/dirent.cpp index 7a42ae7..9015d13 100644 --- a/src/svnqt/dirent.cpp +++ b/src/svnqt/dirent.cpp @@ -60,7 +60,7 @@ namespace svn hasProps (dirEntry->has_props != 0), createdRev (dirEntry->created_rev), time (dirEntry->time), m_Lock() { - lastAuthor = dirEntry->last_author == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(dirEntry->last_author); + lastAuthor = dirEntry->last_author == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(dirEntry->last_author); } DirEntry_Data (const DirEntry & src) diff --git a/src/svnqt/log_entry.cpp b/src/svnqt/log_entry.cpp index f641b17..720642d 100644 --- a/src/svnqt/log_entry.cpp +++ b/src/svnqt/log_entry.cpp @@ -96,8 +96,8 @@ namespace svn const char *message_; svn_compat_log_revprops_out(&author_, &date_, &message_, log_entry->revprops); - author = author_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(author_); - message = message_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(message_); + author = author_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(author_); + message = message_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(message_); setDate(date_); revision = log_entry->revision; if (log_entry->changed_paths) { @@ -125,8 +125,8 @@ namespace svn setDate(date_); revision = revision_; - author = author_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(author_); - message = message_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(message_); + author = author_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(author_); + message = message_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(message_); } void LogEntry::setDate(const char*date_) diff --git a/src/svnqt/path.cpp b/src/svnqt/path.cpp index 4281de7..4e0b14d 100644 --- a/src/svnqt/path.cpp +++ b/src/svnqt/path.cpp @@ -213,7 +213,7 @@ namespace svn if (pos == -1) { filename = basename; - ext = TQString::tqfromLatin1(""); + ext = TQString::fromLatin1(""); } else { diff --git a/src/svnqt/status.cpp b/src/svnqt/status.cpp index a7913f6..c5e47a3 100644 --- a/src/svnqt/status.cpp +++ b/src/svnqt/status.cpp @@ -175,7 +175,7 @@ namespace svn m_hasReal=true; } - tqStatus::tqStatus (const tqStatus & src) + Status::Status (const Status & src) : m_Data(new Status_private()) { if( &src != this ) @@ -188,37 +188,37 @@ namespace svn } } - tqStatus::tqStatus (const TQString&path, svn_wc_status2_t * status) + Status::Status (const TQString&path, svn_wc_status2_t * status) : m_Data(new Status_private()) { m_Data->init(path, status); } - tqStatus::tqStatus (const char*path, svn_wc_status2_t * status) + Status::Status (const char*path, svn_wc_status2_t * status) : m_Data(new Status_private()) { m_Data->init(TQString::FROMUTF8(path),status); } - tqStatus::tqStatus(const TQString&url,const DirEntryPtr&src) + Status::Status(const TQString&url,const DirEntryPtr&src) : m_Data(new Status_private()) { m_Data->init(url,src); } - tqStatus::tqStatus(const TQString&url,const InfoEntry&src) + Status::Status(const TQString&url,const InfoEntry&src) : m_Data(new Status_private()) { m_Data->init(url,src); } - tqStatus::~tqStatus () + Status::~Status () { delete m_Data; } - tqStatus & - tqStatus::operator=(const tqStatus & status) + Status & + Status::operator=(const Status & status) { if (this == &status) return *this; @@ -231,89 +231,89 @@ namespace svn } const LockEntry& - tqStatus::lockEntry () const + Status::lockEntry () const { return m_Data->m_Lock; } svn_wc_status_kind - tqStatus::reposProptqStatus () const + Status::reposPropStatus () const { return m_Data->_repos_prop_status; } svn_wc_status_kind - tqStatus::reposTexttqStatus () const + Status::reposTextStatus () const { return m_Data->_repos_text_status; } bool - tqStatus::isSwitched () const + Status::isSwitched () const { return m_Data->_switched != 0; } bool - tqStatus::isCopied () const + Status::isCopied () const { return m_Data->_copied; } bool - tqStatus::isLocked () const + Status::isLocked () const { return m_Data->m_Lock.Locked(); } bool - tqStatus::isModified()const + Status::isModified()const { - return texttqStatus()==svn_wc_status_modified||proptqStatus()==svn_wc_status_modified - ||texttqStatus ()==svn_wc_status_replaced; + return textStatus()==svn_wc_status_modified||propStatus()==svn_wc_status_modified + ||textStatus ()==svn_wc_status_replaced; } bool - tqStatus::isRealVersioned()const + Status::isRealVersioned()const { return m_Data->m_hasReal; } bool - tqStatus::isVersioned () const + Status::isVersioned () const { return m_Data->m_isVersioned; } svn_wc_status_kind - tqStatus::proptqStatus () const + Status::propStatus () const { return m_Data->_prop_status; } svn_wc_status_kind - tqStatus::texttqStatus () const + Status::textStatus () const { return m_Data->_text_status; } const Entry& - tqStatus::entry () const + Status::entry () const { return m_Data->m_entry; } const TQString& - tqStatus::path () const + Status::path () const { return m_Data->m_Path; } bool - tqStatus::validRepostqStatus()const + Status::validReposStatus()const { - return reposTexttqStatus()!=svn_wc_status_none||reposProptqStatus()!=svn_wc_status_none; + return reposTextStatus()!=svn_wc_status_none||reposPropStatus()!=svn_wc_status_none; } bool - tqStatus::validLocaltqStatus()const + Status::validLocalStatus()const { - return texttqStatus()!=svn_wc_status_none||proptqStatus()!=svn_wc_status_none; + return textStatus()!=svn_wc_status_none||propStatus()!=svn_wc_status_none; } } diff --git a/src/svnqt/status.hpp b/src/svnqt/status.hpp index 3b6e03e..281f905 100644 --- a/src/svnqt/status.hpp +++ b/src/svnqt/status.hpp @@ -53,13 +53,13 @@ namespace svn */ class Status_private; - class SVNTQT_EXPORT tqStatus + class SVNTQT_EXPORT Status { public: /** * copy constructor */ - tqStatus (const tqStatus & src); + Status (const Status & src); /** * default constructor @@ -67,27 +67,27 @@ namespace svn * @param path path for this status entry * @param status status entry */ - tqStatus (const TQString&path=TQString(), svn_wc_status2_t * status = NULL); + Status (const TQString&path=TQString(), svn_wc_status2_t * status = NULL); /** * default constructor * * @param path path for this status entry * @param status status entry */ - tqStatus (const char*path, svn_wc_status2_t * status = NULL); + Status (const char*path, svn_wc_status2_t * status = NULL); /** * converting constructor */ - tqStatus(const TQString&path,const DirEntryPtr&src); + Status(const TQString&path,const DirEntryPtr&src); /** * converting constructor */ - tqStatus(const TQString&path,const InfoEntry&src); + Status(const TQString&path,const InfoEntry&src); /** * destructor */ - virtual ~tqStatus (); + virtual ~Status (); /** * @return path of status entry @@ -105,13 +105,13 @@ namespace svn * @return file status property enum of the "textual" component. */ svn_wc_status_kind - texttqStatus () const; + textStatus () const; /** * @return file status property enum of the "property" component. */ svn_wc_status_kind - proptqStatus () const; + propStatus () const; /** * @retval TRUE if under version control @@ -152,28 +152,28 @@ namespace svn * @return the entry's text status in the repository */ svn_wc_status_kind - reposTexttqStatus () const; + reposTextStatus () const; /** * @return the entry's prop status in the repository */ svn_wc_status_kind - reposProptqStatus () const; + reposPropStatus () const; const LockEntry& lockEntry () const; bool - validRepostqStatus()const; + validReposStatus()const; bool - validLocaltqStatus()const; + validLocalStatus()const; /** * assignment operator */ - tqStatus & - operator = (const tqStatus &); + Status & + operator = (const Status &); private: Status_private*m_Data; }; diff --git a/src/svnqt/svnqttypes.hpp b/src/svnqt/svnqttypes.hpp index 5b470f2..5d16658 100644 --- a/src/svnqt/svnqttypes.hpp +++ b/src/svnqt/svnqttypes.hpp @@ -41,7 +41,7 @@ namespace svn class InfoEntry; class LogEntry; class Revision; - class tqStatus; + class Status; class Targets; class Path; class StringArray; @@ -61,7 +61,7 @@ namespace svn /// shared_pointer for LogEntriesMap typedef SharedPointer<LogEntriesMap> LogEntriesMapPtr; - typedef SharedPointer<tqStatus> StatusPtr; + typedef SharedPointer<Status> StatusPtr; typedef TQLIST<StatusPtr> StatusEntries; typedef TQLIST<Revision> Revisions; diff --git a/src/svnqt/url.cpp b/src/svnqt/url.cpp index 2478997..6f55356 100644 --- a/src/svnqt/url.cpp +++ b/src/svnqt/url.cpp @@ -64,10 +64,10 @@ namespace svn { bool cs = false; if ( - url.tqstartsWith("file://",cs) || - url.tqstartsWith("/") || - url.tqstartsWith("svn+file://",cs) || - url.tqstartsWith("ksvn+file://",cs) ) + url.startsWith("file://",cs) || + url.startsWith("/") || + url.startsWith("svn+file://",cs) || + url.startsWith("ksvn+file://",cs) ) { return true; } diff --git a/src/svnqt/wc.cpp b/src/svnqt/wc.cpp index 4729696..bf3b5dd 100644 --- a/src/svnqt/wc.cpp +++ b/src/svnqt/wc.cpp @@ -116,7 +116,7 @@ namespace svn TQString result = ""; const svn_wc_entry_t *entry; entry = getEntry( path ); - result = entry ? TQString::FROMUTF8(entry->repos) : TQString::tqfromLatin1(""); + result = entry ? TQString::FROMUTF8(entry->repos) : TQString::fromLatin1(""); return result; } |