From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmail/configuredialog.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'kmail/configuredialog.cpp') diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index bc415a888..993c6c74f 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -451,7 +451,7 @@ void IdentityPage::slotRemoveIdentity() if ( !item ) return; TQString msg = i18n("Do you really want to remove the identity named " - "%1?").arg( item->identity().identityName() ); + "%1?").tqarg( item->identity().identityName() ); if( KMessageBox::warningContinueCancel( this, msg, i18n("Remove Identity"), KGuiItem(i18n("&Remove"),"editdelete") ) == KMessageBox::Continue ) if ( im->removeIdentity( item->identity().identityName() ) ) { @@ -649,7 +649,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * tqparent, const char btn_vlay->addStretch( 1 ); // spacer // "Common options" groupbox: - group = new TQGroupBox( 0, TQt::Vertical, + group = new TQGroupBox( 0, Qt::Vertical, i18n("Common Options"), this ); vlay->addWidget(group); @@ -742,7 +742,7 @@ static inline TQString uniqueName( const TQStringList & list, while ( list.tqfind( 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; @@ -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, @@ -1364,7 +1364,7 @@ void AccountsPage::ReceivingTab::slotRemoveSelectedAccount() { if ( !acct ) { // ### FIXME: see above KMessageBox::sorry( this, i18n("Unable to locate account %1.") - .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("Unable to locate account %1.") - .arg( (*it)->name() ) ); + .tqarg( (*it)->name() ) ); } mAccountsToDelete.clear(); @@ -1667,7 +1667,7 @@ void AppearancePage::FontsTab::installProfile( KConfig * profile ) { needChange = true; mFont[i] = fonts.readFontEntry( fontNames[i].configName ); kdDebug(5006) << "got font \"" << fontNames[i].configName - << "\" thusly: \"" << mFont[i].toString() << "\"" << endl; + << "\" thusly: \"" << TQString(mFont[i].toString()) << "\"" << endl; } if ( needChange && mFontLocationCombo->currentItem() > 0 ) mFontChooser->setFont( mFont[ mFontLocationCombo->currentItem() ], @@ -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 @@ -2058,7 +2058,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * tqparent, const c for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) { TQString buttonLabel = i18n(dateDisplayConfig[i].displayName); if ( buttonLabel.tqcontains("%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 ) { @@ -3304,7 +3304,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { if ( charset.lower() == TQString::tqfromLatin1("locale") ) { charset = TQString::tqfromLatin1("%1 (locale)") - .arg( TQCString( kmkernel->networkCodec()->mimeName() ).lower() ); + .tqarg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); return; } @@ -3328,7 +3328,7 @@ void ComposerPage::CharsetTab::doLoadOther() { if ( (*it) == TQString::tqfromLatin1("locale") ) { TQCString cset = kmkernel->networkCodec()->mimeName(); KPIM::kAsciiToLower( cset.data() ); - (*it) = TQString("%1 (locale)").arg( cset ); + (*it) = TQString("%1 (locale)").tqarg( TQString(cset) ); } mCharsetListEditor->setStringList( charsets ); @@ -3376,7 +3376,7 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * tqparent, const char mMessageIdSuffixEdit = new KLineEdit( this ); // only ASCII letters, digits, plus, minus and dots are allowed mMessageIdSuffixValidator = - new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), this ); + new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(this) ); mMessageIdSuffixEdit->setValidator( mMessageIdSuffixValidator ); label = new TQLabel( mMessageIdSuffixEdit, i18n("Custom message-&id suffix:"), this ); @@ -3815,7 +3815,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * tqparent, const char "exploits. More about " "HTML mails... More " "about external references...") - .arg(htmlWhatsThis).arg(externalWhatsThis), + .tqarg(htmlWhatsThis).tqarg(externalWhatsThis), group ); vlay->addWidget( group ); @@ -3890,7 +3890,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * tqparent, const char label = new KActiveLabel( i18n("WARNING: Unconditionally returning " "confirmations undermines your privacy. " "More...") - .arg(receiptWhatsThis), + .tqarg(receiptWhatsThis), group ); vlay->addWidget( group ); @@ -4358,7 +4358,7 @@ void SecurityPage::SMimeTab::doLoadOther() { TQString systemProxy = TQString::fromLocal8Bit( getenv( "http_proxy" ) ); if ( systemProxy.isEmpty() ) systemProxy = i18n( "no proxy" ); - mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).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; @@ -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() ); } } -- cgit v1.2.1