summaryrefslogtreecommitdiffstats
path: root/src/svnqt
diff options
context:
space:
mode:
Diffstat (limited to 'src/svnqt')
-rw-r--r--src/svnqt/cache/DatabaseException.cpp2
-rw-r--r--src/svnqt/cache/LogCache.cpp2
-rw-r--r--src/svnqt/cache/ReposLog.cpp14
-rw-r--r--src/svnqt/cache/sqlite3/qsql_sqlite3.cpp10
-rw-r--r--src/svnqt/cache/test/sqlite.cpp2
-rw-r--r--src/svnqt/client.hpp8
-rw-r--r--src/svnqt/client_impl.hpp8
-rw-r--r--src/svnqt/client_status.cpp36
-rw-r--r--src/svnqt/diff_data.cpp2
-rw-r--r--src/svnqt/dirent.cpp2
-rw-r--r--src/svnqt/exception.cpp2
-rw-r--r--src/svnqt/log_entry.cpp8
-rw-r--r--src/svnqt/path.cpp2
-rw-r--r--src/svnqt/revision.hpp2
-rw-r--r--src/svnqt/status.cpp54
-rw-r--r--src/svnqt/status.hpp30
-rw-r--r--src/svnqt/svnqttypes.hpp4
-rw-r--r--src/svnqt/tests/lsdir.cpp4
-rw-r--r--src/svnqt/url.cpp8
-rw-r--r--src/svnqt/version_check.cpp4
-rw-r--r--src/svnqt/wc.cpp2
21 files changed, 103 insertions, 103 deletions
diff --git a/src/svnqt/cache/DatabaseException.cpp b/src/svnqt/cache/DatabaseException.cpp
index 199a5f9..880c041 100644
--- a/src/svnqt/cache/DatabaseException.cpp
+++ b/src/svnqt/cache/DatabaseException.cpp
@@ -7,6 +7,6 @@ svn::cache::DatabaseException::DatabaseException(const TQString&msg,int aNumber)
: Exception(msg),m_number(aNumber)
{
if (aNumber>-1) {
- setMessage(TQString("(Code %1) %2").arg(aNumber).arg(msg));
+ setMessage(TQString("(Code %1) %2").tqarg(aNumber).tqarg(msg));
}
}
diff --git a/src/svnqt/cache/LogCache.cpp b/src/svnqt/cache/LogCache.cpp
index 4dcb27b..fd62eee 100644
--- a/src/svnqt/cache/LogCache.cpp
+++ b/src/svnqt/cache/LogCache.cpp
@@ -154,7 +154,7 @@ public:
int i = 0;
TQString _key = dbFile;
while (TQSqlDatabase::contains(_key)) {
- _key = TQString("%1-%2").arg(dbFile).arg(i++);
+ _key = TQString("%1-%2").tqarg(dbFile).tqarg(i++);
}
// qDebug("The repository key is now: %s",_key.TOUTF8().data());
TQDataBase _db = TQSqlDatabase::addDatabase(SQLTYPE,_key);
diff --git a/src/svnqt/cache/ReposLog.cpp b/src/svnqt/cache/ReposLog.cpp
index 34aa99f..d63d1d3 100644
--- a/src/svnqt/cache/ReposLog.cpp
+++ b/src/svnqt/cache/ReposLog.cpp
@@ -360,15 +360,15 @@ bool svn::cache::ReposLog::log(const svn::Path&what,const svn::Revision&_start,
svn::Revision peg = date2numberRev(_peg,true);
svn::Revision end = date2numberRev(_end,true);
svn::Revision start = date2numberRev(_start,true);
- TQString query_string = TQString(s_q).arg(what.native()).arg(what.native()).arg((peg==svn::Revision::UNDEFINED?"":TQString(" AND revision<=%1").arg(peg.revnum())));
+ TQString query_string = TQString(s_q).tqarg(what.native()).tqarg(what.native()).tqarg((peg==svn::Revision::UNDEFINED?"":TQString(" AND revision<=%1").tqarg(peg.revnum())));
if (peg==svn::Revision::UNDEFINED) {
peg = latestCachedRev();
}
if (!itemExists(peg,what)) {
- throw svn::cache::DatabaseException(TQString("Entry '%1' does not exists at revision %2").arg(what.native()).arg(peg.toString()));
+ throw svn::cache::DatabaseException(TQString("Entry '%1' does not exists at revision %2").tqarg(what.native()).tqarg(peg.toString()));
}
if (limit>0) {
- query_string+=TQString(" LIMIT %1").arg(limit);
+ query_string+=TQString(" LIMIT %1").tqarg(limit);
}
TQSqlQuery _q(TQString(),m_Database);
TQSqlQuery _q2(TQString(),m_Database);
@@ -384,7 +384,7 @@ bool svn::cache::ReposLog::log(const svn::Path&what,const svn::Revision&_start,
target[revision].author=_q.value(1).toString();
target[revision].date=_q.value(2).toLongLong();
target[revision].message=_q.value(3).toString();
- query_string=s_e.arg(revision);
+ query_string=s_e.tqarg(revision);
_q2.prepare(query_string);
if (!_q2.exec()) {
qDebug("Could not select values: %s",_q2.lastError().text().TOUTF8().data());
@@ -416,7 +416,7 @@ bool svn::cache::ReposLog::itemExists(const svn::Revision&peg,const svn::Path&pa
#if 0
static TQString _s1("select revision from changeditems where changeditem='%1' and action='A' and revision<=%2 order by revision desc limit 1");
TQSqlQuery _q(TQString(),m_Database);
- TQString query_string=TQString(_s1).arg(path.native()).arg(peg.revnum());
+ TQString query_string=TQString(_s1).tqarg(path.native()).tqarg(peg.revnum());
if (!_q.exec(query_string)) {
qDebug("Could not select values: %s",_q.lastError().text().TOUTF8().data());
qDebug(_q.lastQuery().TOUTF8().data());
@@ -429,10 +429,10 @@ bool svn::cache::ReposLog::itemExists(const svn::Revision&peg,const svn::Path&pa
static TQString _s2("select revision from changeditem where changeditem in (%1) and action='D' and revision>%2 and revision<=%3 order by revision desc limit 1");
TQStringList p_list;
while (_p.length()>0) {
- p_list.append(TQString("'%1'").arg(_p.native()));
+ p_list.append(TQString("'%1'").tqarg(_p.native()));
_p.removeLast();
}
- query_string=TQString(_s2).arg(p_list.join(",")).arg();
+ query_string=TQString(_s2).tqarg(p_list.join(",")).tqarg();
#endif
return true;
}
diff --git a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp
index d104e66..46e165f 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 skippedStatus: 1; // the status of the fetchNext() that's skipped
+ uint skippedtqStatus: 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), skippedStatus(false), skipRow(false), utf8(false)
+ stmt(0), skippedtqStatus(false), skipRow(false), utf8(false)
{
}
@@ -98,7 +98,7 @@ void TQSQLite3ResultPrivate::cleanup()
{
finalize();
rInf.clear();
- skippedStatus = false;
+ skippedtqStatus = 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 skippedStatus;
+ return skippedtqStatus;
}
skipRow = initialFetch;
@@ -226,7 +226,7 @@ bool TQSQLite3Result::reset (const TQString &query)
return false;
}
- d->skippedStatus = d->fetchNext(cache(), 0, true);
+ d->skippedtqStatus = d->fetchNext(cache(), 0, true);
setSelect(!d->rInf.isEmpty());
setActive(true);
diff --git a/src/svnqt/cache/test/sqlite.cpp b/src/svnqt/cache/test/sqlite.cpp
index 937c332..07b5148 100644
--- a/src/svnqt/cache/test/sqlite.cpp
+++ b/src/svnqt/cache/test/sqlite.cpp
@@ -3,7 +3,7 @@
#include <tqstringlist.h>
#include <iostream>
#include <tqapplication.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include "svnqt/client.hpp"
#include "svnqt/svnqttypes.hpp"
diff --git a/src/svnqt/client.hpp b/src/svnqt/client.hpp
index 68d0aa0..4fb6015 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 Status entries.
+ * @return vector with tqStatus 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 Status with Statis.isVersioned = FALSE
+ * @return a tqStatus with Statis.isVersioned = FALSE
*/
virtual StatusPtr
- singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0;
+ singletqStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0;
/**
* Executes a revision checkout.
@@ -428,7 +428,7 @@ namespace svn
* @param native_eol Either "LF", "CR" or "CRLF" or NULL.
* @param ignore_externals don't process externals definitions as part of this operation.
* @param recurse if true, export recursively.<br>
- Otherwise, export just the directory represented by from and its immediate non-directory children.
+ Otherwise, export just the directory represented by from and its immediate non-directory tqchildren.
*/
virtual svn_revnum_t
doExport (const Path & srcPath,
diff --git a/src/svnqt/client_impl.hpp b/src/svnqt/client_impl.hpp
index 4e2ea60..25d5b62 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 Status entries.
+ * @return vector with tqStatus 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 Status with Statis.isVersioned = FALSE
+ * @return a tqStatus with Statis.isVersioned = FALSE
*/
virtual StatusPtr
- singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException);
+ singletqStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException);
/**
* Executes a revision checkout.
@@ -398,7 +398,7 @@ namespace svn
* @param overwrite overwrite existing files
* @param native_eol Either "LF", "CR" or "CRLF" or NULL.
* @param ignore_externals don't process externals definitions as part of this operation.
- * @param recurse if true, export recursively. Otherwise, export just the directory represented by from and its immediate non-directory children.
+ * @param recurse if true, export recursively. Otherwise, export just the directory represented by from and its immediate non-directory tqchildren.
*/
virtual svn_revnum_t
doExport (const Path & srcPath,
diff --git a/src/svnqt/client_status.cpp b/src/svnqt/client_status.cpp
index 1c58610..4468b0d 100644
--- a/src/svnqt/client_status.cpp
+++ b/src/svnqt/client_status.cpp
@@ -269,7 +269,7 @@ namespace svn
}
static StatusEntries
- localStatus (const Path& path,
+ localtqStatus (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 Status(filePath, status)));
+ entries.push_back (StatusPtr(new tqStatus(filePath, status)));
}
return entries;
}
static StatusPtr
- dirEntryToStatus (const Path& path, DirEntryPtr dirEntry)
+ dirEntryTotqStatus (const Path& path, DirEntryPtr dirEntry)
{
TQString url = path.path();
url += TQString::FROMUTF8("/");
url += dirEntry->name();
- return StatusPtr(new Status (url, dirEntry));
+ return StatusPtr(new tqStatus (url, dirEntry));
}
static StatusPtr
- infoEntryToStatus(const Path&,const InfoEntry&infoEntry)
+ infoEntryTotqStatus(const Path&,const InfoEntry&infoEntry)
{
- return StatusPtr(new Status(infoEntry.url(),infoEntry));
+ return StatusPtr(new tqStatus(infoEntry.url(),infoEntry));
}
static StatusEntries
- remoteStatus (Client * client,
+ remotetqStatus (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(dirEntryToStatus (path, dirEntry));
+ entries.push_back(dirEntryTotqStatus (path, dirEntry));
}
return entries;
}
@@ -402,16 +402,16 @@ namespace svn
const StringArray & changelists) throw (ClientException)
{
if (Url::isValid (path.path())) {
- return remoteStatus (this, path, depth, get_all, update,
+ return remotetqStatus (this, path, depth, get_all, update,
no_ignore,revision,m_context,detailed_remote);
} else {
- return localStatus (path, depth, get_all, update,
+ return localtqStatus (path, depth, get_all, update,
no_ignore, hide_externals,changelists, m_context);
}
}
static StatusPtr
- localSingleStatus (const Path& path, Context * context,bool update=false)
+ localSingletqStatus (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 Status (filePath, status));
+ return StatusPtr(new tqStatus (filePath, status));
};
static StatusPtr
- remoteSingleStatus (Client * client, const Path& path,const Revision revision, Context * )
+ remoteSingletqStatus (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 Status());
+ return StatusPtr(new tqStatus());
else
- return infoEntryToStatus (path, infoEntries [0]);
+ return infoEntryTotqStatus (path, infoEntries [0]);
}
StatusPtr
- Client_impl::singleStatus (const Path& path,bool update,const Revision revision) throw (ClientException)
+ Client_impl::singletqStatus (const Path& path,bool update,const Revision revision) throw (ClientException)
{
if (Url::isValid (path.path()))
- return remoteSingleStatus (this, path,revision, m_context);
+ return remoteSingletqStatus (this, path,revision, m_context);
else
- return localSingleStatus (path, m_context,update);
+ return localSingletqStatus (path, m_context,update);
}
bool
diff --git a/src/svnqt/diff_data.cpp b/src/svnqt/diff_data.cpp
index 756e771..f1837ce 100644
--- a/src/svnqt/diff_data.cpp
+++ b/src/svnqt/diff_data.cpp
@@ -130,7 +130,7 @@ namespace svn
close();
TQFile fi(m_outFileName);
if (!fi.open(IO_ReadOnly|IO_Raw)) {
- throw ClientException(TQString("%1 '%2'").arg(fi.errorString()).arg(m_outFileName));
+ throw ClientException(TQString("%1 '%2'").tqarg(fi.errorString()).tqarg(m_outFileName));
}
TQByteArray res = fi.readAll();
diff --git a/src/svnqt/dirent.cpp b/src/svnqt/dirent.cpp
index 9015d13..7a42ae7 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::fromLatin1("") : TQString::FROMUTF8(dirEntry->last_author);
+ lastAuthor = dirEntry->last_author == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(dirEntry->last_author);
}
DirEntry_Data (const DirEntry & src)
diff --git a/src/svnqt/exception.cpp b/src/svnqt/exception.cpp
index 1824572..bc25345 100644
--- a/src/svnqt/exception.cpp
+++ b/src/svnqt/exception.cpp
@@ -121,7 +121,7 @@ namespace svn
{
message += TQString::FROMUTF8("In file ");
message += TQString::FROMUTF8(error->file);
- message += TQString(" Line %1").arg(error->line);
+ message += TQString(" Line %1").tqarg(error->line);
}
}
while (next != NULL && next->message != NULL)
diff --git a/src/svnqt/log_entry.cpp b/src/svnqt/log_entry.cpp
index 720642d..f641b17 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::fromLatin1("") : TQString::FROMUTF8(author_);
- message = message_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(message_);
+ author = author_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(author_);
+ message = message_ == 0 ? TQString::tqfromLatin1("") : 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::fromLatin1("") : TQString::FROMUTF8(author_);
- message = message_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(message_);
+ author = author_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(author_);
+ message = message_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(message_);
}
void LogEntry::setDate(const char*date_)
diff --git a/src/svnqt/path.cpp b/src/svnqt/path.cpp
index 4e0b14d..4281de7 100644
--- a/src/svnqt/path.cpp
+++ b/src/svnqt/path.cpp
@@ -213,7 +213,7 @@ namespace svn
if (pos == -1)
{
filename = basename;
- ext = TQString::fromLatin1("");
+ ext = TQString::tqfromLatin1("");
}
else
{
diff --git a/src/svnqt/revision.hpp b/src/svnqt/revision.hpp
index 178397e..5acaab2 100644
--- a/src/svnqt/revision.hpp
+++ b/src/svnqt/revision.hpp
@@ -38,7 +38,7 @@
// qt
#include <tqglobal.h>
#include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
// subversion api
#include "svn_types.h"
diff --git a/src/svnqt/status.cpp b/src/svnqt/status.cpp
index c5e47a3..a7913f6 100644
--- a/src/svnqt/status.cpp
+++ b/src/svnqt/status.cpp
@@ -175,7 +175,7 @@ namespace svn
m_hasReal=true;
}
- Status::Status (const Status & src)
+ tqStatus::tqStatus (const tqStatus & src)
: m_Data(new Status_private())
{
if( &src != this )
@@ -188,37 +188,37 @@ namespace svn
}
}
- Status::Status (const TQString&path, svn_wc_status2_t * status)
+ tqStatus::tqStatus (const TQString&path, svn_wc_status2_t * status)
: m_Data(new Status_private())
{
m_Data->init(path, status);
}
- Status::Status (const char*path, svn_wc_status2_t * status)
+ tqStatus::tqStatus (const char*path, svn_wc_status2_t * status)
: m_Data(new Status_private())
{
m_Data->init(TQString::FROMUTF8(path),status);
}
- Status::Status(const TQString&url,const DirEntryPtr&src)
+ tqStatus::tqStatus(const TQString&url,const DirEntryPtr&src)
: m_Data(new Status_private())
{
m_Data->init(url,src);
}
- Status::Status(const TQString&url,const InfoEntry&src)
+ tqStatus::tqStatus(const TQString&url,const InfoEntry&src)
: m_Data(new Status_private())
{
m_Data->init(url,src);
}
- Status::~Status ()
+ tqStatus::~tqStatus ()
{
delete m_Data;
}
- Status &
- Status::operator=(const Status & status)
+ tqStatus &
+ tqStatus::operator=(const tqStatus & status)
{
if (this == &status)
return *this;
@@ -231,89 +231,89 @@ namespace svn
}
const LockEntry&
- Status::lockEntry () const
+ tqStatus::lockEntry () const
{
return m_Data->m_Lock;
}
svn_wc_status_kind
- Status::reposPropStatus () const
+ tqStatus::reposProptqStatus () const
{
return m_Data->_repos_prop_status;
}
svn_wc_status_kind
- Status::reposTextStatus () const
+ tqStatus::reposTexttqStatus () const
{
return m_Data->_repos_text_status;
}
bool
- Status::isSwitched () const
+ tqStatus::isSwitched () const
{
return m_Data->_switched != 0;
}
bool
- Status::isCopied () const
+ tqStatus::isCopied () const
{
return m_Data->_copied;
}
bool
- Status::isLocked () const
+ tqStatus::isLocked () const
{
return m_Data->m_Lock.Locked();
}
bool
- Status::isModified()const
+ tqStatus::isModified()const
{
- return textStatus()==svn_wc_status_modified||propStatus()==svn_wc_status_modified
- ||textStatus ()==svn_wc_status_replaced;
+ return texttqStatus()==svn_wc_status_modified||proptqStatus()==svn_wc_status_modified
+ ||texttqStatus ()==svn_wc_status_replaced;
}
bool
- Status::isRealVersioned()const
+ tqStatus::isRealVersioned()const
{
return m_Data->m_hasReal;
}
bool
- Status::isVersioned () const
+ tqStatus::isVersioned () const
{
return m_Data->m_isVersioned;
}
svn_wc_status_kind
- Status::propStatus () const
+ tqStatus::proptqStatus () const
{
return m_Data->_prop_status;
}
svn_wc_status_kind
- Status::textStatus () const
+ tqStatus::texttqStatus () const
{
return m_Data->_text_status;
}
const Entry&
- Status::entry () const
+ tqStatus::entry () const
{
return m_Data->m_entry;
}
const TQString&
- Status::path () const
+ tqStatus::path () const
{
return m_Data->m_Path;
}
bool
- Status::validReposStatus()const
+ tqStatus::validRepostqStatus()const
{
- return reposTextStatus()!=svn_wc_status_none||reposPropStatus()!=svn_wc_status_none;
+ return reposTexttqStatus()!=svn_wc_status_none||reposProptqStatus()!=svn_wc_status_none;
}
bool
- Status::validLocalStatus()const
+ tqStatus::validLocaltqStatus()const
{
- return textStatus()!=svn_wc_status_none||propStatus()!=svn_wc_status_none;
+ return texttqStatus()!=svn_wc_status_none||proptqStatus()!=svn_wc_status_none;
}
}
diff --git a/src/svnqt/status.hpp b/src/svnqt/status.hpp
index 281f905..3b6e03e 100644
--- a/src/svnqt/status.hpp
+++ b/src/svnqt/status.hpp
@@ -53,13 +53,13 @@ namespace svn
*/
class Status_private;
- class SVNTQT_EXPORT Status
+ class SVNTQT_EXPORT tqStatus
{
public:
/**
* copy constructor
*/
- Status (const Status & src);
+ tqStatus (const tqStatus & src);
/**
* default constructor
@@ -67,27 +67,27 @@ namespace svn
* @param path path for this status entry
* @param status status entry
*/
- Status (const TQString&path=TQString(), svn_wc_status2_t * status = NULL);
+ tqStatus (const TQString&path=TQString(), svn_wc_status2_t * status = NULL);
/**
* default constructor
*
* @param path path for this status entry
* @param status status entry
*/
- Status (const char*path, svn_wc_status2_t * status = NULL);
+ tqStatus (const char*path, svn_wc_status2_t * status = NULL);
/**
* converting constructor
*/
- Status(const TQString&path,const DirEntryPtr&src);
+ tqStatus(const TQString&path,const DirEntryPtr&src);
/**
* converting constructor
*/
- Status(const TQString&path,const InfoEntry&src);
+ tqStatus(const TQString&path,const InfoEntry&src);
/**
* destructor
*/
- virtual ~Status ();
+ virtual ~tqStatus ();
/**
* @return path of status entry
@@ -105,13 +105,13 @@ namespace svn
* @return file status property enum of the "textual" component.
*/
svn_wc_status_kind
- textStatus () const;
+ texttqStatus () const;
/**
* @return file status property enum of the "property" component.
*/
svn_wc_status_kind
- propStatus () const;
+ proptqStatus () 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
- reposTextStatus () const;
+ reposTexttqStatus () const;
/**
* @return the entry's prop status in the repository
*/
svn_wc_status_kind
- reposPropStatus () const;
+ reposProptqStatus () const;
const LockEntry&
lockEntry () const;
bool
- validReposStatus()const;
+ validRepostqStatus()const;
bool
- validLocalStatus()const;
+ validLocaltqStatus()const;
/**
* assignment operator
*/
- Status &
- operator = (const Status &);
+ tqStatus &
+ operator = (const tqStatus &);
private:
Status_private*m_Data;
};
diff --git a/src/svnqt/svnqttypes.hpp b/src/svnqt/svnqttypes.hpp
index 5d16658..5b470f2 100644
--- a/src/svnqt/svnqttypes.hpp
+++ b/src/svnqt/svnqttypes.hpp
@@ -41,7 +41,7 @@ namespace svn
class InfoEntry;
class LogEntry;
class Revision;
- class Status;
+ class tqStatus;
class Targets;
class Path;
class StringArray;
@@ -61,7 +61,7 @@ namespace svn
/// shared_pointer for LogEntriesMap
typedef SharedPointer<LogEntriesMap> LogEntriesMapPtr;
- typedef SharedPointer<Status> StatusPtr;
+ typedef SharedPointer<tqStatus> StatusPtr;
typedef TQLIST<StatusPtr> StatusEntries;
typedef TQLIST<Revision> Revisions;
diff --git a/src/svnqt/tests/lsdir.cpp b/src/svnqt/tests/lsdir.cpp
index f3a2f6f..1ac0140 100644
--- a/src/svnqt/tests/lsdir.cpp
+++ b/src/svnqt/tests/lsdir.cpp
@@ -15,8 +15,8 @@ int main(int,char**)
m_Svnclient->setContext(m_CurrentContext);
svn::DirEntries dlist;
- TQString p = TQString("file://%1").arg(TESTREPOPATH);
- TQString l = TQString("%1").arg(TESTCOPATH);
+ TQString p = TQString("file://%1").tqarg(TESTREPOPATH);
+ TQString l = TQString("%1").tqarg(TESTCOPATH);
try {
dlist = m_Svnclient->list(svn::Path(p),svn::Revision::HEAD,svn::Revision::HEAD,svn::DepthInfinity,true);
diff --git a/src/svnqt/url.cpp b/src/svnqt/url.cpp
index 6f55356..2478997 100644
--- a/src/svnqt/url.cpp
+++ b/src/svnqt/url.cpp
@@ -64,10 +64,10 @@ namespace svn
{
bool cs = false;
if (
- url.startsWith("file://",cs) ||
- url.startsWith("/") ||
- url.startsWith("svn+file://",cs) ||
- url.startsWith("ksvn+file://",cs) )
+ url.tqstartsWith("file://",cs) ||
+ url.tqstartsWith("/") ||
+ url.tqstartsWith("svn+file://",cs) ||
+ url.tqstartsWith("ksvn+file://",cs) )
{
return true;
}
diff --git a/src/svnqt/version_check.cpp b/src/svnqt/version_check.cpp
index ceb8e49..44c79d3 100644
--- a/src/svnqt/version_check.cpp
+++ b/src/svnqt/version_check.cpp
@@ -52,8 +52,8 @@ namespace svn {
{
if (curr_version_string.length()==0) {
curr_version_string =
- TQString("%1.%2.%3.%4").arg(svn_client_version()->major).arg(svn_client_version()->minor)
- .arg(svn_client_version()->patch).arg(svn_client_version()->tag);
+ TQString("%1.%2.%3.%4").tqarg(svn_client_version()->major).tqarg(svn_client_version()->minor)
+ .tqarg(svn_client_version()->patch).tqarg(svn_client_version()->tag);
}
return curr_version_string;
}
diff --git a/src/svnqt/wc.cpp b/src/svnqt/wc.cpp
index bf3b5dd..4729696 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::fromLatin1("");
+ result = entry ? TQString::FROMUTF8(entry->repos) : TQString::tqfromLatin1("");
return result;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-23 18:36:12 +0000