X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/blobdiff_plain/accae6beb43e6ca2e71d69cefa8895fc94156c1e..351728eb784ba307ebcca9841341f4617b73845e:/src/gui/eventdialog.cpp

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index 8e5d1b5..486d2d9 100644
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -26,10 +26,7 @@
 #include "alarm.h"
 #endif
 
-EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
-    : QDialog(aParent)
-    , mEventId(aEventId)
-{
+EventDialog::EventDialog(int conferenceId, int eventId, QWidget *parent): QDialog(parent), mConferenceId(conferenceId), mEventId(eventId) {
     setupUi(this);
 
 #ifdef MAEMO
@@ -38,7 +35,7 @@ EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
     alarmButton->hide();
 #endif
 
-    Event event = Event::getById(mEventId,Conference::activeConference());
+    Event event = Event::getById(mEventId, mConferenceId);
 
     title->setText(event.title());
     persons->setText(event.persons().join(" and "));
@@ -65,9 +62,9 @@ EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
 
 void EventDialog::favouriteClicked()
 {
-    Event event = Event::getById(mEventId,Conference::activeConference());
+    Event event = Event::getById(mEventId, mConferenceId);
 
-    QList<Event> conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
+    QList<Event> conflicts = Event::conflictEvents(event.id(), mConferenceId);
     if(event.isFavourite())
     {
         event.setFavourite(false);
@@ -83,7 +80,7 @@ void EventDialog::favouriteClicked()
     if(event.isFavourite())
     {
         // event has became 'favourite' and so 'conflicts' list may have changed
-        conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
+        conflicts = Event::conflictEvents(event.id(), mConferenceId);
     }
 
     // have to emit 'eventChanged' signal on all events in conflict
@@ -97,14 +94,14 @@ void EventDialog::favouriteClicked()
 
 void EventDialog::alarmClicked()
 {
-    Event event = Event::getById(mEventId,Conference::activeConference());
+    Event event = Event::getById(mEventId, mConferenceId);
 
     if(event.hasAlarm())
     {
         event.setHasAlarm(false); // update DB
         alarmButton->setIcon(QIcon(":/icons/alarm-off.png"));
 #ifdef MAEMO
-        // remove alarm from the 'alarmd' alrms list
+        // remove alarm from the 'alarmd' alarms list
         Alarm alarm;
         alarm.deleteAlarm(event.conferenceId(), event.id());
         // TODO: test if removing was successfull