updated schedule.en.xml to the newest version

[toast/confclerk.git] / src / gui / conflictsdialog.cpp

diff --git a/src/gui/conflictsdialog.cpp b/src/gui/conflictsdialog.cpp
index 070dc9df8a7b566fadc1d887add98459b237a074..2ce5f2a718c9742634d70491371aac37aad87625 100644 (file)
--- a/src/gui/conflictsdialog.cpp
+++ b/src/gui/conflictsdialog.cpp
@@ -1,11 +1,13 @@
 #include "conflictsdialog.h"
 
-ConflictsDialog::ConflictsDialog(QWidget *aParent)
+ConflictsDialog::ConflictsDialog(int aEventId, QWidget *aParent)
     : QDialog(aParent)
 {
     setupUi(this);
-    connect(container, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));
-    connect(container, SIGNAL(eventHasChanged(int)), container, SLOT(updateTreeViewModel(int)));
+    connect(container, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
+    connect(container, SIGNAL(eventHasChanged(int,bool)), container, SLOT(updateTreeViewModel(int,bool)));
+
+    container->setEventId(aEventId);
 
     int confId = Conference::activeConference();
     QDate startDate = Conference::getById(confId).start();
@@ -15,6 +17,6 @@ ConflictsDialog::ConflictsDialog(QWidget *aParent)
 
 ConflictsDialog::~ConflictsDialog()
 {
-    disconnect(container, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));
+    disconnect(container, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
 }