From 30cd1d6b258c79c69ee21a0cdd26111930ad1304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 29 Oct 2020 01:03:10 +0100 Subject: [PATCH] Fix FTBFS due to redefine the 'round' symbol in korganizer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 1762272863a8f3440d8b3f5e8afd1c221bab552d) --- korganizer/printing/calprintpluginbase.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index 9eecda39..c094ad84 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -38,7 +38,7 @@ #ifndef KORG_NOPRINTER -inline int round(const double x) +inline int roundToInt(const double x) { return int(x > 0.0 ? x + 0.5 : x - 0.5); } @@ -1178,7 +1178,7 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect // Fill the remaining space (if a month has less days than others) with a crossed-out pattern if ( daysinmonthsetYMD( day, dt.year(), dt.month(), d+1 ); - TQRect dayBox( daysBox.left()/*+rand()%50*/, daysBox.top() + round(dayheight*d), daysBox.width()/*-rand()%50*/, 0 ); + TQRect dayBox( daysBox.left()/*+rand()%50*/, daysBox.top() + roundToInt(dayheight*d), daysBox.width()/*-rand()%50*/, 0 ); // FIXME: When using a border width of 0 for event boxes, don't let the rectangles overlap, i.e. subtract 1 from the top or bottom! - dayBox.setBottom( daysBox.top()+round(dayheight*(d+1)) - 1 ); + dayBox.setBottom( daysBox.top()+roundToInt(dayheight*(d+1)) - 1 ); p.setBrush( isWorkingDay( day )?workdayColor:holidayColor ); p.drawRect( dayBox ); @@ -1314,9 +1314,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect int minsToEnd = starttime.secsTo( placeItem->end() )/60; TQRect eventBox( xstartcont + placeItem->subCell()*17, - daysBox.top() + round( double( minsToStart*daysBox.height()) / double(maxdays*24*60) ), + daysBox.top() + roundToInt( double( minsToStart*daysBox.height()) / double(maxdays*24*60) ), 14, 0 ); - eventBox.setBottom( daysBox.top() + round( double( minsToEnd*daysBox.height()) / double(maxdays*24*60) ) ); + eventBox.setBottom( daysBox.top() + roundToInt( double( minsToEnd*daysBox.height()) / double(maxdays*24*60) ) ); drawVerticalBox( p, 0, eventBox, placeItem->event()->summary() ); newxstartcont = TQMAX( newxstartcont, eventBox.right() ); } @@ -1327,9 +1327,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect for ( int d=0; d