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-07 17:06:29 +0900 |
| commit | c036d97d35d25c4511d9569d40c1de07dab96bb6 (patch) | |
| tree | abb9a42ff29a9c144450b6b6a5aafb851cbdc69c /kalarm/kalarmapp.cpp | |
| parent | 74a91e13153f0696bb62baa78dac119f3a2e9fca (diff) | |
| download | tdepim-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/kalarmapp.cpp')
| -rw-r--r-- | kalarm/kalarmapp.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 7530b14a..476a8c1f 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -229,7 +229,7 @@ bool KAlarmApp::restoreSession() // Try to display the system tray icon if it is configured to be autostarted, // or if we're in run-in-system-tray mode. if (Preferences::autostartTrayIcon() - || MainWindow::count() && wantRunInSystemTray()) + || (MainWindow::count() && wantRunInSystemTray())) { displayTrayIcon(true, trayParent); // Occasionally for no obvious reason, the main main window is @@ -786,7 +786,7 @@ void KAlarmApp::quitIf(int exitCode, bool force) return; int mwcount = MainWindow::count(); MainWindow* mw = mwcount ? MainWindow::firstWindow() : 0; - if (mwcount > 1 || mwcount && (!mw->isHidden() || !mw->isTrayParent())) + if (mwcount > 1 || (mwcount && (!mw->isHidden() || !mw->isTrayParent()))) return; // There are no windows left except perhaps a main window which is a hidden tray icon parent if (mTrayWindow) @@ -1328,7 +1328,7 @@ bool KAlarmApp::handleEvent(const TQString& eventID, EventFunc function) if (now >= limit) { if (type == KAEvent::LAST_RECURRENCE - || type == KAEvent::FIRST_OR_ONLY_OCCURRENCE && !event.recurs()) + || (type == KAEvent::FIRST_OR_ONLY_OCCURRENCE && !event.recurs())) cancel = true; // last occurrence (and there are no repetitions) else late = true; @@ -1360,7 +1360,7 @@ bool KAlarmApp::handleEvent(const TQString& eventID, EventFunc function) if (next.dateTime().secsTo(now) > maxlate) { if (type == KAEvent::LAST_RECURRENCE - || type == KAEvent::FIRST_OR_ONLY_OCCURRENCE && !event.recurs()) + || (type == KAEvent::FIRST_OR_ONLY_OCCURRENCE && !event.recurs())) cancel = true; // last occurrence (and there are no repetitions) else late = true; @@ -1621,7 +1621,7 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule if (!event.enabled()) delete win; // event is disabled - close its window else if (!win - || !win->hasDefer() && !alarm.repeatAtLogin() + || (!win->hasDefer() && !alarm.repeatAtLogin()) || replaceReminder) { // Either there isn't already a message for this event, |