diff options
Diffstat (limited to 'src/kiosvn/kiolistener.cpp')
| -rw-r--r-- | src/kiosvn/kiolistener.cpp | 142 |
1 files changed, 71 insertions, 71 deletions
diff --git a/src/kiosvn/kiolistener.cpp b/src/kiosvn/kiolistener.cpp index f3b7b68..28536d7 100644 --- a/src/kiosvn/kiolistener.cpp +++ b/src/kiosvn/kiolistener.cpp @@ -50,27 +50,27 @@ bool KioListener::contextCancel() /*! - \fn KioListener::contextGetLogMessage (QString & msg) + \fn KioListener::contextGetLogMessage (TQString & msg) */ -bool KioListener::contextGetLogMessage (QString & msg,const svn::CommitItemList&_items) +bool KioListener::contextGetLogMessage (TQString & msg,const svn::CommitItemList&_items) { #if 1 - QByteArray reply; - QByteArray params; - QCString replyType; - QDataStream stream(params,IO_WriteOnly); + TQByteArray reply; + TQByteArray params; + TQCString replyType; + TQDataStream stream(params,IO_WriteOnly); if (_items.count()>0) { - QMap<QString,QString> list; + TQMap<TQString,TQString> list; for (unsigned i = 0;i<_items.count();++i) { if (_items[i].path().isEmpty()) { - list[_items[i].url()]=QChar(_items[i].actionType()); + list[_items[i].url()]=TQChar(_items[i].actionType()); } else { - list[_items[i].path()]=QChar(_items[i].actionType()); + list[_items[i].path()]=TQChar(_items[i].actionType()); } } stream << list; - if (!par->dcopClient()->call("kded","kdesvnd","get_logmsg(QMap<QString,QString>)",params,replyType,reply)) { + if (!par->dcopClient()->call("kded","kdesvnd","get_logmsg(TQMap<TQString,TQString>)",params,replyType,reply)) { msg = "Communication with dcop failed"; kdWarning()<<msg<<endl; return false; @@ -83,13 +83,13 @@ bool KioListener::contextGetLogMessage (QString & msg,const svn::CommitItemList& } } - if (replyType!="QStringList") { + if (replyType!=TQSTRINGLIST_OBJECT_NAME_STRING) { msg = "Wrong reply type"; kdWarning()<<msg<<endl; return false; } - QDataStream stream2(reply,IO_ReadOnly); - QStringList lt; + TQDataStream stream2(reply,IO_ReadOnly); + TQStringList lt; stream2>>lt; if (lt.count()!=1) { msg = "Wrong or missing log (may cancel pressed)."; @@ -110,15 +110,15 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action if (par->wasKilled()) { return; } - QString userstring; + TQString userstring; switch(action) { case svn_wc_notify_add: { if (mime_type && (svn_mime_type_is_binary (mime_type))) - userstring = i18n( "A (bin) %1" ).arg( path ); + userstring = i18n( "A (bin) %1" ).tqarg( path ); else - userstring = i18n( "A %1" ).arg( path ); + userstring = i18n( "A %1" ).tqarg( path ); break; } break; @@ -126,33 +126,33 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action break; case svn_wc_notify_delete: //delete m_HasChanges = TRUE; - userstring = i18n( "D %1" ).arg( path ); + userstring = i18n( "D %1" ).tqarg( path ); break; case svn_wc_notify_restore : //restore - userstring=i18n( "Restored %1." ).arg( path ); + userstring=i18n( "Restored %1." ).tqarg( path ); break; case svn_wc_notify_revert : //revert - userstring=i18n( "Reverted %1." ).arg( path ); + userstring=i18n( "Reverted %1." ).tqarg( path ); break; case svn_wc_notify_failed_revert: //failed revert - userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path ); + userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path ); break; case svn_wc_notify_resolved: //resolved - userstring=i18n( "Resolved conflicted state of %1." ).arg( path ); + userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path ); break; case svn_wc_notify_skip: //skip if ( content_state == svn_wc_notify_state_missing ) - userstring=i18n("Skipped missing target %1.").arg( path ); + userstring=i18n("Skipped missing target %1.").tqarg( path ); else - userstring=i18n("Skipped %1.").arg( path ); + userstring=i18n("Skipped %1.").tqarg( path ); break; case svn_wc_notify_update_delete: //update_delete m_HasChanges = TRUE; - userstring=i18n( "D %1" ).arg( path ); + userstring=i18n( "D %1" ).tqarg( path ); break; case svn_wc_notify_update_add: //update_add m_HasChanges = TRUE; - userstring=i18n( "A %1" ).arg( path ); + userstring=i18n( "A %1" ).tqarg( path ); break; case svn_wc_notify_update_update: //update_update { @@ -187,7 +187,7 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action || content_state == svn_wc_notify_state_unknown) && (prop_state == svn_wc_notify_state_unchanged || prop_state == svn_wc_notify_state_unknown))) - userstring += QString( " " ) + path; + userstring += TQString( " " ) + path; } break; } @@ -195,13 +195,13 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action { if (!m_External) { if (SVN_IS_VALID_REVNUM(revision)) { - userstring = i18n("Finished at revision %1.").arg(revision); + userstring = i18n("Finished at revision %1.").tqarg(revision); } else { userstring = i18n("Finished."); } } else { if (SVN_IS_VALID_REVNUM(revision)) { - userstring = i18n("Finished external at revision %1.").arg(revision); + userstring = i18n("Finished external at revision %1.").tqarg(revision); } else { userstring = i18n("Finished external."); } @@ -212,30 +212,30 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action break; case svn_wc_notify_update_external: //update_external m_External = TRUE; - userstring = i18n("Fetching external item into %1." ).arg( path ); + userstring = i18n("Fetching external item into %1." ).tqarg( path ); break; case svn_wc_notify_status_completed: //status_completed if (SVN_IS_VALID_REVNUM (revision)) - userstring = i18n( "Status against revision: %1.").arg( revision ); + userstring = i18n( "tqStatus against revision: %1.").tqarg( revision ); break; case svn_wc_notify_status_external: //status_external - userstring = i18n("Performing status on external item at %1.").arg( path ); + userstring = i18n("Performing status on external item at %1.").tqarg( path ); break; case svn_wc_notify_commit_modified: //commit_modified - userstring = i18n( "Sending %1.").arg( path ); + userstring = i18n( "Sending %1.").tqarg( path ); break; case svn_wc_notify_commit_added: //commit_added if (mime_type && svn_mime_type_is_binary (mime_type)) { - userstring = i18n( "Adding (bin) %1.").arg( path ); + userstring = i18n( "Adding (bin) %1.").tqarg( path ); } else { - userstring = i18n( "Adding %1.").arg( path ); + userstring = i18n( "Adding %1.").tqarg( path ); } break; case svn_wc_notify_commit_deleted: //commit_deleted - userstring = i18n( "Deleting %1.").arg( path ); + userstring = i18n( "Deleting %1.").tqarg( path ); break; case svn_wc_notify_commit_replaced: //commit_replaced - userstring = i18n( "Replacing %1.").arg( path ); + userstring = i18n( "Replacing %1.").tqarg( path ); break; case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta if (!m_FirstTxDelta) { @@ -253,14 +253,14 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action default: break; } - par->setMetaData(QString::number(counter()).rightJustify( 10,'0' )+ "path" , QString::FROMUTF8( path )); - par->setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "action", QString::number( action )); - par->setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "kind", QString::number( kind )); - par->setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "mime_t", QString::FROMUTF8( mime_type )); - par->setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "content", QString::number( content_state )); - par->setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "prop", QString::number( prop_state )); - par->setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "rev", QString::number( revision )); - par->setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string", userstring ); + par->setMetaData(TQString::number(counter()).rightJustify( 10,'0' )+ "path" , TQString::FROMUTF8( path )); + par->setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "action", TQString::number( action )); + par->setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "kind", TQString::number( kind )); + par->setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "mime_t", TQString::FROMUTF8( mime_type )); + par->setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "content", TQString::number( content_state )); + par->setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "prop", TQString::number( prop_state )); + par->setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "rev", TQString::number( revision )); + par->setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", userstring ); incCounter(); } @@ -272,16 +272,16 @@ void KioListener::contextNotify (const svn_wc_notify_t *action) action->content_state,action->prop_state,action->revision); // return; // } -// QString aString = NotifyAction(action->action); +// TQString aString = NotifyAction(action->action); } svn::ContextListener::SslServerTrustAnswer KioListener::contextSslServerTrustPrompt (const SslServerTrustData & data, apr_uint32_t & acceptedFailures) { - QByteArray reply; - QByteArray params; - QCString replyType; - QDataStream stream(params,IO_WriteOnly); + TQByteArray reply; + TQByteArray params; + TQCString replyType; + TQDataStream stream(params,IO_WriteOnly); stream << data.hostname << data.fingerprint << data.validFrom @@ -290,7 +290,7 @@ KioListener::contextSslServerTrustPrompt (const SslServerTrustData & data, apr_u << data.realm; if (!par->dcopClient()->call("kded","kdesvnd", - "get_sslaccept(QString,QString,QString,QString,QString,QString)", + "get_sslaccept(TQString,TQString,TQString,TQString,TQString,TQString)", params,replyType,reply)) { kdWarning()<<"Communication with dcop failed"<<endl; return DONT_ACCEPT; @@ -299,7 +299,7 @@ KioListener::contextSslServerTrustPrompt (const SslServerTrustData & data, apr_u kdWarning()<<"Wrong reply type"<<endl; return DONT_ACCEPT; } - QDataStream stream2(reply,IO_ReadOnly); + TQDataStream stream2(reply,IO_ReadOnly); int res; stream2>>res; switch (res) { @@ -318,27 +318,27 @@ KioListener::contextSslServerTrustPrompt (const SslServerTrustData & data, apr_u return ACCEPT_TEMPORARILY; } -bool KioListener::contextLoadSslClientCertPw(QString&password,const QString&realm) +bool KioListener::contextLoadSslClientCertPw(TQString&password,const TQString&realm) { return PwStorage::self()->getCertPw(realm,password); } -bool KioListener::contextSslClientCertPrompt (QString & certFile) +bool KioListener::contextSslClientCertPrompt (TQString & certFile) { - QByteArray reply; - QByteArray params; - QCString replyType; + TQByteArray reply; + TQByteArray params; + TQCString replyType; if (!par->dcopClient()->call("kded","kdesvnd", "get_sslclientcertfile()", params,replyType,reply)) { kdWarning()<<"Communication with dcop failed"<<endl; return false; } - if (replyType!="QString") { + if (replyType!=TQSTRING_OBJECT_NAME_STRING) { kdWarning()<<"Wrong reply type"<<endl; return false; } - QDataStream stream2(reply,IO_ReadOnly); + TQDataStream stream2(reply,IO_ReadOnly); stream2>>certFile; if (certFile.isEmpty()) { return false; @@ -346,43 +346,43 @@ bool KioListener::contextSslClientCertPrompt (QString & certFile) return true; } -bool KioListener::contextSslClientCertPwPrompt (QString & password, - const QString & realm, bool & maySave) +bool KioListener::contextSslClientCertPwPrompt (TQString & password, + const TQString & realm, bool & maySave) { return false; } -bool KioListener::contextGetSavedLogin (const QString & realm,QString & username,QString & password) +bool KioListener::contextGetSavedLogin (const TQString & realm,TQString & username,TQString & password) { PwStorage::self()->getLogin(realm,username,password); return true; } -bool KioListener::contextGetCachedLogin (const QString & realm,QString & username,QString & password) +bool KioListener::contextGetCachedLogin (const TQString & realm,TQString & username,TQString & password) { return true; } -bool KioListener::contextGetLogin (const QString & realm, QString & username, QString & password, bool & maySave) +bool KioListener::contextGetLogin (const TQString & realm, TQString & username, TQString & password, bool & maySave) { - QByteArray reply; - QByteArray params; - QCString replyType; + TQByteArray reply; + TQByteArray params; + TQCString replyType; - QDataStream stream(params,IO_WriteOnly); + TQDataStream stream(params,IO_WriteOnly); stream << realm; stream << username; - if (!par->dcopClient()->call("kded","kdesvnd","get_login(QString,QString)",params,replyType,reply)) { + if (!par->dcopClient()->call("kded","kdesvnd","get_login(TQString,TQString)",params,replyType,reply)) { kdWarning()<<"Communication with dcop failed"<<endl; return false; } - if (replyType!="QStringList") { + if (replyType!=TQSTRINGLIST_OBJECT_NAME_STRING) { kdWarning()<<"Wrong reply type"<<endl; return false; } - QDataStream stream2(reply,IO_ReadOnly); - QStringList lt; + TQDataStream stream2(reply,IO_ReadOnly); + TQStringList lt; stream2>>lt; if (lt.count()!=3) { kdDebug()<<"Wrong or missing auth list (may cancel pressed)." << endl; |