From d7633c195a464e4d344ada9eea61afd10110598a Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 4 May 2011 19:54:24 +0000 Subject: 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 --- src/svnfrontend/ccontextlistener.cpp | 96 ++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'src/svnfrontend/ccontextlistener.cpp') diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp index a331db4..ddcdaa4 100644 --- a/src/svnfrontend/ccontextlistener.cpp +++ b/src/svnfrontend/ccontextlistener.cpp @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include +#include +#include class CContextListenerData { @@ -43,7 +43,7 @@ public: // data bool m_cancelMe; - QMutex m_CancelMutex; + TQMutex m_CancelMutex; bool noDialogs; }; @@ -59,7 +59,7 @@ CContextListenerData::~CContextListenerData() const int CContextListener::smax_actionstring=svn_wc_notify_failed_unlock+1; -const QString CContextListener::action_strings[]={ +const TQString CContextListener::action_strings[]={ I18N_NOOP("Add to revision control"), I18N_NOOP("Copy"), I18N_NOOP("Delete"), @@ -73,48 +73,48 @@ const QString CContextListener::action_strings[]={ I18N_NOOP("Update"), //svn_wc_notify_update_update I18N_NOOP("Update complete"), I18N_NOOP("Update external module"), - QString::null, // status completed - will not send is just noisy - I18N_NOOP("Status on external"), //svn_wc_notify_status_external + TQString(), // status completed - will not send is just noisy + I18N_NOOP("tqStatus on external"), //svn_wc_notify_status_external I18N_NOOP("Commit Modified"), I18N_NOOP("Commit Added"), I18N_NOOP("Commit Deleted"), I18N_NOOP("Commit Replaced"), - QString::null, //tx delta -> making ticks instead - QString::null, //svn_wc_notify_blame_revision - using ticks + TQString(), //tx delta -> making ticks instead + TQString(), //svn_wc_notify_blame_revision - using ticks I18N_NOOP("Locking"), I18N_NOOP("Unlocked"), I18N_NOOP("Lock failed"), I18N_NOOP("Unlock failed") }; -const QString CContextListener::notify_state_strings[]={ - QString::null, // = 0 - QString::null, +const TQString CContextListener::notify_state_strings[]={ + TQString(), // = 0 + TQString(), I18N_NOOP("unchanged"), I18N_NOOP("item wasn't present"), I18N_NOOP("unversioned item obstructed work"), // I18N_NOOP("Pristine state was modified."), // should send a signal with path instead of message? - QString::null, + TQString(), I18N_NOOP("Modified state had mods merged in."), I18N_NOOP("Modified state got conflicting mods.") }; -QString CContextListener::NotifyAction(svn_wc_notify_action_t action) +TQString CContextListener::NotifyAction(svn_wc_notify_action_t action) { if (action>=smax_actionstring||action<0) { - return QString::null; + return TQString(); } - return action_strings[action].isEmpty()?QString::null:i18n(action_strings[action]); + return action_strings[action].isEmpty()?TQString():i18n(action_strings[action]); } -QString CContextListener::NotifyState(svn_wc_notify_state_t state) +TQString CContextListener::NotifyState(svn_wc_notify_state_t state) { - if (state > svn_wc_notify_state_conflicted || state<0) return QString::null; - return notify_state_strings[state].isEmpty()?QString::null:i18n(notify_state_strings[state]); + if (state > svn_wc_notify_state_conflicted || state<0) return TQString(); + return notify_state_strings[state].isEmpty()?TQString():i18n(notify_state_strings[state]); } -CContextListener::CContextListener(QObject *parent, const char *name) - : QObject(parent, name), svn::ContextListener(),ref_count() +CContextListener::CContextListener(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), svn::ContextListener(),ref_count() { m_Data = new CContextListenerData(); } @@ -125,13 +125,13 @@ CContextListener::~CContextListener() delete m_Data; } -bool CContextListener::contextGetCachedLogin (const QString & realm,QString & username,QString & password) +bool CContextListener::contextGetCachedLogin (const TQString & realm,TQString & username,TQString & password) { PwStorage::self()->getCachedLogin(realm,username,password); return true; } -bool CContextListener::contextGetSavedLogin (const QString & realm,QString & username,QString & password) +bool CContextListener::contextGetSavedLogin (const TQString & realm,TQString & username,TQString & password) { PwStorage::self()->getLogin(realm,username,password); PwStorage::self()->setCachedLogin(realm,username,password); @@ -140,16 +140,16 @@ bool CContextListener::contextGetSavedLogin (const QString & realm,QString & use } bool CContextListener::contextGetLogin ( - const QString & realm, - QString & username, - QString & password, + const TQString & realm, + TQString & username, + TQString & password, bool & maySave) { maySave = false; emit waitShow(true); emit sendNotify(realm); AuthDialogImpl auth(realm,username); - if (auth.exec()==QDialog::Accepted) { + if (auth.exec()==TQDialog::Accepted) { username=auth.Username(); password=auth.Password(); maySave = (Kdesvnsettings::passwords_in_wallet()?false:auth.maySave()); @@ -166,7 +166,7 @@ bool CContextListener::contextGetLogin ( return false; } -void CContextListener::contextNotify(const QString&aMsg) +void CContextListener::contextNotify(const TQString&aMsg) { if (aMsg.isEmpty()) { emit tickProgress(); @@ -183,12 +183,12 @@ void CContextListener::contextNotify (const char *path, svn_wc_notify_state_t prop_state, svn_revnum_t revision) { - QString msg; - QString aString = NotifyAction(action); + TQString msg; + TQString aString = NotifyAction(action); if (!aString.isEmpty()) { - QTextStream ts(&msg,IO_WriteOnly); - ts << NotifyAction(action) << " " << QString::FROMUTF8(path); + TQTextStream ts(&msg,IO_WriteOnly); + ts << NotifyAction(action) << " " << TQString::FROMUTF8(path); if (revision>-1) { ts << " (Rev "<content_state,action->prop_state,action->revision); // return; // } -// QString aString = NotifyAction(action->action); +// TQString aString = NotifyAction(action->action); } void CContextListener::sendTick() @@ -219,7 +219,7 @@ void CContextListener::sendTick() bool CContextListener::contextCancel() { { - QMutexLocker lock(&(m_Data->m_CancelMutex)); + TQMutexLocker lock(&(m_Data->m_CancelMutex)); if (m_Data->m_cancelMe) { m_Data->m_cancelMe=false; return true; @@ -230,11 +230,11 @@ bool CContextListener::contextCancel() return false; } -bool CContextListener::contextGetLogMessage (QString & msg,const svn::CommitItemList&items) +bool CContextListener::contextGetLogMessage (TQString & msg,const svn::CommitItemList&items) { bool isOk = false; emit waitShow(true); - QString logMessage = Logmsg_impl::getLogmessage(items,&isOk,0,0,0); + TQString logMessage = Logmsg_impl::getLogmessage(items,&isOk,0,0,0); if (isOk) { msg = logMessage; } @@ -265,13 +265,13 @@ svn::ContextListener::SslServerTrustAnswer CContextListener::contextSslServerTru return ACCEPT_PERMANENTLY; } -bool CContextListener::contextSslClientCertPrompt (QString & certFile) +bool CContextListener::contextSslClientCertPrompt (TQString & certFile) { kdDebug()<<"CContextListener::contextSslClientCertPrompt " << certFile << endl; emit waitShow(true); - QString afile = KFileDialog::getOpenFileName(QString::null, - QString::null, + TQString afile = KFileDialog::getOpenFileName(TQString(), + TQString(), 0, i18n("Open a file with a #PKCS12 certificate")); emit waitShow(false); @@ -282,21 +282,21 @@ bool CContextListener::contextSslClientCertPrompt (QString & certFile) return true; } -bool CContextListener::contextLoadSslClientCertPw(QString&password,const QString&realm) +bool CContextListener::contextLoadSslClientCertPw(TQString&password,const TQString&realm) { PwStorage::self()->getCertPw(realm,password); return true; } -bool CContextListener::contextSslClientCertPwPrompt (QString & password, - const QString & realm, bool & maysave) +bool CContextListener::contextSslClientCertPwPrompt (TQString & password, + const TQString & realm, bool & maysave) { maysave = false; emit waitShow(true); - QCString npass; + TQCString npass; int keep = 1; int res = KPasswordDialog::getPassword(npass, - i18n("Enter password for realm %1").arg(realm), + i18n("Enter password for realm %1").tqarg(realm), &keep); emit waitShow(false); if (res!=KPasswordDialog::Accepted) { @@ -312,13 +312,13 @@ bool CContextListener::contextSslClientCertPwPrompt (QString & password, void CContextListener::setCanceled(bool how) { - QMutexLocker lock(&(m_Data->m_CancelMutex)); + TQMutexLocker lock(&(m_Data->m_CancelMutex)); m_Data->m_cancelMe = how; } -QStringList CContextListener::failure2Strings(apr_uint32_t acceptedFailures) +TQStringList CContextListener::failure2Strings(apr_uint32_t acceptedFailures) { - QStringList res; + TQStringList res; if (acceptedFailures&SVN_AUTH_SSL_UNKNOWNCA) { res << i18n("The certificate is not issued by a trusted authority. Use the fingerprint to validate the certificate manually!"); } @@ -337,7 +337,7 @@ QStringList CContextListener::failure2Strings(apr_uint32_t acceptedFailures) return res; } -QString CContextListener::translate(const QString&what) +TQString CContextListener::translate(const TQString&what) { return i18n(what); } -- cgit v1.2.1