Ignore:
Timestamp:
10/17/12 20:49:16 (10 years ago)
Author:
Philipp Spitzer <philipp@…>
Branches:
master, qt5
Children:
908b4ce
Parents:
95257a6
Message:

We added the conferenceId to some alarm related methods (ticket #41).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gui/eventdialog.cpp

    r95257a6 r8bd618c  
    2727#endif
    2828
    29 EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
    30     : QDialog(aParent)
    31     , mEventId(aEventId)
    32 {
     29EventDialog::EventDialog(int conferenceId, int eventId, QWidget *parent): QDialog(parent), mConferenceId(conferenceId), mEventId(eventId) {
    3330    setupUi(this);
    3431
     
    3936#endif
    4037
    41     Event event = Event::getById(mEventId,Conference::activeConference());
     38    Event event = Event::getById(mEventId, mConferenceId);
    4239
    4340    title->setText(event.title());
     
    6663void EventDialog::favouriteClicked()
    6764{
    68     Event event = Event::getById(mEventId,Conference::activeConference());
     65    Event event = Event::getById(mEventId, mConferenceId);
    6966
    70     QList<Event> conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
     67    QList<Event> conflicts = Event::conflictEvents(event.id(), mConferenceId);
    7168    if(event.isFavourite())
    7269    {
     
    8481    {
    8582        // event has became 'favourite' and so 'conflicts' list may have changed
    86         conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
     83        conflicts = Event::conflictEvents(event.id(), mConferenceId);
    8784    }
    8885
     
    9895void EventDialog::alarmClicked()
    9996{
    100     Event event = Event::getById(mEventId,Conference::activeConference());
     97    Event event = Event::getById(mEventId, mConferenceId);
    10198
    10299    if(event.hasAlarm())
Note: See TracChangeset for help on using the changeset viewer.