Ignore:
Timestamp:
10/17/11 21:04:20 (11 years ago)
Author:
Philipp Spitzer <philipp@…>
Branches:
master, qt5
Children:
1ca13ef
Parents:
dc66a91
Message:

The conflict editor works again.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/gui/conflictsdialog.cpp

    rdc66a91 rc81f30a  
    2020#include "conflictsdialog.h"
    2121
    22 ConflictsDialog::ConflictsDialog(int aEventId, QWidget *aParent)
     22ConflictsDialog::ConflictsDialog(int aEventId, int aConferenceId, QWidget *aParent)
    2323    : QDialog(aParent)
    2424{
    2525    setupUi(this);
    26     connect(container, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
    27     connect(container, SIGNAL(eventHasChanged(int,bool)), container, SLOT(updateTreeViewModel(int,bool)));
     26    connect(container, SIGNAL(eventChanged(int,bool)), this, SIGNAL(eventChanged(int,bool)));
     27    connect(container, SIGNAL(eventChanged(int,bool)), container, SLOT(loadEvents()));
    2828
    29     container->setEventId(aEventId);
     29    container->setEventId(aEventId, aConferenceId);
    3030}
     31
    3132
    3233ConflictsDialog::~ConflictsDialog()
    3334{
    34     disconnect(container, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
     35    disconnect(container, SIGNAL(eventChanged(int,bool)), this, SIGNAL(eventChanged(int,bool)));
    3536}
    3637
Note: See TracChangeset for help on using the changeset viewer.