diff options
Diffstat (limited to 'kmail/configuredialog.cpp')
-rw-r--r-- | kmail/configuredialog.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 538b6205f..e569eff3a 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -167,7 +167,7 @@ namespace { void populateButtonGroup( TQButtonGroup * g, const EnumConfigEntry & e ) { g->setTitle( i18n( e.desc ) ); - g->tqlayout()->setSpacing( KDialog::spacingHint() ); + g->layout()->setSpacing( KDialog::spacingHint() ); for ( int i = 0 ; i < e.numItems ; ++i ) g->insert( new TQRadioButton( i18n( e.items[i].desc ), g ), i ); } @@ -597,7 +597,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // label: zero stretch ### FIXME more vlay->addWidget( new TQLabel( i18n("Outgoing accounts (add at least one):"), this ) ); - // hbox tqlayout: stretch 10, spacing inherited from vlay + // hbox layout: stretch 10, spacing inherited from vlay hlay = new TQHBoxLayout(); vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's sizeHint @@ -614,7 +614,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * this, TQT_SLOT(slotModifySelectedTransport()) ); hlay->addWidget( mTransportList, 1 ); - // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay + // a vbox layout 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 tqlayout for the contents of the "common options" group box - glay = new TQGridLayout( group->tqlayout(), 5, 3, KDialog::spacingHint() ); + // a grid layout for the contents of the "common options" group box + glay = new TQGridLayout( group->layout(), 5, 3, KDialog::spacingHint() ); glay->setColStretch( 2, 10 ); // "confirm before send" check box: @@ -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 tqlayout: stretch 10, spacing inherited from vlay + // hbox layout: 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 tqlayout for the buttons: zero stretch, spacing inherited from hlay + // a vbox layout for the buttons: zero stretch, spacing inherited from hlay btn_vlay = new TQVBoxLayout( hlay ); // "add..." button: stretch 0 @@ -1123,7 +1123,7 @@ 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->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); // "beep on new mail" check box: mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group ); @@ -1793,9 +1793,9 @@ void AppearancePage::ColorsTab::doLoadOther() { mCloseToQuotaThreshold->setValue( GlobalSettings::closeToQuotaThreshold() ); static const TQColor defaultColor[ numColorNames ] = { - kapp->tqpalette().active().base(), // bg + kapp->palette().active().base(), // bg KGlobalSettings::alternateBackgroundColor(), // alt bg - kapp->tqpalette().active().text(), // fg + kapp->palette().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-tqlayout"); + return TQString::fromLatin1("configure-appearance-layout"); } static const EnumConfigEntryItem folderListModes[] = { @@ -2004,7 +2004,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "General Options" group: group = new TQVButtonGroup( i18n( "General Options" ), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->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->tqlayout()->setSpacing( KDialog::spacingHint() ); + mNestingPolicy->layout()->setSpacing( KDialog::spacingHint() ); mNestingPolicy->insert( new TQRadioButton( i18n("Always &keep threads open"), @@ -2053,7 +2053,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "Date Display" group: mDateDisplay = new TQVButtonGroup( i18n("Date Display"), this ); - mDateDisplay->tqlayout()->setSpacing( KDialog::spacingHint() ); + mDateDisplay->layout()->setSpacing( KDialog::spacingHint() ); for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) { TQString buttonLabel = i18n(dateDisplayConfig[i].displayName); @@ -2490,7 +2490,7 @@ AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, // System tray modes mSystemTrayGroup = new TQVButtonGroup( i18n("System Tray Mode"), this ); - mSystemTrayGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); + mSystemTrayGroup->layout()->setSpacing( KDialog::spacingHint() ); vlay->addWidget( mSystemTrayGroup ); connect( mSystemTrayGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotEmitChanged( void ) ) ); @@ -2766,7 +2766,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * // The "external editor" group: group = new TQVGroupBox( i18n("External Editor"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mExternalEditorCheck = new TQCheckBox( GlobalSettings::self()->useExternalEditorItem()->label(), @@ -3185,7 +3185,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); group = new TQVGroupBox( i18n("Repl&y Subject Prefixes"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); // row 0: help text: label = new TQLabel( i18n("Recognize any sequence of the following prefixes\n" @@ -3214,7 +3214,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * group = new TQVGroupBox( i18n("For&ward Subject Prefixes"), this ); - group->tqlayout()->setSpacing( KDialog::marginHint() ); + group->layout()->setSpacing( KDialog::marginHint() ); // row 0: help text: label= new TQLabel( i18n("Recognize any sequence of the following prefixes\n" @@ -3798,7 +3798,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "HTML Messages" group box: group = new TQVGroupBox( i18n( "HTML Messages" ), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mHtmlMailCheck = new TQCheckBox( i18n("Prefer H&TML to plain text"), group ); TQWhatsThis::add( mHtmlMailCheck, htmlWhatsThis ); @@ -3822,14 +3822,14 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // encrypted messages group group = new TQVGroupBox( i18n("Encrypted Messages"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->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->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); // "ignore", "ask", "deny", "always send" radiobutton line: @@ -3897,7 +3897,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "Attached keys" group box: group = new TQVGroupBox( i18n( "Certificate && Key Bundle Attachments" ), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mAutomaticallyImportAttachedKeysCheck = new TQCheckBox( i18n("Automatically import keys and certificates"), group ); connect( mAutomaticallyImportAttachedKeysCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); |