diff options
Diffstat (limited to 'src/svnqt/contextdata.cpp')
| -rw-r--r-- | src/svnqt/contextdata.cpp | 54 | 
1 files changed, 27 insertions, 27 deletions
| diff --git a/src/svnqt/contextdata.cpp b/src/svnqt/contextdata.cpp index b4c2ea4..4bbfabc 100644 --- a/src/svnqt/contextdata.cpp +++ b/src/svnqt/contextdata.cpp @@ -29,7 +29,7 @@  namespace svn { -ContextData::ContextData(const QString & configDir_) +ContextData::ContextData(const TQString & configDir_)      : listener (0), logIsSet (false),          m_promptCounter (0), m_ConfigDir(configDir_)  { @@ -203,7 +203,7 @@ ContextData::ContextData(const QString & configDir_)        m_ctx->conflict_func = onWcConflictResolver;        m_ctx->conflict_baton = this; -      m_ctx->client_name = "SvnQt wrapper client"; +      m_ctx->client_name = "SvnTQt wrapper client";        initMimeTypes();  #endif  } @@ -214,12 +214,12 @@ ContextData::~ContextData()  } -const QString&ContextData::getLogMessage () const +const TQString&ContextData::getLogMessage () const  {      return logMessage;  } -bool ContextData::retrieveLogMessage (QString & msg,const CommitItemList&_itemlist) +bool ContextData::retrieveLogMessage (TQString & msg,const CommitItemList&_itemlist)  {      bool ok = false;      if (listener) { @@ -262,12 +262,12 @@ bool ContextData::cancel()          return false;      }  } -const QString& ContextData::getUsername () const +const TQString& ContextData::getUsername () const  {      return username;  } -const QString& ContextData::getPassword() const +const TQString& ContextData::getPassword() const  {      return password;  } @@ -281,8 +281,8 @@ bool ContextData::retrieveLogin (const char * username_,      if (listener == 0)          return false; -    username = QString::FROMUTF8(username_); -    ok = listener->contextGetLogin(QString::FROMUTF8(realm),username, password, may_save); +    username = TQString::FROMUTF8(username_); +    ok = listener->contextGetLogin(TQString::FROMUTF8(realm),username, password, may_save);      return ok;  } @@ -297,8 +297,8 @@ bool ContextData::retrieveSavedLogin (const char * username_,      if (listener == 0)          return false; -    username = QString::FROMUTF8(username_); -    ok = listener->contextGetSavedLogin(QString::FROMUTF8(realm),username, password); +    username = TQString::FROMUTF8(username_); +    ok = listener->contextGetSavedLogin(TQString::FROMUTF8(realm),username, password);      return ok;  } @@ -312,8 +312,8 @@ bool ContextData::retrieveCachedLogin (const char * username_,      if (listener == 0)          return false; -    username = QString::FROMUTF8(username_); -    ok = listener->contextGetCachedLogin(QString::FROMUTF8(realm),username, password); +    username = TQString::FROMUTF8(username_); +    ok = listener->contextGetCachedLogin(TQString::FROMUTF8(realm),username, password);      return ok;  } @@ -322,7 +322,7 @@ svn_client_ctx_t *ContextData::ctx()      return m_ctx;  } -const QString&ContextData::configDir()const +const TQString&ContextData::configDir()const  {      return m_ConfigDir;  } @@ -354,7 +354,7 @@ void ContextData::setAuthCache(bool value)          SVN_AUTH_PARAM_NO_AUTH_CACHE,param);  } -void ContextData::setLogin(const QString& usr, const QString& pwd) +void ContextData::setLogin(const TQString& usr, const TQString& pwd)  {      username = usr;      password = pwd; @@ -363,7 +363,7 @@ void ContextData::setLogin(const QString& usr, const QString& pwd)      svn_auth_set_parameter (ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD, password.TOUTF8());  } -void ContextData::setLogMessage (const QString& msg) +void ContextData::setLogMessage (const TQString& msg)  {      logMessage = msg;      if (msg.isNull()) { @@ -382,7 +382,7 @@ svn_error_t *ContextData::onLogMsg (const char **log_msg,      ContextData * data = 0;      SVN_ERR (getContextData (baton, &data)); -    QString msg; +    TQString msg;      if (data->logIsSet) {          msg = data->getLogMessage ();      } else { @@ -410,7 +410,7 @@ svn_error_t *ContextData::onLogMsg2 (const char **log_msg,      ContextData * data = 0;      SVN_ERR (getContextData (baton, &data)); -    QString msg; +    TQString msg;      if (data->logIsSet) {          msg = data->getLogMessage ();      } else { @@ -440,7 +440,7 @@ svn_error_t *ContextData::onLogMsg3 (const char **log_msg,      ContextData * data = 0;      SVN_ERR (getContextData (baton, &data)); -    QString msg; +    TQString msg;      if (data->logIsSet) {          msg = data->getLogMessage ();      } else { @@ -508,7 +508,7 @@ svn_error_t *ContextData::onCachedPrompt(svn_auth_cred_simple_t **cred,          return SVN_NO_ERROR;      svn_auth_cred_simple_t* lcred = (svn_auth_cred_simple_t*)              apr_palloc (pool, sizeof (svn_auth_cred_simple_t)); -    QByteArray l; +    TQByteArray l;      l = data->getPassword().TOUTF8();      lcred->password = apr_pstrndup (pool,l,l.size());      l = data->getUsername().TOUTF8(); @@ -535,7 +535,7 @@ svn_error_t *ContextData::onSavedPrompt(svn_auth_cred_simple_t **cred,          return SVN_NO_ERROR;      svn_auth_cred_simple_t* lcred = (svn_auth_cred_simple_t*)              apr_palloc (pool, sizeof (svn_auth_cred_simple_t)); -    QByteArray l; +    TQByteArray l;      l = data->getPassword().TOUTF8();      lcred->password = apr_pstrndup (pool,l,l.size());      l = data->getUsername().TOUTF8(); @@ -563,7 +563,7 @@ svn_error_t *ContextData::onSimplePrompt (svn_auth_cred_simple_t **cred,        svn_auth_cred_simple_t* lcred = (svn_auth_cred_simple_t*)          apr_palloc (pool, sizeof (svn_auth_cred_simple_t)); -      QByteArray l; +      TQByteArray l;        l = data->getPassword().TOUTF8();        lcred->password = apr_pstrndup (pool,l,l.size());        l = data->getUsername().TOUTF8(); @@ -630,7 +630,7 @@ svn_error_t * ContextData::onSslClientCertPrompt (svn_auth_cred_ssl_client_cert_      ContextData * data = 0;      SVN_ERR (getContextData (baton, &data)); -    QString certFile; +    TQString certFile;      if (!data->listener->contextSslClientCertPrompt (certFile))          return data->generate_cancel_error(); @@ -654,9 +654,9 @@ svn_error_t *ContextData::onFirstSslClientCertPw (      ContextData * data = 0;      SVN_ERR (getContextData (baton, &data)); -    QString password; +    TQString password;      bool may_save = maySave != 0; -    if (!data->listener->contextLoadSslClientCertPw(password, QString::FROMUTF8(realm))) +    if (!data->listener->contextLoadSslClientCertPw(password, TQString::FROMUTF8(realm)))          return SVN_NO_ERROR;      svn_auth_cred_ssl_client_cert_pw_t *cred_ = @@ -680,9 +680,9 @@ svn_error_t * ContextData::onSslClientCertPwPrompt(      ContextData * data = 0;      SVN_ERR (getContextData (baton, &data)); -    QString password; +    TQString password;      bool may_save = maySave != 0; -    if (!data->listener->contextSslClientCertPwPrompt (password, QString::FROMUTF8(realm), may_save)) +    if (!data->listener->contextSslClientCertPwPrompt (password, TQString::FROMUTF8(realm), may_save))          return data->generate_cancel_error();      svn_auth_cred_ssl_client_cert_pw_t *cred_ = @@ -714,7 +714,7 @@ void ContextData::reset()  svn_error_t * ContextData::generate_cancel_error()  { -    return svn_error_create (SVN_ERR_CANCELLED, 0, listener->translate(QString::FROMUTF8("Cancelled by user.")).TOUTF8()); +    return svn_error_create (SVN_ERR_CANCELLED, 0, listener->translate(TQString::FROMUTF8("Cancelled by user.")).TOUTF8());  }  void ContextData::onProgress(apr_off_t progress, apr_off_t total, void*baton, apr_pool_t*) | 
