Add .pro.user.* to svn:ignore and remove it in the release target.

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

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index 694ce78580e10ae8effa0a28ec051ffb2218a652..522860e668e50ad9cfff51f4501c2118e685a788 100644 (file)
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011 Philipp Spitzer, gregor herrmann
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -76,7 +76,8 @@ void TabContainer::itemClicked(const QModelIndex &aIndex)
 
 void TabContainer::displayConflicts(const QModelIndex &aIndex)
 {
-    ConflictsDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);
+    Event* event = static_cast<Event*>(aIndex.internalPointer());
+    ConflictsDialog dialog(event->id(), event->conferenceId(), this);
 #ifdef N810
     dialog.setFixedWidth(static_cast<QWidget*>(parent())->width());
 #endif
@@ -86,9 +87,8 @@ void TabContainer::displayConflicts(const QModelIndex &aIndex)
 }
 
 
-void TabContainer::redisplayEvent(int aEventId, bool aReloadModel) {
-    /* if (aReloadModel) updateTreeView(dayNavigator->curDate());
-    else */ static_cast<EventModel*>(treeView->model())->updateModel(aEventId);
+void TabContainer::redisplayEvent(int aEventId) {
+    static_cast<EventModel*>(treeView->model())->updateModel(aEventId);
 }