diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-08-07 17:06:29 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-08-27 23:21:13 +0900 |
| commit | c822d344caac7367564ef929037082e3374267be (patch) | |
| tree | 5be64ca958a093c3175888b4e15a22724fac4d39 /kalarm/alarmcalendar.cpp | |
| parent | 3ba5901c39be9c956e74accdafe1a8b8b745e0e5 (diff) | |
| download | tdepim-c822d344caac7367564ef929037082e3374267be.tar.gz tdepim-c822d344caac7367564ef929037082e3374267be.zip | |
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 <michele.calgaro@yahoo.it>
Diffstat (limited to 'kalarm/alarmcalendar.cpp')
| -rw-r--r-- | kalarm/alarmcalendar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index 8d11854bd..d0150d00e 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()) |