'conflict' dialog now contains list of events in conflict with given eventId
[toast/confclerk.git] / src / gui / conflictdialogcontainer.cpp
index b09eda7..b83bb8f 100644 (file)
@@ -8,19 +8,7 @@ ConflictDialogContainer::ConflictDialogContainer(QWidget *aParent)
 
 void ConflictDialogContainer::loadEvents( const QDate &aDate, const int aConferenceId )
 {
-    static_cast<EventModel*>(treeView->model())->loadEventsByRoom( aDate, aConferenceId );
-    //treeView->setAllExpanded(true);
-}
-
-void ConflictDialogContainer::updateTreeViewModel(int aEventId)
-{
-    // requires special handling
-    // we need to reload favourites, because some favourite could be deleted
-    //static_cast<EventModel*>(favTreeView->model())->updateModel(aEventId);
-    int confId = Conference::activeConference();
-    QDate startDate = Conference::getById(confId).start();
-    QDate endDate = Conference::getById(confId).end();
-    dayNavigator->setDates(startDate, endDate);
-    updateTreeView( Conference::getById(confId).start() );
+    static_cast<EventModel*>(treeView->model())->loadConflictEvents( mEventId, aConferenceId );
+    dayNavigator->hide();
 }