summaryrefslogtreecommitdiffstats
path: root/kalarm/kalarmd/adcalendar.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-07 17:06:29 +0900
commitc036d97d35d25c4511d9569d40c1de07dab96bb6 (patch)
treeabb9a42ff29a9c144450b6b6a5aafb851cbdc69c /kalarm/kalarmd/adcalendar.cpp
parent74a91e13153f0696bb62baa78dac119f3a2e9fca (diff)
downloadtdepim-c036d97d35d25c4511d9569d40c1de07dab96bb6.tar.gz
tdepim-c036d97d35d25c4511d9569d40c1de07dab96bb6.zip
Fixed KAlarm building warnings. Minor style patch up. Fixed possible error in treating deferred evens (see kalarm/alarmevent.cpp:1739).
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kalarm/kalarmd/adcalendar.cpp')
-rw-r--r--kalarm/kalarmd/adcalendar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index a2cc4836..b1033eb0 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -153,8 +153,8 @@ bool ADCalendar::eventHandled(const KCal::Event* event, const TQValueList<TQDate
if (alarmtimes[i].isValid()
&& (i >= oldCount // is it an additional alarm?
|| !it.data().alarmTimes[i].isValid() // or has it just become due?
- || it.data().alarmTimes[i].isValid() // or has it changed?
- && alarmtimes[i] != it.data().alarmTimes[i]))
+ || (it.data().alarmTimes[i].isValid() // or has it changed?
+ && alarmtimes[i] != it.data().alarmTimes[i])))
return false; // this alarm has changed
}
return true;