From 83020cddd8269fd206a9875549a5bcd1b8cf9360 Mon Sep 17 00:00:00 2001
From: pavelpa <pavelpa@localhost>
Date: Thu, 28 Jan 2010 14:59:37 +0000
Subject: [PATCH] forgotten in previous commit

---
 src/gui/conflictsdialog.cpp | 6 +++---
 src/gui/conflictsdialog.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/conflictsdialog.cpp b/src/gui/conflictsdialog.cpp
index 674375e..2ce5f2a 100644
--- a/src/gui/conflictsdialog.cpp
+++ b/src/gui/conflictsdialog.cpp
@@ -4,8 +4,8 @@ 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);
 
@@ -17,6 +17,6 @@ ConflictsDialog::ConflictsDialog(int aEventId, QWidget *aParent)
 
 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 cd28c7c..429084b 100644
--- a/src/gui/conflictsdialog.h
+++ b/src/gui/conflictsdialog.h
@@ -11,7 +11,7 @@ public:
     ConflictsDialog(int aEventId, QWidget *aParent = NULL);
     ~ConflictsDialog();
 signals:
-    void eventHasChanged(int aEventId);
+    void eventHasChanged(int aEventId, bool aReloadModel = false);
 };
 
 #endif /* CONFLICTSDIALOG_H */ 
-- 
2.30.2