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/kmfilterdlg.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kmail/kmfilterdlg.cpp') diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index a83b6eec..02abff7b 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -185,11 +185,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* tqparent, const char* name, bool popFilter, b vbl->addWidget( mGlobalsBox, 0, TQt::AlignTop ); } else { - TQGroupBox *agb = new TQGroupBox( 1 /*column*/, Vertical, i18n("Filter Actions"), page1 ); + TQGroupBox *agb = new TQGroupBox( 1 /*column*/, Qt::Vertical, i18n("Filter Actions"), page1 ); mActionLister = new KMFilterActionWidgetLister( agb ); vbl->addWidget( agb, 0, TQt::AlignTop ); - mAdvOptsGroup = new TQGroupBox ( 1 /*columns*/, Vertical, + mAdvOptsGroup = new TQGroupBox ( 1 /*columns*/, Qt::Vertical, i18n("Advanced Options"), page2); { TQWidget *adv_w = new TQWidget( mAdvOptsGroup ); @@ -558,7 +558,7 @@ void KMFilterDlg::slotUpdateAccountList() TQCheckListItem *listItem = new TQCheckListItem( mAccountList, top, a->name(), TQCheckListItem::CheckBox ); listItem->setText( 1, a->type() ); - listItem->setText( 2, TQString( "%1" ).arg( a->id() ) ); + listItem->setText( 2, TQString( "%1" ).tqarg( a->id() ) ); if ( mFilter ) listItem->setOn( mFilter->applyOnAccount( a->id() ) ); top = listItem; @@ -578,7 +578,7 @@ void KMFilterDlg::slotUpdateAccountList() //============================================================================= KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *tqparent, const char* name, bool popFilter ) - : TQGroupBox( 1, Horizontal, title, tqparent, name ), + : TQGroupBox( 1, Qt::Horizontal, title, tqparent, name ), bPopFilter(popFilter) { mFilterList.setAutoDelete( true ); @@ -682,7 +682,7 @@ void KMFilterListBox::createFilter( const TQCString & field, KMFilter *newFilter = new KMFilter(0, bPopFilter); newFilter->pattern()->append( newRule ); - newFilter->pattern()->setName( TQString("<%1>:%2").arg( field ).arg( value) ); + newFilter->pattern()->setName( TQString("<%1>:%2").tqarg( TQString(field) ).tqarg( TQString(value) ) ); KMFilterActionDesc *desc = (*kmkernel->filterActionDict())["transfer"]; if ( desc ) @@ -712,7 +712,7 @@ void KMFilterListBox::slotUpdateFilterName() if ( mFilterList.at(mIdxSelItem)->isAutoNaming() ) { // auto-naming of patterns if ( !p->isEmpty() && p->first() && !p->first()->field().stripWhiteSpace().isEmpty() ) - shouldBeName = TQString( "<%1>: %2" ).arg( p->first()->field() ).arg( p->first()->contents() ); + shouldBeName = TQString( "<%1>: %2" ).tqarg( TQString(p->first()->field()) ).tqarg( TQString(p->first()->contents()) ); else shouldBeName = "<" + i18n("unnamed") + ">"; p->setName( shouldBeName ); @@ -946,7 +946,7 @@ void KMFilterListBox::slotRename() ( i18n("Rename Filter"), i18n("Rename filter \"%1\" to:\n(leave the field empty for automatic naming)") - .arg( filter->pattern()->name() ) /*label*/, + .tqarg( filter->pattern()->name() ) /*label*/, filter->pattern()->name() /* initial value */, &okPressed, tqtopLevelWidget(), 0, validator ); -- cgit v1.2.3