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 /korganizer/komonthview.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 'korganizer/komonthview.cpp')
-rw-r--r-- | korganizer/komonthview.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index ad03aec43..5ed6664f0 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -168,7 +168,7 @@ void KNoScrollListBox::mousePressEvent( TQMouseEvent *e ) { TQListBox::mousePressEvent( e ); - if ( e->button() == RightButton ) { + if ( e->button() == Qt::RightButton ) { emit rightClick(); } } @@ -425,8 +425,8 @@ void MonthViewCell::setDate( const TQDate &date ) TQString text; if ( KOGlobals::self()->calendarSystem()->day( date ) == 1 ) { text = i18n("'Month day' for month view cells", "%1 %2") - .arg( KOGlobals::self()->calendarSystem()->monthName( date, true ) ) - .arg( KOGlobals::self()->calendarSystem()->day(mDate) ); + .tqarg( KOGlobals::self()->calendarSystem()->monthName( date, true ) ) + .tqarg( KOGlobals::self()->calendarSystem()->day(mDate) ); TQFontMetrics fm( mLabel->font() ); mLabel->resize( mLabelSize + TQSize( fm.width( text ), 0 ) ); } else { @@ -546,7 +546,7 @@ class MonthViewCell::CreateItemVisitor : TQDateTime dt( mDate ); // take the time 0:00 into account, which is non-inclusive TQDate dtEnd = event->dtEnd().addSecs( event->doesFloat() ? 0 : -1).date(); - int length = event->dtStart().daysTo( dtEnd ); + int length = event->dtStart().daysTo( TQDateTime(dtEnd) ); if ( event->isMultiDay() ) { if ( mDate == event->dtStart().date() || ( mMultiDay == 0 && event->recursOn( mDate ) ) ) { @@ -976,8 +976,8 @@ void KOMonthView::showDates( const TQDate &start, const TQDate & ) mStartDate = mStartDate.addDays( -weekdayCol ); mLabel->setText( i18n( "monthname year", "%1 %2" ) - .arg( calSys->monthName( start ) ) - .arg( calSys->year( start ) ) ); + .tqarg( calSys->monthName( start ) ) + .tqarg( calSys->year( start ) ) ); showLabel( !KOPrefs::instance()->fullViewMonth() ); @@ -1087,7 +1087,7 @@ void KOMonthView::changeIncidenceDisplayAdded( Incidence *incidence, MonthViewCe if ( incidence->recursOn( mCells[i]->date(), calendar() ) ) { // handle multiday events - int length = gdv.startDate().daysTo( gdv.endDate().addSecs( floats ? 0 : -1 ).date() ); + int length = gdv.startDate().daysTo( TQDateTime(gdv.endDate().addSecs( floats ? 0 : -1 ).date()) ); for ( int j = 0; j <= length && i+j < mCells.count(); ++j ) { mCells[i+j]->addIncidence( incidence, v, j ); } |