From 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:34:45 -0600 Subject: Rename old tq methods that no longer need a unique name --- kmail/configuredialog.cpp | 102 +++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'kmail/configuredialog.cpp') diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 59223cf89..6dd25347d 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -281,7 +281,7 @@ void ConfigureDialog::slotUser2() { // * * // ************************************************************* TQString IdentityPage::helpAnchor() const { - return TQString::tqfromLatin1("configure-identity"); + return TQString::fromLatin1("configure-identity"); } IdentityPage::IdentityPage( TQWidget * parent, const char * name ) @@ -552,7 +552,7 @@ void IdentityPage::slotUpdateTransportCombo( const TQStringList & sl ) // * * // ************************************************************* TQString AccountsPage::helpAnchor() const { - return TQString::tqfromLatin1("configure-accounts"); + return TQString::fromLatin1("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::tqfromLatin1("configure-accounts-sending"); + return TQString::fromLatin1("configure-accounts-sending"); } AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name ) @@ -599,7 +599,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // hbox tqlayout: stretch 10, spacing inherited from vlay hlay = new TQHBoxLayout(); - vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's tqsizeHint + vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's sizeHint // transport list: left widget in hlay; stretch 1 // ### FIXME: allow inline renaming of the account: @@ -787,10 +787,10 @@ void AccountsPage::SendingTab::slotAddTransport() KMTransportInfo *transportInfo = new KMTransportInfo(); switch ( transportType ) { case 0: // smtp - transportInfo->type = TQString::tqfromLatin1("smtp"); + transportInfo->type = TQString::fromLatin1("smtp"); break; case 1: // sendmail - transportInfo->type = TQString::tqfromLatin1("sendmail"); + transportInfo->type = TQString::fromLatin1("sendmail"); transportInfo->name = i18n("Sendmail"); transportInfo->host = _PATH_SENDMAIL; // ### FIXME: use const, not #define break; @@ -1026,7 +1026,7 @@ void AccountsPage::SendingTab::doLoadOther() { buffer[255] = 0; else buffer[0] = 0; - str = TQString::tqfromLatin1( *buffer ? buffer : "localhost" ); + str = TQString::fromLatin1( *buffer ? buffer : "localhost" ); } mDefaultDomainEdit->setText( str ); } @@ -1053,7 +1053,7 @@ void AccountsPage::SendingTab::save() { } TQString AccountsPage::ReceivingTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-accounts-receiving"); + return TQString::fromLatin1("configure-accounts-receiving"); } AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name ) @@ -1127,7 +1127,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "beep on new mail" check box: mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group ); - mBeepNewMailCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + mBeepNewMailCheck->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + mVerboseNotificationCheck->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, + mOtherNewMailActionsButton->setSizePolicy( 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::tqfromLatin1( accountType ) ); + = kmkernel->acctMgr()->create( TQString::fromLatin1( accountType ) ); if ( !account ) { // ### FIXME: Give the user more information. Is this error // recoverable? @@ -1478,7 +1478,7 @@ void AccountsPage::ReceivingTab::save() { // * * // ************************************************************* TQString AppearancePage::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance"); + return TQString::fromLatin1("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::tqfromLatin1("configure-appearance-fonts"); + return TQString::fromLatin1("configure-appearance-fonts"); } static const struct { @@ -1694,7 +1694,7 @@ void AppearancePage::FontsTab::save() { } TQString AppearancePage::ColorsTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance-colors"); + return TQString::fromLatin1("configure-appearance-colors"); } @@ -1857,7 +1857,7 @@ void AppearancePage::ColorsTab::save() { } TQString AppearancePage::LayoutTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance-tqlayout"); + return TQString::fromLatin1("configure-appearance-tqlayout"); } static const EnumConfigEntryItem folderListModes[] = { @@ -1976,7 +1976,7 @@ void AppearancePage::LayoutTab::save() { // TQString AppearancePage::HeadersTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance-headers"); + return TQString::fromLatin1("configure-appearance-headers"); } static const struct { @@ -2246,7 +2246,7 @@ static const BoolConfigEntry showCurrentTime = { }; TQString AppearancePage::ReaderTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance-reader"); + return TQString::fromLatin1("configure-appearance-reader"); } AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, @@ -2472,7 +2472,7 @@ void AppearancePage::ReaderTab::installProfile( KConfig * /* profile */ ) { TQString AppearancePage::SystemTrayTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance-systemtray"); + return TQString::fromLatin1("configure-appearance-systemtray"); } AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, @@ -2537,7 +2537,7 @@ void AppearancePage::SystemTrayTab::save() { // ************************************************************* TQString ComposerPage::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer"); + return TQString::fromLatin1("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::tqfromLatin1("configure-composer-general"); + return TQString::fromLatin1("configure-composer-general"); } ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name ) @@ -2910,7 +2910,7 @@ void ComposerPage::GeneralTab::slotConfigureCompletionOrder( ) } TQString ComposerPage::PhrasesTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer-phrases"); + return TQString::fromLatin1("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::tqfromLatin1("configure-composer-templates"); + return TQString::fromLatin1("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::tqfromLatin1("configure-composer-custom-templates"); + return TQString::fromLatin1("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::tqfromLatin1("configure-composer-subject"); + return TQString::fromLatin1("configure-composer-subject"); } ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name ) @@ -3190,7 +3190,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * // row 0: help text: label = new TQLabel( i18n("Recognize any sequence of the following prefixes\n" "(entries are case-insensitive regular expressions):"), group ); - label->tqsetAlignment( AlignLeft|WordBreak ); + label->setAlignment( AlignLeft|WordBreak ); // row 1, string list editor: SimpleStringListEditor::ButtonCode buttonCode = @@ -3219,7 +3219,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * // row 0: help text: label= new TQLabel( i18n("Recognize any sequence of the following prefixes\n" "(entries are case-insensitive regular expressions):"), group ); - label->tqsetAlignment( AlignLeft|WordBreak ); + label->setAlignment( AlignLeft|WordBreak ); // row 1: string list editor mForwardListEditor = @@ -3254,7 +3254,7 @@ void ComposerPage::SubjectTab::save() { } TQString ComposerPage::CharsetTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer-charset"); + return TQString::fromLatin1("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->tqsetAlignment( WordBreak); + label->setAlignment( WordBreak); vlay->addWidget( label ); mCharsetListEditor = @@ -3297,13 +3297,13 @@ 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::tqfromLatin1("us-ascii") ) { - charset = TQString::tqfromLatin1("us-ascii"); + if ( charset.lower() == TQString::fromLatin1("us-ascii") ) { + charset = TQString::fromLatin1("us-ascii"); return; } - if ( charset.lower() == TQString::tqfromLatin1("locale") ) { - charset = TQString::tqfromLatin1("%1 (locale)") + if ( charset.lower() == TQString::fromLatin1("locale") ) { + charset = TQString::fromLatin1("%1 (locale)") .tqarg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); return; } @@ -3311,7 +3311,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { bool ok = false; TQTextCodec *codec = KGlobal::charsets()->codecForName( charset, ok ); if ( ok && codec ) { - charset = TQString::tqfromLatin1( codec->mimeName() ).lower(); + charset = TQString::fromLatin1( codec->mimeName() ).lower(); return; } @@ -3325,7 +3325,7 @@ void ComposerPage::CharsetTab::doLoadOther() { TQStringList charsets = composer.readListEntry( "pref-charsets" ); for ( TQStringList::Iterator it = charsets.begin() ; it != charsets.end() ; ++it ) - if ( (*it) == TQString::tqfromLatin1("locale") ) { + if ( (*it) == TQString::fromLatin1("locale") ) { TQCString cset = kmkernel->networkCodec()->mimeName(); KPIM::kAsciiToLower( cset.data() ); (*it) = TQString("%1 (locale)").tqarg( TQString(cset) ); @@ -3349,7 +3349,7 @@ void ComposerPage::CharsetTab::save() { } TQString ComposerPage::HeadersTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer-headers"); + return TQString::fromLatin1("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::tqfromLatin1("configure-composer-attachments"); + return TQString::fromLatin1("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->tqsetAlignment( AlignLeft|WordBreak ); + label->setAlignment( 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::tqfromLatin1("attachment") - << TQString::tqfromLatin1("attached"); - if ( TQString::tqfromLatin1("attachment") != i18n("attachment") ) + attachWordsList << TQString::fromLatin1("attachment") + << TQString::fromLatin1("attached"); + if ( TQString::fromLatin1("attachment") != i18n("attachment") ) attachWordsList << i18n("attachment"); - if ( TQString::tqfromLatin1("attached") != i18n("attached") ) + if ( TQString::fromLatin1("attached") != i18n("attached") ) attachWordsList << i18n("attached"); } @@ -3669,7 +3669,7 @@ void ComposerPageAttachmentsTab::slotOutlookCompatibleClicked() // * * // ************************************************************* TQString SecurityPage::helpAnchor() const { - return TQString::tqfromLatin1("configure-security"); + return TQString::fromLatin1("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::tqfromLatin1("configure-security-reading"); + return TQString::fromLatin1("configure-security-reading"); } SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name ) @@ -3993,7 +3993,7 @@ void SecurityPage::GeneralTab::save() { TQString SecurityPage::ComposerCryptoTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-security-composing"); + return TQString::fromLatin1("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::tqfromLatin1("configure-security-warnings"); + return TQString::fromLatin1("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::tqfromLatin1("configure-security-smime-validation"); + return TQString::fromLatin1("configure-security-smime-validation"); } SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name ) @@ -4495,7 +4495,7 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp //// TQString SecurityPage::CryptPlugTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-security-crypto-backends"); + return TQString::fromLatin1("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::tqfromLatin1("configure-misc"); + return TQString::fromLatin1("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::tqfromLatin1("configure-misc-folders"); + return TQString::fromLatin1("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::tqfromLatin1("configure-misc-groupware"); + return TQString::fromLatin1("configure-misc-groupware"); } MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) -- cgit v1.2.1