diff options
Diffstat (limited to 'kmail')
43 files changed, 187 insertions, 187 deletions
diff --git a/kmail/ChangeLog b/kmail/ChangeLog index 8dddd300..4af2bcb1 100644 --- a/kmail/ChangeLog +++ b/kmail/ChangeLog @@ -245,7 +245,7 @@ please visit http://webcvs.kde.org 1999-01-23 Stefan Taferner <taferner@kde.org> (KMail-1.0.14) - * New feature: tqlayout can now be switched between + * New feature: layout can now be switched between "long folder list" and "short folder list". Option setable in settings->appearance. @@ -264,7 +264,7 @@ please visit http://webcvs.kde.org Now it is possible to have more folders than the screen is high and still select them in the filter dialog. * Filter Dialog: changed folder combo box to (semi) auto - resize. Changed tqlayout of dialog to better display all + resize. Changed layout of dialog to better display all elements. Also enabled vertical resizing of dialog. 1999-01-17 Stefan Taferner <taferner@kde.org> (KMail-1.0.12) diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index cdab18ac..d970bbe8 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -316,9 +316,9 @@ with questions... length := Q_UINT16 ; little endian (native?) - value := tqunicode-string-value / ulong-value + value := unicode-string-value / ulong-value - tqunicode-string-value := 0*256QChar ; network-byte-order + unicode-string-value := 0*256QChar ; network-byte-order ulong-value := unsigned_long ; little endian @@ -344,7 +344,7 @@ Currently defined tag values are: StrippedSubject 15 u strippedSubjectMD5().stripWhiteSpace() Status 16 l status() - u: tqunicode-string-value; l: ulong-value + u: unicode-string-value; l: ulong-value Proposed new (KDE 3.2 / KMail 1.6) entry format: diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp index 0782f3d3..2ed80f7b 100644 --- a/kmail/aboutdata.cpp +++ b/kmail/aboutdata.cpp @@ -196,7 +196,7 @@ namespace KMail { "jan@simonson.pp.se", 0 }, { "Paul Sprakes", 0, 0, 0 }, // fix for bug:63619 (filter button in toolbar doesn't work), context menu clean up { "Will Stephenson", 0, 0, 0 }, // added IM status indicator - { "Hasso Tepper", 0, 0, 0 }, // improve tqlayout of recipients editor + { "Hasso Tepper", 0, 0, 0 }, // improve layout of recipients editor { "Patrick S. Vogt", I18N_NOOP("timestamp for 'Transmission completed' status messages"), "patrick.vogt@unibas.ch", 0 }, { "Jan-Oliver Wagner", I18N_NOOP("\xC3\x84gypten and Kroupware project management"), diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index fd29fa19..b25a1a2a 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -358,9 +358,9 @@ void AccountDialog::makeLocalAccountPage() TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page ); group->setColumnLayout(0, Qt::Horizontal); - group->tqlayout()->setSpacing( 0 ); - group->tqlayout()->setMargin( 0 ); - TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() ); + group->layout()->setSpacing( 0 ); + group->layout()->setMargin( 0 ); + TQGridLayout *groupLayout = new TQGridLayout( group->layout() ); groupLayout->setAlignment( TQt::AlignTop ); groupLayout->setSpacing( 6 ); groupLayout->setMargin( 11 ); @@ -1127,7 +1127,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) // TODO (marc/bo): Test this mSieveConfigEditor = new SieveConfigEditor( tabWidget ); - mSieveConfigEditor->tqlayout()->setMargin( KDialog::marginHint() ); + mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") ); connect(kapp,TQT_SIGNAL(kdisplayFontChanged()),TQT_SLOT(slotFontChanged())); diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index caafcb35..5ae16164 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -215,29 +215,29 @@ void AccountWizard::setupAccountTypePage() void AccountWizard::setupAccountInformationPage() { mAccountInformationPage = new TQWidget( this ); - TQGridLayout *tqlayout = new TQGridLayout( mAccountInformationPage, 3, 2, + TQGridLayout *layout = new TQGridLayout( mAccountInformationPage, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Real name:" ), mAccountInformationPage ); mRealName = new KLineEdit( mAccountInformationPage ); label->setBuddy( mRealName ); - tqlayout->addWidget( label, 0, 0 ); - tqlayout->addWidget( mRealName, 0, 1 ); + layout->addWidget( label, 0, 0 ); + layout->addWidget( mRealName, 0, 1 ); label = new TQLabel( i18n( "E-mail address:" ), mAccountInformationPage ); mEMailAddress = new KLineEdit( mAccountInformationPage ); label->setBuddy( mEMailAddress ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->addWidget( mEMailAddress, 1, 1 ); + layout->addWidget( label, 1, 0 ); + layout->addWidget( mEMailAddress, 1, 1 ); label = new TQLabel( i18n( "Organization:" ), mAccountInformationPage ); mOrganization = new KLineEdit( mAccountInformationPage ); label->setBuddy( mOrganization ); - tqlayout->addWidget( label, 2, 0 ); - tqlayout->addWidget( mOrganization, 2, 1 ); + layout->addWidget( label, 2, 0 ); + layout->addWidget( mOrganization, 2, 1 ); addPage( mAccountInformationPage, i18n( "Account Information" ) ); } @@ -245,23 +245,23 @@ void AccountWizard::setupAccountInformationPage() void AccountWizard::setupLoginInformationPage() { mLoginInformationPage = new TQWidget( this ); - TQGridLayout *tqlayout = new TQGridLayout( mLoginInformationPage, 2, 2, + TQGridLayout *layout = new TQGridLayout( mLoginInformationPage, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Login name:" ), mLoginInformationPage ); mLoginName = new KLineEdit( mLoginInformationPage ); label->setBuddy( mLoginName ); - tqlayout->addWidget( label, 0, 0 ); - tqlayout->addWidget( mLoginName, 0, 1 ); + layout->addWidget( label, 0, 0 ); + layout->addWidget( mLoginName, 0, 1 ); label = new TQLabel( i18n( "Password:" ), mLoginInformationPage ); mPassword = new KLineEdit( mLoginInformationPage ); mPassword->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPassword ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->addWidget( mPassword, 1, 1 ); + layout->addWidget( label, 1, 0 ); + layout->addWidget( mPassword, 1, 1 ); addPage( mLoginInformationPage, i18n( "Login Information" ) ); } @@ -269,7 +269,7 @@ void AccountWizard::setupLoginInformationPage() void AccountWizard::setupServerInformationPage() { mServerInformationPage = new TQWidget( this ); - TQGridLayout *tqlayout = new TQGridLayout( mServerInformationPage, 3, 2, + TQGridLayout *layout = new TQGridLayout( mServerInformationPage, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); mIncomingLabel = new TQLabel( mServerInformationPage ); @@ -285,23 +285,23 @@ void AccountWizard::setupServerInformationPage() connect( mChooseLocation, TQT_SIGNAL( clicked() ), this, TQT_SLOT( chooseLocation() ) ); - tqlayout->addWidget( mIncomingLabel, 0, 0, AlignTop ); - tqlayout->addWidget( mIncomingLocationWdg, 0, 1 ); - tqlayout->addWidget( mIncomingServerWdg, 0, 1 ); + layout->addWidget( mIncomingLabel, 0, 0, AlignTop ); + layout->addWidget( mIncomingLocationWdg, 0, 1 ); + layout->addWidget( mIncomingServerWdg, 0, 1 ); TQLabel *label = new TQLabel( i18n( "Outgoing server:" ), mServerInformationPage ); mOutgoingServer = new KLineEdit( mServerInformationPage ); label->setBuddy( mOutgoingServer ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->addWidget( mOutgoingServer, 1, 1 ); + layout->addWidget( label, 1, 0 ); + layout->addWidget( mOutgoingServer, 1, 1 ); mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mServerInformationPage ); - tqlayout->addWidget( mOutgoingUseSSL, 2, 1 ); + layout->addWidget( mOutgoingUseSSL, 2, 1 ); mLocalDelivery = new TQCheckBox( i18n( "Use local delivery" ), mServerInformationPage ); - tqlayout->addWidget( mLocalDelivery, 3, 0 ); + layout->addWidget( mLocalDelivery, 3, 0 ); connect( mLocalDelivery, TQT_SIGNAL( toggled( bool ) ), mOutgoingServer, TQT_SLOT( setDisabled( bool ) ) ); diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 533ee379..a63ecae9 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -855,7 +855,7 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, TQWidget * parent, const char * name ) : ASWizPage( parent, name ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); + TQBoxLayout * layout = new TQVBoxLayout( mLayout ); mIntroText = new TQLabel( this ); mIntroText->setText( @@ -879,26 +879,26 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, "deleting the filter rules created by the wizard to get " "back to the former behavior." ) ); - tqlayout->addWidget( mIntroText ); + layout->addWidget( mIntroText ); mScanProgressText = new TQLabel( this ); mScanProgressText->setText( "" ) ; - tqlayout->addWidget( mScanProgressText ); + layout->addWidget( mScanProgressText ); mToolsList = new KListBox( this ); mToolsList->hide(); mToolsList->setSelectionMode( TQListBox::Multi ); mToolsList->setRowMode( TQListBox::FixedNumber ); mToolsList->setRowMode( 10 ); - tqlayout->addWidget( mToolsList ); + layout->addWidget( mToolsList ); connect( mToolsList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(processSelectionChange(void)) ); mSelectionHint = new TQLabel( this ); mSelectionHint->setText( "" ); - tqlayout->addWidget( mSelectionHint ); + layout->addWidget( mSelectionHint ); - tqlayout->addStretch(); + layout->addStretch(); } @@ -940,18 +940,18 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree ) : ASWizPage( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout ); + TQVBoxLayout *layout = new TQVBoxLayout( mLayout ); mMarkRules = new TQCheckBox( i18n("&Mark detected spam messages as read"), this ); TQWhatsThis::add( mMarkRules, i18n( "Mark messages which have been classified as spam as read.") ); - tqlayout->addWidget( mMarkRules); + layout->addWidget( mMarkRules); mMoveSpamRules = new TQCheckBox( i18n("Move &known spam to:"), this ); TQWhatsThis::add( mMoveSpamRules, i18n( "The default folder for spam messages is the trash folder, " "but you may change that in the folder view below.") ); - tqlayout->addWidget( mMoveSpamRules ); + layout->addWidget( mMoveSpamRules ); mFolderReqForSpamFolder = new FolderRequester( this, mainFolderTree ); mFolderReqForSpamFolder->setFolder( "trash" ); @@ -959,7 +959,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, mFolderReqForSpamFolder->setShowOutbox( false ); mFolderReqForSpamFolder->setShowImapFolders( false ); - TQHBoxLayout *hLayout1 = new TQHBoxLayout( tqlayout ); + TQHBoxLayout *hLayout1 = new TQHBoxLayout( layout ); hLayout1->addSpacing( KDialog::spacingHint() * 3 ); hLayout1->addWidget( mFolderReqForSpamFolder ); @@ -969,7 +969,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, "in the folder view below.<p>" "Not all tools support a classification as unsure. If you haven't " "selected a capable tool, you can't select a folder as well.") ); - tqlayout->addWidget( mMoveUnsureRules ); + layout->addWidget( mMoveUnsureRules ); mFolderReqForUnsureFolder = new FolderRequester( this, mainFolderTree ); mFolderReqForUnsureFolder->setFolder( "inbox" ); @@ -977,11 +977,11 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, mFolderReqForUnsureFolder->setShowOutbox( false ); mFolderReqForUnsureFolder->setShowImapFolders( false ); - TQHBoxLayout *hLayout2 = new TQHBoxLayout( tqlayout ); + TQHBoxLayout *hLayout2 = new TQHBoxLayout( layout ); hLayout2->addSpacing( KDialog::spacingHint() * 3 ); hLayout2->addWidget( mFolderReqForUnsureFolder ); - tqlayout->addStretch(); + layout->addStretch(); connect( mMarkRules, TQT_SIGNAL(clicked()), this, TQT_SLOT(processSelectionChange(void)) ); @@ -1138,11 +1138,11 @@ void ASWizVirusRulesPage::processSelectionChange() ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name ) : ASWizPage( parent, name ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); + TQBoxLayout * layout = new TQVBoxLayout( mLayout ); mSummaryText = new TQLabel( this ); - tqlayout->addWidget( mSummaryText ); - tqlayout->addStretch(); + layout->addWidget( mSummaryText ); + layout->addStretch(); } diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp index 475ddd44..ea21ca01 100644 --- a/kmail/chiasmuskeyselector.cpp +++ b/kmail/chiasmuskeyselector.cpp @@ -14,26 +14,26 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt { TQWidget *page = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint()); mLabel = new TQLabel( i18n( "Please select the Chiasmus key file to use:" ), page ); - tqlayout->addWidget( mLabel ); + layout->addWidget( mLabel ); mListBox = new KListBox( page ); mListBox->insertStringList( keys ); const int current = keys.findIndex( currentKey ); mListBox->setSelected( TQMAX( 0, current ), true ); mListBox->ensureCurrentVisible(); - tqlayout->addWidget( mListBox, 1 ); + layout->addWidget( mListBox, 1 ); TQLabel* optionLabel = new TQLabel( i18n( "Additional arguments for chiasmus:" ), page ); - tqlayout->addWidget( optionLabel ); + layout->addWidget( optionLabel ); mOptions = new KLineEdit( lastOptions, page ); optionLabel->setBuddy( mOptions ); - tqlayout->addWidget( mOptions ); + layout->addWidget( mOptions ); - tqlayout->addStretch(); + layout->addStretch(); connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 538b6205..e569eff3 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()) ); diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 93f6123c..9f668ca3 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -195,7 +195,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, bool modal ) : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true ) { - // tqlayout the page (a combobox with label): + // layout the page (a combobox with label): TQWidget *page = makeMainWidget(); TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() ); mComboBox = new TQComboBox( false, page ); diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index 73300edd..df92c4f3 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -15,7 +15,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -147,7 +147,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -155,7 +155,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -181,7 +181,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -222,7 +222,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> diff --git a/kmail/encodingdetector.h b/kmail/encodingdetector.h index 0f223178..9fe17306 100644 --- a/kmail/encodingdetector.h +++ b/kmail/encodingdetector.h @@ -35,7 +35,7 @@ class EncodingDetectorPrivate; * Searches for encoding declaration inside raw data -- meta and xml tags. * In the case it can't find it, uses heuristics for specified language. * - * If it finds tqunicode BOM marks, it changes encoding regardless of what the user has told + * If it finds unicode BOM marks, it changes encoding regardless of what the user has told * * Intended lifetime of the object: one instance per document. * diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp index 98c3579c..1faf61a1 100644 --- a/kmail/folderdiaquotatab_p.cpp +++ b/kmail/folderdiaquotatab_p.cpp @@ -56,19 +56,19 @@ QuotaWidget::QuotaWidget( TQWidget* parent, const char* name ) { TQVBoxLayout *box = new TQVBoxLayout(this); TQWidget *stuff = new TQWidget( this ); - TQGridLayout* tqlayout = + TQGridLayout* layout = new TQGridLayout( stuff, 3, 3, KDialog::marginHint(), KDialog::spacingHint() ); mInfoLabel = new TQLabel("", stuff ); mRootLabel = new TQLabel("", stuff ); mProgressBar = new TQProgressBar( stuff ); - tqlayout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 ); - tqlayout->addWidget( mRootLabel, 0, 1 ); - tqlayout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 ); - //tqlayout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 ); - tqlayout->addWidget( mInfoLabel, 1, 1 ); - tqlayout->addWidget( mProgressBar, 2, 1 ); + layout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 ); + layout->addWidget( mRootLabel, 0, 1 ); + layout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 ); + //layout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 ); + layout->addWidget( mInfoLabel, 1, 1 ); + layout->addWidget( mProgressBar, 2, 1 ); box->addWidget( stuff ); box->addStretch( 2 ); } diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index 68c881f0..4355c9df 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -108,9 +108,9 @@ void FolderTreeBase::readColorConfig() KConfig* conf = KMKernel::config(); // Custom/System color support KConfigGroupSaver saver(conf, "Reader"); - TQColor c1=TQColor(kapp->tqpalette().active().text()); + TQColor c1=TQColor(kapp->palette().active().text()); TQColor c2=TQColor("blue"); - TQColor c4=TQColor(kapp->tqpalette().active().base()); + TQColor c4=TQColor(kapp->palette().active().base()); TQColor c5=TQColor("red"); if (!conf->readBoolEntry("defaultColors",true)) { diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index ab3ae936..1e745517 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -124,7 +124,7 @@ namespace KMail { strategy = HeaderStrategy::brief(); // The direction of the header is determined according to the direction - // of the application tqlayout. + // of the application layout. TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ; @@ -223,7 +223,7 @@ namespace KMail { strategy = HeaderStrategy::rich(); // The direction of the header is determined according to the direction - // of the application tqlayout. + // of the application layout. TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); @@ -427,7 +427,7 @@ namespace KMail { // ### from kmreaderwin begin // The direction of the header is determined according to the direction - // of the application tqlayout. + // of the application layout. TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").arg(dir); @@ -882,7 +882,7 @@ namespace KMail { strategy = HeaderStrategy::brief(); // The direction of the header is determined according to the direction - // of the application tqlayout. + // of the application layout. TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ; diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index c2455264..b37a400d 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -427,11 +427,11 @@ namespace KMail { // Tab Widget: Signature // mSignatureConfigurator = new SignatureConfigurator( tabWidget ); - mSignatureConfigurator->tqlayout()->setMargin( KDialog::marginHint() ); + mSignatureConfigurator->layout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mSignatureConfigurator, i18n("&Signature") ); mXFaceConfigurator = new XFaceConfigurator( tabWidget ); - mXFaceConfigurator->tqlayout()->setMargin( KDialog::marginHint() ); + mXFaceConfigurator->layout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") ); KConfigGroup geometry( KMKernel::config(), "Geometry" ); diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 72a68c65..1ece4c51 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -426,9 +426,9 @@ TQString KMAccount::encryptStr(const TQString &aStr) TQString result; for (uint i = 0; i < aStr.length(); i++) /* yes, no typo. can't encode ' ' or '!' because - they're the tqunicode BOM. stupid scrambling. stupid. */ - result += (aStr[i].tqunicode() <= 0x21 ) ? aStr[i] : - TQChar(0x1001F - aStr[i].tqunicode()); + they're the unicode BOM. stupid scrambling. stupid. */ + result += (aStr[i].unicode() <= 0x21 ) ? aStr[i] : + TQChar(0x1001F - aStr[i].unicode()); return result; } diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg index b2cd4d39..d1889e29 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -561,10 +561,10 @@ <default>true</default> </entry> <entry name="ForegroundColor" type="Color" key="ForegroundColor"> - <default code="true">kapp->tqpalette().active().text()</default> + <default code="true">kapp->palette().active().text()</default> </entry> <entry name="BackgroundColor" type="Color" key="BackgroundColor"> - <default code="true">kapp->tqpalette().active().base()</default> + <default code="true">kapp->palette().active().base()</default> </entry> <entry name="FallbackCharacterEncoding" type="String" key="FallbackCharacterEncoding"> <default code="true"> TQCString(TQTextCodec::codecForLocale()->name()).lower() == "eucjp"? TQCString("jis7") : TQCString(TQTextCodec::codecForLocale()->name()).lower()</default> diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 341a3520..3194b0ca 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -586,7 +586,7 @@ KMUrlCopyCommand::KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget ) KMCommand::Result KMUrlCopyCommand::execute() { - TQClipboard* clip = TQApplication::tqclipboard(); + TQClipboard* clip = TQApplication::clipboard(); if (mUrl.protocol() == "mailto") { // put the url into the mouse selection and the clipboard diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 31fff2ad..7db2c677 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -648,8 +648,8 @@ bool KMComposeWin::event(TQEvent *e) void KMComposeWin::readColorConfig(void) { if ( GlobalSettings::self()->useDefaultColors() ) { - mForeColor = TQColor(kapp->tqpalette().active().text()); - mBackColor = TQColor(kapp->tqpalette().active().base()); + mForeColor = TQColor(kapp->palette().active().text()); + mBackColor = TQColor(kapp->palette().active().base()); } else { mForeColor = GlobalSettings::self()->foregroundColor(); mBackColor = GlobalSettings::self()->backgroundColor(); @@ -3665,7 +3665,7 @@ void KMComposeWin::slotPasteClipboardAsQuotation() { if( mEditor->hasFocus() && msg() ) { - TQString s = TQApplication::tqclipboard()->text(); + TQString s = TQApplication::clipboard()->text(); if (!s.isEmpty()) mEditor->insert(addQuotesToText(s)); } @@ -3673,13 +3673,13 @@ void KMComposeWin::slotPasteClipboardAsQuotation() void KMComposeWin::slotPasteClipboardAsAttachment() { - KURL url( TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); + KURL url( TQApplication::clipboard()->text( TQClipboard::Clipboard ) ); if ( url.isValid() ) { - addAttach(TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); + addAttach(TQApplication::clipboard()->text( TQClipboard::Clipboard ) ); return; } - TQMimeSource *mimeSource = TQApplication::tqclipboard()->data(); + TQMimeSource *mimeSource = TQApplication::clipboard()->data(); if ( TQImageDrag::canDecode(mimeSource) ) { slotAttachPNGImageData(mimeSource->encodedData("image/png")); } @@ -3691,7 +3691,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment() KMMessagePart *msgPart = new KMMessagePart; msgPart->setName(attName); TQValueList<int> dummy; - msgPart->setBodyAndGuessCte(TQCString(TQApplication::tqclipboard()->text().latin1()), dummy, + msgPart->setBodyAndGuessCte(TQCString(TQApplication::clipboard()->text().latin1()), dummy, kmkernel->msgSender()->sendQuotedPrintable()); addAttach(msgPart); } @@ -3832,7 +3832,7 @@ void KMComposeWin::paste( TQClipboard::Mode mode ) TQWidget* fw = focusWidget(); if (!fw) return; - TQMimeSource *mimeSource = TQApplication::tqclipboard()->data( mode ); + TQMimeSource *mimeSource = TQApplication::clipboard()->data( mode ); if ( mimeSource->provides("image/png") ) { slotAttachPNGImageData(mimeSource->encodedData("image/png")); } else if ( KURLDrag::canDecode( mimeSource ) ) { @@ -4982,7 +4982,7 @@ void KMComposeWin::slotSpellcheckConfig() KWin twin; TQTabDialog qtd (this, "tabdialog", true); KSpellConfig mKSpellConfig (&qtd); - mKSpellConfig.tqlayout()->setMargin( KDialog::marginHint() ); + mKSpellConfig.layout()->setMargin( KDialog::marginHint() ); qtd.addTab (&mKSpellConfig, i18n("Spellchecker")); qtd.setCancelButton (); diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 4b45adc8..99382915 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -251,7 +251,7 @@ void KMEdit::initializeAutoSpellChecking() TQColor defaultColor1( 0x00, 0x80, 0x00 ); // defaults from kmreaderwin.cpp TQColor defaultColor2( 0x00, 0x70, 0x00 ); TQColor defaultColor3( 0x00, 0x60, 0x00 ); - TQColor defaultForeground( kapp->tqpalette().active().text() ); + TQColor defaultForeground( kapp->palette().active().text() ); TQColor c = TQt::red; KConfigGroup readerConfig( KMKernel::config(), "Reader" ); @@ -281,7 +281,7 @@ TQPopupMenu *KMEdit::createPopupMenu( const TQPoint& pos ) enum { IdUndo, IdRedo, IdSep1, IdCut, IdCopy, IdPaste, IdClear, IdSep2, IdSelectAll }; TQPopupMenu *menu = KEdit::createPopupMenu( pos ); - if ( !TQApplication::tqclipboard()->image().isNull() ) { + if ( !TQApplication::clipboard()->image().isNull() ) { int id = menu->idAt(0); menu->setItemEnabled( id - IdPaste, true); } diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index d484102a..4ba4422c 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -1140,7 +1140,7 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name ) // don't show scroll bars. mComboBox->setSizeLimit( mComboBox->count() ); - // tqlayout management: + // layout management: // o the combo box is not to be made larger than it's sizeHint(), // the parameter widget should grow instead. // o the whole widget takes all space horizontally, but is fixed vertically. diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index dead2a98..161354bc 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -234,14 +234,14 @@ void KMFolderDialog::setFolder( KMFolder* folder ) mFolder = folder; } -static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout ) +static void addLine( TQWidget *parent, TQVBoxLayout* layout ) { TQFrame *line = new TQFrame( parent, "line" ); line->setGeometry( TQRect( 80, 150, 250, 20 ) ); line->setFrameShape( TQFrame::HLine ); line->setFrameShadow( TQFrame::Sunken ); line->setFrameShape( TQFrame::HLine ); - tqlayout->addWidget( line ); + layout->addWidget( line ); } //---------------------------------------------------------------------------- @@ -449,7 +449,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, addLine( this, topLayout ); - // use grid tqlayout for the following combobox settings + // use grid layout for the following combobox settings TQGridLayout *gl = new TQGridLayout( topLayout, 3, 2, KDialog::spacingHint() ); gl->setColStretch( 1, 100 ); // make the second column use all available space int row = -1; diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index a0fe190d..63010f9b 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -495,7 +495,7 @@ void KMFolderTree::readConfig (void) setFont(KGlobalSettings::generalFont()); } - // restore the tqlayout + // restore the layout restoreLayout(conf, "Geometry"); } @@ -510,7 +510,7 @@ void KMFolderTree::writeConfig() writeIsListViewItemOpen(fti); } - // save the current tqlayout + // save the current layout saveLayout(KMKernel::config(), "Geometry"); } diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 7b5d2a3c..0b10d3d4 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -429,10 +429,10 @@ void KMHeaders::readColorConfig (void) KConfig* config = KMKernel::config(); // Custom/System colors KConfigGroupSaver saver(config, "Reader"); - TQColor c1=TQColor(kapp->tqpalette().active().text()); + TQColor c1=TQColor(kapp->palette().active().text()); TQColor c2=TQColor("red"); TQColor c3=TQColor("blue"); - TQColor c4=TQColor(kapp->tqpalette().active().base()); + TQColor c4=TQColor(kapp->palette().active().base()); TQColor c5=TQColor(0,0x7F,0); TQColor c6=TQColor(0,0x98,0); TQColor c7=KGlobalSettings::alternateBackgroundColor(); @@ -1371,10 +1371,10 @@ void KMHeaders::setStyleDependantFrameWidth() { // set the width of the frame to a reasonable value for the current GUI style int frameWidth; - if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + if( style().isA("KeramikStyle") ) + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) @@ -2676,7 +2676,7 @@ static void internalWriteItem(FILE *sortStream, KMFolder *folder, int msgid, TQ_INT32 len = key.length() * sizeof(TQChar); fwrite(&len, sizeof(len), 1, sortStream); if (len) - fwrite(key.tqunicode(), TQMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream); + fwrite(key.unicode(), TQMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream); if (update_discover) { //update the discovered change count diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 392f348b..33380686 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -551,7 +551,7 @@ void KMMainWidget::writeConfig(void) //----------------------------------------------------------------------------- void KMMainWidget::createWidgets(void) { - // Create the splitters according to the tqlayout settings + // Create the splitters according to the layout settings TQWidget *headerParent = 0, *mimeParent = 0, *messageParent = 0; @@ -587,7 +587,7 @@ void KMMainWidget::createWidgets(void) mTopLayout->add( mPanner1 ); // BUG -sanders these accelerators stop working after switching - // between long/short folder tqlayout + // between long/short folder layout // Probably need to disconnect them first. // create list of messages diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h index dbf34b1c..5045b0e6 100644 --- a/kmail/kmmessage.h +++ b/kmail/kmmessage.h @@ -545,7 +545,7 @@ public: */ void setBodyFromUnicode( const TQString & str, DwEntity *entity = 0 ); - /** Returns the body part decoded to tqunicode. + /** Returns the body part decoded to unicode. **/ TQString bodyToUnicode(const TQTextCodec* codec=0) const; @@ -746,7 +746,7 @@ public: static TQString guessEmailAddressFromLoginName( const TQString& userName ); /** - * Given argument msg add quoting characters and retqlayout for max width maxLength + * Given argument msg add quoting characters and relayout for max width maxLength * @param msg the string which it to be quoted * @param maxLineLength reformat text to be this amount of columns at maximum, adding * linefeeds at word boundaries to make it fit. diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index e5cead4d..50af4a42 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -95,7 +95,7 @@ void KMMimePartTree::restoreLayoutIfPresent() { header()->setStretchEnabled( true, 0 ); // rest of the columns: if ( KMKernel::config()->hasGroup( configGroup ) ) { - // there is a saved tqlayout. use it... + // there is a saved layout. use it... restoreLayout( KMKernel::config(), configGroup ); // and disable Maximum mode: for ( int i = 1 ; i < 4 ; ++i ) @@ -213,10 +213,10 @@ void KMMimePartTree::setStyleDependantFrameWidth() { // set the width of the frame to a reasonable value for the current GUI style int frameWidth; - if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + if( style().isA("KeramikStyle") ) + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) @@ -309,7 +309,7 @@ void KMMimePartTree::slotCopy() if ( !url.isValid() ) return; urls.append( url ); KURLDrag* drag = new KURLDrag( urls, this ); - TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard ); } //============================================================================= diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index 0f7e2890..6a5a1057 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -587,7 +587,7 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok) TQString result = _str; int len = result.length(); for (int i = 0; i < len; i++) - if (result.at(i).tqunicode() >= 128) { + if (result.at(i).unicode() >= 128) { result.at(i) = '?'; all_ok = false; } @@ -800,7 +800,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, unsigned int nonAscii = 0; unsigned int strLength(_str.length()); for (unsigned int i = 0; i < strLength; i++) - if (_str.at(i).tqunicode() >= 128) nonAscii++; + if (_str.at(i).unicode() >= 128) nonAscii++; bool useBase64 = (nonAscii * 6 > strLength); unsigned int start, stop, p, pos = 0, encLength; @@ -815,7 +815,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, { if (!breakLine && (_str.at(p) == ' ' || dontQuote.find(_str.at(p)) != -1)) start = p + 1; - if (_str.at(p).tqunicode() >= 128 || _str.at(p).tqunicode() < 32) + if (_str.at(p).unicode() >= 128 || _str.at(p).unicode() < 32) break; p++; } @@ -1119,9 +1119,9 @@ static void swapEndian(TQString &str) { uint len = str.length(); str = TQDeepCopy<TQString>(str); - TQChar *tqunicode = const_cast<TQChar*>( str.tqunicode() ); + TQChar *unicode = const_cast<TQChar*>( str.unicode() ); for (uint i = 0; i < len; i++) - tqunicode[i] = kmail_swap_16(tqunicode[i].tqunicode()); + unicode[i] = kmail_swap_16(unicode[i].unicode()); } //----------------------------------------------------------------------------- @@ -1371,23 +1371,23 @@ const uchar *KMMsgBase::asIndexString(int &length) const //these is at the beginning because it is queried quite often tmp_str = msgIdMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); tmp = mLegacyStatus; STORE_DATA(MsgLegacyStatusPart, tmp); //these are completely arbitrary order tmp_str = fromStrip().stripWhiteSpace(); - STORE_DATA_LEN(MsgFromStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgFromStripPart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = subject().stripWhiteSpace(); - STORE_DATA_LEN(MsgSubjectPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgSubjectPart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = toStrip().stripWhiteSpace(); - STORE_DATA_LEN(MsgToStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgToStripPart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = replyToIdMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = xmark().stripWhiteSpace(); - STORE_DATA_LEN(MsgXMarkPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgXMarkPart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = fileName().stripWhiteSpace(); - STORE_DATA_LEN(MsgFilePart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgFilePart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp = msgSize(); STORE_DATA(MsgSizePart, tmp); tmp = folderOffset(); @@ -1400,10 +1400,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const STORE_DATA(MsgMDNSentPart, tmp); tmp_str = replyToAuxIdMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = strippedSubjectMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); tmp = status(); STORE_DATA(MsgStatusPart, tmp); @@ -1414,10 +1414,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const STORE_DATA(MsgUIDPart, tmp); tmp_str = from(); - STORE_DATA_LEN( MsgFromPart, tmp_str.tqunicode(), tmp_str.length() * 2, true ); + STORE_DATA_LEN( MsgFromPart, tmp_str.unicode(), tmp_str.length() * 2, true ); tmp_str = to(); - STORE_DATA_LEN( MsgToPart, tmp_str.tqunicode(), tmp_str.length() * 2, true ); + STORE_DATA_LEN( MsgToPart, tmp_str.unicode(), tmp_str.length() * 2, true ); return ret; } diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h index a135edc5..1137bb6e 100644 --- a/kmail/kmmsgbase.h +++ b/kmail/kmmsgbase.h @@ -459,7 +459,7 @@ public: enum MsgPartType { MsgNoPart = 0, - //tqunicode strings + //unicode strings MsgFromStripPart = 1, MsgSubjectPart = 2, MsgToStripPart = 3, @@ -474,7 +474,7 @@ public: MsgFilePart = 11, MsgCryptoStatePart = 12, MsgMDNSentPart = 13, - //another two tqunicode strings + //another two unicode strings MsgReplyToAuxIdMD5Part = 14, MsgStrippedSubjectMD5Part = 15, // and another unsigned long diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h index e4c41a40..9d69f87c 100644 --- a/kmail/kmmsgpart.h +++ b/kmail/kmmsgpart.h @@ -58,7 +58,7 @@ public: **/ void setBodyFromUnicode( const TQString & str ); - /** Returns the body part decoded to tqunicode. + /** Returns the body part decoded to unicode. **/ TQString bodyToUnicode(const TQTextCodec* codec=0) const; diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 6e310641..e7cfe858 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -1999,10 +1999,10 @@ void KMReaderWin::setStyleDependantFrameWidth() return; // set the width of the frame to a reasonable value for the current GUI style int frameWidth; - if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + if( style().isA("KeramikStyle") ) + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != mBox->lineWidth() ) @@ -2041,7 +2041,7 @@ void KMReaderWin::slotHandleAttachment( int choice ) if (!url.isValid() ) return; urls.append( url ); KURLDrag* drag = new KURLDrag( urls, this ); - TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard ); } else if ( choice == 10 ) { // Scroll To scrollToAttachment( node ); } @@ -2880,7 +2880,7 @@ void KMReaderWin::injectAttachments() imgSrc.append( "attachmentQuicklistOpened.png" ); } - TQString html = renderAttachments( mRootNode, TQApplication::tqpalette().active().background() ); + TQString html = renderAttachments( mRootNode, TQApplication::palette().active().background() ); if ( html.isEmpty() ) return; diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index d3188926..baa63731 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -370,7 +370,7 @@ public slots: /** Refresh the reader window */ void updateReaderWin(); - /** HTML Widget scrollbar and tqlayout handling. */ + /** HTML Widget scrollbar and layout handling. */ void slotScrollUp(); void slotScrollDown(); void slotScrollPrior(); diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index 2e85c38d..b60ada92 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -55,12 +55,12 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* TQLabel* label; mLastItem = 0; - TQVBoxLayout *topLayout = new TQVBoxLayout( tqlayout(), spacingHint(), + TQVBoxLayout *topLayout = new TQVBoxLayout( layout(), spacingHint(), "topLayout" ); TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this ); mlGroup->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *groupLayout = new TQGridLayout( mlGroup->tqlayout(), 6, 3, spacingHint() ); + TQGridLayout *groupLayout = new TQGridLayout( mlGroup->layout(), 6, 3, spacingHint() ); topLayout->addWidget( mlGroup ); setMainWidget( mlGroup ); diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index 6b6b6819..8d87d2d4 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -536,7 +536,7 @@ void RecipientsView::resizeView() // setFixedHeight( mLineHeight * mLines.count() ); } - parentWidget()->tqlayout()->activate(); + parentWidget()->layout()->activate(); emit sizeHintChanged(); TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) ); } diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index e2955167..1239e65d 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -52,7 +52,7 @@ namespace KMail { TQVBoxLayout * vlay; TQVBoxLayout * page_vlay; - vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" ); + vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" ); // "enable signatue" checkbox: mEnableCheck = new TQCheckBox( i18n("&Enable signature"), this ); diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui index a1a34d39..430cbe7f 100644 --- a/kmail/smimeconfiguration.ui +++ b/kmail/smimeconfiguration.ui @@ -54,7 +54,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -80,7 +80,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -202,7 +202,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -312,7 +312,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index 4197fa19..d2b5c19d 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -49,8 +49,8 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam connect( snippetName, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed()) ); - tqlayout3->addWidget( textLabel3, 7, 0 ); - tqlayout3->addWidget( keyButton, 7, 1 ); + layout3->addWidget( textLabel3, 7, 0 ); + layout3->addWidget( keyButton, 7, 1 ); // tab order setTabOrder( snippetText, keyButton ); diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui index f49212ad..3f05f08f 100644 --- a/kmail/snippetdlgbase.ui +++ b/kmail/snippetdlgbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -64,7 +64,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui index 83eba964..c266a202 100644 --- a/kmail/snippetsettingsbase.ui +++ b/kmail/snippetsettingsbase.ui @@ -123,7 +123,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index 2c81c6d2..0b4f271a 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -660,7 +660,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ TQDialog dlg(this); dlg.setCaption(i18n("Enter Values for Variables")); - TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout"); + TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout"); TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop"); TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar"); TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn"); @@ -674,11 +674,11 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ labTop->sizePolicy().hasHeightForWidth() ) ); labTop->setText(i18n("Enter the replacement values for these variables:")); layoutTop->addWidget(labTop, 0, 0); - tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); + layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); int i = 0; //walk through the variable map and add - for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main tqlayout + for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main layout if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter()) continue; @@ -705,7 +705,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ i++; } - tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); + layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" ); btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, @@ -718,7 +718,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ btn2->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn2, 0, 1 ); - tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); + layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots @@ -767,7 +767,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ delete layoutTop; delete layoutVar; delete layoutBtn; - delete tqlayout; + delete layout; if (i==0) //if nothing happened this means, that there are no variables to translate return true; //.. so just return OK @@ -788,7 +788,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri TQDialog dlg(this); dlg.setCaption(i18n("Enter Values for Variables")); - TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout"); + TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout"); TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop"); TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar"); TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn"); @@ -800,7 +800,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri labTop = new TQLabel( &dlg, "label" ); layoutTop->addWidget(labTop, 0, 0); labTop->setText(i18n("Enter the replacement values for %1:").arg( var )); - tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); + layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); cb = new TQCheckBox( &dlg, "cbVar" ); @@ -820,7 +820,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri "If you use the same variable later, even in another snippet, the value entered to the right " "will be the default value for that variable.") ); - tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); + layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" ); layoutBtn->addWidget( btn1, 0, 0 ); @@ -829,7 +829,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri btn2->setDefault( TRUE ); layoutBtn->addWidget( btn2, 0, 1 ); - tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); + layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); te->setFocus(); // --END-- building a dynamic dialog @@ -861,7 +861,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri delete layoutTop; delete layoutVar; delete layoutBtn; - delete tqlayout; + delete layout; return strReturn; } diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui index fb45fd02..c1ed8d44 100644 --- a/kmail/templatesconfiguration_base.ui +++ b/kmail/templatesconfiguration_base.ui @@ -258,7 +258,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui index f16a157b..cef88e25 100644 --- a/kmail/warningconfiguration.ui +++ b/kmail/warningconfiguration.ui @@ -357,7 +357,7 @@ The recommended SPHINX setting is 14 days. </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index d329ef36..64b165ef 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -84,7 +84,7 @@ namespace KMail { TQPushButton * mFromFileBtn; TQPushButton * mFromAddrbkBtn; - vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" ); + vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" ); hlay = new TQHBoxLayout( vlay ); // "enable X-Face" checkbox: |