summaryrefslogtreecommitdiffstats
path: root/kalarm/alarmtimewidget.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/alarmtimewidget.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/alarmtimewidget.cpp')
-rw-r--r--kalarm/alarmtimewidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp
index 94abd0e3e..615696cfb 100644
--- a/kalarm/alarmtimewidget.cpp
+++ b/kalarm/alarmtimewidget.cpp
@@ -81,7 +81,7 @@ void AlarmTimeWidget::init(int mode)
{
static const TQString recurText = i18n("For a simple repetition, enter the date/time of the first occurrence.\n"
"If a recurrence is configured, the start date/time will be adjusted "
- "to the first recurrence on or after the entered date/time.");
+ "to the first recurrence on or after the entered date/time.");
connect(this, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotButtonSet(int)));
TQBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
@@ -466,7 +466,7 @@ void AlarmTimeWidget::slotTimer()
{
// The current date has reached or has passed the maximum date
if (now.date() > mMaxDateTime.date()
- || !mAnyTime && now.time() > mTimeEdit->maxTime())
+ || (!mAnyTime && now.time() > mTimeEdit->maxTime()))
{
mPastMax = true;
emit pastMax();