summaryrefslogtreecommitdiffstats
path: root/kalarm/kalarmd/alarmdaemon.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2015-08-07 17:06:29 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2015-08-27 23:21:13 +0900
commitc822d344caac7367564ef929037082e3374267be (patch)
tree5be64ca958a093c3175888b4e15a22724fac4d39 /kalarm/kalarmd/alarmdaemon.cpp
parent3ba5901c39be9c956e74accdafe1a8b8b745e0e5 (diff)
downloadtdepim-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/kalarmd/alarmdaemon.cpp')
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 4af7f0de7..3b7f7456f 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -312,7 +312,7 @@ void AlarmDaemon::enableAutoStart(bool on)
{
ADConfigData::enableAutoStart(on);
}
-
+
/******************************************************************************
* Check if any alarms are pending for any enabled calendar, and display the
* pending alarms.
@@ -449,7 +449,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal)
}
}
if (!dt.isValid() || dt > now
- || dt1.isValid() && dt1 > dt) // already tested dt1 <= now
+ || (dt1.isValid() && dt1 > dt)) // already tested dt1 <= now
dt = dt1;
}
alarmtimes.append(dt);