From 9f51f088d1c9b4ad562f6e1107b2ccb3159b44ce Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:32:19 -0600 Subject: [PATCH] Rename a number of old tq methods that are no longer tq specific --- src/otrlchatinterface.cpp | 6 +++--- src/otrplugin.cpp | 8 ++++---- src/otrpreferences.cpp | 8 ++++---- src/otrpreferences.h | 2 +- src/otrprefs.ui | 6 +++--- src/privkeypopupui.ui | 2 +- src/smppopup.cpp | 2 +- src/smppopupui.ui | 2 +- src/verifypopup.cpp | 6 +++--- src/verifypopupui.ui | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/otrlchatinterface.cpp b/src/otrlchatinterface.cpp index 3743b80..0ba2ce1 100644 --- a/src/otrlchatinterface.cpp +++ b/src/otrlchatinterface.cpp @@ -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("Received a new fingerprint from %1. You should authenticate this contact.").tqarg( session->members().getFirst()->contactId() ), Kopete::Message::Internal, Kopete::Message::RichText ); + Kopete::Message msg( session->members().getFirst(), session->account()->myself(), i18n("Received a new fingerprint from %1. You should authenticate this contact.").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("%1 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("%1 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; diff --git a/src/otrplugin.cpp b/src/otrplugin.cpp index 93f1720..c99b316 100644 --- a/src/otrplugin.cpp +++ b/src/otrplugin.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include #include #include @@ -143,7 +143,7 @@ OTRPlugin::OTRPlugin( TQObject *parent, const char *name, const TQStringList & / //adding menu to contaclists menubar and contacts popup menu TQStringList policies; policies << i18n("&Default") << i18n("Al&ways") << i18n("&Opportunistic") << i18n("&Manual") << i18n("Ne&ver"); - otrPolicyMenu = new KSelectAction( i18n( "&OTR Policy" ), TQString::tqfromLatin1("kopete_otr"), 0, actionCollection(), "otr_policy" ); + otrPolicyMenu = new KSelectAction( i18n( "&OTR Policy" ), TQString::fromLatin1("kopete_otr"), 0, actionCollection(), "otr_policy" ); otrPolicyMenu->setItems( policies ); otrPolicyMenu->popupMenu()->insertSeparator( 1 ); otrPolicyMenu->setEnabled( false ); @@ -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 %1...").tqarg( otrlChatInterface->formatContact( session->members().getFirst()->contactId() ) ); + body = i18n("Attempting to refresh the OTR session with %1...").arg( otrlChatInterface->formatContact( session->members().getFirst()->contactId() ) ); } else { - body = i18n("Attempting to start a private OTR session with %1...").tqarg( otrlChatInterface->formatContact( session->members().getFirst()->contactId() ) ); + body = i18n("Attempting to start a private OTR session with %1...").arg( otrlChatInterface->formatContact( session->members().getFirst()->contactId() ) ); } Kopete::Message msg2( session->account()->myself(), session->members().getFirst(), body, Kopete::Message::Internal, Kopete::Message::RichText ); diff --git a/src/otrpreferences.cpp b/src/otrpreferences.cpp index 65dca42..79b3ca7 100644 --- a/src/otrpreferences.cpp +++ b/src/otrpreferences.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include #include #include @@ -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; } diff --git a/src/otrpreferences.h b/src/otrpreferences.h index 00f8946..262e132 100644 --- a/src/otrpreferences.h +++ b/src/otrpreferences.h @@ -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; diff --git a/src/otrprefs.ui b/src/otrprefs.ui index 4a6a43e..cb93975 100644 --- a/src/otrprefs.ui +++ b/src/otrprefs.ui @@ -60,7 +60,7 @@ cbKeys - + 400 32767 @@ -181,7 +181,7 @@ Expanding - + 20 161 @@ -209,7 +209,7 @@ - tqStatus + Status diff --git a/src/privkeypopupui.ui b/src/privkeypopupui.ui index c2f406d..34f90d4 100644 --- a/src/privkeypopupui.ui +++ b/src/privkeypopupui.ui @@ -45,7 +45,7 @@ 0 - + 72 72 diff --git a/src/smppopup.cpp b/src/smppopup.cpp index 36f650b..dcb630b 100644 --- a/src/smppopup.cpp +++ b/src/smppopup.cpp @@ -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() diff --git a/src/smppopupui.ui b/src/smppopupui.ui index b387ca0..b2dc7f8 100644 --- a/src/smppopupui.ui +++ b/src/smppopupui.ui @@ -81,7 +81,7 @@ Please enter the secret passphrase to authenticate this contact. - + WordBreak|AlignVCenter diff --git a/src/verifypopup.cpp b/src/verifypopup.cpp index 2fc7bc8..c7550e0 100644 --- a/src/verifypopup.cpp +++ b/src/verifypopup.cpp @@ -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)){ diff --git a/src/verifypopupui.ui b/src/verifypopupui.ui index 948364c..b1e066c 100644 --- a/src/verifypopupui.ui +++ b/src/verifypopupui.ui @@ -40,7 +40,7 @@ Expanding - + 461 20 @@ -56,7 +56,7 @@ cbVerify - + 130 32767 @@ -80,7 +80,7 @@ - + WordBreak|AlignVCenter