forgotten in previous commit

diff --git a/src/gui/conflictsdialog.cpp b/src/gui/conflictsdialog.cpp
index 674375e5e5f89b294f95fcea7a1361b16a968ab6..2ce5f2a718c9742634d70491371aac37aad87625 100644 (file)
--- a/src/gui/conflictsdialog.cpp
+++ b/src/gui/conflictsdialog.cpp
@@ -4,8 +4,8 @@ ConflictsDialog::ConflictsDialog(int aEventId, QWidget *aParent)
     : QDialog(aParent)
 {
     setupUi(this);
     : 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);
 
 
     container->setEventId(aEventId);
 


@@ -17,6 +17,6 @@ ConflictsDialog::ConflictsDialog(int aEventId, QWidget *aParent)
 
 ConflictsDialog::~ConflictsDialog()
 {
 
 ConflictsDialog::~ConflictsDialog()
 {

-    disconnect(container, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));
+    disconnect(container, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));

 }
 
 }
 

diff --git a/src/gui/conflictsdialog.h b/src/gui/conflictsdialog.h
index cd28c7c70e12da60901ba69a5ee21d99529f6686..429084bbf4063295868d22dc62b7e6e2e69cfc18 100644 (file)
--- a/src/gui/conflictsdialog.h
+++ b/src/gui/conflictsdialog.h
@@ -11,7 +11,7 @@ public:
     ConflictsDialog(int aEventId, QWidget *aParent = NULL);
     ~ConflictsDialog();
 signals:
     ConflictsDialog(int aEventId, QWidget *aParent = NULL);
     ~ConflictsDialog();
 signals:

-    void eventHasChanged(int aEventId);
+    void eventHasChanged(int aEventId, bool aReloadModel = false);

 };
 
 #endif /* CONFLICTSDIALOG_H */ 
 };
 
 #endif /* CONFLICTSDIALOG_H */