diff options
Diffstat (limited to 'kmail/configuredialog.cpp')
| -rw-r--r-- | kmail/configuredialog.cpp | 230 |
1 files changed, 115 insertions, 115 deletions
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 10653b8b4..59223cf89 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -110,11 +110,11 @@ using KMime::DateFormatter; #include <tqhbuttongroup.h> #include <tqtooltip.h> #include <tqlabel.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqheader.h> #include <tqpopupmenu.h> #include <tqradiobutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqwidgetstack.h> @@ -167,7 +167,7 @@ namespace { void populateButtonGroup( TQButtonGroup * g, const EnumConfigEntry & e ) { g->setTitle( i18n( e.desc ) ); - g->layout()->setSpacing( KDialog::spacingHint() ); + g->tqlayout()->setSpacing( KDialog::spacingHint() ); for ( int i = 0 ; i < e.numItems ; ++i ) g->insert( new TQRadioButton( i18n( e.items[i].desc ), g ), i ); } @@ -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 geometry( KMKernel::config(), "Geometry" ); - int width = geometry.readNumEntry( "ConfigureDialogWidth" ); - int height = geometry.readNumEntry( "ConfigureDialogHeight" ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" ); + int height = tqgeometry.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 geometry( KMKernel::config(), "Geometry" ); - geometry.writeEntry( "ConfigureDialogWidth", width() ); - geometry.writeEntry( "ConfigureDialogHeight",height() ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + tqgeometry.writeEntry( "ConfigureDialogWidth", width() ); + tqgeometry.writeEntry( "ConfigureDialogHeight",height() ); KDialogBase::hideEvent( ev ); } @@ -281,7 +281,7 @@ void ConfigureDialog::slotUser2() { // * * // ************************************************************* TQString IdentityPage::helpAnchor() const { - return TQString::fromLatin1("configure-identity"); + return TQString::tqfromLatin1("configure-identity"); } IdentityPage::IdentityPage( TQWidget * parent, const char * name ) @@ -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>").arg( item->identity().identityName() ); + "<b>%1</b>?</qt>").tqarg( item->identity().identityName() ); if( KMessageBox::warningContinueCancel( this, msg, i18n("Remove Identity"), KGuiItem(i18n("&Remove"),"editdelete") ) == KMessageBox::Continue ) if ( im->removeIdentity( item->identity().identityName() ) ) { @@ -552,7 +552,7 @@ void IdentityPage::slotUpdateTransportCombo( const TQStringList & sl ) // * * // ************************************************************* TQString AccountsPage::helpAnchor() const { - return TQString::fromLatin1("configure-accounts"); + return TQString::tqfromLatin1("configure-accounts"); } AccountsPage::AccountsPage( TQWidget * parent, const char * name ) @@ -578,7 +578,7 @@ AccountsPage::AccountsPage( TQWidget * parent, const char * name ) } TQString AccountsPage::SendingTab::helpAnchor() const { - return TQString::fromLatin1("configure-accounts-sending"); + return TQString::tqfromLatin1("configure-accounts-sending"); } AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name ) @@ -597,9 +597,9 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // label: zero stretch ### FIXME more vlay->addWidget( new TQLabel( i18n("Outgoing accounts (add at least one):"), this ) ); - // hbox layout: stretch 10, spacing inherited from vlay + // hbox tqlayout: stretch 10, spacing inherited from vlay hlay = new TQHBoxLayout(); - vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's sizeHint + vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's tqsizeHint // transport list: left widget in hlay; stretch 1 // ### FIXME: allow inline renaming of the account: @@ -614,7 +614,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * this, TQT_SLOT(slotModifySelectedTransport()) ); hlay->addWidget( mTransportList, 1 ); - // a vbox layout for the buttons: zero stretch, spacing inherited from hlay + // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay btn_vlay = new TQVBoxLayout( hlay ); // "add..." button: stretch 0 @@ -653,8 +653,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * i18n("Common Options"), this ); vlay->addWidget(group); - // a grid layout for the contents of the "common options" group box - glay = new TQGridLayout( group->layout(), 5, 3, KDialog::spacingHint() ); + // a grid tqlayout for the contents of the "common options" group box + glay = new TQGridLayout( group->tqlayout(), 5, 3, KDialog::spacingHint() ); glay->setColStretch( 2, 10 ); // "confirm before send" check box: @@ -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") - .arg( name ).arg( suffix ); + .tqarg( name ).tqarg( suffix ); suffix++; } return result; @@ -787,10 +787,10 @@ void AccountsPage::SendingTab::slotAddTransport() KMTransportInfo *transportInfo = new KMTransportInfo(); switch ( transportType ) { case 0: // smtp - transportInfo->type = TQString::fromLatin1("smtp"); + transportInfo->type = TQString::tqfromLatin1("smtp"); break; case 1: // sendmail - transportInfo->type = TQString::fromLatin1("sendmail"); + transportInfo->type = TQString::tqfromLatin1("sendmail"); transportInfo->name = i18n("Sendmail"); transportInfo->host = _PATH_SENDMAIL; // ### FIXME: use const, not #define break; @@ -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)") - .arg( transportInfo->type ); + .tqarg( transportInfo->type ); GlobalSettings::self()->setDefaultTransport( transportInfo->name ); } (void) new TQListViewItem( mTransportList, lastItem, transportInfo->name, @@ -1026,7 +1026,7 @@ void AccountsPage::SendingTab::doLoadOther() { buffer[255] = 0; else buffer[0] = 0; - str = TQString::fromLatin1( *buffer ? buffer : "localhost" ); + str = TQString::tqfromLatin1( *buffer ? buffer : "localhost" ); } mDefaultDomainEdit->setText( str ); } @@ -1053,7 +1053,7 @@ void AccountsPage::SendingTab::save() { } TQString AccountsPage::ReceivingTab::helpAnchor() const { - return TQString::fromLatin1("configure-accounts-receiving"); + return TQString::tqfromLatin1("configure-accounts-receiving"); } AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name ) @@ -1071,7 +1071,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // label: zero stretch vlay->addWidget( new TQLabel( i18n("Incoming accounts (add at least one):"), this ) ); - // hbox layout: stretch 10, spacing inherited from vlay + // hbox tqlayout: stretch 10, spacing inherited from vlay hlay = new TQHBoxLayout(); vlay->addLayout( hlay, 10 ); // high stretch to suppress groupbox's growing @@ -1088,7 +1088,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha this, TQT_SLOT(slotModifySelectedAccount()) ); hlay->addWidget( mAccountList, 1 ); - // a vbox layout for the buttons: zero stretch, spacing inherited from hlay + // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay btn_vlay = new TQVBoxLayout( hlay ); // "add..." button: stretch 0 @@ -1123,11 +1123,11 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "New Mail Notification" group box: stretch 0 group = new TQVGroupBox( i18n("New Mail Notification"), this ); vlay->addWidget( group ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); // "beep on new mail" check box: mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group ); - mBeepNewMailCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + mBeepNewMailCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); connect( mBeepNewMailCheck, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotEmitChanged( void ) ) ); @@ -1135,7 +1135,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "Detailed new mail notification" check box mVerboseNotificationCheck = new TQCheckBox( i18n( "Deta&iled new mail notification" ), group ); - mVerboseNotificationCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + mVerboseNotificationCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); TQToolTip::add( mVerboseNotificationCheck, i18n( "Show for each folder the number of newly arrived " @@ -1147,7 +1147,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "Other Actions" button: mOtherNewMailActionsButton = new TQPushButton( i18n("Other Actio&ns"), group ); - mOtherNewMailActionsButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, + mOtherNewMailActionsButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( mOtherNewMailActionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditNotifications()) ); @@ -1229,7 +1229,7 @@ void AccountsPage::ReceivingTab::slotAddAccount() { } KMAccount *account - = kmkernel->acctMgr()->create( TQString::fromLatin1( accountType ) ); + = kmkernel->acctMgr()->create( TQString::tqfromLatin1( accountType ) ); if ( !account ) { // ### FIXME: Give the user more information. Is this error // recoverable? @@ -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>") - .arg(listItem->text(0)) ); + .tqarg(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>") - .arg( (*it)->name() ) ); + .tqarg( (*it)->name() ) ); } mAccountsToDelete.clear(); @@ -1478,7 +1478,7 @@ void AccountsPage::ReceivingTab::save() { // * * // ************************************************************* TQString AppearancePage::helpAnchor() const { - return TQString::fromLatin1("configure-appearance"); + return TQString::tqfromLatin1("configure-appearance"); } AppearancePage::AppearancePage( TQWidget * parent, const char * name ) @@ -1525,7 +1525,7 @@ AppearancePage::AppearancePage( TQWidget * parent, const char * name ) TQString AppearancePage::FontsTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-fonts"); + return TQString::tqfromLatin1("configure-appearance-fonts"); } static const struct { @@ -1694,7 +1694,7 @@ void AppearancePage::FontsTab::save() { } TQString AppearancePage::ColorsTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-colors"); + return TQString::tqfromLatin1("configure-appearance-colors"); } @@ -1793,9 +1793,9 @@ void AppearancePage::ColorsTab::doLoadOther() { mCloseToQuotaThreshold->setValue( GlobalSettings::closeToQuotaThreshold() ); static const TQColor defaultColor[ numColorNames ] = { - kapp->palette().active().base(), // bg + kapp->tqpalette().active().base(), // bg KGlobalSettings::alternateBackgroundColor(), // alt bg - kapp->palette().active().text(), // fg + kapp->tqpalette().active().text(), // fg TQColor( 0x00, 0x80, 0x00 ), // quoted l1 TQColor( 0x00, 0x70, 0x00 ), // quoted l2 TQColor( 0x00, 0x60, 0x00 ), // quoted l3 @@ -1857,7 +1857,7 @@ void AppearancePage::ColorsTab::save() { } TQString AppearancePage::LayoutTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-layout"); + return TQString::tqfromLatin1("configure-appearance-tqlayout"); } static const EnumConfigEntryItem folderListModes[] = { @@ -1941,33 +1941,33 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char void AppearancePage::LayoutTab::doLoadOther() { const KConfigGroup reader( KMKernel::config(), "Reader" ); - const KConfigGroup geometry( KMKernel::config(), "Geometry" ); + const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - loadWidget( mFolderListGroup, geometry, folderListMode ); + loadWidget( mFolderListGroup, tqgeometry, folderListMode ); loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation ); loadWidget( mMIMETreeModeGroup, reader, mimeTreeMode ); - loadWidget( mReaderWindowModeGroup, geometry, readerWindowMode ); + loadWidget( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() ); } void AppearancePage::LayoutTab::installProfile( KConfig * profile ) { const KConfigGroup reader( profile, "Reader" ); - const KConfigGroup geometry( profile, "Geometry" ); + const KConfigGroup tqgeometry( profile, "Geometry" ); - loadProfile( mFolderListGroup, geometry, folderListMode ); + loadProfile( mFolderListGroup, tqgeometry, folderListMode ); loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation ); loadProfile( mMIMETreeModeGroup, reader, mimeTreeMode ); - loadProfile( mReaderWindowModeGroup, geometry, readerWindowMode ); + loadProfile( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); } void AppearancePage::LayoutTab::save() { KConfigGroup reader( KMKernel::config(), "Reader" ); - KConfigGroup geometry( KMKernel::config(), "Geometry" ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - saveButtonGroup( mFolderListGroup, geometry, folderListMode ); + saveButtonGroup( mFolderListGroup, tqgeometry, folderListMode ); saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation ); saveButtonGroup( mMIMETreeModeGroup, reader, mimeTreeMode ); - saveButtonGroup( mReaderWindowModeGroup, geometry, readerWindowMode ); + saveButtonGroup( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); GlobalSettings::self()->setEnableFavoriteFolderView( mFavoriteFolderViewCB->isChecked() ); } @@ -1976,7 +1976,7 @@ void AppearancePage::LayoutTab::save() { // TQString AppearancePage::HeadersTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-headers"); + return TQString::tqfromLatin1("configure-appearance-headers"); } static const struct { @@ -2004,7 +2004,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "General Options" group: group = new TQVButtonGroup( i18n( "General Options" ), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); mMessageSizeCheck = new TQCheckBox( i18n("Display messa&ge sizes"), group ); @@ -2030,7 +2030,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "Message Header Threading Options" group: mNestingPolicy = new TQVButtonGroup( i18n("Threaded Message List Options"), this ); - mNestingPolicy->layout()->setSpacing( KDialog::spacingHint() ); + mNestingPolicy->tqlayout()->setSpacing( KDialog::spacingHint() ); mNestingPolicy->insert( new TQRadioButton( i18n("Always &keep threads open"), @@ -2053,12 +2053,12 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "Date Display" group: mDateDisplay = new TQVButtonGroup( i18n("Date Display"), this ); - mDateDisplay->layout()->setSpacing( KDialog::spacingHint() ); + mDateDisplay->tqlayout()->setSpacing( KDialog::spacingHint() ); for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) { TQString buttonLabel = i18n(dateDisplayConfig[i].displayName); if ( buttonLabel.contains("%1") ) - buttonLabel = buttonLabel.arg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) ); + buttonLabel = buttonLabel.tqarg( 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 geometry( KMKernel::config(), "Geometry" ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); // "General Options": - mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) ); + mNestedMessagesCheck->setChecked( tqgeometry.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 = geometry.readNumEntry( "nestingPolicy", 3 ); + int num = tqgeometry.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 geometry( profile, "Geometry" ); + KConfigGroup tqgeometry( profile, "Geometry" ); - if ( geometry.hasKey( "nestedMessages" ) ) - mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) ); + if ( tqgeometry.hasKey( "nestedMessages" ) ) + mNestedMessagesCheck->setChecked( tqgeometry.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 ( geometry.hasKey( "nestingPolicy" ) ) { - int num = geometry.readNumEntry( "nestingPolicy" ); + if ( tqgeometry.hasKey( "nestingPolicy" ) ) { + int num = tqgeometry.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 geometry( KMKernel::config(), "Geometry" ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - if ( geometry.readBoolEntry( "nestedMessages", false ) + if ( tqgeometry.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 ) { - geometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() ); + tqgeometry.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() { } } - geometry.writeEntry( "nestingPolicy", + tqgeometry.writeEntry( "nestingPolicy", mNestingPolicy->id( mNestingPolicy->selected() ) ); general.writeEntry( "showMessageSize", mMessageSizeCheck->isChecked() ); general.writeEntry( "showCryptoIcons", mCryptoIconsCheck->isChecked() ); @@ -2246,7 +2246,7 @@ static const BoolConfigEntry showCurrentTime = { }; TQString AppearancePage::ReaderTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-reader"); + return TQString::tqfromLatin1("configure-appearance-reader"); } AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, @@ -2472,7 +2472,7 @@ void AppearancePage::ReaderTab::installProfile( KConfig * /* profile */ ) { TQString AppearancePage::SystemTrayTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-systemtray"); + return TQString::tqfromLatin1("configure-appearance-systemtray"); } AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, @@ -2490,7 +2490,7 @@ AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, // System tray modes mSystemTrayGroup = new TQVButtonGroup( i18n("System Tray Mode"), this ); - mSystemTrayGroup->layout()->setSpacing( KDialog::spacingHint() ); + mSystemTrayGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); vlay->addWidget( mSystemTrayGroup ); connect( mSystemTrayGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotEmitChanged( void ) ) ); @@ -2537,7 +2537,7 @@ void AppearancePage::SystemTrayTab::save() { // ************************************************************* TQString ComposerPage::helpAnchor() const { - return TQString::fromLatin1("configure-composer"); + return TQString::tqfromLatin1("configure-composer"); } ComposerPage::ComposerPage( TQWidget * parent, const char * name ) @@ -2596,7 +2596,7 @@ ComposerPage::ComposerPage( TQWidget * parent, const char * name ) } TQString ComposerPage::GeneralTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-general"); + return TQString::tqfromLatin1("configure-composer-general"); } ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name ) @@ -2766,7 +2766,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * // The "external editor" group: group = new TQVGroupBox( i18n("External Editor"), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); mExternalEditorCheck = new TQCheckBox( GlobalSettings::self()->useExternalEditorItem()->label(), @@ -2910,7 +2910,7 @@ void ComposerPage::GeneralTab::slotConfigureCompletionOrder( ) } TQString ComposerPage::PhrasesTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-phrases"); + return TQString::tqfromLatin1("configure-composer-phrases"); } ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name ) @@ -3122,7 +3122,7 @@ void ComposerPage::PhrasesTab::save() { } TQString ComposerPage::TemplatesTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-templates"); + return TQString::tqfromLatin1("configure-composer-templates"); } ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const char * name ) @@ -3146,7 +3146,7 @@ void ComposerPage::TemplatesTab::save() { } TQString ComposerPage::CustomTemplatesTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-custom-templates"); + return TQString::tqfromLatin1("configure-composer-custom-templates"); } ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * parent, const char * name ) @@ -3170,7 +3170,7 @@ void ComposerPage::CustomTemplatesTab::save() { } TQString ComposerPage::SubjectTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-subject"); + return TQString::tqfromLatin1("configure-composer-subject"); } ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name ) @@ -3185,12 +3185,12 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); group = new TQVGroupBox( i18n("Repl&y Subject Prefixes"), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); // row 0: help text: label = new TQLabel( i18n("Recognize any sequence of the following prefixes\n" "(entries are case-insensitive regular expressions):"), group ); - label->setAlignment( AlignLeft|WordBreak ); + label->tqsetAlignment( AlignLeft|WordBreak ); // row 1, string list editor: SimpleStringListEditor::ButtonCode buttonCode = @@ -3214,12 +3214,12 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * group = new TQVGroupBox( i18n("For&ward Subject Prefixes"), this ); - group->layout()->setSpacing( KDialog::marginHint() ); + group->tqlayout()->setSpacing( KDialog::marginHint() ); // row 0: help text: label= new TQLabel( i18n("Recognize any sequence of the following prefixes\n" "(entries are case-insensitive regular expressions):"), group ); - label->setAlignment( AlignLeft|WordBreak ); + label->tqsetAlignment( AlignLeft|WordBreak ); // row 1: string list editor mForwardListEditor = @@ -3254,7 +3254,7 @@ void ComposerPage::SubjectTab::save() { } TQString ComposerPage::CharsetTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-charset"); + return TQString::tqfromLatin1("configure-composer-charset"); } ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name ) @@ -3269,7 +3269,7 @@ ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * label = new TQLabel( i18n("This list is checked for every outgoing message " "from the top to the bottom for a charset that " "contains all required characters."), this ); - label->setAlignment( WordBreak); + label->tqsetAlignment( WordBreak); vlay->addWidget( label ); mCharsetListEditor = @@ -3297,21 +3297,21 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { // KCharsets::codecForName("us-ascii") returns "iso-8859-1" (cf. Bug #49812) // therefore we have to treat this case specially - if ( charset.lower() == TQString::fromLatin1("us-ascii") ) { - charset = TQString::fromLatin1("us-ascii"); + if ( charset.lower() == TQString::tqfromLatin1("us-ascii") ) { + charset = TQString::tqfromLatin1("us-ascii"); return; } - if ( charset.lower() == TQString::fromLatin1("locale") ) { - charset = TQString::fromLatin1("%1 (locale)") - .arg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); + if ( charset.lower() == TQString::tqfromLatin1("locale") ) { + charset = TQString::tqfromLatin1("%1 (locale)") + .tqarg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); return; } bool ok = false; TQTextCodec *codec = KGlobal::charsets()->codecForName( charset, ok ); if ( ok && codec ) { - charset = TQString::fromLatin1( codec->mimeName() ).lower(); + charset = TQString::tqfromLatin1( codec->mimeName() ).lower(); return; } @@ -3325,10 +3325,10 @@ void ComposerPage::CharsetTab::doLoadOther() { TQStringList charsets = composer.readListEntry( "pref-charsets" ); for ( TQStringList::Iterator it = charsets.begin() ; it != charsets.end() ; ++it ) - if ( (*it) == TQString::fromLatin1("locale") ) { + if ( (*it) == TQString::tqfromLatin1("locale") ) { TQCString cset = kmkernel->networkCodec()->mimeName(); KPIM::kAsciiToLower( cset.data() ); - (*it) = TQString("%1 (locale)").arg( TQString(cset) ); + (*it) = TQString("%1 (locale)").tqarg( TQString(cset) ); } mCharsetListEditor->setStringList( charsets ); @@ -3349,7 +3349,7 @@ void ComposerPage::CharsetTab::save() { } TQString ComposerPage::HeadersTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-headers"); + return TQString::tqfromLatin1("configure-composer-headers"); } ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * name ) @@ -3564,7 +3564,7 @@ void ComposerPage::HeadersTab::save() { } TQString ComposerPage::AttachmentsTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-attachments"); + return TQString::tqfromLatin1("configure-composer-attachments"); } ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, @@ -3601,7 +3601,7 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, // "Attachment key words" label and string list editor label = new TQLabel( i18n("Recognize any of the following key words as " "intention to attach a file:"), this ); - label->setAlignment( AlignLeft|WordBreak ); + label->tqsetAlignment( AlignLeft|WordBreak ); vlay->addWidget( label ); SimpleStringListEditor::ButtonCode buttonCode = @@ -3629,11 +3629,11 @@ void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() { TQStringList attachWordsList = GlobalSettings::self()->attachmentKeywords(); if ( attachWordsList.isEmpty() ) { // default value - attachWordsList << TQString::fromLatin1("attachment") - << TQString::fromLatin1("attached"); - if ( TQString::fromLatin1("attachment") != i18n("attachment") ) + attachWordsList << TQString::tqfromLatin1("attachment") + << TQString::tqfromLatin1("attached"); + if ( TQString::tqfromLatin1("attachment") != i18n("attachment") ) attachWordsList << i18n("attachment"); - if ( TQString::fromLatin1("attached") != i18n("attached") ) + if ( TQString::tqfromLatin1("attached") != i18n("attached") ) attachWordsList << i18n("attached"); } @@ -3669,7 +3669,7 @@ void ComposerPageAttachmentsTab::slotOutlookCompatibleClicked() // * * // ************************************************************* TQString SecurityPage::helpAnchor() const { - return TQString::fromLatin1("configure-security"); + return TQString::tqfromLatin1("configure-security"); } SecurityPage::SecurityPage( TQWidget * parent, const char * name ) @@ -3716,7 +3716,7 @@ void SecurityPage::installProfile( KConfig * profile ) { } TQString SecurityPage::GeneralTab::helpAnchor() const { - return TQString::fromLatin1("configure-security-reading"); + return TQString::tqfromLatin1("configure-security-reading"); } SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name ) @@ -3798,7 +3798,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "HTML Messages" group box: group = new TQVGroupBox( i18n( "HTML Messages" ), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); mHtmlMailCheck = new TQCheckBox( i18n("Prefer H&TML to plain text"), group ); TQWhatsThis::add( mHtmlMailCheck, htmlWhatsThis ); @@ -3815,21 +3815,21 @@ 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>") - .arg(htmlWhatsThis).arg(externalWhatsThis), + .tqarg(htmlWhatsThis).tqarg(externalWhatsThis), group ); vlay->addWidget( group ); // encrypted messages group group = new TQVGroupBox( i18n("Encrypted Messages"), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); mAlwaysDecrypt = new TQCheckBox( i18n( "Attempt decryption of encrypted messages when viewing" ), group ); connect( mAlwaysDecrypt, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotEmitChanged()) ); vlay->addWidget( group ); // "Message Disposition Notification" groupbox: group = new TQVGroupBox( i18n("Message Disposition Notifications"), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); // "ignore", "ask", "deny", "always send" radiobutton line: @@ -3890,14 +3890,14 @@ 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>") - .arg(receiptWhatsThis), + .tqarg(receiptWhatsThis), group ); vlay->addWidget( group ); // "Attached keys" group box: group = new TQVGroupBox( i18n( "Certificate && Key Bundle Attachments" ), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); mAutomaticallyImportAttachedKeysCheck = new TQCheckBox( i18n("Automatically import keys and certificates"), group ); connect( mAutomaticallyImportAttachedKeysCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); @@ -3993,7 +3993,7 @@ void SecurityPage::GeneralTab::save() { TQString SecurityPage::ComposerCryptoTab::helpAnchor() const { - return TQString::fromLatin1("configure-security-composing"); + return TQString::tqfromLatin1("configure-security-composing"); } SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, const char * name ) @@ -4068,7 +4068,7 @@ void SecurityPage::ComposerCryptoTab::save() { } TQString SecurityPage::WarningTab::helpAnchor() const { - return TQString::fromLatin1("configure-security-warnings"); + return TQString::tqfromLatin1("configure-security-warnings"); } SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * name ) @@ -4177,7 +4177,7 @@ void SecurityPage::WarningTab::slotReenableAllWarningsClicked() { //// TQString SecurityPage::SMimeTab::helpAnchor() const { - return TQString::fromLatin1("configure-security-smime-validation"); + return TQString::tqfromLatin1("configure-security-smime-validation"); } SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name ) @@ -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)" ).arg( systemProxy ) ); + mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).tqarg( 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" ).arg( componentName, groupName, entryName ) << endl; + kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).tqarg( 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" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) << endl; + 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; return 0; } return entry; @@ -4495,7 +4495,7 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp //// TQString SecurityPage::CryptPlugTab::helpAnchor() const { - return TQString::fromLatin1("configure-security-crypto-backends"); + return TQString::tqfromLatin1("configure-security-crypto-backends"); } SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const char * name ) @@ -4528,7 +4528,7 @@ void SecurityPage::CryptPlugTab::save() { // * * // ************************************************************* TQString MiscPage::helpAnchor() const { - return TQString::fromLatin1("configure-misc"); + return TQString::tqfromLatin1("configure-misc"); } MiscPage::MiscPage( TQWidget * parent, const char * name ) @@ -4543,7 +4543,7 @@ MiscPage::MiscPage( TQWidget * parent, const char * name ) } TQString MiscPage::FolderTab::helpAnchor() const { - return TQString::fromLatin1("configure-misc-folders"); + return TQString::tqfromLatin1("configure-misc-folders"); } MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) @@ -4797,7 +4797,7 @@ void MiscPage::FolderTab::save() { } TQString MiscPage::GroupwareTab::helpAnchor() const { - return TQString::fromLatin1("configure-misc-groupware"); + return TQString::tqfromLatin1("configure-misc-groupware"); } MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) @@ -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" ).arg( acct->id() ); + folderId = TQString( ".%1.directory/INBOX" ).tqarg( acct->id() ); GlobalSettings::self()->setTheIMAPResourceAccount( acct->id() ); } } |