diff options
Diffstat (limited to 'kmail/configuredialog.cpp')
-rw-r--r-- | kmail/configuredialog.cpp | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 6dd25347d..538b6205f 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -233,9 +233,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal // the KCMultiDialog starts with the size of the first kcm, not // the largest one. This way at least after the first showing of // the largest kcm the size is kept. - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" ); - int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); + int width = geometry.readNumEntry( "ConfigureDialogWidth" ); + int height = geometry.readNumEntry( "ConfigureDialogHeight" ); if ( width != 0 && height != 0 ) { setMinimumSize( width, height ); } @@ -243,9 +243,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal } void ConfigureDialog::hideEvent( TQHideEvent *ev ) { - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - tqgeometry.writeEntry( "ConfigureDialogWidth", width() ); - tqgeometry.writeEntry( "ConfigureDialogHeight",height() ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); + geometry.writeEntry( "ConfigureDialogWidth", width() ); + geometry.writeEntry( "ConfigureDialogHeight",height() ); KDialogBase::hideEvent( ev ); } @@ -451,7 +451,7 @@ void IdentityPage::slotRemoveIdentity() if ( !item ) return; TQString msg = i18n("<qt>Do you really want to remove the identity named " - "<b>%1</b>?</qt>").tqarg( item->identity().identityName() ); + "<b>%1</b>?</qt>").arg( item->identity().identityName() ); if( KMessageBox::warningContinueCancel( this, msg, i18n("Remove Identity"), KGuiItem(i18n("&Remove"),"editdelete") ) == KMessageBox::Continue ) if ( im->removeIdentity( item->identity().identityName() ) ) { @@ -742,7 +742,7 @@ static inline TQString uniqueName( const TQStringList & list, while ( list.find( result ) != list.end() ) { result = i18n("%1: name; %2: number appended to it to make it unique " "among a list of names", "%1 %2") - .tqarg( name ).tqarg( suffix ); + .arg( name ).arg( suffix ); suffix++; } return result; @@ -830,7 +830,7 @@ void AccountsPage::SendingTab::slotAddTransport() "Configure->Accounts->Sending listview, \"type\" " "column, first row, to indicate that this is the " "default transport", "%1 (Default)") - .tqarg( transportInfo->type ); + .arg( transportInfo->type ); GlobalSettings::self()->setDefaultTransport( transportInfo->name ); } (void) new TQListViewItem( mTransportList, lastItem, transportInfo->name, @@ -1364,7 +1364,7 @@ void AccountsPage::ReceivingTab::slotRemoveSelectedAccount() { if ( !acct ) { // ### FIXME: see above KMessageBox::sorry( this, i18n("<qt>Unable to locate account <b>%1</b>.</qt>") - .tqarg(listItem->text(0)) ); + .arg(listItem->text(0)) ); return; } @@ -1444,7 +1444,7 @@ void AccountsPage::ReceivingTab::save() { kmkernel->acctMgr()->writeConfig( true ); if ( (*it) && !kmkernel->acctMgr()->remove(*it) ) KMessageBox::sorry( this, i18n("<qt>Unable to locate account <b>%1</b>.</qt>") - .tqarg( (*it)->name() ) ); + .arg( (*it)->name() ) ); } mAccountsToDelete.clear(); @@ -1941,33 +1941,33 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char void AppearancePage::LayoutTab::doLoadOther() { const KConfigGroup reader( KMKernel::config(), "Reader" ); - const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + const KConfigGroup geometry( KMKernel::config(), "Geometry" ); - loadWidget( mFolderListGroup, tqgeometry, folderListMode ); + loadWidget( mFolderListGroup, geometry, folderListMode ); loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation ); loadWidget( mMIMETreeModeGroup, reader, mimeTreeMode ); - loadWidget( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); + loadWidget( mReaderWindowModeGroup, geometry, readerWindowMode ); mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() ); } void AppearancePage::LayoutTab::installProfile( KConfig * profile ) { const KConfigGroup reader( profile, "Reader" ); - const KConfigGroup tqgeometry( profile, "Geometry" ); + const KConfigGroup geometry( profile, "Geometry" ); - loadProfile( mFolderListGroup, tqgeometry, folderListMode ); + loadProfile( mFolderListGroup, geometry, folderListMode ); loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation ); loadProfile( mMIMETreeModeGroup, reader, mimeTreeMode ); - loadProfile( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); + loadProfile( mReaderWindowModeGroup, geometry, readerWindowMode ); } void AppearancePage::LayoutTab::save() { KConfigGroup reader( KMKernel::config(), "Reader" ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); - saveButtonGroup( mFolderListGroup, tqgeometry, folderListMode ); + saveButtonGroup( mFolderListGroup, geometry, folderListMode ); saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation ); saveButtonGroup( mMIMETreeModeGroup, reader, mimeTreeMode ); - saveButtonGroup( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); + saveButtonGroup( mReaderWindowModeGroup, geometry, readerWindowMode ); GlobalSettings::self()->setEnableFavoriteFolderView( mFavoriteFolderViewCB->isChecked() ); } @@ -2058,7 +2058,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) { TQString buttonLabel = i18n(dateDisplayConfig[i].displayName); if ( buttonLabel.contains("%1") ) - buttonLabel = buttonLabel.tqarg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) ); + buttonLabel = buttonLabel.arg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) ); radio = new TQRadioButton( buttonLabel, mDateDisplay ); mDateDisplay->insert( radio, i ); if ( dateDisplayConfig[i].dateDisplay == DateFormatter::Custom ) { @@ -2115,16 +2115,16 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha void AppearancePage::HeadersTab::doLoadOther() { KConfigGroup general( KMKernel::config(), "General" ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); // "General Options": - mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages", false ) ); + mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) ); mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize", false ) ); mCryptoIconsCheck->setChecked( general.readBoolEntry( "showCryptoIcons", false ) ); mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon", true ) ); // "Message Header Threading Options": - int num = tqgeometry.readNumEntry( "nestingPolicy", 3 ); + int num = geometry.readNumEntry( "nestingPolicy", 3 ); if ( num < 0 || num > 3 ) num = 3; mNestingPolicy->setButton( num ); @@ -2152,10 +2152,10 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma void AppearancePage::HeadersTab::installProfile( KConfig * profile ) { KConfigGroup general( profile, "General" ); - KConfigGroup tqgeometry( profile, "Geometry" ); + KConfigGroup geometry( profile, "Geometry" ); - if ( tqgeometry.hasKey( "nestedMessages" ) ) - mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages" ) ); + if ( geometry.hasKey( "nestedMessages" ) ) + mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) ); if ( general.hasKey( "showMessageSize" ) ) mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize" ) ); @@ -2164,8 +2164,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) { if ( general.hasKey( "showAttachmentIcon" ) ) mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon" ) ); - if ( tqgeometry.hasKey( "nestingPolicy" ) ) { - int num = tqgeometry.readNumEntry( "nestingPolicy" ); + if ( geometry.hasKey( "nestingPolicy" ) ) { + int num = geometry.readNumEntry( "nestingPolicy" ); if ( num < 0 || num > 3 ) num = 3; mNestingPolicy->setButton( num ); } @@ -2177,16 +2177,16 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) { void AppearancePage::HeadersTab::save() { KConfigGroup general( KMKernel::config(), "General" ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); - if ( tqgeometry.readBoolEntry( "nestedMessages", false ) + if ( geometry.readBoolEntry( "nestedMessages", false ) != mNestedMessagesCheck->isChecked() ) { int result = KMessageBox::warningContinueCancel( this, i18n("Changing the global threading setting will override " "all folder specific values."), TQString(), KStdGuiItem::cont(), "threadOverride" ); if ( result == KMessageBox::Continue ) { - tqgeometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() ); + geometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() ); // remove all threadMessagesOverride keys from all [Folder-*] groups: TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") ); kdDebug(5006) << "groups.count() == " << groups.count() << endl; @@ -2197,7 +2197,7 @@ void AppearancePage::HeadersTab::save() { } } - tqgeometry.writeEntry( "nestingPolicy", + geometry.writeEntry( "nestingPolicy", mNestingPolicy->id( mNestingPolicy->selected() ) ); general.writeEntry( "showMessageSize", mMessageSizeCheck->isChecked() ); general.writeEntry( "showCryptoIcons", mCryptoIconsCheck->isChecked() ); @@ -3304,7 +3304,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { if ( charset.lower() == TQString::fromLatin1("locale") ) { charset = TQString::fromLatin1("%1 (locale)") - .tqarg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); + .arg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); return; } @@ -3328,7 +3328,7 @@ void ComposerPage::CharsetTab::doLoadOther() { if ( (*it) == TQString::fromLatin1("locale") ) { TQCString cset = kmkernel->networkCodec()->mimeName(); KPIM::kAsciiToLower( cset.data() ); - (*it) = TQString("%1 (locale)").tqarg( TQString(cset) ); + (*it) = TQString("%1 (locale)").arg( TQString(cset) ); } mCharsetListEditor->setStringList( charsets ); @@ -3815,7 +3815,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * "exploits. <a href=\"whatsthis:%1\">More about " "HTML mails...</a> <a href=\"whatsthis:%2\">More " "about external references...</a>") - .tqarg(htmlWhatsThis).tqarg(externalWhatsThis), + .arg(htmlWhatsThis).arg(externalWhatsThis), group ); vlay->addWidget( group ); @@ -3890,7 +3890,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * label = new KActiveLabel( i18n("<b>WARNING:</b> Unconditionally returning " "confirmations undermines your privacy. " "<a href=\"whatsthis:%1\">More...</a>") - .tqarg(receiptWhatsThis), + .arg(receiptWhatsThis), group ); vlay->addWidget( group ); @@ -4358,7 +4358,7 @@ void SecurityPage::SMimeTab::doLoadOther() { TQString systemProxy = TQString::fromLocal8Bit( getenv( "http_proxy" ) ); if ( systemProxy.isEmpty() ) systemProxy = i18n( "no proxy" ); - mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).tqarg( systemProxy ) ); + mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).arg( systemProxy ) ); bool honor = e.mHonorHTTPProxy && e.mHonorHTTPProxy->boolValue(); mWidget->honorHTTPProxyRB->setChecked( honor ); mWidget->useCustomHTTPProxyRB->setChecked( !honor ); @@ -4482,11 +4482,11 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp { Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName ); if ( !entry ) { - kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) << endl; + kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) << endl; return 0; } if( entry->argType() != argType || entry->isList() != isList ) { - kdWarning(5006) << TQString( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) << endl; + kdWarning(5006) << TQString( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) << endl; return 0; } return entry; @@ -5135,7 +5135,7 @@ void MiscPage::GroupwareTab::save() { // Inbox folder of the selected account KMAccount* acct = mAccountCombo->currentAccount(); if ( acct ) { - folderId = TQString( ".%1.directory/INBOX" ).tqarg( acct->id() ); + folderId = TQString( ".%1.directory/INBOX" ).arg( acct->id() ); GlobalSettings::self()->setTheIMAPResourceAccount( acct->id() ); } } |