TDE
/
kopete-otr
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kopete-otr
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 96f6451b95
commit b860acda13
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File

6
src/otrlchatinterface.cpp
Unescape View File

@ -175,7 +175,7 @@ static void protocol_name_free(void *opdata, const char *protocol_name){
static void new_fingerprint(void *opdata, OtrlUserState us, const char *accountname, const char *protocol, const char *username, unsigned char fingerprint[20]){
kdDebug() << "Received a new Fingerprint" << endl;
Kopete::ChatSession *session= ((Kopete::ChatSession*)opdata);
Kopete::Message msg( session->members().getFirst(), session->account()->myself(), i18n("<b>Received a new fingerprint from <a>%1</a>. You should authenticate this contact.</b>").tqarg( session->members().getFirst()->contactId() ), Kopete::Message::Internal, Kopete::Message::RichText );
Kopete::Message msg( session->members().getFirst(), session->account()->myself(), i18n("<b>Received a new fingerprint from <a>%1</a>. You should authenticate this contact.</b>").arg( session->members().getFirst()->contactId() ), Kopete::Message::Internal, Kopete::Message::RichText );
session->appendMessage( msg );
}
@ -300,7 +300,7 @@ int OtrlChatInterface::decryptMessage( TQString *msg, TQString accountId,
tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED);
if( tlv ){
Kopete::Message msg( chatSession->members().getFirst(), chatSession->account()->myself(), i18n("<b>%1</b> has ended the OTR session. You should do the same.").tqarg(chatSession->members().getFirst()->contactId()) , Kopete::Message::Internal, Kopete::Message::RichText );
Kopete::Message msg( chatSession->members().getFirst(), chatSession->account()->myself(), i18n("<b>%1</b> has ended the OTR session. You should do the same.").arg(chatSession->members().getFirst()->contactId()) , Kopete::Message::Internal, Kopete::Message::RichText );
chatSession->appendMessage( msg );
OTRPlugin::plugin()->emitGoneSecure( chatSession, 3 );
@ -628,7 +628,7 @@ void OtrlChatInterface::checkFilePermissions( TQString file ){
if( fingerprint != NULL ){
int doVerify = KMessageBox::questionYesNo(
NULL,
i18n("Please contact %1 via another secure way and verify that the following Fingerprint is correct:").tqarg( formatContact(session->members().getFirst()->contactId())) + "\n\n" + fingerprint + "\n\n" + i18n("Are you sure you want to trust this fingerprint?"),
i18n("Please contact %1 via another secure way and verify that the following Fingerprint is correct:").arg( formatContact(session->members().getFirst()->contactId())) + "\n\n" + fingerprint + "\n\n" + i18n("Are you sure you want to trust this fingerprint?"),
i18n("Verify fingerprint") );
if( doVerify == KMessageBox::Yes ){
return true;

4
src/otrplugin.cpp
Unescape View File

@ -222,9 +222,9 @@ void OTRPlugin::slotEnableOtr( Kopete::ChatSession *session, bool enable ){
TQString body = otrlChatInterface->getDefaultQuery( session->account()->accountId() );
Kopete::Message msg1( session->account()->myself(), session->members().getFirst(), TQString( body ), Kopete::Message::Outbound );
if( otrlChatInterface->privState( session ) > 0 ){
body = i18n("Attempting to refresh the OTR session with <b>%1</b>...").tqarg( otrlChatInterface->formatContact( session->members().getFirst()->contactId() ) );
body = i18n("Attempting to refresh the OTR session with <b>%1</b>...").arg( otrlChatInterface->formatContact( session->members().getFirst()->contactId() ) );
} else {
body = i18n("Attempting to start a private OTR session with <b>%1</b>...").tqarg( otrlChatInterface->formatContact( session->members().getFirst()->contactId() ) );
body = i18n("Attempting to start a private OTR session with <b>%1</b>...").arg( otrlChatInterface->formatContact( session->members().getFirst()->contactId() ) );
}
Kopete::Message msg2( session->account()->myself(), session->members().getFirst(), body, Kopete::Message::Internal, Kopete::Message::RichText );

6
src/otrpreferences.cpp
Unescape View File

@ -154,7 +154,7 @@ void OTRPreferences::verifyFingerprint(){
int doVerify = KMessageBox::questionYesNo(
this,
i18n("Please contact %1 via another secure way and verify that the following Fingerprint is correct:").tqarg(preferencesDialog->tbFingerprints->text( preferencesDialog->tbFingerprints->currentRow(), 0 )) + "\n\n" + preferencesDialog->tbFingerprints->text( preferencesDialog->tbFingerprints->currentRow(), 3 ) + "\n\n" + i18n("Are you sure you want to trust this fingerprint?"), i18n("Verify fingerprint") );
i18n("Please contact %1 via another secure way and verify that the following Fingerprint is correct:").arg(preferencesDialog->tbFingerprints->text( preferencesDialog->tbFingerprints->currentRow(), 0 )) + "\n\n" + preferencesDialog->tbFingerprints->text( preferencesDialog->tbFingerprints->currentRow(), 3 ) + "\n\n" + i18n("Are you sure you want to trust this fingerprint?"), i18n("Verify fingerprint") );
if( doVerify == KMessageBox::Yes ){
@ -188,9 +188,9 @@ void OTRPreferences::forgetFingerprint(){
}
}
TQAlignTableItem :: TQAlignTableItem( TQTable *table, EditType editType, const TQString& text, int tqalignment )
TQAlignTableItem :: TQAlignTableItem( TQTable *table, EditType editType, const TQString& text, int alignment )
: TQTableItem( table, editType, text ) {
align = tqalignment;
align = alignment;
}

2
src/otrpreferences.h
Unescape View File

@ -56,7 +56,7 @@ private slots: // Public slots
class TQAlignTableItem : public TQTableItem {
public :
TQAlignTableItem(TQTable *table, EditType editType, const TQString& text, int tqalignment);
TQAlignTableItem(TQTable *table, EditType editType, const TQString& text, int alignment);
private :
int align;

2
src/smppopup.cpp
Unescape View File

@ -35,7 +35,7 @@ SMPPopup::SMPPopup(TQWidget* parent, const char* name, WFlags fl, ConnContext *c
this->context = context;
this->session = session;
this->initiate = initiate;
tlText->setText( i18n("Please enter the secret passphrase to authenticate %1:").tqarg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
tlText->setText( i18n("Please enter the secret passphrase to authenticate %1:").arg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
}
SMPPopup::~SMPPopup()

2
src/smppopupui.ui
Unescape View File

@ -81,7 +81,7 @@
<property name="text">
<string>Please enter the secret passphrase to authenticate this contact.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>

6
src/verifypopup.cpp
Unescape View File

@ -36,9 +36,9 @@ VerifyPopup::VerifyPopup(TQWidget* parent, const char* name, Kopete::ChatSession
: VerifyPopupUI(parent,name, modal,fl)
{
this->session = session;
alContact->setText(i18n("Verify fingerprint for %1.").tqarg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
alFingerprint->setText(i18n("The received fingerprint is:\n\n%1\n\nContact %2 via another secure channel and verify that this fingerprint is correct.").tqarg(OtrlChatInterface::self()->findActiveFingerprint(session)).tqarg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
alVerified->setText(i18n("verified that this is in fact the correct fingerprint for %1").tqarg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
alContact->setText(i18n("Verify fingerprint for %1.").arg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
alFingerprint->setText(i18n("The received fingerprint is:\n\n%1\n\nContact %2 via another secure channel and verify that this fingerprint is correct.").arg(OtrlChatInterface::self()->findActiveFingerprint(session)).arg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
alVerified->setText(i18n("verified that this is in fact the correct fingerprint for %1").arg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
cbVerify->insertItem(i18n("I have not"));
cbVerify->insertItem(i18n("I have"));
if( OtrlChatInterface::self()->isVerified(session)){

2
src/verifypopupui.ui
Unescape View File

@ -80,7 +80,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>

Write Preview
Loading…
Cancel
Save