From c822d344caac7367564ef929037082e3374267be Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 7 Aug 2015 17:06:29 +0900 Subject: Fixed KAlarm building warnings. Minor style patch up. Fixed possible error in treating deferred evens (see kalarm/alarmevent.cpp:1739). (cherry picked from commit c036d97d35d25c4511d9569d40c1de07dab96bb6) Signed-off-by: Michele Calgaro --- kalarm/alarmcalendar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kalarm/alarmcalendar.cpp') diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index 8d11854b..d0150d00 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -373,7 +373,7 @@ bool AlarmCalendar::reload() */ bool AlarmCalendar::saveCal(const TQString& newFile) { - if (!mCalendar || !mOpen && newFile.isNull()) + if (!mCalendar || (!mOpen && newFile.isNull())) return false; kdDebug(5950) << "AlarmCalendar::saveCal(\"" << newFile << "\", " << mType << ")\n"; @@ -638,7 +638,7 @@ void AlarmCalendar::setPurgeDays(int days) mPurgeDays = days; if (mPurgeDays <= 0) StartOfDayTimer::disconnect(this); - if (oldDays < 0 || days >= 0 && days < oldDays) + if (oldDays < 0 || (days >= 0 && days < oldDays)) { // Alarms are now being kept for less long, so purge them if (open()) -- cgit v1.2.3