diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
| commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
| tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /libkdepim/kincidencechooser.cpp | |
| parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
| download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip | |
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
Diffstat (limited to 'libkdepim/kincidencechooser.cpp')
| -rw-r--r-- | libkdepim/kincidencechooser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libkdepim/kincidencechooser.cpp b/libkdepim/kincidencechooser.cpp index 431d650d..b9d8758e 100644 --- a/libkdepim/kincidencechooser.cpp +++ b/libkdepim/kincidencechooser.cpp @@ -104,7 +104,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *tqparent, char *name) : #else mDiffBut = 0; #endif - mBg = new TQButtonGroup ( 1, TQt::Horizontal, i18n("Sync Preferences"), topFrame); + mBg = new TQButtonGroup ( 1, Qt::Horizontal, i18n("Sync Preferences"), topFrame); topLayout->addMultiCellWidget(mBg, iii,iii,0,2); ++iii; mBg->insert( new TQRadioButton ( i18n("Take local entry on conflict"), mBg ), KIncidenceChooser::local); @@ -249,7 +249,7 @@ void KIncidenceChooser::showIncidence1() void KIncidenceChooser::detailsDialogClosed() { - KDialogBase* dialog = static_cast<KDialogBase *>( const_cast<TQObject *>( sender() ) ); + KDialogBase* dialog = static_cast<KDialogBase *>( const_cast<TQWidget *>( TQT_TQWIDGET(sender()) ) ); if ( dialog == mTbL ) mShowDetails1->setText( i18n( "Show details..." ) ); else @@ -265,9 +265,9 @@ void KIncidenceChooser::showDiff() } mDisplayDiff = new KPIM::HTMLDiffAlgoDisplay (this); if ( mInc1->summary().left( 20 ) != mInc2->summary().left( 20 ) ) - mDisplayDiff->setCaption( i18n( "Differences of %1 and %2").arg( mInc1->summary().left( 20 ) ).arg( mInc2->summary().left( 20 ) ) ); + mDisplayDiff->setCaption( i18n( "Differences of %1 and %2").tqarg( mInc1->summary().left( 20 ) ).tqarg( mInc2->summary().left( 20 ) ) ); else - mDisplayDiff->setCaption( i18n( "Differences of %1").arg( mInc1->summary().left( 20 ) ) ); + mDisplayDiff->setCaption( i18n( "Differences of %1").tqarg( mInc1->summary().left( 20 ) ) ); diff = new KPIM::CalendarDiffAlgo( mInc1, mInc2); diff->setLeftSourceTitle( i18n( "Local entry")); |