diff options
Diffstat (limited to 'kopete/protocols/gadu')
-rw-r--r-- | kopete/protocols/gadu/gaduaccount.cpp | 6 | ||||
-rw-r--r-- | kopete/protocols/gadu/gaducommands.cpp | 6 | ||||
-rw-r--r-- | kopete/protocols/gadu/gadudcctransaction.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/gadu/gaduregisteraccount.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/gadu/gadurichtextformat.cpp | 10 | ||||
-rw-r--r-- | kopete/protocols/gadu/gadusession.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/gadu/ui/gaduadd.ui | 4 | ||||
-rw-r--r-- | kopete/protocols/gadu/ui/gadueditaccountui.ui | 4 | ||||
-rw-r--r-- | kopete/protocols/gadu/ui/gaduregisteraccountui.ui | 4 |
9 files changed, 23 insertions, 23 deletions
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 47a124b3..19db0db7 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -710,7 +710,7 @@ GaduAccount::connectionFailed( gg_failure_t failure ) slotLogin( p->status.internalStatus() , p->lastDescription ); } else { - error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).tqarg( GaduSession::failureDescription( failure ) ), + error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).arg( GaduSession::failureDescription( failure ) ), i18n( "Connection Error" ) ); p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); myself()->setOnlineStatus( p->status ); @@ -925,7 +925,7 @@ GaduAccount::slotExportContactsListToFile() p->saveListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString(), Kopete::UI::Global::mainWidget(), "gadu-list-save", false ); p->saveListDialog->setCaption( - i18n("Save Contacts List for Account %1 As").tqarg( + i18n("Save Contacts List for Account %1 As").arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) ); if ( p->saveListDialog->exec() == TQDialog::Accepted ) { @@ -971,7 +971,7 @@ GaduAccount::slotImportContactsFromFile() p->loadListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString(), Kopete::UI::Global::mainWidget(), "gadu-list-load", true ); p->loadListDialog->setCaption( - i18n("Load Contacts List for Account %1 As").tqarg( + i18n("Load Contacts List for Account %1 As").arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) ); if ( p->loadListDialog->exec() == TQDialog::Accepted ) { diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp index c36f1ced..104e1b01 100644 --- a/kopete/protocols/gadu/gaducommands.cpp +++ b/kopete/protocols/gadu/gaducommands.cpp @@ -44,7 +44,7 @@ GaduCommand::GaduCommand( TQObject* parent, const char* name ) GaduCommand::~GaduCommand() { - //TQSocketNotifiers are tqchildren and will + //TQSocketNotifiers are children and will //be deleted anyhow } @@ -204,7 +204,7 @@ void RegisterCommand::watcher() } pubDir = (struct gg_pubdir *)session_->data; - emit operationStatus( i18n( "Token retrieving status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); + emit operationStatus( i18n( "Token retrieving status: %1" ).arg( GaduSession::stateDescription( session_->state ) ) ); switch ( session_->state ) { case GG_STATE_CONNECTING: kdDebug( 14100 ) << "Recreating notifiers " << endl; @@ -254,7 +254,7 @@ void RegisterCommand::watcher() return; } pubDir = (gg_pubdir*) session_->data; - emit operationStatus( i18n( "Registration status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); + emit operationStatus( i18n( "Registration status: %1" ).arg( GaduSession::stateDescription( session_->state ) ) ); switch ( session_->state ) { case GG_STATE_CONNECTING: kdDebug( 14100 ) << "Recreating notifiers " << endl; diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index 2d0e45d4..7ec8d2ac 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -237,8 +237,8 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c KGuiItem resumeButton( i18n ( "&Resume" ) ); KGuiItem overwriteButton( i18n ( "Over&write" ) ); switch ( KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget (), - i18n( "The file %1 already exists, do you want to resume or overwrite it?" ).tqarg( fileName ), - i18n( "File Exists: %1" ).tqarg( fileName ), resumeButton, overwriteButton ) ) + i18n( "The file %1 already exists, do you want to resume or overwrite it?" ).arg( fileName ), + i18n( "File Exists: %1" ).arg( fileName ), resumeButton, overwriteButton ) ) { // resume case KMessageBox::Yes: diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index 22f28703..e33b4959 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -156,7 +156,7 @@ GaduRegisterAccount::registrationDone( const TQString& /*title*/, const TQStri ui->labelVerificationSequence->setDisabled( true ); ui->labelInstructions->setDisabled( true ); emit registeredNumber( cRegister->newUin(), ui->valuePassword->text() ); - updateStatus( i18n( "Account created; your new UIN is %1." ).tqarg(TQString::number( cRegister->newUin() ) ) ); + updateStatus( i18n( "Account created; your new UIN is %1." ).arg(TQString::number( cRegister->newUin() ) ) ); enableButton( User1, false ); setButtonText( Ok, i18n( "&Close" ) ); } @@ -164,7 +164,7 @@ GaduRegisterAccount::registrationDone( const TQString& /*title*/, const TQStri void GaduRegisterAccount::registrationError( const TQString& title, const TQString& what ) { - updateStatus( i18n( "Registration failed: %1" ).tqarg( what ) ); + updateStatus( i18n( "Registration failed: %1" ).arg( what ) ); KMessageBox::sorry( this, "Registration was unsucessful, please try again.", title ); disconnect( this, TQT_SLOT( displayToken( TQPixmap, TQString ) ) ); diff --git a/kopete/protocols/gadu/gadurichtextformat.cpp b/kopete/protocols/gadu/gadurichtextformat.cpp index 18ef22b7..377967bc 100644 --- a/kopete/protocols/gadu/gadurichtextformat.cpp +++ b/kopete/protocols/gadu/gadurichtextformat.cpp @@ -100,9 +100,9 @@ GaduRichTextFormat::convertToHtml( const TQString& msg, unsigned int formats, vo g = (int)color->green; b = (int)color->blue; } - style += TQString(" color: rgb( %1, %2, %3 ); ").tqarg( r ).tqarg( g ).tqarg( b ); + style += TQString(" color: rgb( %1, %2, %3 ); ").arg( r ).arg( g ).arg( b ); - tmp += formatOpeningTag( TQString::fromLatin1("span"), TQString::fromLatin1("style=\"%1\"").tqarg( style ) ); + tmp += formatOpeningTag( TQString::fromLatin1("span"), TQString::fromLatin1("style=\"%1\"").arg( style ) ); opened = true; } @@ -198,7 +198,7 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) return NULL; } - TQString rep = TQString("<span style=\"%1\">%2</span>" ).tqarg( styleHTML ).tqarg( replacement ); + TQString rep = TQString("<span style=\"%1\">%2</span>" ).arg( styleHTML ).arg( replacement ); htmlString.replace( findTags.pos( 0 ), rep.length(), replacement ); replacement = unescapeGaduMessage( replacement ); @@ -263,14 +263,14 @@ GaduRichTextFormat::insertRtf( uint position) // append font description rtfs.position = position; uint csize = rtf.size(); - if ( rtf.tqresize( csize + sizeof( gg_msg_richtext_format ) ) == FALSE ) { + if ( rtf.resize( csize + sizeof( gg_msg_richtext_format ) ) == FALSE ) { return false; }; memcpy( rtf.data() + csize, &rtfs, sizeof( rtfs ) ); // append color description, if color has changed if ( rtfs.font & GG_FONT_COLOR ) { csize = rtf.size(); - if ( rtf.tqresize( csize + sizeof( gg_msg_richtext_color ) ) == FALSE ) { + if ( rtf.resize( csize + sizeof( gg_msg_richtext_color ) ) == FALSE ) { return false; }; memcpy( rtf.data() + csize, &rtcs, sizeof( rtcs ) ); diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index 12fc5794..7fded85a 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -617,7 +617,7 @@ GaduSession::errorDescription( int err ) case GG_ERROR_WRITING: return i18n( "Writing error." ); default: - return i18n( "Unknown error number %1." ).tqarg( TQString::number( (unsigned int)err ) ); + return i18n( "Unknown error number %1." ).arg( TQString::number( (unsigned int)err ) ); } } @@ -642,7 +642,7 @@ GaduSession::failureDescription( gg_failure_t f ) case GG_FAILURE_TLS: return i18n( "Unable to connect over encrypted channel.\nTry to turn off encryption support in Gadu account settings and reconnect." ); default: - return i18n( "Unknown error number %1." ).tqarg( TQString::number( (unsigned int)f ) ); + return i18n( "Unknown error number %1." ).arg( TQString::number( (unsigned int)f ) ); } } diff --git a/kopete/protocols/gadu/ui/gaduadd.ui b/kopete/protocols/gadu/ui/gaduadd.ui index 7fa193d6..48279c5d 100644 --- a/kopete/protocols/gadu/ui/gaduadd.ui +++ b/kopete/protocols/gadu/ui/gaduadd.ui @@ -45,7 +45,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -78,7 +78,7 @@ <property name="text"> <string><i>(for example: 1234567)</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kopete/protocols/gadu/ui/gadueditaccountui.ui b/kopete/protocols/gadu/ui/gadueditaccountui.ui index 91556886..8707f8db 100644 --- a/kopete/protocols/gadu/ui/gadueditaccountui.ui +++ b/kopete/protocols/gadu/ui/gadueditaccountui.ui @@ -168,7 +168,7 @@ <string>To connect to the Gadu-Gadu network, you will need a Gadu-Gadu account.<br><br> If you do not currently have an account, please click the button to create one.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -797,7 +797,7 @@ If you do not currently have an account, please click the button to create one.< <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui index cc4f6149..8099b0d9 100644 --- a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui +++ b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui @@ -374,7 +374,7 @@ <property name="text"> <string><i>Type the letters and numbers shown in the image above into the <b>Verification Sequence</b> field. This is used to prevent automated registration abuse.</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -402,7 +402,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> |